Changeset 76 for sans/SANSReduction/branches

Timestamp:

Apr 9, 2007 3:42:39 PM (16 years ago)

Author:

srkline

Message:

2nd pass of pulling out NCNR calls. Also cleared a lot of deadwood from the code, removing depricated functions that were mostly already commented out.

Location:

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00

Files:

• AvgGraphics.ipf (modified) (4 diffs)
• Buttons.ipf (modified) (6 diffs)
• CatVSTable.ipf (modified) (1 diff)
• CircSectAve.ipf (modified) (5 diffs)
• Correct.ipf (modified) (3 diffs)
• FIT_Ops.ipf (modified) (5 diffs)
• MainPanel.ipf (modified) (1 diff)
• Marquee.ipf (modified) (4 diffs)
• MaskUtils.ipf (modified) (1 diff)
• MultipleReduce.ipf (modified) (7 diffs)
• NCNR_Utils.ipf (modified) (1 diff)
• NSORT.ipf (modified) (16 diffs)
• PatchFiles.ipf (modified) (4 diffs)
• PlotUtils.ipf (modified) (2 diffs)
• ProtocolAsPanel.ipf (modified) (11 diffs)
• RawWindowHook.ipf (modified) (4 diffs)
• RectAnnulAvg.ipf (modified) (7 diffs)
• Schematic.ipf (modified) (5 diffs)
• Tile_2D.ipf (modified) (2 diffs)
• WriteQIS.ipf (modified) (1 diff)

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/AvgGraphics.ipf

@@ -845 +845 @@
         Wave yErrWave=$(curPath+"yErrWave")
         
-        DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-//              //kill the old graph and make a new one
-//              //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif
-//      Init_Plot1d()
         Variable/G root:myGlobals:Plot_1d:isPhiAve=0    //0 signifies (normal) x=qvals
         //make a completely new graph
         Draw_Plot1D(xAxisWave,yAxisWave,YErrWave)
-        
-// OLD graph creation routines  
-//      Display /W=(412,51,727,302)/K=1 yAxisWave vs xAxisWave
-//      ModifyGraph log=1
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars yAxisWave Y,wave=(yErrWave,yErrWave)
-//      Label left "Counts"
-//      Label bottom "q\\U"
-//      SVAR angst = root:myGlobals:gAngstStr
-//      Label bottom "q ("+angst+"\\S-1\\M)"
-//      DoWindow/C Plot_1d
         
         return(0)
@@ -894 +876 @@
         Wave yErrWave=$(curPath+"yErrWave")
         
-        DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-                //kill the old graph and make a new one
-                //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif   
-//      Init_Plot1d()
         Variable/G root:myGlobals:Plot_1d:isPhiAve=1    //1 signifies x=phival
         //make a completely new graph
         Draw_Plot1D(xAxisWave,yAxisWave,YErrWave)
-
-// OLD graph creation routines
-//      Display /W=(412,51,727,302)/K=1 yAxisWave vs xAxisWave
-//      ModifyGraph log=0
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars yAxisWave Y,wave=(yErrWave,yErrWave)
-//      Label left "Counts"
-//      Label bottom "Angle (degrees)"
-//      DoWindow/C Plot_1d
         
         return(0)
@@ -1186 +1152 @@
                         break
                 endif
-                //more ifs for each case
+                //more ifs for each case as they are added
                 
                 // if selection not found, abort
@@ -1258 +1224 @@
         ModifyGraph log(bottom)=(logBottom)
         
-//      SetDataFolder dfSav             //didn't change the data folder
-End
-
+End
+

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Buttons.ipf

@@ -183 +183 @@
 End
 
-//sets the low cutoff of the color mapping (threshold)
-//Function LowThreshSetVarProc(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//      
-//      ControlInfo/W=SANS_Data lowThresh
-//      Variable loScale = V_Value
-//
-//      ControlInfo/W=SANS_Data highThresh
-//      Variable hiScale = V_Value
-//
-//      String result = ImageInfo("SANS_Data","data",0)
-//      String fullPath = StringByKey("ZWAVEDF", result, ":", ";")
-//      fullpath += "data"
-//      //Print fullpath
-//      WaveStats/Q $fullpath
-//      Variable maxData=V_max
-//
-//   WAVE NIHColors = $"root:myGlobals:NIHColors"
-//      ScaleColorsToData((loScale*maxData),(hiScale*maxData),NIHColors)
-//      ModifyImage/W=SANS_Data data cindex=NIHColors
-////    ModifyImage/W=SANS_Data vlegend cindex=NIHColors
-//
-//End
-
-//sets the high cutoff of the color mapping (threshold)
-//Function HighThreshSetVarProc(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//
-//      ControlInfo/W=SANS_Data lowThresh
-//      Variable loScale = V_Value
-//
-//      ControlInfo/W=SANS_Data highThresh
-//      Variable hiScale = V_Value
-//
-//      String result = ImageInfo("SANS_Data","data",0)
-//      String fullPath = StringByKey("ZWAVEDF", result, ":", ";")
-//      fullpath += "data"
-//      //Print fullpath
-//      WaveStats/Q $fullpath
-//      Variable maxData=V_max
-//
-//      WAVE NIHColors = $"root:myGlobals:NIHColors"
-//      ScaleColorsToData((loScale*maxData),(hiScale*maxData),NIHColors)
-//      ModifyImage/W=SANS_Data data cindex=NIHColors
-////    ModifyImage/W=SANS_Data vlegend cindex=NIHColors
-//      
-//End
-
 //button procedure to display previous RAW data file
 //incremented by run number, not dependent on file prefix
@@ -328 +274 @@
 
 
-//invoked by function key, (if menu declared)or the arrow button
-//on Raw data display
+//invoked by function key, (if menu declared)
 // if no window, or if display type is not RAW, do nothing
 Function NextRawFile()
@@ -344 +289 @@
         LoadPlotAndDisplayRAW(1)                //go to next file
 
-//      //do the average (either the default, or what is on the panel currently
-//      if(!DataFolderExists("root:myGlobals:Drawing"))
-//              Execute "InitializeAveragePanel()"
-//      endif
-//      Panel_DoAverageButtonProc("")           //the avg panel does not need to be open, folders must exist
         return 0
 end
 
-//invoked by function key, (if menu declared)or the arrow button
-//on Raw data display
+//invoked by function key, (if menu declared)
 // if no window, or if display type is not RAW, do nothing
 Function PreviousRawFile()
@@ -368 +307 @@
         LoadPlotAndDisplayRAW(-1)               //go to previous file
 
-//      //do the average (either the default, or what is on the panel currently
-//      if(!DataFolderExists("root:myGlobals:Drawing"))
-//              Execute "InitializeAveragePanel()"
-//      endif
-//      Panel_DoAverageButtonProc("")           //the avg panel does not need to be open, folders must exist
         return 0
 end
-
 
 //test function invoked by F5
@@ -388 +321 @@
         endif
         GetSelection table,CatVSTable,3
-//      Print V_startRow
         
         Wave/T fWave = $"root:myGlobals:CatVSHeaderInfo:Filenames"
@@ -400 +332 @@
         fRawWindowHook()
 
-        //do the average (either the default, or what is on the panel currently
+        // if you want a plot, too
+        //do the average and plot (either the default, or what is on the panel currently
         if(!DataFolderExists("root:myGlobals:Drawing"))
                 Execute "InitializeAveragePanel()"
         endif
         Panel_DoAverageButtonProc("")           //the avg panel does not need to be open, folders must exist
+        
         return(0)
 End

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/CatVSTable.ipf

@@ -2 +2 @@
 #pragma version=5.0
 #pragma IgorVersion=4.0
-
 
 //

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/CircSectAve.ipf

@@ -329 +329 @@
         DDet = DetectorPixelResolution(fileStr,detStr)          //needs detector type and beamline
         
-        //print fileStr
-//      do
-//        if(strsearch(fileStr, "NG5", 0) != -1)
-//          //string was found, it's an NG5 file
-//          DDet = 1.0
-//          break
-//        Endif
-//        if(strsearch(fileStr, "NG3", 0) != -1)
-//          //string was found, it's an NG3 file
-//          DDet = 0.5
-//          break
-//        Endif
-//        if(strsearch(fileStr, "NG7", 0) != -1)
-//          //string was found, it's an NG7 file
-//          DDet = 0.5
-//          break
-//        Endif
-//      while(0)
-
         //Width of annulus used for the average is gotten from the
         //input dialog before.  This also must be passed to the resolution
@@ -356 +337 @@
 
         ii=0
-//      String res_string="root:myGlobals:Res_vals"
-//      Make/O/D/N=3 $res_string
-//      Wave res_wave=$res_string
+
         Variable ret1,ret2,ret3
         do
                 getResolution(qval[ii],lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,ddr,ret1,ret2,ret3)
-                sigmaq[ii] = ret1       //res_wave[0]
-                qbar[ii] = ret2         //res_wave[1]
-                fsubs[ii] = ret3                //res_wave[2]
+                sigmaq[ii] = ret1       
+                qbar[ii] = ret2 
+                fsubs[ii] = ret3        
                 ii+=1
         while(ii<nq)
@@ -374 +353 @@
         //Plot the data in the Plot_1d window
         Avg_1D_Graph(aveint,qval,sigave)
-//      DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-//              //kill the old graph and make a new one
-//              //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif
-//      //make a completely new graph
-//      Display /W=(412,51,727,302)/K=1 aveint vs qval
-//      ModifyGraph log=1
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars aveint Y,wave=(sigave,sigave)
-//      Label left "Counts";DelayUpdate
-//      Label bottom "q\\U"
-//      SVAR angst = root:myGlobals:gAngstStr
-//      Label bottom "q ("+angst+"\\S-1\\M)"
-//      DoWindow/C Plot_1d
-        
+
         //get rid of the default mask, if one was created (it is in the current folder)
         //don't just kill "mask" since it might be pointing to the one in the MSK folder
@@ -493 +456 @@
                 //rename the button to reflect "isLin" - the displayed name must have been isLog
                 Button bisLog,title="isLin",rename=bisLin
-                
         Endif
 
@@ -522 +484 @@
         Return 0
 End
-//above is unused function

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Correct.ipf

@@ -31 +31 @@
 //********************************
 
-
 //unused test procedure for Correct() function
 //must be updated to include "mode" parameter before re-use
@@ -57 +56 @@
 End
 
