Changeset 291

Timestamp:

Feb 21, 2008 5:15:15 PM (15 years ago)

Author:

srkline

Message:

Major changes to the SANS_Analysis Help file

Bug fixes in Global fit, the wrapper and the plot manager (help buttons)

updated snapshots of the sample 2d data and proper parameters

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files

Files:

• Put in Igor Help Files/SANS_Analysis_Docs_v4.00.ihf (modified) (previous)
• Put in User Procedures/SANS_Models_v4.00/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf (modified) (4 diffs)
• Put in User Procedures/SANS_Models_v4.00/Packages/Wrapper_v40.ipf (modified) (3 diffs)
• Put in User Procedures/SANS_Models_v4.00/PlotManager_v40.ipf (modified) (2 diffs)
• Sample_2D_Data/cyl2d_a.png (modified) (previous)
• Sample_2D_Data/cyl2d_b.png (modified) (previous)
• Sample_2D_Data/cyl2d_c.png (modified) (previous)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf

@@ -210 +210 @@
                 ControlInfo/W=NewGlobalFitPanel#NewGF_GlobalControlArea NewGF_MaskingCheckBox
                 Variable useCursors = V_Value
-                if(useCursors)
+                if(useCursors && waveexists(mw))
                         //find the first 1,  then find the zero
                         pt1 = 0
@@ -1275 +1275 @@
                 if (doMasking)
                         Wave/Z mw = $(DataSets[i][MaskCol])
-                        if (!WaveExists(mw))
+//                      if (!WaveExists(mw))
+                        if (!WaveExists(mw) && cmpstr(DataSets[i][MaskCol],"No Mask") != 0)     // SRK - allow for no mask
                                 errorWaveRow = i
                                 errorWaveColumn = MaskCol
                                 return NewGlobalFitNOMSKWAVE
                         endif
-                        if (wavePoints != numpnts(mw))
+//                      if (wavePoints != numpnts(mw))
+                        if ( (wavePoints != numpnts(mw)) && (cmpstr(DataSets[i][MaskCol],"No Mask") != 0) )     // SRK - allow for no mask
                                 errorWaveRow = i
                                 errorWaveColumn = MaskCol
@@ -1340 +1342 @@
                         
                         if (doMasking)
-                                if ( (numtype(mw[j]) != 0) || (mw[j] == 0) )
+                                // SRK keep points in data that has no Mask wave specified
+                                if(cmpstr(DataSets[i][MaskCol],"No Mask") == 0) // SRK - allow for no mask
+                                        //do nothing, keep the point
+                                elseif ( (numtype(mw[j]) != 0) || (mw[j] == 0) )
                                         continue
                                 endif
@@ -4010 +4015 @@
                         DataSets[i][startingNCols] = MaskingListWave[i][1]
                 else
-                        Redimension/N=(-1,startingNCols) DataSets
-                        DoAlert 0,"The mask wave \""+MaskingListWave[i][1]+"\" for Y wave \""+(DataSets[i][0])+"\" does not exist."
-                        return -1
+                        //SRK !!!! CHANGING THE BEHAVIOR !!!!
+                        // if no masking wave was specified, use the entire set (==1)
+//                      Redimension/N=(-1,startingNCols) DataSets
+//                      DoAlert 0,"The mask wave \""+MaskingListWave[i][1]+"\" for Y wave \""+(DataSets[i][0])+"\" does not exist."
+//                      return -1
+
+                        DataSets[i][startingNCols] = "No Mask"
+                        //eSRK
                 endif
         endfor

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Packages/Wrapper_v40.ipf

@@ -19 +19 @@
 
         //Create useful globals
-        Variable/G root:Packages:NIST:SANS_ANA_VERSION=4.00
+        Variable/G root:Packages:NIST:SANS_ANA_VERSION=4.00
         String/G root:Packages:NIST:SANS_ANA_EXTENSION="_v40"
         
@@ -72 +72 @@
         //change draw order to put button over text of checkbox
         Button button_0,pos={520,93},size={100,20},proc=DoTheFitButton,title="Do 1D Fit"
-        Button button_4,pos={520,130},size={100,20},proc=FeedbackButtonButtonProc,title="Feedback"
+        Button button_4,pos={520,126},size={100,20},proc=FeedbackButtonProc,title="Feedback"
+        Button button_5,pos={520,150},size={100,20},proc=FitHelpButtonProc,title="Help"
 
         Edit/W=(20,174,634,435)/HOST=#  
@@ -80 +81 @@
 EndMacro
 
+//open the Help file for the Fit Manager
+Function FitHelpButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        DisplayHelpTopic "Fit Manager"
+                        break
+        endswitch
+
+        return 0
+End
+
+
 //open the trac page for feedback
-Function FeedbackButtonButtonProc(ba) : ButtonControl
+Function FeedbackButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba
 

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/PlotManager_v40.ipf

@@ -47 +47 @@
         GroupBox group0_1,pos={222,123},size={50,4},title="multiple files"
         GroupBox group1,pos={7,207},size={350,4}
+        Button button8,pos={238,50},size={100,20},proc=A_OneDLoader_HelpButton,title="Help"
 EndMacro
+
+//open the Help file for the Fit Manager
+Function A_OneDLoader_HelpButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        DisplayHelpTopic "Plot Manager"
+                        break
+        endswitch
+
+        return 0
+End
 
 //uses the same data folder listing as the wrapper
@@ -142 +157 @@
         ModifyGraph grid=1,mirror=2,standoff=0
         ErrorBars $iStr Y,wave=($eStr,$eStr)
-        ModifyGraph tickUnit(left)=1
+        ModifyGraph tickUnit=1
                                 
         Label left "I(q)"