Changeset 994 for sans/Dev/trunk

Timestamp:

Apr 27, 2016 4:16:09 PM (7 years ago)

Author:

srkline

Message:

more changes, lots of files.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NIST_XML_v40.ipf (modified) (1 diff)
• Reduction/USANS/WriteUSANSData.ipf (modified) (1 diff)
• Reduction/VSANS/VC_BeamCenter.ipf (modified) (1 diff)
• Reduction/VSANS/VC_HDF5_VSANS_Utils.ipf (modified) (1 diff)
• Reduction/VSANS/VC_UtilityProcedures.ipf (modified) (1 diff)
• Reduction/VSANS/V_DetectorCorrections.ipf (modified) (2 diffs)
• Reduction/VSANS/V_HDF5_RW_Utils.ipf (modified) (1 diff)
• Reduction/VSANS/V_HDF5_Read.ipf (modified) (1 diff)
• Reduction/VSANS/V_HDF5_Write.ipf (modified) (1 diff)
• Reduction/VSANS/V_MainPanel.ipf (modified) (4 diffs)
• Reduction/VSANS/V_Menu.ipf (modified) (1 diff)
• Reduction/VSANS/V_Test_RAW_Panel.ipf (modified) (5 diffs)
• Reduction/VSANS/V_Testing_Data_Procs.ipf (modified) (1 diff)
• Reduction/VSANS/V_Utilities_General.ipf (modified) (2 diffs)
• Reduction/VSANS/V_WorkFolderUtils.ipf (modified) (1 diff)

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

@@ -1117 +1117 @@
         end
         
-        Function WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,[res])
+        Function WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res])
                 Wave q3,i3,sig3,res
-                String firstFileName,secondFileName,thirdFileName,normTo
-                Variable norm12,norm23
+                String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo
+                Variable norm12,norm23,norm34
 
                  Abort  "XML function provided by XMLutils XOP is not available, get the XOP from : http://www.igorexchange.com/project/XMLutils (see http://www.smallangles.net/wgwiki/index.php/cansas1d_binding_IgorPro for details)"

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

@@ -495 +495 @@
         end
         
-        Function WriteXMLUSANSDesmeared(type,fullpath,lo,hi,dialog)
-                String type,fullpath
+        Function WriteXMLUSANSDesmeared(fullpath,lo,hi,dialog)
+                String fullpath
                 Variable lo,hi,dialog           //=1 will present dialog for name
         

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_BeamCenter.ipf

@@ -23 +23 @@
 //      ModifyGraph width={Plan,1,bottom,left}
 //
-Macro DetectorPanelFit() : Panel
+Proc DetectorPanelFit() : Panel
         PauseUpdate; Silent 1           // building window...
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_HDF5_VSANS_Utils.ipf

@@ -270 +270 @@
                         Make/O/T/N=1    name    = "NG3_VSANS"
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_B       
-                        Make/O/D/N=(150,150)    data    = abs(gnoise(10))
-                        Make/O/D/N=(150,150)    linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(150,150)    data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(150,150)    linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_MR              
-                        Make/O/D/N=(48,128)     data    = abs(gnoise(10))
-                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(48,128)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_ML              
-                        Make/O/D/N=(48,128)     data    = abs(gnoise(10))
-                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(48,128)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_MT              
-                        Make/O/D/N=(128,48)     data    = abs(gnoise(10))
-                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(128,48)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_MB              
-                        Make/O/D/N=(128,48)     data    = abs(gnoise(10))
-                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(128,48)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FR              
-                        Make/O/D/N=(48,128)     data    = abs(gnoise(10))
-                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(48,128)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FL              
-                        Make/O/D/N=(48,128)     data    = abs(gnoise(10))
-                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(48,128)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FT              
-                        Make/O/D/N=(128,48)     data    = abs(gnoise(10))
-                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(128,48)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(1))
                 NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FB              
-                        Make/O/D/N=(128,48)     data    = abs(gnoise(10))
-                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(10))
+                        Make/O/D/N=(128,48)     data    = 1 + (enoise(0.1))
+                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(1))
                         
         SetDataFolder root:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_UtilityProcedures.ipf