-//mode describes the type of subtraction that is to be done
-//1 = both emp and bgd subtraction
-//2 = only bgd subtraction
-//3 = only emp subtraction
-//4 = no subtraction (handled by ExecuteProtocol(), but implemented here as well)
-//
-// + 10 indicates that WORK.DRK is to be used
-//**********unused***********
-//**worse yet, only partially converted to use DRK files!***********
-//
-Function OLD_Correct(mode)
-        Variable mode
-        
-        //Print "mode = ",mode
-        if(mode==4)
-                Print "no subtraction required - Correct(mode) should not have been called"
-                return(1)               //error - correct should not have been called
-        Endif
-        
-        // always check for existence of data in SAM
-        // if the desired workfile doesn't exist, let the user know, and abort
-        String destPath
-        String type = "SAM"
-        //check for SAM
-        destPath = "root:"+Type + ":data"
-        if(WaveExists($destpath) == 0)
-                Print "There is no work file in "+type+"--Aborting"
-                Return(1)               //error condition
-        else
-                //check for log-scaling of the "SAM" data and adjust if necessary
-                ConvertFolderToLinearScale(type)
-                Wave sam_data = $"root:SAM:data"
-        Endif
-        
-        //check for BGD if mode = 1 or 2 or 11 or 12
-        if( (mode ==1) || (mode==2) || (mode==11) || (mode==12) )
-                type = "BGD"
-                destPath =  "root:"+Type + ":data"
-                if(WaveExists($destpath) == 0)
-                        Print "There is no work file in "+type+"--Aborting"
-                        Return(1)               //error condition
-                else
-                        //check for log-scaling of the "BGD" data and adjust if necessary
-                        ConvertFolderToLinearScale(type)
-                        Wave bgd_data = $"root:BGD:data"
-                Endif
-        Endif
-        
-        // check for EMP data if type 3 or 1 or 13 or 11
-        if( (mode==1) || (mode==3) || (mode==11) || (mode==13) )
-                type = "EMP"
-                destPath =  "root:"+Type + ":data"
-                if(WaveExists($destpath) == 0)
-                        Print "There is no work file in "+type+"--Aborting"
-                        Return(1)               //error condition
-                else
-                        //check for log-scaling of the "EMP" data and adjust if necessary
-                        ConvertFolderToLinearScale(type)
-                        Wave emp_data = $"root:EMP:data"
-                Endif
-        Endif
-        
-        // check for DRK data if type 11,12,13, or 14
-        if( (mode==11) || (mode==12) || (mode==13) || (mode==14) )
-                type = "DRK"
-                destPath =  "root:"+Type + ":data"
-                if(WaveExists($destpath) == 0)
-                        Print "There is no work file in "+type+"--Aborting"
-                        Return(1)               //error condition
-                else
-                        //check for log-scaling of the "EMP" data and adjust if necessary
-                        ConvertFolderToLinearScale(type)
-                        Wave drk_data = $"root:DRK:data"
-                Endif
-        Endif
-        
-        //necessary files exist, proceed
-
-        //make needed wave references to other folders
-        //NOTE that these references MAY NOT EXIST, depending on the mode
-        WAVE sam_reals = $"root:SAM:realsread"
-        WAVE sam_ints = $"root:SAM:integersread"
-        WAVE/T sam_text = $"root:SAM:textread"
-        WAVE/Z emp_reals = $"root:EMP:realsread"
-        WAVE/Z emp_ints = $"root:EMP:integersread"
-        WAVE/T/Z emp_text = $"root:EMP:textread"
-        WAVE/Z bgd_reals = $"root:BGD:realsread"
-        WAVE/Z bgd_ints = $"root:BGD:integersread"
-        WAVE/T/Z bgd_text = $"root:BGD:textread"
-        
-        //find the attenuation of the sample (if any)
-        Variable SamAttenFactor,lambda,attenNo,err=0
-        String samfileStr=""
-        samfileStr = sam_text[3]
-        lambda = sam_reals[26]
-        attenNo = sam_reals[3]
-        SamAttenFactor = AttenuationFactor(samFileStr,lambda,AttenNo)
-        //if sample trans is zero, do only SAM-BGD subtraction (notify the user)
-        Variable sam_trans = sam_reals[4]
-        
-        //copy SAM information to COR, wiping out the old contents of the COR folder first
-        err = CopyWorkContents("SAM","COR")     
-        if(err==1)
-                Abort "No data in SAM, abort from Correct()"
-        endif
-        
-        //now switch to COR folder
-        DestPath="root:COR"
-        //make appropriate wave references
-        WAVE data=$(destPath + ":data")                                 // these wave references point to the SAM data in COR
-        WAVE/T textread=$(destPath + ":textread")                       //that are to be directly operated on
-        WAVE integersread=$(destPath + ":integersread")
-        WAVE realsread=$(destPath + ":realsRead")
-
-        NVAR pixelsX = root:myGlobals:gNPixelsX
-        NVAR pixelsY = root:myGlobals:gNPixelsY
-        
-        //Print "done copying data, starting the correct calculations"
-        
-        // Start the actual "correct" step here
-        Variable wcen=0.001,numsam,tmonsam,tsam,rsam,csam,fsam
-        Variable tmonbgd,fbgd,xshift,yshift,rbgd,cbgd,sh_sum,ii,jj,trans,tmonemp,temp,femp
-        Variable cemp,remp
-        //make temporary waves to hold the intermediate results and the shifted arrays
-        Duplicate/O data cor1,cor2
-        cor1 = 0                //initialize to zero
-        cor2 = 0
-        
-        //make needed wave references to other folders
-        Wave sam_reals = $"root:SAM:realsread"
-        Wave bgd_reals = $"root:BGD:realsread"
-        Wave emp_reals = $"root:EMP:realsread"
-        
-        //get counts, trans, etc. from file headers
-        numsam = sam_ints[3]            //number of runs in SAM file
-        tmonsam = sam_reals[0]          //monitor count in SAM
-        tsam = sam_reals[4]             //SAM transmission
-        csam = sam_reals[16]            //x center
-        rsam = sam_reals[17]            //beam (x,y) define center of corrected field
-        //Print "rsam,csam = ",rsam,csam
-        
-        //
-        //do sam-bgd subtraction if mode (1) or (2)
-        //else (mode 3), set cor1 = sam_data
-        if( (mode==1) || (mode==2) )
-                fsam = 1
-                tmonbgd = bgd_reals[0]          //monitor count in BGD
-                fbgd = tmonsam/tmonbgd  //this should be ==1 since normalized files
-        
-                //set up  center shift, relative to SAM
-                cbgd = bgd_reals[16]
-                rbgd = bgd_reals[17]
-                //Print "rbgd,cbgd = ",rbgd,cbgd
-                xshift = cbgd-csam
-                yshift = rbgd-rsam
-                if(abs(xshift) <= wcen)
-                        xshift = 0
-                Endif
-                if(abs(yshift) <= wcen)
-                        yshift = 0
-                Endif
-                
-                If((xshift != 0) || (yshift != 0))
-                        DoAlert 1,"Do you want to ignore the beam center mismatch?"
-                        if(V_flag==1)           //yes -> just go on
-                                xshift=0
-                                yshift=0
-                        endif
-                endif
-                //do the sam-bgd subtraction,  deposit result in cor1[][]
-                If((xshift == 0) && (yshift == 0))
-                        //great, no shift required
-                        cor1 = fsam*sam_data - fbgd*bgd_data*SamAttenFactor
-                else
-                        //shift required, very time-consuming
-                        Print "sam-bgd shift x,y = ",xshift,yshift
-                        Make/O/N=1 noadd                //needed to get noadd condition back from ShiftSum()
-                        ii=0
-                        do
-                                jj=0
-                                do
-                                        //get the contribution of shifted data
-                                        sh_sum = ShiftSum(bgd_data,ii,jj,xshift,yshift,noadd)
-                                        if(noadd[0])
-                                                cor1[ii][jj]=0
-                                        else
-                                                //add the sam_data + shifted sum 
-                                                cor1[ii][jj] = fsam*sam_data[ii][jj] - fbgd*sh_sum*SamAttenFactor
-                                        Endif
-                                        jj+=1
-                                while(jj<pixelsY)
-                                ii+=1
-                        while(ii<pixelsX)
-                Endif
-        else                    //switch on mode
-                cor1 = sam_data         //setup for just EMP subtraction
-        Endif
-        
-        //Print "sam-bgd done"
-        
-        if(mode == 2)           //just a BGD subtraction
-                //we're done, get out w/no error
-                //set the COR data to the result
-                data = cor1
-                //update COR header
-                textread[1] = date() + " " + time()             //date + time stamp
-                SetDataFolder root:
-                KillWaves/Z cor1,cor2
-                Return(0)
-        Endif
-        
-        //if mode ==1 (ONLY choice left) do the empty-background subtraction
-        //else mode = 3, set cor2 to emp_data
-        if(mode==1)             //full subtraction
-                trans = emp_reals[4]            //EMP transmission
-                if(trans == 0)
-                        trans = 1
-                        DoAlert 0,"Empty cell transmission was zero. It has been reset to one for the calculation"
-                endif
-                tmonemp = emp_reals[0]
-                femp = tmonsam/tmonemp
-                temp = trans
-        
-                //set up center shift, relative to EMP
-                cemp = emp_reals[16]
-                remp = emp_reals[17]
-                //Print "remp,cemp ",remp,cemp
-                xshift = cbgd - cemp
-                yshift = rbgd - remp
-                if(abs(xshift) <= wcen )
-                        xshift = 0
-                endif
-                if(abs(yshift) <= wcen)
-                        yshift = 0
-                endif
-                
-                If((xshift != 0) || (yshift != 0))
-                        DoAlert 1,"Do you want to ignore the beam center mismatch?"
-                        if(V_flag==1)
-                                xshift=0
-                                yshift=0
-                        endif
-                endif
-                //do the emp-bgd subtraction,  deposit result in cor2[][]
-                If((xshift == 0) && (yshift == 0))
-                        //great, no shift required, DON'T scale this by the attenuation gfactor
-                        cor2 = femp*emp_data - fbgd*bgd_data
-                else
-                        //shift required, very time-consuming
-                        Print "emp-bgd shift x,y = ",xshift,yshift
-                        Make/O/N=1 noadd                //needed to get noadd condition back from ShiftSum()
-                        ii=0
-                        do
-                                jj=0
-                                do
-                                        //get the contribution of shifted data
-                                        sh_sum = ShiftSum(bgd_data,ii,jj,xshift,yshift,noadd)
-                                        if(noadd[0])
-                                                cor2[ii][jj]=0
-                                        else
-                                                //add the sam_data + shifted sum 
-                                                cor2[ii][jj] = femp*emp_data[ii][jj] - fbgd*sh_sum
-                                        Endif
-                                        jj+=1
-                                while(jj<pixelsY)
-                                ii+=1
-                        while(ii<pixelsX)
-                Endif
-        else            //switch on mode==1 for full subtraction
-                cor2 = emp_data
-                //be sure to set the empty center location... for the shift
-                trans = emp_reals[4]            //EMP transmission
-                if(trans == 0)
-                        trans = 1
-                        DoAlert 0,"Empty cell transmission was zero. It has been reset to one for the calculation"
-                endif
-                tmonemp = emp_reals[0]
-                femp = tmonsam/tmonemp
-                temp = trans
-        
-                //set up center shift, relative to EMP
-                cemp = emp_reals[16]
-                remp = emp_reals[17]
-        Endif
-        
-        //Print "emp-bgd done"
-        
-        //mode 2 exited, either 1 or 3 apply from here, and are setup properly.
-        
-        //set up for final step, data(COR) = cor1 - Tsam/Temp*cor2
-        //set up shift, relative to SAM
-        xshift = cemp - csam
-        yshift = remp - rsam
-        if(abs(xshift) <= wcen )
-                xshift = 0
-        endif
-        if(abs(yshift) <= wcen)
-                yshift = 0
-        endif
-        
-        If((xshift != 0) || (yshift != 0))
-                DoAlert 1,"Do you want to ignore the beam center mismatch?"
-                if(V_flag==1)
-                        xshift=0
-                        yshift=0
-                endif
-        endif
-        //do the cor1-a*cor2 subtraction,  deposit result in data[][] (in the COR folder)
-        If((xshift == 0) && (yshift == 0))
-                //great, no shift required
-                data = cor1 - (tsam/temp)*cor2*SamAttenFactor
-        else
-                //shift required, very time-consuming
-                Print "sam-emp shift x,y = ",xshift,yshift
-                Make/O/N=1 noadd                //needed to get noadd condition back from ShiftSum()
-                ii=0
-                do
-                        jj=0
-                        do
-                                //get the contribution of shifted data
-                                sh_sum = ShiftSum(cor2,ii,jj,xshift,yshift,noadd)
-                                if(noadd[0])
-                                        data[ii][jj]=0
-                                else
-                                        //add the sam_data + shifted sum 
-                                        data[ii][jj] = cor1[ii][jj] - (tsam/temp)*sh_sum*SamAttenFactor
-                                Endif
-                                jj+=1
-                        while(jj<pixelsY)
-                        ii+=1
-                while(ii<pixelsX)
-        Endif
-        
-        //Print "all done"
-        
-        //update COR header
-        textread[1] = date() + " " + time()             //date + time stamp
-        
-        //clean up
-        SetDataFolder root:COR
-        SetDataFolder root:
-        KillWaves/Z cor1,cor2,noadd
-
-        Return(0)               //all is ok, if you made it to this point
-End
 
 //mode describes the type of subtraction that is to be done
@@ -1385 +1039 @@
 
 //////////////////////////
