Changeset 480 for sans

Timestamp:

Mar 6, 2009 5:11:44 PM (14 years ago)

Author:

srkline

Message:

minor bug fixes:
Schematic.ipf: fixed duplicate error, was incorrect folder path
Invariant.ipf: "Can't find dQv" error, now looks in proper data folder

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/SANS_Model_Docs_v4.00.ihf (modified) (previous)
• NCNR_User_Procedures/Common/GaussUtils_v40.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf (modified) (3 diffs)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/Schematic.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf

@@ -323 +323 @@
 End             //Make76GaussPoints()
 
-// !!!!! reduces the length of qt and zi by one !!!!!
+// !!!!! reduces the length of wt and zi by one !!!!!
 //
 Function Make_N_GaussPoints(wt,zi)
@@ -1315 +1315 @@
         return(0)
 end
-

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

@@ -277 +277 @@
         PopupMenu ywave,pos={10,60},size={231,20},proc=Inv_FilePopMenuProc,title="Data File"
         PopupMenu ywave,help={"Select the experimental intensity values"}
-        PopupMenu ywave,mode=1,popvalue="DDAB_EMATF_1p_25C.absb",value= #"root:Packages:NIST:invariant:gDataPopList"
+        PopupMenu ywave,mode=1,value= #"root:Packages:NIST:invariant:gDataPopList"
         Button loadButton,pos={10,90},size={130,20},proc=Inv_Load_Proc,title="Load and Plot File"
         Button loadButton,help={"After choosing a file, load it into memory and plot it with this button."}
@@ -653 +653 @@
 
         NVAR isSlitSmeared=root:Packages:NIST:invariant:gIsSlitSmeared
-        SVAR fileStr=root:Packages:NIST:gLastFileName
+//      SVAR fileStr=root:Packages:NIST:gLastFileName
         
         //reset the global to the checkbox state
@@ -659 +659 @@
         
         if(checked)             //get the smearing info
-                String cleanLastFileName = "root:"+CleanupName(fileStr,0)
+                ControlInfo/W=Invariant_Panel ywave
+                String folderStr=CleanupName(S_value,0)
                 NVAR dQv=root:Packages:NIST:invariant:gDqv
-                String tempName = cleanLastFileName+"sq"
-                Wave/Z w=$tempName
-                if(WaveExists(w) && w[0] < 0)
-                        dQv = - w[0]
-                        Print "Data is slit-smeared, dqv = ",w[0]
+                NVAR/Z loaded_dQv = $("root:"+folderStr+":USANS_dQv")
+                if(NVAR_Exists(loaded_dQv))
+                        dQv = loaded_dQv
+                        Print "Data is slit-smeared, dqv = ",dQv
                 else
                         DoAlert 0,"Can't find the slit height from the data. Enter the value manually if the data is truly slit-smeared, or uncheck the box."

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -816 +816 @@
         while(1)
         
-        // remove myGlobals, Packages from the folder list
+        // remove myGlobals, Packages, etc. from the folder list
         if(type==4)
                 str = RemoveFromList("myGlobals", str , ";" )
                 str = RemoveFromList("Packages", str, ";")
                 str = RemoveFromList("AutoFit", str, ";")
+                str = RemoveFromList("TISANE", str, ";")
         endif
         

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Schematic.ipf

@@ -346 +346 @@
                         if(cmpstr(choice,"MSK overlay")==0)
                                 nameStr = type+"MSK_PNG"
-                                Duplicate/O root:Packages:NIST:MSK:data root:MSK:overlay
+                                Duplicate/O root:Packages:NIST:MSK:data root:Packages:NIST:MSK:overlay
                                 Redimension/D root:Packages:NIST:MSK:overlay
                                 String tempStr = "root:Packages:NIST:MSK:overlay"