@@ -436 +436 @@
 
 
-//////// function to take VCALC information and 
-// fill in the simulated information as needed to make a "fake" data file
-//
-// TODO:
-// -- identify all of the necessary bits to change
-// -- maybe want a panel to make it easier to decide what inputs to change in the file
-// -- decide if it's better to write wholesale, or as individual waves
-//
-Macro Copy_VCALC_to_VSANSFile()
-        
-        String fileName = V_DoSaveFileDialog("pick the file to write to")
-        print fileName
-//      
-        if(strlen(fileName) > 0)
-                writeVCALC_to_file(fileName)
-        endif
-End
-
-//
-// TODO -- fill this in as needed to get fake data that's different
-//
-Function writeVCALC_to_file(fileName)
-        String fileName
-
-
-// the detectors, all 9 + the correct SDD (that accounts for the offset of T/B panels
-// the data itself (as INT32)
-// the front SDD (correct units)
-// the middle SDD (correct units)
-// the back SDD (correct units)
-        Variable ii,val
-        String detStr
-        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
-                detStr = StringFromList(ii, ksDetectorListAll, ";")
-                Duplicate/O $("root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_"+detStr+":det_"+detStr) tmpData
-                Redimension/I tmpData
-                tmpData = (tmpData ==   2147483647) ? 0 : tmpData               //the NaN "mask" in the sim data (T/B only)shows up as an ugly integer
-                V_writeDetectorData(fileName,detStr,tmpData)
-                
-                val = VCALC_getTopBottomSDDOffset(detStr)/10 + VCALC_getSDD(detStr)*100         // make sure value is in cm
-                print val
-                V_writeDet_distance(fileName,detStr,val)
-                
-                // x and y pixel sizes for each detector should be correct in the "base" file - but if not...
-                //Function VCALC_getPixSizeX(type)              // returns the pixel X size, in [cm]
-                //Function VCALC_getPixSizeY(type)
-                V_writeDet_x_pixel_size(fileName,detStr,VCALC_getPixSizeX(detStr)*10)           // data file is expecting mm
-                V_writeDet_y_pixel_size(fileName,detStr,VCALC_getPixSizeY(detStr)*10)
-        
-                // write out the xCtr and yCtr (pixels) that was used in the q-calculation, done in VC_CalculateQFrontPanels()
-                V_writeDet_beam_center_x(fileName,detStr,V_getDet_beam_center_x("VCALC",detStr))
-                V_writeDet_beam_center_y(fileName,detStr,V_getDet_beam_center_y("VCALC",detStr))
-                
-                
-        
-                // the calibration data for each detector (except B) is already correct in the "base" file
-                //V_writeDetTube_spatialCalib(fname,detStr,inW)
-                // and for "B"
-                //V_writeDet_cal_x(fname,detStr,inW)
-                //V_writeDet_cal_y(fname,detStr,inW)
-                
-                                
-                // the dead time for each detector is already correct in the "base" file
-                // V_writeDetector_deadtime(fname,detStr,inW)
-                // TODO: need a new, separate function to write the single deadtime value in/out of "B"
-
-        endfor
-        
-        
-//? other detector geometry - lateral separation?
-
-// the wavelength
-//      Variable lam = V_getWavelength("VCALC")         //doesn't work, the corresponding folder in VCALC has not been defined
-        V_writeWavelength(fileName,VCALC_getWavelength())
-
-// description of the sample
-
-// sample information
-// name, title, etc
-        
-// fake the information about the count setup, so I have different numbers to read
-// count time = fake time of 100 s
-        V_writeCount_time(fileName,100)
-
-// monitor count (= imon)
-// returns the number of neutrons on the sample
-//Function VCALC_getImon()
-
-// ?? anything else that I'd like to see on the catalog - I could change them here to see different values
-// different collimation types?
-//
-
-        return(0)
-end
-

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf

@@ -327 +327 @@
 //
 // TESTING ONLY
-Macro MakeFakeCalibrationWaves()
+Proc MakeFakeCalibrationWaves()
         // make these in the RAW data folder, before converting to a work folder
         // - then they will be "found" by get()
@@ -1018 +1018 @@
 //check before re-implementing
 //
-Macro DIV_a_Workfile(type)
+Proc DIV_a_Workfile(type)
         String type
         Prompt type,"WORK data type",popup,"SAM;EMP;BGD;ADJ;"

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

@@ -26 +26 @@
 
 // passing null file string presents a dialog