+//**********unused***********
+//mode describes the type of subtraction that is to be done
+//1 = both emp and bgd subtraction
+//2 = only bgd subtraction
+//3 = only emp subtraction
+//4 = no subtraction (handled by ExecuteProtocol(), but implemented here as well)
+//
+// + 10 indicates that WORK.DRK is to be used
+//**********unused***********
+//**worse yet, only partially converted to use DRK files!***********
+//
+Function OLD_Correct(mode)
+        Variable mode
+        
+        //Print "mode = ",mode
+        if(mode==4)
+                Print "no subtraction required - Correct(mode) should not have been called"
+                return(1)               //error - correct should not have been called
+        Endif
+        
+        // always check for existence of data in SAM
+        // if the desired workfile doesn't exist, let the user know, and abort
+        String destPath
+        String type = "SAM"
+        //check for SAM
+        destPath = "root:"+Type + ":data"
+        if(WaveExists($destpath) == 0)
+                Print "There is no work file in "+type+"--Aborting"
+                Return(1)               //error condition
+        else
+                //check for log-scaling of the "SAM" data and adjust if necessary
+                ConvertFolderToLinearScale(type)
+                Wave sam_data = $"root:SAM:data"
+        Endif
+        
+        //check for BGD if mode = 1 or 2 or 11 or 12
+        if( (mode ==1) || (mode==2) || (mode==11) || (mode==12) )
+                type = "BGD"
+                destPath =  "root:"+Type + ":data"
+                if(WaveExists($destpath) == 0)
+                        Print "There is no work file in "+type+"--Aborting"
+                        Return(1)               //error condition
+                else
+                        //check for log-scaling of the "BGD" data and adjust if necessary
+                        ConvertFolderToLinearScale(type)
+                        Wave bgd_data = $"root:BGD:data"
+                Endif
+        Endif
+        
+        // check for EMP data if type 3 or 1 or 13 or 11
+        if( (mode==1) || (mode==3) || (mode==11) || (mode==13) )
+                type = "EMP"
+                destPath =  "root:"+Type + ":data"
+                if(WaveExists($destpath) == 0)
+                        Print "There is no work file in "+type+"--Aborting"
+                        Return(1)               //error condition
+                else
+                        //check for log-scaling of the "EMP" data and adjust if necessary
+                        ConvertFolderToLinearScale(type)
+                        Wave emp_data = $"root:EMP:data"
+                Endif
+        Endif
+        
+        // check for DRK data if type 11,12,13, or 14
+        if( (mode==11) || (mode==12) || (mode==13) || (mode==14) )
+                type = "DRK"
+                destPath =  "root:"+Type + ":data"
+                if(WaveExists($destpath) == 0)
+                        Print "There is no work file in "+type+"--Aborting"
+                        Return(1)               //error condition
+                else
+                        //check for log-scaling of the "EMP" data and adjust if necessary
+                        ConvertFolderToLinearScale(type)
+                        Wave drk_data = $"root:DRK:data"
+                Endif
+        Endif
+        
+        //necessary files exist, proceed
+
+        //make needed wave references to other folders
+        //NOTE that these references MAY NOT EXIST, depending on the mode
+        WAVE sam_reals = $"root:SAM:realsread"
+        WAVE sam_ints = $"root:SAM:integersread"
+        WAVE/T sam_text = $"root:SAM:textread"
+        WAVE/Z emp_reals = $"root:EMP:realsread"
+        WAVE/Z emp_ints = $"root:EMP:integersread"
+        WAVE/T/Z emp_text = $"root:EMP:textread"
+        WAVE/Z bgd_reals = $"root:BGD:realsread"
+        WAVE/Z bgd_ints = $"root:BGD:integersread"
+        WAVE/T/Z bgd_text = $"root:BGD:textread"
+        
+        //find the attenuation of the sample (if any)
+        Variable SamAttenFactor,lambda,attenNo,err=0
+        String samfileStr=""
+        samfileStr = sam_text[3]
+        lambda = sam_reals[26]
+        attenNo = sam_reals[3]
+        SamAttenFactor = AttenuationFactor(samFileStr,lambda,AttenNo)
+        //if sample trans is zero, do only SAM-BGD subtraction (notify the user)
+        Variable sam_trans = sam_reals[4]
+        
+        //copy SAM information to COR, wiping out the old contents of the COR folder first
+        err = CopyWorkContents("SAM","COR")     
+        if(err==1)
+                Abort "No data in SAM, abort from Correct()"
+        endif
+        
+        //now switch to COR folder
+        DestPath="root:COR"
+        //make appropriate wave references
+        WAVE data=$(destPath + ":data")                                 // these wave references point to the SAM data in COR
+        WAVE/T textread=$(destPath + ":textread")                       //that are to be directly operated on
+        WAVE integersread=$(destPath + ":integersread")
+        WAVE realsread=$(destPath + ":realsRead")
+
+        NVAR pixelsX = root:myGlobals:gNPixelsX
+        NVAR pixelsY = root:myGlobals:gNPixelsY
+        
+        //Print "done copying data, starting the correct calculations"
+        
+        // Start the actual "correct" step here
+        Variable wcen=0.001,numsam,tmonsam,tsam,rsam,csam,fsam
+        Variable tmonbgd,fbgd,xshift,yshift,rbgd,cbgd,sh_sum,ii,jj,trans,tmonemp,temp,femp
+        Variable cemp,remp
+        //make temporary waves to hold the intermediate results and the shifted arrays
+        Duplicate/O data cor1,cor2
+        cor1 = 0                //initialize to zero
+        cor2 = 0
+        
+        //make needed wave references to other folders
+        Wave sam_reals = $"root:SAM:realsread"
+        Wave bgd_reals = $"root:BGD:realsread"
+        Wave emp_reals = $"root:EMP:realsread"
+        
+        //get counts, trans, etc. from file headers
+        numsam = sam_ints[3]            //number of runs in SAM file
+        tmonsam = sam_reals[0]          //monitor count in SAM
+        tsam = sam_reals[4]             //SAM transmission
+        csam = sam_reals[16]            //x center
+        rsam = sam_reals[17]            //beam (x,y) define center of corrected field
+        //Print "rsam,csam = ",rsam,csam
+        
+        //
+        //do sam-bgd subtraction if mode (1) or (2)
+        //else (mode 3), set cor1 = sam_data
+        if( (mode==1) || (mode==2) )
+                fsam = 1
+                tmonbgd = bgd_reals[0]          //monitor count in BGD
+                fbgd = tmonsam/tmonbgd  //this should be ==1 since normalized files
+        
+                //set up  center shift, relative to SAM
+                cbgd = bgd_reals[16]
+                rbgd = bgd_reals[17]
+                //Print "rbgd,cbgd = ",rbgd,cbgd
+                xshift = cbgd-csam
+                yshift = rbgd-rsam
+                if(abs(xshift) <= wcen)
+                        xshift = 0
+                Endif
+                if(abs(yshift) <= wcen)
+                        yshift = 0
+                Endif
+                
+                If((xshift != 0) || (yshift != 0))
+                        DoAlert 1,"Do you want to ignore the beam center mismatch?"
+                        if(V_flag==1)           //yes -> just go on
+                                xshift=0
+                                yshift=0
+                        endif
+                endif
+                //do the sam-bgd subtraction,  deposit result in cor1[][]
+                If((xshift == 0) && (yshift == 0))
+                        //great, no shift required
+                        cor1 = fsam*sam_data - fbgd*bgd_data*SamAttenFactor
+                else
+                        //shift required, very time-consuming
+                        Print "sam-bgd shift x,y = ",xshift,yshift
+                        Make/O/N=1 noadd                //needed to get noadd condition back from ShiftSum()
+                        ii=0
+                        do
+                                jj=0
+                                do
+                                        //get the contribution of shifted data
+                                        sh_sum = ShiftSum(bgd_data,ii,jj,xshift,yshift,noadd)
+                                        if(noadd[0])
+                                                cor1[ii][jj]=0
+                                        else
+                                                //add the sam_data + shifted sum 
+                                                cor1[ii][jj] = fsam*sam_data[ii][jj] - fbgd*sh_sum*SamAttenFactor
+                                        Endif
+                                        jj+=1
+                                while(jj<pixelsY)
+                                ii+=1
+                        while(ii<pixelsX)
+                Endif
+        else                    //switch on mode
+                cor1 = sam_data         //setup for just EMP subtraction
+        Endif
+        
+        //Print "sam-bgd done"
+        
+        if(mode == 2)           //just a BGD subtraction
+                //we're done, get out w/no error
+                //set the COR data to the result
+                data = cor1
+                //update COR header
+                textread[1] = date() + " " + time()             //date + time stamp
+                SetDataFolder root:
+                KillWaves/Z cor1,cor2
+                Return(0)
+        Endif
+        
+        //if mode ==1 (ONLY choice left) do the empty-background subtraction
+        //else mode = 3, set cor2 to emp_data
+        if(mode==1)             //full subtraction
+                trans = emp_reals[4]            //EMP transmission
+                if(trans == 0)
+                        trans = 1
+                        DoAlert 0,"Empty cell transmission was zero. It has been reset to one for the calculation"
+                endif
+                tmonemp = emp_reals[0]
+                femp = tmonsam/tmonemp
+                temp = trans
+        
+                //set up center shift, relative to EMP
+                cemp = emp_reals[16]
+                remp = emp_reals[17]
+                //Print "remp,cemp ",remp,cemp
+                xshift = cbgd - cemp
+                yshift = rbgd - remp
+                if(abs(xshift) <= wcen )
+                        xshift = 0
+                endif
+                if(abs(yshift) <= wcen)
+                        yshift = 0
+                endif
+                
+                If((xshift != 0) || (yshift != 0))
+                        DoAlert 1,"Do you want to ignore the beam center mismatch?"
+                        if(V_flag==1)
+                                xshift=0
+                                yshift=0
+                        endif
+                endif
+                //do the emp-bgd subtraction,  deposit result in cor2[][]
+                If((xshift == 0) && (yshift == 0))
+                        //great, no shift required, DON'T scale this by the attenuation gfactor
+                        cor2 = femp*emp_data - fbgd*bgd_data
+                else
+                        //shift required, very time-consuming
+                        Print "emp-bgd shift x,y = ",xshift,yshift
+                        Make/O/N=1 noadd                //needed to get noadd condition back from ShiftSum()
+                        ii=0
+                        do
+                                jj=0
+                                do
+                                        //get the contribution of shifted data
+                                        sh_sum = ShiftSum(bgd_data,ii,jj,xshift,yshift,noadd)
+                                        if(noadd[0])
+                                                cor2[ii][jj]=0
+                                        else
+                                                //add the sam_data + shifted sum 
+                                                cor2[ii][jj] = femp*emp_data[ii][jj] - fbgd*sh_sum
+                                        Endif
+                                        jj+=1
+                                while(jj<pixelsY)
+                                ii+=1
+                        while(ii<pixelsX)
+                Endif
+        else            //switch on mode==1 for full subtraction
+                cor2 = emp_data
+                //be sure to set the empty center location... for the shift
+                trans = emp_reals[4]            //EMP transmission
+                if(trans == 0)
+                        trans = 1
+                        DoAlert 0,"Empty cell transmission was zero. It has been reset to one for the calculation"
+                endif
+                tmonemp = emp_reals[0]
+                femp = tmonsam/tmonemp
+                temp = trans
+        
+                //set up center shift, relative to EMP
+                cemp = emp_reals[16]
+                remp = emp_reals[17]
+        Endif
+        
+        //Print "emp-bgd done"
+        
+        //mode 2 exited, either 1 or 3 apply from here, and are setup properly.
+        
+        //set up for final step, data(COR) = cor1 - Tsam/Temp*cor2
+        //set up shift, relative to SAM
+        xshift = cemp - csam
+        yshift = remp - rsam
+        if(abs(xshift) <= wcen )
+                xshift = 0
+        endif
+        if(abs(yshift) <= wcen)
+                yshift = 0
+        endif
+        
+        If((xshift != 0) || (yshift != 0))
+                DoAlert 1,"Do you want to ignore the beam center mismatch?"
+                if(V_flag==1)
+                        xshift=0
+                        yshift=0
+                endif
+        endif
+        //do the cor1-a*cor2 subtraction,  deposit result in data[][] (in the COR folder)
+        If((xshift == 0) && (yshift == 0))
+                //great, no shift required
+                data = cor1 - (tsam/temp)*cor2*SamAttenFactor
+        else
+                //shift required, very time-consuming
+                Print "sam-emp shift x,y = ",xshift,yshift
+                Make/O/N=1 noadd                //needed to get noadd condition back from ShiftSum()
+                ii=0
+                do
+                        jj=0
+                        do
+                                //get the contribution of shifted data
+                                sh_sum = ShiftSum(cor2,ii,jj,xshift,yshift,noadd)
+                                if(noadd[0])
+                                        data[ii][jj]=0
+                                else
+                                        //add the sam_data + shifted sum 
+                                        data[ii][jj] = cor1[ii][jj] - (tsam/temp)*sh_sum*SamAttenFactor
+                                Endif
+                                jj+=1
+                        while(jj<pixelsY)
+                        ii+=1
+                while(ii<pixelsX)
+        Endif
+        
+        //Print "all done"
+        
+        //update COR header
+        textread[1] = date() + " " + time()             //date + time stamp
+        
+        //clean up
+        SetDataFolder root:COR
+        SetDataFolder root:
+        KillWaves/Z cor1,cor2,noadd
+
+        Return(0)               //all is ok, if you made it to this point
+End

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/FIT_Ops.ipf

@@ -732 +732 @@
 End
 
-//function returning a string (list) of semicolon separated filenames
-//that are not version numbers, and not raw data files
-//(can't really pare out other files any better - trying to just get ascii I vs. q)
-//works in folder specified by catPathName, (abort if it doesn't exist)
-//
-//** not used anymore - simpler file filter is used instead
-//
-//Function/S GetValidFITRPAPopupList()
-//
-//      String list = "none;something;"
-//      
-//      PathInfo catPathName
-//      String path = S_path
-//      if(V_flag == 0)
-//              Abort "path does not exist - use Pick Path button"
-//      Endif
-//      
-//      list = IndexedFile(catPathName,-1,"????")               //get all files in folder
-//      
-//      //trim version numbers from list
-//      Variable num = ItemsInList(list,";")
-//      Variable ii,isRAW
-//      String item = "",listCopy = "", fullName = "",partialName = ""
-//      
-//      ii=1
-//      do
-//              item = num2str(ii)
-//              list = RemoveFromList(item,list,";")
-//              ii+=1
-//      while (ii<12)
-//      
-//      //trim raw data files from list
-//      listCopy = list                                 //scan through items in copy, change list
-//      num = ItemsInList(listCopy,";")         //get the new number of items in the list
-//      ii=0
-//      do
-//              //build valid fileName
-//              item = StringFromList(ii,listCopy,";")
-//              if (strlen(item) !=0 )
-//                      partialName  = FindValidFileName(item)
-//                      if(strlen(partialName) !=0)             //non-null return from FindValidFileName()
-//                              fullName = path + partialName
-//                              //check if RAW, if so, remove from list
-//                              isRAW = CheckIfRAWData(fullName)
-//                              if(isRAW)
-//                                      list = RemoveFromList(item,list,";")
-//                              Endif
-//                      Endif
-//              Endif
-//              ii+=1
-//      While(ii<num)
-//      
-//      return list
-//End
+
 
 // window recreation macro to draw the fit/rpa panel
@@ -1107 +1054 @@
         qrgh = x*sqrt(nh*ap2/6)
         qrgd = x*sqrt(nd*ap2/6)
-        iabs_rpa = kn/(1/(ch*dbf(qrgh)) + 1/(cd*dbf(qrgd)) - chiv)
+        iabs_rpa = kn/(1/(ch*FIT_dbf(qrgh)) + 1/(cd*FIT_dbf(qrgd)) - chiv)
         iabs = corr*iabs_rpa + inc
         
@@ -1133 +1080 @@
         qrgh = x*sqrt(nh*ap2/6)
         qrgd = x*sqrt(nd*ap2/6)
-        iabs_rpa = kn/(1/(ch*dbf(qrgh)) + 1/(cd*dbf(qrgd)) - chiv)
+        iabs_rpa = kn/(1/(ch*FIT_dbf(qrgh)) + 1/(cd*FIT_dbf(qrgd)) - chiv)
         iabs = corr*iabs_rpa + inc
         
@@ -1159 +1106 @@
 //The following lines were commented out in the fortran function
         //qrgd = x*sqrt(nd*ap2/6)
-        //iabs_rpa = kn/(1/(ch*dbf(qrgh)) + 1/(cd*dbf(qrgd)) - chiv)
-
-        iabs_rpa = kn*dbf(qrgh)
+        //iabs_rpa = kn/(1/(ch*FIT_dbf(qrgh)) + 1/(cd*FIT_dbf(qrgd)) - chiv)
+
+        iabs_rpa = kn*FIT_dbf(qrgh)
         iabs = iabs_rpa + inc
         
@@ -1170 +1117 @@
 
 //Debye Function used for polymer standards
-Function dbf(rgq)
+Function FIT_dbf(rgq)
         Variable rgq
         Variable x

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/MainPanel.ipf

@@ -361 +361 @@
 //************* OLD version of Main Panel *************
 //Window Main_Panel()
-Window Main_Panel_OLD()
+Window OLD_Main_Panel()
         PauseUpdate; Silent 1           // building window...
         NewPanel /K=2 /W=(630,75,938,408) as "SANS Reduction Controls"

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Marquee.ipf

@@ -79 +79 @@
                 return(1)
         endif
-                //printf "marquee left in bottom axis terms: %g\r",round(V_left)
-                //printf "marquee right in bottom axis terms: %g\r",round(V_right)
-                //printf "marquee top in left axis terms: %g\r",round(V_top)
-                //printf "marquee bottom in left axis terms: %g\r",round(V_bottom)
+        //printf "marquee left in bottom axis terms: %g\r",round(V_left)
+        //printf "marquee right in bottom axis terms: %g\r",round(V_right)
+        //printf "marquee top in left axis terms: %g\r",round(V_top)
+        //printf "marquee bottom in left axis terms: %g\r",round(V_bottom)
         Variable x1,x2,y1,y2
         x1 = round(V_left)
