Changeset 578

Timestamp:

Oct 22, 2009 2:37:45 PM (13 years ago)

Author:

srkline

Message:

fixes in USANS:

• now a click in the white space of the file list will not bring up two open file dialogs. Instead, the null string is caught.

when writing out simulated VAX files:

• now a proper date is written to the file header
• runNumber can be entered, and automatically increments

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/NCNR_DataReadWrite.ipf (modified) (3 diffs)
• USANS/Main_USANS.ipf (modified) (2 diffs)

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

@@ -2241 +2241 @@
         Close refNum
         
+        
+        // write out the results into a text file
+        //      SetDataFolder $destStr
+        WAVE results=results
+        WAVE/T results_desc=results_desc
+        
+        //check each wave
+        If(!(WaveExists(results)))
+                Abort "results DNExist WriteVAXData()"
+        Endif
+        If(!(WaveExists(results_desc)))
+                Abort "results_desc DNExist WriteVAXData()"
+        Endif
+        
+        Save/T results_desc,results as fullpath+".itx"
+        
+        ///////////////////////////////
+        
         // all done
         Killwaves/Z tmpFile,dataWRecMarkers
@@ -2396 +2414 @@
         // [9] det type "ORNL  " (6 chars)
         
-        tw[1] = "01-JAN-2009 12:12:12"
+        tw[1] = Secs2Date(DateTime,-2)+"  "+ Secs2Time(DateTime,3)              //20 chars, not quite VAX format
         tw[2] = "SIM"
         tw[3] = "[NG7SANS99]"
@@ -2406 +2424 @@
         SVAR prefix = root:Packages:NIST:SAS:gSavePrefix
 
-        tw[0] = prefix+num2str(index)+".SA2_SIM_A"+num2str(index)
-        index += 1
+
         
         String labelStr=" "     
+        Variable runNum = index
         Prompt labelStr, "Enter sample label "          // Set prompt for x param
-        DoPrompt "Enter sample label", labelStr
+        Prompt runNum,"Run Number (automatically increments)"
+        DoPrompt "Enter sample label", labelStr,runNum
         if (V_Flag)
                 //Print "no sample label entered - no file written"
-                index -=1
+                //index -=1
                 return -1                                                               // User canceled
         endif
+        
+        if(runNum != index)
+                index = runNum
+        endif
+        index += 1
+
+        tw[0] = prefix+num2str(runNum)+".SA2_SIM_A"+num2str(runNum)
         
         labelStr = PadString(labelStr,60,0x20)  //60 fortran-style spaces

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

@@ -608 +608 @@
         endif
         //Print fname
-        err = LoadBT5File(fname,"RAW")
-        if(err)
-                return(err)
-        endif
-        //if the "Raw Data" Graph exists, do nothing - else draw it
-        //DoWindow/F RawDataWin
-        if(WinType("RawDataWin")!=1)
-                Execute "GraphRawData()"
-        else
-                //just update the textbox
-                //String textStr=StringForRawGraph()
-                //TextBox/W=RawDataWin/C/N=text1/A=RC/X=0.50/Y=-2 textStr
-                //TextBox/W=RawDataWin/C/E=2/A=MT/X=0/Y=0/N=text0 textStr
-                TitleForRawGraph()
-        Endif
+        if(strlen(fileWave[ii]) > 0)            //make sure that this is not a click in blank space
+                err = LoadBT5File(fname,"RAW")
+                if(err)
+                        return(err)
+                endif
+                //if the "Raw Data" Graph exists, do nothing - else draw it
+                //DoWindow/F RawDataWin
+                if(WinType("RawDataWin")!=1)
+                        Execute "GraphRawData()"
+                else
+                        //just update the textbox
+                        //String textStr=StringForRawGraph()
+                        //TextBox/W=RawDataWin/C/N=text1/A=RC/X=0.50/Y=-2 textStr
+                        //TextBox/W=RawDataWin/C/E=2/A=MT/X=0/Y=0/N=text0 textStr
+                        TitleForRawGraph()
+                Endif
+        endif
         //bring the panel back to the front
         DoWindow/F USANS_Panel
@@ -692 +694 @@
         endif           
         //Print fname
-        ReadBT5Header(fname)
+        if(strlen(fileWave[ii]) > 0)            //make sure that this is not a click in blank space
+                ReadBT5Header(fname)
+        endif
 End