-Macro LoadFakeDIVData()
+Proc LoadFakeDIVData()
         V_LoadHDF5Data("","DIV")
 End
 
 // passing null file string presents a dialog
-Macro LoadFakeMASKData()
+Proc LoadFakeMASKData()
         V_LoadHDF5Data("","MSK")
 End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Read.ipf

@@ -1426 +1426 @@
 End
 
+// TODO - be sure this is defined correctly
+// -- only returns for T/B detectors
+Function V_getDet_TBSetback(fname,detStr)
+        String fname,detStr
+
+        if(cmpstr(detStr,"B") == 0)
+                return(0)
+        endif
+        if(cmpstr(detStr,"FR") == 0 || cmpstr(detStr,"FL") == 0)
+                return(0)
+        endif
+        if(cmpstr(detStr,"MR") == 0 || cmpstr(detStr,"ML") == 0)
+                return(0)
+        endif   
+        
+        String path = "entry:instrument:detector_"+detStr+":setback"
+        return(V_getRealValueFromHDF5(fname,path))
+        
+        
+End
+
 //Function V_getDet_VerticalOffset(fname,detStr)
 //      String fname,detStr

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Write.ipf

@@ -3933 +3933 @@
 End
 
+
+// TODO - be sure that this is defined correctly
+// -- it needs to exist in the data file, and only for TB detector panels
+Function V_writeDet_TBSetback(fname,detStr,val)
+        String fname,detStr
+        Variable val
+
+//      String path = "entry:instrument:detector_"+detStr+":setback"
+        
+        if(cmpstr(detStr,"B") == 0)
+                return(0)
+        endif
+        if(cmpstr(detStr,"FR") == 0 || cmpstr(detStr,"FL") == 0)
+                return(0)
+        endif
+        if(cmpstr(detStr,"MR") == 0 || cmpstr(detStr,"ML") == 0)
+                return(0)
+        endif   
+        
+        Make/O/D/N=1 wTmpWrite
+//      Make/O/R/N=1 wTmpWrite
+        String groupName = "/entry/instrument/detector_"+detStr 
+        String varName = "setback"
+        wTmpWrite[0] = val
+
+        variable err
+        err = V_WriteWaveToHDF(fname, groupName, varName, wTmpWrite)
+        if(err)
+                Print "HDF write err = ",err
+        endif
+        // now be sure to kill the data folder to force a re-read of the data next time this file is read in
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
+        return(err)
+End
+
+
+        
+
 //Function V_writeDet_VerticalOffset(fname,detStr,val)
 //      String fname,detStr

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MainPanel.ipf

@@ -20 +20 @@
 
 
-
+// TODO-- decide whether to automatically read in the mask, or not
+// -- there could be a default mask, or look for the mask that is speficied in the
+// next file that is read in from the path
 Proc PickPath_MainButtonProc(ctrlName) : ButtonControl
         String ctrlName
@@ -49 +51 @@
 
 
+//
 // this will only load the data into RAW, overwriting whatever is there. no copy is put in rawVSANS
 //
@@ -54 +57 @@
         String ctrlName
 
-        Variable err=   V_LoadHDF5Data("","RAW")                        // load the data into RawVSANS storage folder (why am I doing this?)
+        Variable err=   V_LoadHDF5Data("","RAW")                        // load the data 
 //      Print "Load err = "+num2str(err)
         if(!err)
@@ -62 +65 @@
                 // this (in SANS) just passes directly to fRawWindowHook()
                 UpdateDisplayInformation("RAW")         // plot the data in whatever folder type
+                
+                FakeRestorePanelsButtonClick()          //so the panels display correctly
                 
         endif

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Menu.ipf

@@ -21 +21 @@
         Submenu "In Progress Panels"
                 "VSANS Preferences",Show_VSANSPreferences_Panel()
-                
+                "Beam Center Panel",DetectorPanelFit()
         End
+        Submenu "Work Files"
+                "Convert to WORK",Convert_to_Workfile()
+                "Load Fake DIV Data"
+                "DIV a work file",DIV_a_Workfile()
+                "Load Fake MASK Data"
+        End
+        
 End
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Test_RAW_Panel.ipf

@@ -130 +130 @@
         Button button_status,pos={607,146},size={70,20},proc=StatusButtonProc,title="Status"
         Button button_IvsQ,pos={689,113},size={70,20},proc=IvsQPanelButtonProc,title="I vs. Q"