@@ -145 +145 @@
         WriteXYBoxToHeader(filename,x1,x2,y1,y2)
         
-        //ReWriteReal() takes care of open/close on its own
         Print counts, " counts in XY box"
         WriteBoxCountsToHeader(filename,counts)
@@ -361 +360 @@
         return(0)
 End
+
+//
 // promts the user for a range of file numbers to perform the sum over
 // list must be comma delimited numbers (or dashes) just as in the BuildProtocol panel
@@ -418 +419 @@
 
 //testing function, not used
-Function testKeep(x1,x2,y1,y2)
+Function testKeepInBounds(x1,x2,y1,y2)
         Variable x1,x2,y1,y2
         

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/MaskUtils.ipf

@@ -39 +39 @@
         maskButtonProc("maskButton")
 //      OverlayMask(1)
-
-
-//      Display/W=(10,50,400,400); AppendImage $waveStr
 
         //back to root folder (redundant)

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/MultipleReduce.ipf

@@ -15 +15 @@
 //**************************
 
+//panel to allow reduction of a series of files using a selected  protocol
+//
+//main entry procedure to open the panel, initializing if necessary
+Proc ReduceMultipleFiles()
+        
+        DoWindow/F Multiple_Reduce_Panel
+        If(V_flag == 0)
+                InitializeMultReducePanel()
+                //draw panel
+                Multiple_Reduce_Panel()
+                //pop the protocol list
+                MRProtoPopMenuProc("",1,"")
+        Endif
+End
+
+//create the global variables needed to run the MReduce Panel
+//all are kept in root:myGlobals:MRED
+//
+Proc InitializeMultReducePanel()
+
+        If(DataFolderExists("root:myGlobals:MRED"))
+                //ok, do nothing
+        else
+                //no, create the folder and the globals
+                NewDataFolder/O root:myGlobals:MRED
+//              String/G root:myGlobals:MRED:gMRedMatchStr = "*"
+                PathInfo catPathName
+                If(V_flag==1)
+                        String dum = S_path
+                        String/G root:myGlobals:MRED:gCatPathStr = dum
+                else
+                        String/G root:myGlobals:MRED:gCatPathStr = "no path selected"
+                endif
+                String/G root:myGlobals:MRED:gMRedList = "none"
+                String/G root:myGlobals:MRED:gMRProtoList = "none"
+                String/G root:myGlobals:MRED:gFileNumList=""
+//              String/G root:myGlobals:MRED:gMRS1 = "no file selected"
+//              String/G root:myGlobals:MRED:gMRS2 = "no file selected"
+//              String/G root:myGlobals:MRED:gMRS3 = "no box selected"
+//              Variable/G root:myGlobals:MRED:gMRV1 =0
+//              Variable/G root:myGlobals:MRED:gMRV2 = 999
+        Endif 
+End
+
+//panel recreation macro for the MRED panel
+//
+Window Multiple_Reduce_Panel()
+        PauseUpdate; Silent 1           // building window...
+        NewPanel /W=(535,72,951,228) /K=1 as "Multiple File Reduction"
+        ModifyPanel cbRGB=(65535,49151,29490)
+        ModifyPanel fixedSize=1
+        SetDrawLayer UserBack
+        DrawLine 7,30,422,30
+        SetVariable PathDisplay,pos={77,7},size={300,13},title="Path"
+        SetVariable PathDisplay,help={"This is the path to the folder that will be used to find the SANS data while reducing. If no files appear in the popup, make sure that this folder is set correctly"}
+        SetVariable PathDisplay,limits={-Inf,Inf,0},value= root:myGlobals:MRED:gCatPathStr
+        Button PathButton,pos={3,3},size={70,20},proc=PickMRPathButton,title="Pick Path"
+        Button PathButton,help={"Select the folder containing the raw SANS data files"}
+        Button helpButton,pos={385,3},size={25,20},proc=ShowMRHelp,title="?"
+        Button helpButton,help={"Show the help file for reducing multiple files using the same protocol"}
+        PopupMenu MRFilesPopup,pos={3,72},size={167,19},proc=MRedPopMenuProc,title="File(s) to Reduce"
+        PopupMenu MRFilesPopup,help={"The displayed file is the one that will be reduced. The entire list will be reduced if \"Reduce All..\" is selected. \r If no items, or the wrong items appear, click on the popup to refresh."}
+        PopupMenu MRFilesPopup,mode=1,popvalue="none",value= #"root:myGlobals:MRED:gMRedList"
+        SetVariable MRList,pos={3,48},size={350,13},proc=FileNumberListProc,title="File number list: "
+        SetVariable MRList,help={"Enter a comma delimited list of file numbers to reduce. Ranges can be entered using a dash."}
+        SetVariable MRList,limits={-Inf,Inf,1},value= root:myGlobals:MRED:gFileNumList
+        Button ReduceAllButton,pos={3,128},size={180,20},proc=ReduceAllPopupFiles,title="Reduce All Files in Popup"
+        Button ReduceAllButton,help={"This will reduce ALL of the files in the popup list, not just the top file."}
+        Button DoneButton,pos={292,128},size={110,20},proc=MRDoneButtonProc,title="Done Reducing"
+        Button DoneButton,help={"When done reducing files, this will close this control panel."}
+        Button cat_short,pos={310,72},size={90,20},proc=DoCatShort,title="File Catalog"
+        Button cat_short,help={"Use this button to generate a table with file header information. Very useful for identifying files."}
+        Button show_cat_short,pos={280,98},size={120,20},proc=ShowCatShort_MRED,title="Show File Catalog"
+        Button show_cat_short,help={"Use this button to bring the File Catalog window to the front."}
+        PopupMenu MRProto_pop,pos={3,98},size={119,19},proc=MRProtoPopMenuProc,title="Protocol "
+        PopupMenu MRProto_pop,help={"All of the data files in the popup will be reduced using this protocol"}
+        PopupMenu MRProto_pop,mode=1,popvalue="none",value= #"root:myGlobals:MRED:gMRProtoList"
+EndMacro
 
 //simple procedure to bring the CAT TABLE to the front if it is present
@@ -107 +185 @@
 End
 
-
-//panel to allow reduction of a series of files using a selected  protocol
-//
-//main entry procedure to open the panel, initializing if necessary
-Proc ReduceMultipleFiles()
-        
-        DoWindow/F Multiple_Reduce_Panel
-        If(V_flag == 0)
-                InitializeMultReducePanel()
-                //draw panel
-                Multiple_Reduce_Panel()
-                //pop the protocol list
-                MRProtoPopMenuProc("",1,"")
-        Endif
-End
-
-//create the global variables needed to run the MReduce Panel
-//all are kept in root:myGlobals:MRED
-//
-Proc InitializeMultReducePanel()
-
-        If(DataFolderExists("root:myGlobals:MRED"))
-                //ok, do nothing
-        else
-                //no, create the folder and the globals
-                NewDataFolder/O root:myGlobals:MRED
-//              String/G root:myGlobals:MRED:gMRedMatchStr = "*"
-                PathInfo catPathName
-                If(V_flag==1)
-                        String dum = S_path
-                        String/G root:myGlobals:MRED:gCatPathStr = dum
-                else
-                        String/G root:myGlobals:MRED:gCatPathStr = "no path selected"
-                endif
-                String/G root:myGlobals:MRED:gMRedList = "none"
-                String/G root:myGlobals:MRED:gMRProtoList = "none"
-                String/G root:myGlobals:MRED:gFileNumList=""
-//              String/G root:myGlobals:MRED:gMRS1 = "no file selected"
-//              String/G root:myGlobals:MRED:gMRS2 = "no file selected"
-//              String/G root:myGlobals:MRED:gMRS3 = "no box selected"
-//              Variable/G root:myGlobals:MRED:gMRV1 =0
-//              Variable/G root:myGlobals:MRED:gMRV2 = 999
-        Endif 
-End
-
-//panel recreation macro for the MRED panel
-//
-Window Multiple_Reduce_Panel()
-        PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(535,72,951,228) /K=1 as "Multiple File Reduction"
-        ModifyPanel cbRGB=(65535,49151,29490)
-        ModifyPanel fixedSize=1
-        SetDrawLayer UserBack
-        DrawLine 7,30,422,30
-        SetVariable PathDisplay,pos={77,7},size={300,13},title="Path"
-        SetVariable PathDisplay,help={"This is the path to the folder that will be used to find the SANS data while reducing. If no files appear in the popup, make sure that this folder is set correctly"}
-        SetVariable PathDisplay,limits={-Inf,Inf,0},value= root:myGlobals:MRED:gCatPathStr
-        Button PathButton,pos={3,3},size={70,20},proc=PickMRPathButton,title="Pick Path"
-        Button PathButton,help={"Select the folder containing the raw SANS data files"}
-        Button helpButton,pos={385,3},size={25,20},proc=ShowMRHelp,title="?"
-        Button helpButton,help={"Show the help file for reducing multiple files using the same protocol"}
-        PopupMenu MRFilesPopup,pos={3,72},size={167,19},proc=MRedPopMenuProc,title="File(s) to Reduce"
-        PopupMenu MRFilesPopup,help={"The displayed file is the one that will be reduced. The entire list will be reduced if \"Reduce All..\" is selected. \r If no items, or the wrong items appear, click on the popup to refresh."}
-        PopupMenu MRFilesPopup,mode=1,popvalue="none",value= #"root:myGlobals:MRED:gMRedList"
-        SetVariable MRList,pos={3,48},size={350,13},proc=FileNumberListProc,title="File number list: "
-        SetVariable MRList,help={"Enter a comma delimited list of file numbers to reduce. Ranges can be entered using a dash."}
-        SetVariable MRList,limits={-Inf,Inf,1},value= root:myGlobals:MRED:gFileNumList
-//      SetVariable MRLow,pos={3,72},size={150,13},proc=SetLowFileNumProc,title="File range: "
-//      SetVariable MRLow,help={"Enter the first file number to reduce. Files must be consecutively numbered."}
-//      SetVariable MRLow,limits={-Inf,Inf,0},value= root:myGlobals:MRED:gMRV1
-        Button ReduceAllButton,pos={3,128},size={180,20},proc=ReduceAllPopupFiles,title="Reduce All Files in Popup"
-        Button ReduceAllButton,help={"This will reduce ALL of the files in the popup list, not just the top file."}
-        Button DoneButton,pos={292,128},size={110,20},proc=MRDoneButtonProc,title="Done Reducing"
-        Button DoneButton,help={"When done reducing files, this will close this control panel."}
-        Button cat_short,pos={310,72},size={90,20},proc=DoCatShort,title="File Catalog"
-        Button cat_short,help={"Use this button to generate a table with file header information. Very useful for identifying files."}
-        Button show_cat_short,pos={280,98},size={120,20},proc=ShowCatShort_MRED,title="Show File Catalog"
-        Button show_cat_short,help={"Use this button to bring the File Catalog window to the front."}
-//      SetVariable MRHigh,pos={160,73},size={90,13},proc=SetHighFileNumProc,title=" to: "
-//      SetVariable MRHigh,help={"Enter the last file number to reduce. Files must be consecutively numbered."}
-//      SetVariable MRHigh,limits={-Inf,Inf,0},value= root:myGlobals:MRED:gMRV2
-        PopupMenu MRProto_pop,pos={3,98},size={119,19},proc=MRProtoPopMenuProc,title="Protocol "
-        PopupMenu MRProto_pop,help={"All of the data files in the popup will be reduced using this protocol"}
-        PopupMenu MRProto_pop,mode=1,popvalue="none",value= #"root:myGlobals:MRED:gMRProtoList"
-EndMacro
-
 //executed when a list of filenumbers is entered in the box
 //responds as if the file popup was hit, to update the popup list contents
@@ -219 +211 @@
         ShowCATWindow()
 End
-
-//obsolete procedure - unused
-//
-//procedure for setVar box to set the low file number (forced to be >=0)
-//sets the global variable, then forces an update of the popup
-//
-//Function SetLowFileNumProc(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//      
-//      ControlInfo MRLow
-//      //low value must be >=0
-//      Variable test = v_value
-//      if (test < 0 )
-//              test = 0
-//      Endif
-//      Variable/G root:myGlobals:MRED:gMRV1 = test
-//      //then update the popup list
-//      MRedPopMenuProc("MRFilesPopup",1,"")
-//
-//End
-
-//obsolete procedure - unused
-//
-//procedure for setVar box to set the high file number (forced to be <=999)
-//sets the global variable, then forces an update of the popup
-//
-//Function SetHighFileNumProc(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//
-//      ControlInfo MRHigh
-//      //high value must be <=999
-//      Variable test = V_value
-//      if(test > 999)
-//              test = 999
-//      Endif
-//      Variable/G root:myGlobals:MRED:gMRV2 = test
-//      //then update the popup list
-//      MRedPopMenuProc("MRFilesPopup",1,"")
-//End
 
 //allows the user to set the path to the local folder that contains the SANS data
@@ -294 +241 @@
 // range of file numbers entered in the text box
 //
-Function MRedPopMenuProc(MRFilesPopup,popNum,popStr) : PopupMenuControl
+Function MREDPopMenuProc(MRFilesPopup,popNum,popStr) : PopupMenuControl
         String MRFilesPopup
         Variable popNum
@@ -300 +247 @@
 
         String list = GetValidMRedPopupList()
-//      Wave/T redList = redList
-//      String list = Wave2SemiList(redWave)
 //      
         String/G root:myGlobals:MRED:gMredList = list
@@ -330 +275 @@
         semiList = SortList(semiList,";",0)
         return(semiList)
