Changeset 10

Timestamp:

Mar 14, 2013 5:15:24 PM (9 years ago)

Author:

ilavsky

Message:

Plotting tool 2 modifications, minor changes other packages

Location:

User Procedures/Irena

Files:

• IR1_DataManipulation.ipf (modified) (2 diffs)
• IR2L_NLSQFsupport.ipf (modified) (1 diff)
• IR2_DWSGraphControls.ipf (modified) (2 diffs)
• IR2_Reflectivity.ipf (modified) (1 diff)
• Modification history.txt (modified) (1 diff)

User Procedures/Irena/IR1_DataManipulation.ipf

@@ -3571 +3571 @@
                 ResultsIntWaveName  = IN2G_RemoveExtraQuote(IntensityWaveName,1,1)[0,25]+NameModifier
                 ResultsQvecWaveName = IN2G_RemoveExtraQuote(QWavename,1,1)[0,25]+NameModifier
-                ResultsErrWaveName =  IN2G_RemoveExtraQuote(ErrorWaveName,1,1)[0,25]+NameModifier
+                if(!stringmatch(ErrorWaveName,"---")&&!stringmatch(IntensityWaveName,ErrorWaveName))
+                        ResultsErrWaveName =  IN2G_RemoveExtraQuote(ErrorWaveName,1,1)[0,25]+NameModifier
+                else
+                        ResultsErrWaveName = "s"+ResultsIntWaveName[1,inf]
+                endif
         endif
 end
@@ -4449 +4453 @@
                                         Wave/Z TempSubtractedEWv0123= $(tempFldrNm+"TempSubtractedEWv0123")
                                         if(WaveExists(TempSubtractedEWv0123))
-                                                Duplicate TempSubtractedEWv0123, $((OutEWvNm))
+                                                Duplicate/O TempSubtractedEWv0123, $((OutEWvNm))
                                         endif
                                         setDataFolder tempFldrNm

User Procedures/Irena/IR2L_NLSQFsupport.ipf

@@ -3998 +3998 @@
                         AutoPositionWindow/M=0/R=LSQF2_MainPanel ChisquaredAnalysis
                         IR1_CreateResultsNbk()
-                        IR1_AppendAnyText("Moldeling II Evaluation of parameter "+ParamName, 2)
+                        IR1_AppendAnyText("Modeling II Evaluation of parameter "+ParamName, 2)
                         IR1_AppendAnyText("  ", 0)
                         IR1_AppendAnyText("Method used to evaluate parameter stability: "+Method, 0)    

User Procedures/Irena/IR2_DWSGraphControls.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
-
+#pragma version 1.01
+
+
+
+// 1.01 changed way error bars are added and added SMR error bars capability.  
 
 
@@ -76 +80 @@
                                 if (Stringmatch (activetrace,"M_DSM_int*"))
                                         if (waveexists(M_DSM_Error))
-                                                ErrorBars $activetrace Y,wave=(M_DSM_Error,M_DSM_Error);DelayUpdate
+                                                ErrorBars/T=0/L=1.2 $activetrace Y,wave=(M_DSM_Error,M_DSM_Error);DelayUpdate
                                         endif
                                 elseif (Stringmatch (activetrace,"*DSM_int*"))
                                         if (waveexists(DSM_Error))
-                                                ErrorBars $activetrace Y,wave=(DSM_Error,DSM_Error);DelayUpdate
+                                                ErrorBars/T=0/L=1.2 $activetrace Y,wave=(DSM_Error,DSM_Error);DelayUpdate
+                                        endif
+                                elseif (Stringmatch (activetrace,"M_SMR_int*"))
+                                        if (waveexists(M_SMR_Error))
+                                                ErrorBars/T=0/L=1.2 $activetrace Y,wave=(M_SMR_Error,M_SMR_Error);DelayUpdate
+                                        endif
+                                elseif (Stringmatch (activetrace,"*SMR_int*"))
+                                        if (waveexists(SMR_Error))
+                                                ErrorBars/T=0/L=1.2 $activetrace Y,wave=(SMR_Error,SMR_Error);DelayUpdate
                                         endif
                                 elseif (Stringmatch (activetrace,"R*"))
                                         ewave="s"+activetrace[1,32]
                                         if (waveexists($ewave))
-                                                ErrorBars $activetrace Y,wave=($ewave,$ewave);DelayUpdate
+                                                ErrorBars/T=0/L=1.2 $activetrace Y,wave=($ewave,$ewave);DelayUpdate
                                         endif
                                 endif

User Procedures/Irena/IR2_Reflectivity.ipf

@@ -2228 +2228 @@
                 abort "Save data error, DataFolderName is not correct"
         endif
-        if(stringmatch(DataFolderName, "*root:Packages:*"))             //using Moldeling tool
+        if(stringmatch(DataFolderName, "*root:Packages:*"))             //using Modeling tool
                 string NewFldrName
                 NewFldrName="ReflectivityModeling"

User Procedures/Irena/Modification history.txt

@@ -15 +15 @@
 Added panel version control for: Fractals tool, Small-angle diffraction, ASCII export, ASCII Import
 Data Manipulation II - modified to add ability to create errors (=uncertainties), scale and rebin to number of points. Modified GUI to separate processing, errors generation and post processing (scaling/rebinning). 
+Plotting tool II - changed how error bars are displayed and enables SMR data error bars.