-        Button button_file_m,pos={619,55},size={50,20},proc=File_m_ButtonProc,title="File <"
-        Button button_file_p,pos={679,55},size={50,20},proc=File_p_ButtonProc,title="File >"
+        Button button_file_m,pos={619,55},size={50,20},proc=File_minus_ButtonProc,title="File <"
+        Button button_file_p,pos={679,55},size={50,20},proc=File_plus_ButtonProc,title="File >"
         Button button_log,pos={689,146},size={70,20},proc=LogLinButtonProc,title="isLin",userData="0"
         Button button_tab_p,pos={648,81},size={50,20},proc=Tab_p_ButtonProc,title="Tab >"
@@ -563 +563 @@
 End
 
+// fake restore panels button click
+Function FakeRestorePanelsButtonClick()
+
+        STRUCT WMButtonAction ba
+        ba.eventCode = 2
+        RestorePanelButtonProc(ba)
+        
+        return(0)
+End
+
+
 // fake status button click
 Function FakeStatusButtonClick()
@@ -591 +602 @@
 // move one file number back
 //
-Function File_m_ButtonProc(ba) : ButtonControl
-        STRUCT WMButtonAction &ba
-
-        switch( ba.eventCode )
-                case 2: // mouse up
-                        // click code here
+Function File_minus_ButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        V_LoadPlotAndDisplayRAW(-1)
+                        
                         break
                 case -1: // control being killed
@@ -609 +622 @@
 // move one file number forward
 //
-Function File_p_ButtonProc(ba) : ButtonControl
-        STRUCT WMButtonAction &ba
-
-        switch( ba.eventCode )
-                case 2: // mouse up
-                        // click code here
+Function File_plus_ButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        V_LoadPlotAndDisplayRAW(1)
+
                         break
                 case -1: // control being killed
@@ -640 +655 @@
                         endif
                         FakeTabClick(V_Value)
+                        
                         break
                 case -1: // control being killed

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Testing_Data_Procs.ipf

@@ -1 +1 @@
 #pragma TextEncoding = "MacRoman"
 #pragma rtGlobals=3             // Use modern global access method and strict wave access.
+
+
+
+//////// function to take VCALC information and 
+// fill in the simulated information as needed to make a "fake" data file
+//
+// TODO:
+// -- identify all of the necessary bits to change
+// -- maybe want a panel to make it easier to decide what inputs to change in the file
+// -- decide if it's better to write wholesale, or as individual waves
+//
+Macro Copy_VCALC_to_VSANSFile()
+        
+        String fileName = V_DoSaveFileDialog("pick the file to write to")
+        print fileName
+//      
+        if(strlen(fileName) > 0)
+                writeVCALC_to_file(fileName)
+        endif
+End
+
+//
+// TODO -- fill this in as needed to get fake data that's different
+//
+Function writeVCALC_to_file(fileName)
+        String fileName
+
+
+// the detectors, all 9 + the correct SDD (that accounts for the offset of T/B panels
+// the data itself (as INT32)
+// the front SDD (correct units)
+// the middle SDD (correct units)
+// the back SDD (correct units)
+        Variable ii,val
+        String detStr
+        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
+                detStr = StringFromList(ii, ksDetectorListAll, ";")
+                Duplicate/O $("root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_"+detStr+":det_"+detStr) tmpData
+                Redimension/I tmpData
+                tmpData = (tmpData ==   2147483647) ? 0 : tmpData               //the NaN "mask" in the sim data (T/B only)shows up as an ugly integer
+                V_writeDetectorData(fileName,detStr,tmpData)
+                
+                val = VCALC_getTopBottomSDDOffset(detStr)/10 + VCALC_getSDD(detStr)*100         // make sure value is in cm
+                print val
+                V_writeDet_distance(fileName,detStr,val)
+                
+                // x and y pixel sizes for each detector should be correct in the "base" file - but if not...
+                //Function VCALC_getPixSizeX(type)              // returns the pixel X size, in [cm]
+                //Function VCALC_getPixSizeY(type)
+                V_writeDet_x_pixel_size(fileName,detStr,VCALC_getPixSizeX(detStr)*10)           // data file is expecting mm
+                V_writeDet_y_pixel_size(fileName,detStr,VCALC_getPixSizeY(detStr)*10)
+        
+                // write out the xCtr and yCtr (pixels) that was used in the q-calculation, done in VC_CalculateQFrontPanels()
+                V_writeDet_beam_center_x(fileName,detStr,V_getDet_beam_center_x("VCALC",detStr))
+                V_writeDet_beam_center_y(fileName,detStr,V_getDet_beam_center_y("VCALC",detStr))
+                
+                
+        
+                // the calibration data for each detector (except B) is already correct in the "base" file
+                //V_writeDetTube_spatialCalib(fname,detStr,inW)
+                // and for "B"
+                //V_writeDet_cal_x(fname,detStr,inW)
+                //V_writeDet_cal_y(fname,detStr,inW)
+                
+                                
+                // the dead time for each detector is already correct in the "base" file
+                // V_writeDetector_deadtime(fname,detStr,inW)
+                // TODO: need a new, separate function to write the single deadtime value in/out of "B"
+
+        endfor
+        
+        
+//? other detector geometry - lateral separation?
+
+// the wavelength
+//      Variable lam = V_getWavelength("VCALC")         //doesn't work, the corresponding folder in VCALC has not been defined
+        V_writeWavelength(fileName,VCALC_getWavelength())
+
+// description of the sample
+
+// sample information
+// name, title, etc
+        
+// fake the information about the count setup, so I have different numbers to read
+// count time = fake time of 100 s
+        V_writeCount_time(fileName,100)
+
+// monitor count (= imon)
+// returns the number of neutrons on the sample
+//Function VCALC_getImon()
+
+// ?? anything else that I'd like to see on the catalog - I could change them here to see different values
+// different collimation types?
+//
+
+        return(0)
+end
+
+
 
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Utilities_General.ipf