-        
-//      //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=""
-//      
-//      list = IndexedFile(catPathName,-1,"????")       //get all files in folder
-//      
-//      NVAR  lownum = root:myGlobals:MRED:gMRV1
-//      NVAR  highnum = root:myGlobals:MRED:gMRV2
-//      
-//      //trim list to include only selected files that are RAW SANS files
-//      //this will exclude version numbers, .AVE, .ABS files, etc. from the popup (which can't be reduced)
-//      Variable ii,isRAW,num,runNum=-1
-//      String item="",newList = "",fullName = "",partialName=""
-//      
-//      //get rid of version numbers first (up to 11)
-//      list =  RemoveVersNumsFromList(list)
-//      
-//      //then filter out only the raw data files within the range lownum to highnum
-//      num = ItemsInList(list,";")             //get the new number of items in the list
-//      ii=0
-//      do
-//              //parse through the list in this order:
-//              // 1 - get the run number from the file (AAAAANNN.SAn_asdfasdfasdf) by finding the "dot"
-//              // 2 - exclude by lownum/highnum
-//              // 3 - exclude by isRaw? (to minimize disk access)
-//              item = StringFromList(ii, list  ,";" )
-//              if(strlen(item) != 0)
-//                      //find the run number, if it exists
-//                      runNum = GetRunNumFromFile(item)
-//                      //is the runNum in the selected range?
-//                      if( (runNum >= lowNum) && (runNum <= highnum) )
-//                              //valid number, continue
-//                              //build valid filename
-//                              partialName = FindValidFileName(item)
-//                              if(strlen(partialName) != 0)            //non-null return from FindValidFileName()
-//                                      fullName = path + partialName
-//                                      //check if RAW, if so, add original item to newList
-//                                      isRAW = CheckIfRawData(fullName)
-//                                      if(isRaw)
-//                                              newList += item + ";"
-//                                      Endif
-//                              Endif
-//                      Endif
-//              Endif
-//              ii+=1
-//      while(ii<num)           //process all items in list
-//
-//      Return(newList)
 End
 
@@ -463 +355 @@
         Return 0
 End
-
-
-//*************************************
-//under construction MRED function
-
-//testing - unused
-//Macro Init_NEW_MRED()
-//      Make/O/T/N=1 fileWave,redWave
-//      Make/O/N=1 selWave
-//End
-
-//testing - unused
-//
-//returns a list of raw data files from catPathName
-//Function/S RawDataList()
-//      //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=IndexedFile(catPathName,-1,"????")  //get all files in folder
-//      
-//      //trim list to include only selected files that are RAW SANS files
-//      //this will exclude version numbers, .AVE, .ABS files, etc. from the popup (which can't be reduced)
-//      Variable ii,isRAW,num,runNum=-1
-//      String item="",newList = "",fullName = "",partialName=""
-//      
-//      //get rid of version numbers first (up to 11)
-//      list =  RemoveVersNumsFromList(list)
-//      
-//      //then filter out only the raw data files within the range lownum to highnum
-//      num = ItemsInList(list,";")             //get the new number of items in the list
-//      ii=0
-//      do
-//              //  exclude by isRaw? (to minimize disk access)
-//              item = StringFromList(ii, list  ,";" )
-//              if(strlen(item) != 0)
-//                              partialName = FindValidFileName(item)
-//                              if(strlen(partialName) != 0)            //non-null return from FindValidFileName()
-//                                      fullName = path + partialName
-//                                      //check if RAW, if so, add original item to newList
-//                                      isRAW = CheckIfRawData(fullName)
-//                                      if(isRaw)
-//                                              newList += item + ";"
-//                                      Endif
-//                              Endif
-//              Endif
-//              ii+=1
-//      while(ii<num)           //process all items in list
-//
-//      Return(newList)
-//End
-
-//testing - unused
-//
-//Function/S RunNumList2FileNameList(NumList)
-//      String numList          //text list of run numbers
-//
-//      //find a valid file name if possible, return null otherwise
-//      String retList = "",str=""
-//      Variable numRuns,ii,r_index
-//      numRuns = ItemsInList(numList,";")
-//      for(ii=0;ii<numRuns;ii+=1)
-//              r_index = str2num(StringFromList(ii,numList,";"))
-//              str= FindFileFromRunNumber(r_index)
-//              if(cmpstr(str,"")!=0)
-//                      retList += str + ";"
-//              Endif
-//      EndFor
-//      return(retList)
-//End
-
-//testing - unused
-//
-//Window panel0() : Panel
-//      PauseUpdate; Silent 1           // building window...
-//      NewPanel /W=(501,97,929,307) /K=1
-//      ListBox fileList,pos={0,0},size={179,146},listWave=root:fileWave
-//      ListBox fileList,selWave=root:selWave,mode= 4
-//      ListBox redList,pos={219,0},size={179,146},listWave=root:redWave,mode= 1
-//      ListBox redList,selRow= -1
-//      Button button0,pos={114,148},size={50,20},proc=AddButtonProc,title="Add"
-//      Button button1,pos={219,148},size={50,20},proc=ClearButtonProc,title="Clear"
-//      Button button2,pos={337,148},size={50,20},proc=PopButtonProc,title="Pop"
-//      Button button3,pos={4,148},size={50,20},proc=NewListButtonProc
-//      Button button4,pos={279,148},size={50,20},proc=DelButtonProc,title="Del"
-//EndMacro
-
-//testing - unused
-//
-//Function DelButtonProc(ctrlName) : ButtonControl
-//      String ctrlName
-//      
-//      ControlInfo redList
-//      Variable selRow=V_Value
-//      Wave lw=$S_Value
-//      DeletePoints selRow,1,lw
-//      
-//End
-
-//testing - unused
-//
-//Function NewListButtonProc(ctrlName) : ButtonControl
-//      String ctrlName
-//      
-//      String list=IndexedFile(catPathName,-1,"????")
-//      String newList="",item=""
-//      Variable num=ItemsInList(list,";"),ii
-//      for(ii=0;ii<num;ii+=1)
-//              item = StringFromList(ii, list  ,";")
-//              if( stringmatch(item,"*.sa1*") )
-//                      newlist += item + ";"
-//              endif
-//              if( stringmatch(item,"*.sa2*") )
-//                      newlist += item + ";"
-//              endif
-//              if( stringmatch(item,"*.sa3*") )
-//                      newlist += item + ";"
-//              endif
-//              //print "ii=",ii
-//      endfor
-//      newList = SortList(newList,";",0)
-//      num=ItemsInList(newlist,";")
-//      Make/O/T/N=(num) fileWave
-//      Make/O/N=(num) selWave
-//      fileWave = StringFromList(p,newlist,";")
-//      Sort filewave,filewave
-//End
-
-//testing - unused
-//
-//Function AddButtonProc(ctrlName) : ButtonControl
-//      String ctrlName
-//
-//      Wave/T fileWave=fileWave
-//      Wave/T redWave=redWave
-//      Wave sel=selWave
-//      
-//      Variable num=numpnts(sel),ii=0
-//      variable lastPt=numpnts(redwave)
-//      do
-//              if(sel[ii] == 1)
-//                      InsertPoints lastPt,1, redWave
-//                      redWave[lastPt]=filewave[ii]
-//                      lastPt +=1
-//              endif
-//              ii+=1
-//      while(ii<num)
-//      return(0)
-//End
-
-//testing - unused
-//
-//Function ClearButtonProc(ctrlName) : ButtonControl
-//      String ctrlName
-//      Make/O/T/N=1 redWave
-//End
-
-//testing - unused
-//
-//Function PopButtonProc(ctrlName) : ButtonControl
-//      String ctrlName         
-//      MRedPopMenuProc("MRFilesPopup",0,"")
-//End
 
 

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/NCNR_Utils.ipf

@@ -1041 +1041 @@
         return newlist
 End
+
+// returns a list of raw data files in the catPathName directory on disk
+// - list is SEMICOLON-delimited
+//
+// does it the "cheap" way, simply finding the ".SAn" in the file name
+// = does not check for proper byte length.
+Function/S GetRawDataFileList()
+        
+        //make sure that path exists
+        PathInfo catPathName
+        if (V_flag == 0)
+                Abort "Folder path does not exist - use Pick Path button on Main Panel"
+        Endif
+        
+        String list=IndexedFile(catPathName,-1,"????")
+        String newList="",item=""
+        Variable num=ItemsInList(list,";"),ii
+        for(ii=0;ii<num;ii+=1)
+                item = StringFromList(ii, list  ,";")
+                if( stringmatch(item,"*.sa1*") )
+                        newlist += item + ";"
+                endif
+                if( stringmatch(item,"*.sa2*") )
+                        newlist += item + ";"
+                endif
+                if( stringmatch(item,"*.sa3*") )
+                        newlist += item + ";"
+                endif
+                //print "ii=",ii
+        endfor
+        newList = SortList(newList,";",0)
+        return(newList)
+End

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

@@ -345 +345 @@
 End
 
-//unused tesing procedure
-//
-Proc AskToStripPoints(nb,ne)
-        Variable nb=7,ne=0
-        Prompt nb,"Points to strip from beginning of file"
-        Prompt ne,"Points to strip from end of file"
-        
-        gBegPts = nb
-        gEndPts = ne
-        
-End
-
 //gets the scaling constant to make (best) overlap of the specified datasets
 //the scaling value is an average value of the individual scaling values for 
@@ -380 +368 @@
                 ii+=1
         while(ii<=num2)
-        Variable norm
-        norm = ratio/(num2+1)           // +1 counts for point zero
-        //Print "norm = ",norm
-
-        Return norm
+        Variable val
+        val = ratio/(num2+1)            // +1 counts for point zero
+        //Print "val = ",val
+
+        Return val
 End
 
@@ -593 +581 @@
 //when a value is entered, the global value is set, and the corresponding dataset
 //is updated on the plot, showing the new result of removing this number of points
+//
+//      SetVar boxes are named beg_N and end_N (so 4th element is the number)
+//
+// 1 == LowQ
+// 2 == MedQ
+// 3 == HighQ
+//
 //"Plot_1" is the low-q button name
 //"Plot_2" is the med-q button name
 //"Plot_3" is the high-q button name
+//
 //calling plot_0_Button() responds as if that named button were pressed
+// and gets the proper number to trim directly from the SetVar
 //
 Function SetBegOrEnd(ctrlName,varNum,varStr,varName) : SetVariableControl
@@ -609 +606 @@
         DoWindow/F NSORT_Panel
 End
-
-//Function SetEnd_1(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//      
-//      //Variable/G root:myGlobals:NSORT:gPtsEnd1 = varNum
-//      print str2num(ctrlName[4]),ctrlName,varNum,varStr,varName
-//      Plot_0_Button("Plot_1")
-//      DoWindow/F NSORT_Panel
-//End
-//
-////see comments on SetEnd_1()
-////
-//Function SetEnd_2(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//      
-//      Variable/G root:myGlobals:NSORT:gPtsEnd2 = varNum
-//      Plot_0_Button("Plot_2")
-//      DoWindow/F NSORT_Panel
-//End
-//
-////see comments on SetEnd_1()
-////
-//Function SetEnd_3(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//      
-//      Variable/G root:myGlobals:NSORT:gPtsEnd3 = varNum
-//      Plot_0_Button("Plot_3")
-//      DoWindow/F NSORT_Panel
-//End
-//
-////see comments on SetEnd_1()
-////
-//Function SetBeg_1(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//      
-//      Variable/G root:myGlobals:NSORT:gPtsBeg1 = varNum
-//      Plot_0_Button("Plot_1")
-//      DoWindow/F NSORT_Panel
-//End
-//
-////see comments on SetEnd_1()
-////
-//Function SetBeg_2(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//
-//      Variable/G root:myGlobals:NSORT:gPtsBeg2 = varNum
-//      Plot_0_Button("Plot_2")
-//      DoWindow/F NSORT_Panel
-//End
-//
-////see comments on SetEnd_1()
-////
-//Function SetBeg_3(ctrlName,varNum,varStr,varName) : SetVariableControl
-//      String ctrlName
-//      Variable varNum
-//      String varStr
-//      String varName
-//
-//      Variable/G root:myGlobals:NSORT:gPtsBeg3 = varNum
-//      Plot_0_Button("Plot_3")
-//      DoWindow/F NSORT_Panel
-//End
-
-////obsolete button control
-//Function ManualScaleButton(ctrlName) : ButtonControl
-//      String ctrlName
-//
-//      Execute "ManualScalePrompt()"
-//      
-//End
-//
-////obsolete missing param dialog
-//Proc ManualScalePrompt(s12,s23)
-//      Variable s12 = 1
-//      Variable s23 = 1
-//      Prompt s12,"enter the multiplier for medium q set"
-//      Prompt s23,"enter the multiplier for high q set"
-//      
-//      Variable/G root:myGlobals:NSORT:gScale1_2 = s12
-//      Variable/G root:myGlobals:NSORT:gScale2_3 = s23
-//End
 
 //this will---
@@ -781 +682 @@
         return(0)
 End
-
 
 //window recreation macro for NSORT Panel
@@ -869 +769 @@
         CheckBox AutoCheck,pos={14,310},size={100,20},title="Auto Scale",value=1
         CheckBox AutoCheck,help={"If checked, the scale factor will be automatically determined, if not checked, the current values in the fields will be used"}
-//      CheckBox check_0,pos={282,91},size={80,20},title="Update ?",value=1
-//      CheckBox check_0,help={"If checked, the list of data files will be updated from disk, unchecked (faster) will not refresh the list"}
-//      CheckBox check_1,pos={282,174},size={80,20},title="Update ?",value=1
-//      CheckBox check_1,help={"If checked, the list of data files will be updated from disk, unchecked (faster) will not refresh the list"}
-//      CheckBox check_2,pos={282,257},size={80,20},title="Update ?",value=1
-//      CheckBox check_2,help={"If checked, the list of data files will be updated from disk, unchecked (faster) will not refresh the list"}
 EndMacro
 
@@ -941 +835 @@
 
 //when menu is popped, it gets a valid list to display and updates the control
-//**for speed, refreshes list only if checkbox is checked
 //
 // 2002- always refreshes, as new (fast) filter is used
@@ -949 +842 @@
         String popStr
 
-        //only update the popup if the "update" checkbox is checked
-        //to improve speed
-//      Variable checked = 0
-//      ControlInfo check_0
-//      checked = V_value
-        
-//      If(checked)
-                String/G root:myGlobals:NSORT:gDataPopList = ReducedDataFileList("")
-                ControlUpdate popup_1
-//      Endif
-        
+        String/G root:myGlobals:NSORT:gDataPopList = ReducedDataFileList("")
+        ControlUpdate popup_1
+
+        return(0)
 End
 
 //when menu is popped, it gets a valid list to display and updates the control
-//**for speed, refreshes list only if checkbox is checked
 //
 Function MedQPopMenuProc(ctrlName,popNum,popStr) : PopupMenuControl
@@ -969 +854 @@
         Variable popNum
         String popStr
-        
-        //only update the popup if the "update" checkbox is checked
-        //to improve speed
-//      Variable checked = 0
-//      ControlInfo check_1
-//      checked = V_value
-        
-//      If(checked)             
-                String/G root:myGlobals:NSORT:gDataPopList_3 = "none;" +  ReducedDataFileList("")
-                ControlUpdate popup_2
-                if(cmpstr(popStr,"none")==0)
-                        PopupMenu popup_3,mode=1        //force "none" (item #1) to be the selection
-                        CheckBox AutoCheck,value=0      //un-check the auto-scale checkbox
-                        DoAlert 0,"You have only one data set. Auto Scaling has been unchecked and Mult Factor 1-2 will be applied to your data. Remember to re-check this as needed"// remind the user of this fact
-                        RemoveFromGraph/Z MedQSet_i,TrimMedQSet_i,HighQSet_i,TrimHighQSet_i             //remove the data from the graph
-                Endif   
-//endif
+                
+        String/G root:myGlobals:NSORT:gDataPopList_3 = "none;" +  ReducedDataFileList("")
+        ControlUpdate popup_2
+        if(cmpstr(popStr,"none")==0)
+                PopupMenu popup_3,mode=1        //force "none" (item #1) to be the selection
+                CheckBox AutoCheck,value=0      //un-check the auto-scale checkbox
+                DoAlert 0,"You have only one data set. Auto Scaling has been unchecked and Mult Factor 1-2 will be applied to your data. Remember to re-check this as needed"// remind the user of this fact
+                RemoveFromGraph/Z MedQSet_i,TrimMedQSet_i,HighQSet_i,TrimHighQSet_i             //remove the data from the graph
+        Endif   
+        return(0)
 End
 
@@ -991 +869 @@
 // - will be different, since set 3 can also be "none" if only 2 sets
 //are to be NSORTed
-//**for speed, refreshes list only if checkbox is checked
 //
 Function HighQPopMenuProc(ctrlName,popNum,popStr) : PopupMenuControl
@@ -998 +875 @@
         String popStr
 
-        //only update the popup if the "update" checkbox is checked
-        //to improve speed
-//      Variable checked = 0
-//      ControlInfo check_2
-//      checked = V_value
-
-//      If(checked)
-                //add the option "none" to the file list (which should already end with a semicolon)
-                String/G root:myGlobals:NSORT:gDataPopList_3 = "none;" +  ReducedDataFileList("")
-
-                ControlUpdate popup_3
-                if(cmpstr(popStr,"none")==0)
-                        RemoveFromGraph/Z HighQSet_i,TrimHighQSet_i             //remove the data from the graph
-                Endif   
-                ControlInfo popup_2
-                if(cmpstr(S_Value,"none")==0)
-                        PopupMenu popup_3,mode=1        //force "none" (item #1) to be the selection if medium is none
-                endif
-//      Endif
-        
-End
-
-////function returning a string (list) of semicolon separated filenames
-////that are not version numbers, and not raw data files
-////(can't really pare out other files any better - trying to just get ascii I vs. q)
-////works in folder specified by catPathName, (abort if it doesn't exist)
-////
-////***** UNUSED ******** - simpler fileFilter is used to simply filter out the raw data
-////
-//Function/S GetValidNSORTPopupList()
-//
-//      String list = "none;something;"
-//      
-//      PathInfo catPathName
-//      String path = S_path
-//      if(V_flag == 0)
-//              Abort "path does not exist - use Pick Path button"
-//      Endif
-//      
-//      list = IndexedFile(catPathName,-1,"????")               //get all files in folder
-//      
-//      //trim version numbers from list
-//      Variable num = ItemsInList(list,";")
-//      Variable ii,isRAW
-//      String item = "",listCopy = "", fullName = "",partialName = ""
-//      
-//      ii=1
-//      do
-//              item = num2str(ii)
-//              list = RemoveFromList(item,list,";")
-//              ii+=1
-//      while (ii<12)
-//      
-//      //trim raw data files from list
-//      listCopy = list                                 //scan through items in copy, change list
-//      num = ItemsInList(listCopy,";")         //get the new number of items in the list
-//      ii=0
-//      do
-//              //build valid fileName
-//              item = StringFromList(ii,listCopy,";")
-//              if (strlen(item) !=0 )
-//                      partialName  = FindValidFileName(item)
-//                      if(strlen(partialName) !=0)             //non-null return from FindValidFileName()
-//                              fullName = path + partialName
-//                              //check if RAW, if so, remove from list
-//                              isRAW = CheckIfRAWData(fullName)
-//                              if(isRAW)
-//                                      list = RemoveFromList(item,list,";")
-//                              Endif
-//                      Endif
-//              Endif
-//              ii+=1
-//      While(ii<num)
-//      
-//      return list
-//End
+        //add the option "none" to the file list (which should already end with a semicolon)
+        String/G root:myGlobals:NSORT:gDataPopList_3 = "none;" +  ReducedDataFileList("")
+
+        ControlUpdate popup_3
+        if(cmpstr(popStr,"none")==0)
+                RemoveFromGraph/Z HighQSet_i,TrimHighQSet_i             //remove the data from the graph
+        Endif   
+        ControlInfo popup_2
+        if(cmpstr(S_Value,"none")==0)
+                PopupMenu popup_3,mode=1        //force "none" (item #1) to be the selection if medium is none
+        endif
+        return(0)       
+End
+
 
 //be sure to use the "Trim.." datasets that have had the bad points removed
@@ -1271 +1086 @@
                 Sort q123, q123,i123,sig123
                 /////////////////
-                
-                //old method
-                        //first point of overlap region (from set 3)
-                        //FindLevel/P/Q q123,(highq[0])
-                        //Variable firstOverlapPt = V_levelX
-                        //last point of overlap region (from set 12)
-                        //FindLevel/P/Q q123,(q12[n12-1])
-                        //Variable lastOverlapPt = V_levelX
-                //end old method, not used
                 
                 //find the maximum point number of set 2  in the overlap region
@@ -1476 +1282 @@
                 /////////////////
                 
-                //old method
-                        //first point of overlap region (from set 3)
-                        //FindLevel/P/Q q123,(highq[0])
-                        //Variable firstOverlapPt = V_levelX
-                        //last point of overlap region (from set 12)
-                        //FindLevel/P/Q q123,(q12[n12-1])
-                        //Variable lastOverlapPt = V_levelX
-                //end old method, not used
-                
                 //find the maximum point number of set 2  in the overlap region
                 FindLevel/P/Q highq,(q12[n12-1])
@@ -1553 +1350 @@
 
 /////////////////////////////////////////////////////////////
-//testing, may speed up NSORT
+// testing, may speed up NSORT, NCNR-specific naming scheme of 
+// run numbers and a run prefix
 Proc Set3NSORTFiles(low,med,hi,pref)
         Variable low=1,med=2,hi=3
@@ -1579 +1377 @@
 End
 
+//make a three character string of the run number
 Function/S ThreeDigitString(num)
         Variable num
         
-        //make a three character string of the run number
         String numStr=""
         if(num<10)
@@ -1866 +1664 @@
 
 
-
-
 // Commentized lines here are incomplete - and NON-FUNCTIONING
 //

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/PatchFiles.ipf

@@ -121 +121 @@
                 Abort "folder path does not exist - use Pick Path button"
         Endif
-        String list
-        list = IndexedFile(catPathName,-1,"????")       //get all files in folder
+        
+        String newList = ""
+
+        newList = GetRawDataFileList()
+
         //trim list to include only selected files
         SVAR match = root:myGlobals:Patch:gPatchMatchStr
-        list = MyMatchList(match,list,";")
-        //further trim list to include only RAW SANS files
-        //this will exclude version numbers, .AVE, .ABS files, etc. from the popup (which can't be patched)
-        Variable num = ItemsInList(list,";")
-        Variable ii,isRAW
-        String item="",newList = "",fullName = "",partialName=""
-        
-        //get rid of version numbers first (up to 11)
-        ii=1
-        do
-                item = num2str(ii)
-                list = RemoveFromList(item, list ,";" )
-                ii+=1
-        while(ii<12)
-        
-        //then filter out only the raw data files
-        num = ItemsInList(list,";")        //get the new number of items in the list
-        ii=0
-        do
-                //build valid filename
-                item = StringFromList(ii, list  ,";" )
-                if(strlen(item) != 0)
-                   partialName = FindValidFileName(item)
-                   if(strlen(partialName) != 0)      //non-null return from FindValidFileName()
-                      fullName = path + partialName
-                      //check if RAW, if so, add original item to newList
-                      isRAW = CheckIfRawData(fullName)
-                      if(isRaw)
-                         newList += item + ";"
-                      Endif
-                   Endif
-                Endif
-                ii+=1
-        while(ii<num)      //process all items in list
-
+        newlist = MyMatchList(match,newlist,";")
+        
         newList = SortList(newList,";",0)
         Return(newList)
@@ -664 +634 @@
         //just reset the global variables that are on the patch panel
         
-//      Variable refNum,integer,realval
-//      String textstr=""
-//      Variable countTime
-//      
-//      //full filename with path is passed in
-//      //actually open the file
-//      Open/R refNum as fname
-//      
-//      // read the sample.label text field
-//      FSetPos refNum,98          //will start reading at byte 99
-//      FReadLine/N=60 refNum,textstr
-//      FSetPos refNum,31
-//      FBinRead/B=3/F=3 refnum,countTime
-//      
-//      Close refNum
-//      
-//      //Print "countTime = ",countTime
-//      
-//      //now get all of the reals
-//      //
-//      //Do all the GBLoadWaves at the end
-//      //
-//      //FBinRead Cannot handle 32 bit VAX floating point
-//      //GBLoadWave, however, can properly read it
-//      String GBLoadStr="GBLoadWave/O/N=tempGBwave/T={2,2}/J=2/W=1/Q"
-//      String strToExecute
-//      //append "/S=offset/U=numofreals" to control the read
-//      // then append fname to give the full file path
-//      // then execute
-//      
-//      // NEW reads
-//      Variable moncnt,savmon,detcnt,atten,trans,thick,temp,field
-//      Variable dis,ang,bstop,ap1,ap2,ap12dis,lmda,dlmda,beamx,beamy,trnscnt
-//      
-//      strToExecute = GBLoadStr + "/S=39/U=4" + "\"" + fname + "\""
-//      Execute strToExecute
-//      Wave w=$"tempGBWave0"
-//      moncnt = w[0]
-//      savmon = w[1]
-//      detcnt = w[2]
-//      atten = w[3]
-//      //printf "moncnt = %g,savmon = %g,detcnt = %g,atten = %g\r",moncnt,savmon,detcnt,atten
-//      
-//      strToExecute = GBLoadStr + "/S=158/U=2" + "\"" + fname + "\""
-//      Execute strToExecute
-//      trans = w[0]
-//      thick = w[1]
-//      //printf "trans = %g, thick = %g\r",trans,thick
-//      
-//      strToExecute = GBLoadStr + "/S=186/U=2" + "\"" + fname + "\""
-//      Execute strToExecute
-//      temp = w[0]
-//      field = w[1]
-//      //printf "temp = %g, field = %g\r",temp,field
-//      
-//      strToExecute = GBLoadStr + "/S=252/U=12" + "\"" + fname + "\""
-//      Execute strToExecute
-//      beamx = w[0]
-//      beamy = w[1]
-//      dis = w[2]
-//      ang = w[3]
-//      // w[4] det size
-//      bstop = w[5]
-//      // w[6] blank
-//      ap1 = w[7]
-//      ap2 = w[8]
-//      ap12dis = w[9]
-//      lmda = w[10]
-//      dlmda = w[11]
-//      //printf "beamx = %g, beamy = %g\r",beamx,beamy
-//      //printf "dis = %g,ang = %g, bstop = %g,ap1= %g,ap2 = %g\r",dis,ang,bstop,ap1,ap2
-//      //printf "ap12dis = %g, lmda = %g, dlmda = %g\r",ap12dis,lmda,dlmda
-//      
-//      strToExecute = GBLoadStr + "/S=388/U=1" + "\"" + fname + "\""
-//      Execute strToExecute
-//      trnscnt = w[0]
-//      //printf "trnscnt = %g\r",trnscnt
-//      
-//      //assign to the globals for display in the panel
-//      String/G root:myGlobals:Patch:gPS1= textstr
-//      Variable/G root:myGlobals:Patch:gPV1 = trans
-//      Variable/G root:myGlobals:Patch:gPV2 = thick
-//      Variable/G root:myGlobals:Patch:gPV3 = beamx
-//      Variable/G root:myGlobals:Patch:gPV4 = beamy
-//      Variable/G root:myGlobals:Patch:gPV5 = atten
-//      Variable/G root:myGlobals:Patch:gPV6 = countTime
-//      Variable/G root:myGlobals:Patch:gPV7 = moncnt
-//      Variable/G root:myGlobals:Patch:gPV8 = detcnt
-//      Variable/G root:myGlobals:Patch:gPV9 = trnscnt
-//      Variable/G root:myGlobals:Patch:gPV10 = lmda
-//      Variable/G root:myGlobals:Patch:gPV11 = dlmda
-//      Variable/G root:myGlobals:Patch:gPV12 = temp
-//      Variable/G root:myGlobals:Patch:gPV13 = field
-//      Variable/G root:myGlobals:Patch:gPV14 = ap1
-//      Variable/G root:myGlobals:Patch:gPV15 = ap2
-//      Variable/G root:myGlobals:Patch:gPV16 = ap12dis
-//      Variable/G root:myGlobals:Patch:gPV17 = ang
-//      Variable/G root:myGlobals:Patch:gPV18 = bstop
-//      Variable/G root:myGlobals:Patch:gPV19 = dis
-//      
-//      //clean up - get rid of w = $"tempGBWave0"
-//      KillWaves/Z w
-        
         // each "get" is an individual call to GBLoadWave...
         // test for acceptable speed over a network...