@@ -49 +49 @@
         Prompt type,"WORK data type to display",popup,"RAW;SAM;EMP;BGD;ADJ;"
 
-        UpdateDisplayInformation(type)
-End
-
+// make sure that data exists before passing this on...
+        
+        if(DataExists(type) > 0)
+                UpdateDisplayInformation(type)
+        else
+                DoAlert 0,"No data in "+type
+        endif
+End
+
+// TODO
+//
+// very simple function to look for something in a work folder
+// -- only checks for FR data to exist, assumes everything else is there
+// -- can't use the V_get() functions, these will try to load data if it's not there!
+Function DataExists(type)
+        String type
+        
+        Wave/Z w = $("root:Packages:NIST:VSANS:"+type+":entry:instrument:detector_FR:data")
+        
+        return(WaveExists(w))
+end
 //
 // tests if two values are close enough to each other
@@ -204 +222 @@
 
 
+
+//
+// previous/next button needs these functions
+// as well as many other utilities that manipulate the data file names
+// and parse run numbers.
+//
+
+
+// TODO
+// x- load in the proper file
+// x- re-click the I(q) button
+// x- be sure that the globals are updated w/ filename
+// -- getting the file_name from the root: global is a poor choice. 
+//     Need a better, more reliable solution than this
+// -- make a copy of "oldName" that is local and not the SVAR, as the SVAR changes
+//    when the next file is loaded in (if it's not in RawVSANS), resulting in a "skipped" file number
+//
+//displays next (or previous) file in series of run numbers
+//file is read from disk, if path is set and the file number is present
+//increment +1, adds 1 to run number, -1 subtracts one
+//
+// will automatically step a gap of 10 run numbers, but nothing larger. Don't want to loop too long
+// trying to find a file (frustrating), don't want to look past the end of the run numbers (waste)
+// -- may find a more elegant solution later.
+//
+Function V_LoadPlotAndDisplayRAW(increment)
+        Variable increment
+
+        Variable i,val
+        String filename,tmp,curFileName
+        //take the currently displayed RAW file 
+        SVAR oldName = root:file_name
+        oldname = V_RemoveAllSpaces(oldname)            // 
+        curFileName = oldName
+//      print oldName
+        
+        filename = oldname
+//      for (i = 0; i < abs(increment); i += 1)
+//              filename = GetPrevNextRawFile(filename,increment/abs(increment))
+//      endfor  
+        i = 1
+        val = increment
+        do
+//              print filename,val
+                filename = V_GetPrevNextRawFile(filename,val)
+//              print "new= ",filename
+                
+                val = i*increment
+                i+=1
+                tmp = ParseFilePath(0, filename, ":", 1, 0)
+
+//              print val,strlen(tmp),strlen(oldname)
+//              print cmpstr(tmp,oldname)
+
+                if(strlen(tmp) == 0)            //in some cases, a null string can be returned - handle gracefully
+                        return(0)
+                endif
+                
+        while( (cmpstr(tmp,curFileName) == 0) && i < 11)
+//      print filename
+        
+        // display the specified RAW data file
+        // this is the set of steps done in DisplayMainButtonProc(ctrlName) : ButtonControl
+        Variable err=   V_LoadHDF5Data(filename,"RAW")                  // load the data, set the global w/file name loaded
+//      Print "Load err = "+num2str(err)
+        if(!err)
+                SVAR hdfDF = root:file_name                     // last file loaded, may not be the safest way to pass
+                String folder = StringFromList(0,hdfDF,".")
+                
+                // this (in SANS) just passes directly to fRawWindowHook()
+                Execute "UpdateDisplayInformation(\"RAW\")"     // plot the data in whatever folder type
+                
+                FakeRestorePanelsButtonClick()          //so the panels display correctly
+                
+        endif
+
+        // TODO
+        // -- update the 1D plotting as needed. these are SANS calls (OK for now, but will need to be better)
+        //do the average and plot (either the default, or what is on the panel currently)
+        V_PlotData_Panel()
+        
+
+        return(0)
+End
+
+
+// Return the full path:filename that represents the previous or next file.
+// Input is current filename and increment. 
+// Increment should be -1 or 1
+// -1 => previous file
+// 1 => next file
+Function/S V_GetPrevNextRawFile(curfilename, prevnext)
+        String curfilename
+        Variable prevnext
+
+        String filename
+        
+        //get the run number
+        Variable num = V_GetRunNumFromFile(curfilename)
+                
+        //find the next specified file by number
+        fileName = V_FindFileFromRunNumber(num+prevnext)
+
+        if(cmpstr(fileName,"")==0)
+                //null return, do nothing
+                fileName = V_FindFileFromRunNumber(num)         //returns the full path, not just curFileName
+        Endif
+
+        Return filename
+End
+
+
+//returns a string containing the full path to the file containing the 
+//run number "num". The null string is returned if no valid file can be found
+//the path "catPathName" used and is hard-wired, will abort if this path does not exist
+//the file returned will be a RAW SANS data file, other types of files are 
+//filtered out.
+//
+// called by Buttons.ipf and Transmission.ipf, and locally by parsing routines
+//
+Function/S V_FindFileFromRunNumber(num)
+        Variable num
+        
+        String fullName="",partialName="",item=""
+        //get list of raw data files in folder that match "num" (add leading zeros)
+        if( (num>9999) || (num<=0) )
+                Print "error in  FindFileFromRunNumber(num), file number too large or too small"
+                Return ("")
+        Endif
+        //make a four character string of the run number
+        String numStr=""
+        if(num<10)
+                numStr = "000"+num2str(num)
+        else
+                if(num<100)
+                        numStr = "00"+num2str(num)
+                else
+                        if(num<1000)
+                                numstr = "0"+num2str(num)
+                        else
+                                numStr = num2str(num)
+                        endif
+                Endif
+        Endif
+        //Print "numstr = ",numstr
+        
+        //make sure that path exists
+        PathInfo catPathName
+        String path = S_path
+        if (V_flag == 0)
+                Abort "folder path does not exist - use Pick Path button"
+        Endif
+        String list="",newList="",testStr=""
+        
+        list = IndexedFile(catPathName,-1,"????")       //get all files in folder
+        //find (the) one with the number in the run # location in the name
+        Variable numItems,ii,runFound,isRAW
+        numItems = ItemsInList(list,";")                //get the new number of items in the list
+        ii=0
+        do
+                //parse through the list in this order:
+                // 1 - does item contain run number (as a string) "TTTTTnnn.SAn_XXX_Tyyy"
+                // 2 - exclude by isRaw? (to minimize disk access)
+                item = StringFromList(ii, list  ,";" )
+                if(strlen(item) != 0)
+                        //find the run number, if it exists as a three character string
+                        testStr = V_GetRunNumStrFromFile(item)
+                        runFound= cmpstr(numStr,testStr)        //compare the three character strings, 0 if equal
+                        if(runFound == 0)
+                                //the run Number was found
+                                //build valid filename
+                                partialName = V_FindValidFileName(item)
+                                if(strlen(partialName) != 0)            //non-null return from FindValidFileName()
+                                        fullName = path + partialName
+                                        //check if RAW, if so,this must be the file!
+                                        isRAW = V_CheckIfRawData(fullName)
+                                        if(isRaw)
+                                                //stop here
+                                                return(fullname)
+                                        Endif
+                                Endif
+                        Endif
+                Endif
+                ii+=1
+        while(ii<numItems)              //process all items in list
+        Return ("")     //null return if file not found in list
+End
+
+//
+// TODO -- for VSANS Nexus files, how do I quickly identify if a file is
+//   RAW VSANS data? I don't want to generate any errors, but I want to quickly
+//   weed out the reduced data sets, etc. from file catalogs.
+//
+//function to test a binary file to see if it is a RAW binary SANS file
+//first checks the total bytes in the file (which for raw data is 33316 bytes)
+//**note that the "DIV" file will also show up as a raw file by the run field
+//should be listed in CAT/SHORT and in patch windows
+//
+//Function then checks the file fname (full path:file) for "RAW" run.type field
+//if not found, the data is not raw data and zero is returned
+//
+// called by many procedures (both external and local)
+//
+// TODO -- as was written by SANS, this function is expecting fname to be the path:fileName
+// - but are the V_get() functions OK with getting a full path, and what do they
+//  do when they fail? I don't want them to spit up another open file dialog
+//
+Function V_CheckIfRawData(fname)
+        String fname
+        
+        Variable refnum,totalBytes
+        String testStr=""
+        
+        testStr = V_getInstrumentName(fname)
+        
+        if(cmpstr(testStr,"") != 0)
+                //testStr exists, ASSUMING it's a raw VSANS data file
+                Return(1)
+        else
+                //some other file
+                Return(0)
+        Endif
+End
+
+
+Function V_GetRunNumFromFile(item)
+        String item
+        
+        String str = V_GetRunNumStrFromFile(item)
+        
+        return(str2num(str))
+end
+
+
+// TODO -- the file name structure for VSANS file is undecided
+// so some of these base functions will need to change
+//
+//given a filename of a VSANS data filename of the form
+// sansNNNN.nxs.ngv
+//returns the run number "NNNN" as a STRING of FOUR characters
+//returns "ABCD" as an invalid file number
+//
+// local function to aid in locating files by run number
+//
+Function/S V_GetRunNumStrFromFile(item)
+        String item
+        String invalid = "ABCD" //"ABCD" is not a valid run number, since it's text
+        Variable num=-1
+        
+        //find the "dot"
+        String runStr=""
+        Variable numChar = 4
+        Variable pos = strsearch(item,".",0)
+        if(pos == -1)
+                //"dot" not found
+                return (invalid)
+        else
+                //found, get the four characters preceeding it
+                if (pos <= numChar-1)
+                        //not enough characters
+                        return (invalid)
+                else
+                        runStr = item[pos-numChar,pos-1]
+                        return (runStr)
+                Endif
+        Endif
+End
+
+//Function attempts to find valid filename from partial name by checking for
+// the existence of the file on disk.
+// - checks as is
+// - strips spaces
+// - permutations of upper/lowercase
+//
+// added 11/99 - uppercase and lowercase versions of the file are tried, if necessary
+// since from marquee, the filename field (textread[0]) must be used, and can be a mix of                       //02JUL13
+// upper/lowercase letters, while the filename on the server (should) be all caps
+// now makes repeated calls to ValidFileString()
+//
+// returns a valid filename (No path prepended) or a null string
+//
+// called by any functions, both external and local
+//
+Function/S V_FindValidFilename(partialName)
+        String PartialName
+        
+        String retStr=""
+        
+        //try name with no changes - to allow for ABS files that have spaces in the names 12APR04
+        retStr = V_ValidFileString(partialName)
+        if(cmpstr(retStr,"") !=0)
+                //non-null return
+                return(retStr)
+        Endif
+        
+        //if the partial name is derived from the file header, there can be spaces at the beginning
+        //or in the middle of the filename - depending on the prefix and initials used
+        //
+        //remove any leading spaces from the name before starting
+        partialName = V_RemoveAllSpaces(partialName)
+        
+        //try name with no spaces
+        retStr = V_ValidFileString(partialName)
+        if(cmpstr(retStr,"") !=0)
+                //non-null return
+                return(retStr)
+        Endif
+        
+        //try all UPPERCASE
+        partialName = UpperStr(partialName)
+        retStr = V_ValidFileString(partialName)
+        if(cmpstr(retStr,"") !=0)
+                //non-null return
+                return(retStr)
+        Endif
+        
+        //try all lowercase (ret null if failure)
+        partialName = LowerStr(partialName)
+        retStr = V_ValidFileString(partialName)
+        if(cmpstr(retStr,"") !=0)
+                //non-null return
+                return(retStr)
+        else
+                return(retStr)
+        Endif
+End
+
+
+// Function checks for the existence of a file
+// partialName;vers (to account for VAX filenaming conventions)
+// The partial name is tried first with no version number
+//
+// *** the PATH is hard-wired to catPathName (which is assumed to exist)
+// version numers up to ;10 are tried
+// only the "name;vers" is returned if successful. The path is not prepended
+//
+// local function
+//
+// TODO -- is this really necessary anymore for the NON-VAX files of VSANS.
+// -- can this be made a pass-through, or will there be another function that is needed for VSANS?
+//
+Function/S V_ValidFileString(partialName)
+        String partialName
+        
+        String tempName = "",msg=""
+        Variable ii,refnum
+        
+        ii=0
+        do
+                if(ii==0)
+                        //first pass, try the partialName
+                        tempName = partialName
+                        Open/Z/R/T="????TEXT"/P=catPathName refnum tempName     //Does open file (/Z flag)
+                        if(V_flag == 0)
+                                //file exists
+                                Close refnum            //YES needed, 
+                                break
+                        endif
+                else
+                        tempName = partialName + ";" + num2str(ii)
+                        Open/Z/R/T="????TEXT"/P=catPathName refnum tempName
+                        if(V_flag == 0)
+                                //file exists
+                                Close refnum
+                                break
+                        endif
+                Endif
+                ii+=1
+                //print "ii=",ii
+        while(ii<11)
+        //go get the selected bits of information, using tempName, which exists
+        if(ii>=11)
+                //msg = partialName + " not found. is version number > 11?"
+                //DoAlert 0, msg
+                //PathInfo catPathName
+                //Print S_Path
+                Return ("")             //use null string as error condition
+        Endif
+        
+        Return (tempName)
+End
+
+//function to remove all spaces from names when searching for filenames
+//the filename (as saved) will never have interior spaces (TTTTTnnn_AB _Bnnn)
+//but the text field in the header WILL, if less than 3 characters were used for the 
+//user's initials, and can have leading spaces if prefix was less than 5 characters
+//
+//returns a string identical to the original string, except with the interior spaces removed
+//
+// local function for file name manipulation
+//
+Function/S V_RemoveAllSpaces(str)
+        String str
+        
+        String tempstr = str
+        Variable ii,spc,len             //should never be more than 2 or 3 trailing spaces in a filename
+        ii=0
+        do
+                len = strlen(tempStr)
+                spc = strsearch(tempStr," ",0)          //is the last character a space?
+                if (spc == -1)
+                        break           //no more spaces found, get out
+                endif
+                str = tempstr
+                tempStr = str[0,(spc-1)] + str[(spc+1),(len-1)] //remove the space from the string
+        While(1)        //should never be more than 2 or 3
+        
+        If(strlen(tempStr) < 1)
+                tempStr = ""            //be sure to return a null string if problem found
+        Endif
+        
+        //Print strlen(tempstr)
+        
+        Return(tempStr)
+                
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf

@@ -304 +304 @@
 //   line fails (but reports no error), then DuplicateDataFolder fails, and reports an error. Trying
 //   to simplify this condition, I can't reproduce the bug for WM...
-Macro Convert_to_Workfile(newtype, doadd)
+Proc Convert_to_Workfile(newtype, doadd)
         String newtype,doadd
         Prompt newtype,"WORK data type",popup,"SAM;EMP;BGD;ADJ;"