@@ -879 +746 @@
 
 //simple action for button to close the panel
-//closes all file that may accidently be open at this point
-//(but none are open)
-//
 Function DoneButtonProc(ctrlName) : ButtonControl
         String ctrlName
-
-        // this button will make sure all files are closed 
-        //and close the panel
-        
-        Close/A
+        
         DoWindow/K Patch_Panel
         
@@ -903 +763 @@
         
         //reset the global variable to the entered text so that it can be relayed to the 
-        //write() routine. Only the TEXT SetVariable control needs to be handles this way
+        //write() routine. Only the TEXT SetVariable control needs to be handled this way
         
         String/G root:myGlobals:Patch:gPS1 = varStr
 
 End
-
-
-//button action function to set the XY box for the empty beam file (or reset it)
-//this function is called by the button on the Patch Panel to set the XY box
-//panel, but is nearly identical. This function resets the string used in the Patch
-//panel to list the current empty beam file
-//
-//depends on the user slecting and setting the box with the marquee (see marquee.ipf)
-//then reads the set coordinates from the global keyword string
-// 
-//**********UNUSED******************
-//Function SetXYBoxButton(ctrlName) : ButtonControl
-//      String ctrlName
-//
-//      String msgStr = "Select the Empty Beam FIle"
-//      String filename,shortName
-//      
-//      //get the filename, then read it in
-//      filename = PromptForPath(msgStr)
-//      //check for cancel from dialog
-//      if(strlen(filename)==0)
-//              //user cancelled, abort
-//              SetDataFolder root:
-//              Abort "No file selected, action aborted"
-//      Endif
-//      shortName = GetFileNameFromPathKeepSemi(filename)
-//      String/G root:myGlobals:Patch:gPS2 = filename      //(reset the string for the patch panel)
-//      
-//      ReadHeaderAndData(filename)
-//      //data is displayed here (go htrough the normal display steps, so all is created properly
-//      String/G root:myGlobals:gDataDisplayType="RAW"
-//      fRawWindowHook()
-//      
-//      // check the empty beam file for previously selected coordinates
-//      //if they exist, set the xy string , save the normalized counts somewhere
-//      //the value was written to an unused r*4 header analysis.factor (@b494)
-//      Variable refnum,x1,x2,y1,y2,err
-//      Open/R refnum as filename
-//      FSetPos refnum,478
-//      FBinRead/F=3/B=3 refnum, x1
-//      FBinRead/F=3/B=3 refnum, x2
-//      FBinRead/F=3/B=3 refnum, y1
-//      FBinRead/F=3/B=3 refnum, y2
-//      Close refnum
-//      //read the real count value
-//      String GBLoadStr="GBLoadWave/O/N=tempGBwave/T={2,2}/J=2/W=1/Q"
-//      String strToExecute
-//      strToExecute = GBLoadStr + "/S=494/U=1" + "\"" + filename + "\""
-//      Execute strToExecute
-//      Wave w=$"tempGBWave0"
-//      Variable/G root:myGlobals:Patch:gTransCts = w[0]
-//      //
-//      if( ((x1-x2)==0) || ((y1-y2)==0) )         //zero width marquee in either direction
-//              //no region selected
-//              
-//              //add the empty beam file to work.SAM
-//              err = Raw_to_work("SAM")
-//      
-//              //the calling macro must change the display type
-//              String/G root:myGlobals:gDataDisplayType="SAM"      //displayed data type is sam
-//      
-//              //data is displayed here
-//              fRawWindowHook()
-//      
-//              //prompt user to select box w/marquee
-//              DoAlert 0,"Select the region to sum with the Marquee"
-//      
-//              //from here the Marquee menu selection must handle the task of setting the box
-//              //and updating the information in the file header
-//      else
-//              // region already selected, just put up the values from the file header
-//              //allow user the option of overriding the current box region
-//              msgStr = "X1="+num2str(x1)+";"
-//              msgStr += "X2="+num2str(x2)+";"
-//              msgStr += "Y1="+num2str(y1)+";"
-//              msgStr += "Y2="+num2str(y2)+";"
-//              String textStr
-//              textStr = "Override current box  "+msgStr+" ?"
-//              DoAlert 1,textStr
-//              If((V_flag)==1)
-//                 //get new box coordinates, same procedure as above
-//                 //add the empty beam file to work.SAM
-//                 err = Raw_to_work("SAM")
-//      
-//                 //the calling macro must change the display type
-//                 String/G root:myGlobals:gDataDisplayType="SAM"      //displayed data type is sam
-//      
-//                 //data is displayed here
-//                 fRawWindowHook()
-//      
-//                 //prompt user to select box w/marquee
-//                 DoAlert 0,"Select the region to sum with the Marquee"
-//      
-//                 //from here the Marquee menu selection must handle the task of setting the box
-//                 //and updating the information in the file header
-//              else
-//                 String/G root:myGlobals:Patch:gPS3 = msgStr
-//              Endif
-//      Endif
-//      
-//      KillWaves/Z w
-//      Return (0)
-//End
-

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/PlotUtils.ipf

@@ -483 +483 @@
         PM_doAppend(S_Value)
         
-       DoWindow/F Plot_Manager
+        DoWindow/F Plot_Manager
 End
 
@@ -520 +520 @@
         Endif
         PM_doNewGraph(S_Value)
-       DoWindow/F Plot_Manager
+        DoWindow/F Plot_Manager
 End
 

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/ProtocolAsPanel.ipf

@@ -80 +80 @@
         String waveStr="tempProtocol"
         SetDataFolder root:myGlobals:Protocols
-        Make/O/T/N=(nsteps) $"root:myGlobals:Protocols:tempProtocol"
-        do
-                $"root:myGlobals:Protocols:tempProtocol"[ii] = ""
-                ii+=1
-        while(ii<nsteps)
+        Make/O/T/N=(nsteps) $"root:myGlobals:Protocols:tempProtocol" = ""
+
         String/G root:myGlobals:Protocols:gSAM="ask"
         String/G root:myGlobals:Protocols:gBGD="ask"
@@ -203 +200 @@
                 checked = 0
         Endif
-//      numItems = ItemsInList(list,comma)
-//      nameList = ""
-//      ii=0
-//      checked = 1
-//      do
-//              fullPath = StringFromList(ii,list,comma)
-//              PathStr = GetPathStrFromFullName(fullPath)
-//              item = GetFileNameFromPathKeepSemi(fullPath)
-//              nameList += item+comma
-//              If(cmpstr(item,"none") ==0)
-//                      nameList = item
-//                      checked = 0
-//                      break
-//              Endif
-//              If(cmpstr(item,"ask") ==0)
-//                      nameList = item
-//                      checked = 1
-//                      break
-//              Endif
-//              if((cmpstr(pathStr,catPathStr) != 0) %& !(specialProtocol))
-//                      Print "pathstr = ",pathStr
-//                      Print "catPathStr = ",catPathStr
-//                      Abort "saved protocol path and CAT path do not match - reset CAT/SHORT to pathStr"
-//              Endif
-//              ii+=1
-//      while(ii<numItems)
+
         //set the global string to display and checkbox
         String/G root:myGlobals:Protocols:gBGD = nameList
@@ -239 +211 @@
                 checked = 0
         Endif
-//      numItems = ItemsInList(list,comma)
-//      nameList = ""
-//      ii=0
-//      checked = 1
-//      do
-//              fullPath = StringFromList(ii,list,comma)
-//              PathStr = GetPathStrFromFullName(fullPath)
-//              item = GetFileNameFromPathKeepSemi(fullPath)
-//              nameList += item+comma
-//              If(cmpstr(item,"none") ==0)
-//                      nameList = item
-//                      checked = 0
-//                      break
-//              Endif
-//              If(cmpstr(item,"ask") ==0)
-//                      nameList = item
-//                      checked = 1
-//                      break
-//              Endif
-//              if((cmpstr(pathStr,catPathStr) != 0) %& !(specialProtocol))
-//                      Print "pathstr = ",pathStr
-//                      Print "catPathStr = ",catPathStr
-//                      Abort "saved protocol path and CAT path do not match"
-//              Endif
-//              ii+=1
-//      while(ii<numItems)
+
         //set the global string to display and checkbox
         String/G root:myGlobals:Protocols:gEMP = nameList
@@ -275 +222 @@
                 checked = 0
         Endif
-//      list = w[2]
-//      numItems = ItemsInList(list,comma)
-//      nameList = ""
-//      ii=0
-//      checked = 1
-//      do
-//              fullPath = StringFromList(ii,list,comma)
-//              PathStr = GetPathStrFromFullName(fullPath)
-//              item = GetFileNameFromPathKeepSemi(fullPath)
-//              nameList += item+comma
-//              If(cmpstr(item,"none") ==0)
-//                      nameList = item
-//                      checked = 0
-//                      break
-//              Endif
-//              If(cmpstr(item,"ask") ==0)
-//                      nameList = item
-//                      checked = 1
-//                      break
-//              Endif
-//              if((cmpstr(pathStr,catPathStr) != 0) %& !(specialProtocol))
-//                      Print "pathstr = ",pathStr
-//                      Print "catPathStr = ",catPathStr
-//                      Abort "saved protocol path and CAT path do not match"
-//              Endif
-//              ii+=1
-//      while(ii<numItems)
+
         //set the global string to display and checkbox
         String/G root:myGlobals:Protocols:gDIV = nameList
@@ -312 +233 @@
                 checked = 0
         Endif
-//      list = w[3]
-//      numItems = ItemsInList(list,comma)
-//      nameList = ""
-//      ii=0
-//      checked = 1
-//      do
-//              fullPath = StringFromList(ii,list,comma)
-//              PathStr = GetPathStrFromFullName(fullPath)
-//              item = GetFileNameFromPathKeepSemi(fullPath)
-//              nameList += item+comma
-//              If(cmpstr(item,"none") ==0)
-//                      nameList = item
-//                      checked = 0
-//                      break
-//              Endif
-//              If(cmpstr(item,"ask") ==0)
-//                      nameList = item
-//                      checked = 1
-//                      break
-//              Endif
-//              if((cmpstr(pathStr,catPathStr) != 0) %& !(specialProtocol))
-//                      Print "pathstr = ",pathStr
-//                      Print "catPathStr = ",catPathStr
-//                      Abort "saved protocol path and CAT path do not match"
-//              Endif
-//              ii+=1
-//      while(ii<numItems)
+
         //set the global string to display and checkbox
         String/G root:myGlobals:Protocols:gMASK = nameList
@@ -606 +501 @@
         
         return(0)
-End
-
-//********UNUSED************
-//7/2001 - plan to modify this function to parse the comma-delimited list, (possibly just run numbers)
-//and return a valid comma-delimited list of full filenames (no paths)
-//
-//function that takes a comma separated list of filenames (without path or version)
-//and returns a full list of path;name;vers (comma delimited) 
-//that is needed for the protocol, which is expecting the full path
-//to directly open the file(s) in the list
-//this function checks for the existence of files before adding to the list
-//pathStr (input) is the path (as returned by pathInfo)
-//
-Function/S BuildList(list,pathstr)
-        String list,pathstr
-        
-        //input list is probably just filename, no version number
-        //COMMA separated lists, since file names will (MAY) include semicolon version numbers
-        //find the file and version number - so that full path:file;vers for each item
-        //trailing comma OK at end of list, ExecuteProtocol() treats all as lists
-        
-        String newList="",separator=",",tempstr="",partialName=""
-        Variable ii=0,numitems
-        
-        numitems = ItemsInList(list,separator)
-        do
-                tempstr = StringFromList(ii,list,separator)
-                if(cmpstr(tempstr,"ask")==0)
-                                newList = tempstr                                       //don't prepend path to "ask" option, no comma
-                                break                                                           //get out - don't add anything else to list
-                endif
-                if(strlen(tempStr)!=0)          //skip any null items
-                        //add version number (if needed) and make sure the filename is valid
-                        partialName = FindValidFilename(tempStr)
-                        //can't check for RAW here - may be dealing with mask, div ... or other filetypes
-                        newList += pathstr+partialName+separator
-                endif
-                ii+=1
-        while(ii<numitems)
-        
-        Return(newlist)
-        
 End
 
@@ -1098 +951 @@
 End
 
-//procedure called by protocol panel to ask user for agerage type choices
+//procedure called by protocol panel to ask user for average type choices
 // somewhat confusing and complex, but may be as good as it gets.
 //
@@ -1175 +1028 @@
 // Procedure files for creating and executing a data reduction protocol
 //
-//**** ONLY invoked from the MAIN PANEL****
+//**** ONLY invoked from the MAIN PANEL**** NOT REALLY EVER USED ******
 //Procedure for reducing a sample file (multiple added files) with a specified
 //protocol. User may create a new protocol, and will be prompted
@@ -1209 +1062 @@
         //samStr is set at top to "ask", since this is the action always desired from "ReduceAFile"
         
-        //////
-        //PathInfo catPathName                  //this is where the files came from
-        //String pathstr=S_path,samStr
-        //samStr = BuildList(tempStr,pathStr)           //ExecuteProtocol() needs full path for SAM files
-        /////
-        
         ExecuteProtocol(waveStr,samStr)
         
@@ -1256 +1103 @@
         return(list)
 End
-//missing paramater dialog to solicit user for a waveStr for the protocal 
+
+//missing paramater dialog to solicit user for a waveStr for the protocol 
 //about to be created
 //name is passed back as a global string and calling procedure is responsible for
@@ -1272 +1120 @@
 //ensures that a valid protocol name was chosen, then fills out each "item"
 //(6 total) needed for reduction
-//it the user cancels at nay point, the partial protocol will be deleted
+//it the user cancels at any point, the partial protocol will be deleted
 //
 Function ProtocolQuestionnare()

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/RawWindowHook.ipf

@@ -34 +34 @@
         String/G root:myGlobals:gCurDispFile = "default string"
         String/G root:myGlobals:gCurTitle = ""
-//      Variable/G root:myGlobals:gMapLow=0.
-//      Variable/G root:myGlobals:gMapHigh=1
         Make/O/N=2 root:myGlobals:q_x_axis,root:myGlobals:q_y_axis
         
@@ -94 +92 @@
                 Button Print_status,pos={170,23},size={50,20},proc=StatusButton,title="Status"
                 Button Print_status,help={"Print out information about the currently displayed file into the history window"}
-//              SetVariable lowThresh,pos={170,55},size={110,17},proc=LowThreshSetVarProc,title="Map low"
-//              SetVariable lowThresh,limits={0,1,0.01},value= root:myGlobals:gMapLow
-//              SetVariable lowThresh,help={"Low limit of threshold as a fraction of maximum data value"}
-//              SetVariable highThresh,pos={285,55},size={120,17},proc=HighThreshSetVarProc,title="Map high"
-//              SetVariable highThresh,limits={0,1,0.01},value= root:myGlobals:gMapHigh
-//              SetVariable highThresh,help={"High limit of threshold as a fraction of maximum data value"}
                 Button maskButton size={84,20}, pos={170,53}, proc=maskButtonProc,title="Show Mask"
                 Button maskButton help={"If a mask has been loaded this will overlay it on the current plot"}
@@ -235 +227 @@
                 xaxval= AxisValFromPixel("","bottom",xpix)
                 yaxval= AxisValFromPixel("","left",ypix)
-                //xint = trunc(xaxval)
-                //yint = trunc(yaxval)
                 xint = round(xaxval)
                 yint = round(yaxval)
@@ -352 +342 @@
 // - needs the location of the currently displayed data to get the header information
 // to be able to calculate q-values at the edges of the detector
-//** assumes a linear correcpondence between pixel->q-values (which should bea a really
+//** assumes a linear correspondence between pixel->q-values (which should bea a really
 // safe bet, since we're using the small -angle approximation...)
 //

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/RectAnnulAvg.ipf

@@ -59 +59 @@
         
         // center of detector, for non-linear corrections
-        xcenter = 64.5
-        ycenter = 64.5
+        NVAR pixelsX = root:myGlobals:gNPixelsX
+        NVAR pixelsY = root:myGlobals:gNPixelsY
+        
+        xcenter = pixelsX/2 + 0.5               // == 64.5 for 128x128 Ordela
+        ycenter = pixelsY/2 + 0.5               // == 64.5 for 128x128 Ordela
         
         // beam center, in pixels
@@ -325 +328 @@
         Variable DDet, apOff=0.0
         DDet = DetectorPixelResolution(fileStr,detStr)          //needs detector type and beamline
-//      do 
-//        if(strsearch(fileStr, "NG5", 0) != -1)
-//          //string was found, it's an NG5 file
-//          DDet = 1.0
-//          break
-//        Endif
-//        if(strsearch(fileStr, "NG3", 0) != -1)
-//          //string was found, it's an NG3 file
-//          DDet = 1.0
-//          break
-//        Endif
-//        if(strsearch(fileStr, "NG7", 0) != -1)
-//          //string was found, it's an NG7 file
-//          DDet = 0.5
-//          break
-//        Endif
-//      while(0)
+
 
         //Width of annulus used for the average is gotten from the 
@@ -351 +338 @@
 
         ii=0
-//      String res_string="root:myGlobals:Res_vals"
-//      Make/O/D/N=3 $res_string
-//      Wave res_wave=$res_string
+
         Variable ret1,ret2,ret3
         do
                 getResolution(qval[ii],lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,ddr,ret1,ret2,ret3)
-                sigmaq[ii] = ret1       //res_wave[0]
-                qbar[ii] = ret2         //res_wave[1]
-                fsubs[ii] = ret3                //res_wave[2]
+                sigmaq[ii] = ret1
+                qbar[ii] = ret2 
+                fsubs[ii] = ret3
                 ii+=1
         while(ii<nq)
@@ -372 +357 @@
 
         Avg_1D_Graph(aveint,qval,sigave)
-//      DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-//              //kill the old graph and make a new one
-//              //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif   
-//      Display /W=(412,51,727,302)/K=1 aveint vs qval
-//      ModifyGraph log=1
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars aveint Y,wave=(sigave,sigave)
-//      Label left "Counts";DelayUpdate
-//      Label bottom "q\\U"
-//      SVAR angst = root:myGlobals:gAngstStr
-//      Label bottom "q ("+angst+"\\S-1\\M)"
-//      DoWindow/C Plot_1d
-        
+
         //get rid of the default mask, if one was created (it is in the current folder)
         //don't just kill "mask" since it might be pointing to the one in the MSK folder
@@ -490 +460 @@
         Wave reals = $(destPath + ":RealsRead")
 
+        // center of detector, for non-linear corrections
         NVAR pixelsX = root:myGlobals:gNPixelsX
         NVAR pixelsY = root:myGlobals:gNPixelsY
         
-        // center of detector, for non-linear corrections
-        xcenter = 64.5
-        ycenter = 64.5
+        xcenter = pixelsX/2 + 0.5               // == 64.5 for 128x128 Ordela
+        ycenter = pixelsY/2 + 0.5               // == 64.5 for 128x128 Ordela
         
         // beam center, in pixels
@@ -517 +487 @@
         nphi = numPhiSteps              //number of anular sectors is set by users
         
-        rcentr = 150            //pixels within rcentr of beam center are broken into 9 parts
         rc = 2*dtdist*asin(qc*lambda/4/Pi)              //in mm
         delr = nw*sx/2
@@ -673 +642 @@
         //angle dependent transmission correction is not done in phiave
         Ann_1D_Graph(aveint,phival,sigave)
-//      DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-//              //kill the old graph and make a new one
-//              //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif   
-//      Display /W=(412,51,727,302)/K=1 aveint vs phival
-//      ModifyGraph log=0
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars aveint Y,wave=(sigave,sigave)
-//      Label left "Counts";DelayUpdate
-//      Label bottom "Angle (degrees)"
-//      DoWindow/C Plot_1d
         
         //get rid of the default mask, if one was created (it is in the current folder)

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Schematic.ipf

@@ -102 +102 @@
         text2 = "Using Protocol: "+protocolName
         text3 = "Sample file: "+ root:SAM:fileList
-        text5 = "T\\BSAM\\M = " + GetTrans("SAM")       //trans and thickness of the sample
-        text5 += "   d\\BSAM\\M = " + GetThick("SAM") + " cm"
-        text7 = "T\\BEMP\\M = " + GetTrans("EMP")       //transmission of the empty cell
+        text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM")   //trans and thickness of the sample
+        text5 += "   d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm"
+        text7 = "T\\BEMP\\M = " + getTransStrFromReals("EMP")   //transmission of the empty cell
         //attenuators used in sample measurement
 
-        text23 = "SAM Attenuator = "+GetAttenNum("SAM")
+        text23 = "SAM Attenuator = "+GetAttenNumStrFromReals("SAM")
         
         text11 = "Final 1-D Dataset"
@@ -433 +433 @@
         text2 = "Using Protocol: "+protocolName
         text3 = "Sample file: "+ root:SAM:fileList
-        text5 = "T\\BSAM\\M = " + GetTrans("SAM")       //trans and thickness of the sample
-        text5 += "   d\\BSAM\\M = " + GetThick("SAM") + " cm"
-        text7 = "T\\BEMP\\M = " + GetTrans("EMP")       //transmission of the empty cell
+        text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM")   //trans and thickness of the sample
+        text5 += "   d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm"
+        text7 = "T\\BEMP\\M = " + getTransStrFromReals("EMP")   //transmission of the empty cell
         //attenuators used in sample measurement
 
-        text23 = "SAM Attenuator = "+GetAttenNum("SAM")
+        text23 = "SAM Attenuator = "+GetAttenNumStrFromReals("SAM")
         
         text11 = "Final 1-D Dataset"
@@ -623 +623 @@
 //returns "none" if the value (in RealsRead) cannot be found
 //
-Function/S GetTrans(type)
+Function/S getTransStrFromReals(type)
         String type
         
@@ -639 +639 @@
 //returns "none" if the value (in RealsRead) cannot be found
 //
-Function/S GetThick(type)
+Function/S getThickStrFromReals(type)
         String type
         
@@ -655 +655 @@
 //returns "none" if the value (in RealsRead) cannot be found
 //
-Function/S GetAttenNum(type)
+Function/S GetAttenNumStrFromReals(type)
         String type
         

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/Tile_2D.ipf

@@ -328 +328 @@
         Endif
         
-        String list=IndexedFile(catPathName,-1,"????")
-        String newList="",item=""
-        Variable num=ItemsInList(list,";"),ii
-        for(ii=0;ii<num;ii+=1)
-                item = StringFromList(ii, list  ,";")
-                if( stringmatch(item,"*.sa1*") )
-                        newlist += item + ";"
-                endif
-                if( stringmatch(item,"*.sa2*") )
-                        newlist += item + ";"
-                endif
-                if( stringmatch(item,"*.sa3*") )
-                        newlist += item + ";"
-                endif
-                //print "ii=",ii
-        endfor
-        newList = SortList(newList,";",0)
+        String newList=""
+        Variable num
+
+        newList = GetRawDataFileList()
+        
         num=ItemsInList(newlist,";")
         WAVE/T fileWave=$"root:myGlobals:Tile_2D:fileWave"
@@ -528 +516 @@
         Endif
         
-        String list=IndexedFile(catPathName,-1,"????")
-        String newList="",item=""
-        Variable num=ItemsInList(list,";"),ii
-        for(ii=0;ii<num;ii+=1)
-                item = StringFromList(ii, list  ,";")
-                if( stringmatch(item,"*.sa1*") )
-                        newlist += item + ";"
-                endif
-                if( stringmatch(item,"*.sa2*") )
-                        newlist += item + ";"
-                endif
-                if( stringmatch(item,"*.sa3*") )
-                        newlist += item + ";"
-                endif
-                //print "ii=",ii
-        endfor
-        newList = SortList(newList,";",0)
+        Variable num
+        String newList = GetRawDataFileList()
+        
         num=ItemsInList(newlist,";")
         WAVE/T fileWave=$"root:myGlobals:RAW2ASCII:fileWave"

sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/WriteQIS.ipf

@@ -653 +653 @@
 End
 
-
-////***this function is not used - WriteWaves_W_Protocol() is used instead
-////
-////for writing out data (q-i-s) from the "type" folder
-////if fullpath is a complete HD path:filename, no dialog will be presented
-////if fullpath is just a filename, the save dialog will be presented (forced if dialog =1)
-////writes ONLY the standard header information (no protocol information)
-////
-//Function WriteWaves(type,fullpath,dialog)
-//      String type,fullpath
-//      Variable dialog         //=1 will present dialog for name
-//      
-//      String destStr=""
-//      destStr = "root:"+type
-//      
-//      Variable refNum
-//      String formatStr = "%15.4g %15.4g %15.4g %15.4g %15.4g %15.4g\r\n"
-//      String fname,ave="C",headerFormat = "%10.4g %8.2g %8.2g %8.2g %8.3g %8.3g %8s %5.0g\r\n"
-//      Variable step=1
-//      
-//      //*****these waves MUST EXIST, or IGOR Pro will crash, with a type 2 error****
-//      WAVE intw=$(destStr + ":integersRead")
-//      WAVE rw=$(destStr + ":realsRead")
-//      WAVE/T textw=$(destStr + ":textRead")
-//      WAVE qvals =$(destStr + ":qval")
-//      WAVE inten=$(destStr + ":aveint")
-//      WAVE sig=$(destStr + ":sigave")
-//      WAVE qbar = $(destStr + ":QBar")
-//      WAVE sigmaq = $(destStr + ":SigmaQ")
-//      WAVE fsubs = $(destStr + ":fSubS")
-//
-//      //check each wave
-//      If(!(WaveExists(intw)))
-//              Abort "intw DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(rw)))
-//              Abort "rw DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(textw)))
-//              Abort "textw DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(qvals)))
-//              Abort "qvals DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(inten)))
-//              Abort "inten DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(sig)))
-//              Abort "sig DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(qbar)))
-//              Abort "qbar DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(sigmaq)))
-//              Abort "sigmaq DNExist BinaryWrite()"
-//      Endif
-//      If(!(WaveExists(fsubs)))
-//              Abort "fsubs DNExist BinaryWrite()"
-//      Endif
-//              
-//      if(dialog)
-//              PathInfo/S catPathName
-//              fullPath = DoSaveFileDialog("Save data as")
-//              If(cmpstr(fullPath,"")==0)
-//                      //user cancel, don't write out a file
-//                      Close/A
-//                      Abort "no data file was written"
-//              Endif
-//              //Print "dialog fullpath = ",fullpath
-//      Endif
-//      
-//      //actually open the file
-//      Open refNum as fullpath
-//      
-//      fprintf refnum,"FILE: %s\t\t CREATED: %s\r\n",textw[0],textw[1]
-//      fprintf refnum,"LABEL: %s\r\n",textw[6]
-//      fprintf refnum,"MON CNT   LAMBDA   DET ANG   DET DIST   TRANS   THICK   AVE   STEP\r\n"
-//      fprintf refnum,headerFormat,rw[0],rw[26],rw[19],rw[18],rw[4],rw[5],ave,step
-//      wfprintf refnum, formatStr, qvals,inten,sig,sigmaq,qbar,fsubs
-//      
-//      Close refnum
-//      
-//      SetDataFolder root:             //(redundant)
-//      
-//      Return(0)
-//End