Ignore:
Timestamp:
Jul 12, 2017 2:44:26 PM (5 years ago)
Author:
srkline
Message:

a lot of little changes:

changed the name of the Raw Data display procedure file (removed test)

lots of bug fixes, moving items from the macros menu to proper locations, getting the file status to display properly, some error checking, and cleaning up a few TODO items.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS
Files:
1 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Utils.ipf

    r1044 r1051  
    1313 
    1414 
    15 // TODO: hard wired for a sphere - change this to allow minimal selections and altering of coefficients 
    16 // TODO: add the "fake" 2D simulation to fill the panels which are then later averaged as I(Q) 
     15// x- hard wired for a sphere - change this to allow minimal selections and altering of coefficients 
     16// x- add the "fake" 2D simulation to fill the panels which are then later averaged as I(Q) 
    1717// 
    1818// NOTE - this is a VCALC only routine, so it's not been made completely generic 
     
    104104 
    105105         
    106 // TODO: this is faked to get around the singularity at the center of the back detector 
     106// x- this is faked to get around the singularity at the center of the back detector 
    107107// 
    108108//  
     
    10171017 
    10181018 
    1019 //TODO: properly define the errors here - I'll have this if I do the simulation 
    1020 // -- need to propagate the errors up to this point 
     1019//TODO: properly define the 2D errors here - I'll have this if I do the simulation 
     1020// -- need to propagate the 2D errors up to this point 
    10211021// 
    10221022        if(WaveExists(iErr)==0  && WaveExists(inten) != 0) 
     
    10921092// this needs to be a double loop now... 
    10931093// TODO: 
    1094 // -- the iErr wave and accumulation of error is NOT CALCULATED CORRECTLY YET 
    1095 // -- the solid angle per pixel is not yet implemented. 
     1094// -- the iErr (=2D) wave and accumulation of error is NOT CALCULATED CORRECTLY YET 
     1095// -- the solid angle per pixel is not completely implemented. 
    10961096//    it will be present for WORK data other than RAW, but not for RAW 
    10971097 
     
    12831283         
    12841284        // TODO: 
    1285         // -- is this where I do the resolution calculation? 
     1285        // -- is this where I do the resolution calculation? This is where I calculate the resolution in SANS (see CircSectAve) 
    12861286        // -- or do I do it as a separate call? 
    12871287        // -- use the isVCALC flag to exclude VCALC from the resolution calculation if necessary 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_VCALCPanel_MockUp.ipf

    r1035 r1051  
    1616 
    1717 
    18 Macro VCALC_Panel() 
     18Proc VCALC_Panel() 
    1919        DoWindow/F VCALC 
    2020        if(V_flag==0) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VSANS_Includes.ipf

    r1045 r1051  
    6565 
    6666// start of raw data display panel 
    67 #include "V_Test_RAW_Panel"             // rename this later when it's done 
     67#include "V_RAW_Data_Panel"             // rename this later when it's done 
    6868#include "V_Utilities_General"          // 
    6969#include "V_DataPlotting" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r1044 r1051  
    4848//  x- move the initialization of the raw data folder to be in the as-yet unwritten initialization routine for 
    4949// reduction. be sure that it's duplicated in the VCALC initialization too. 
    50 // x- as needed, get rid of the FAKE redimension of the data from 3D->2D and from 128x128 to something else for VSANS 
    51 //    This is a fake since I don't have anything close to correct fake data yet. (1/29/16) 
     50// x- as needed, get rid of the fake redimension of the data from 3D->2D and from 128x128 to something else for VSANS 
     51//    This is fake since I don't have anything close to correct fake data yet. (1/29/16) 
    5252// 
    5353// DONE: x- is there an extra "entry" heading? Am I adding this by mistake by setting base_name="entry" for RAW data? 
     
    7373 
    7474        Variable err= V_LoadHDF5_NoAtt(file,folder)     // reads into current folder 
     75         
     76 
    7577         
    7678        // if RAW data, then generate the errors and linear data copy 
     
    150152                                         
    151153                                         
    152                 /// END FAKE DATA CORRECTIONS            
     154                /// END DATA CORRECTIONS FOR LOADER      
    153155                         
    154156        endif 
     
    387389        PathInfo/S catPathName 
    388390        if(V_flag == 0) 
     391                DoAlert 0,"Pick the data folder, then the data file" 
    389392                V_PickPath() 
    390393        endif 
     
    510513         
    511514//s_toc() 
     515 
     516        // save a global string with the file name to be picked up for the status on the display 
     517        // this string can be carried around as the data is moved to other folders 
     518        Print curDF+"gFileList" 
     519        String/G $(curDF+"gFileList") = fileName 
     520 
    512521 
    513522        SetDataFolder root: 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_IQ_Utilities.ipf

    r1044 r1051  
    246246// 
    247247// TODO: 
     248// -- !!! Resolution waves are currently skipped - these must be added 
     249// 
    248250// x- this currently ignores the binning type (one, two, etc. ) 
    249251// x- change the Concatenate call to use the waveList, to eliminate the need to declare all of the waves 
     
    284286        //kill these waves before starting, or the new concatenation will be added to the old 
    285287        KillWaves/Z tmp_q,tmp_i,tmp_s 
     288 
     289        NVAR gIgnoreDetB = root:Packages:NIST:VSANS:Globals:gIgnoreDetB 
    286290         
    287291        String waveListStr="" 
    288292        if(binType == 1) 
    289293                // q-values 
    290                 waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     294                waveListStr="" 
     295                if(!gIgnoreDetB) 
     296                        waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     297                endif 
    291298                waveListStr += "qBin_qxqy_MB" + tagStr + ";" 
    292299                waveListStr += "qBin_qxqy_MT" + tagStr + ";" 
     
    301308 
    302309                //intensity 
    303                 waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     310                waveListStr="" 
     311                if(!gIgnoreDetB) 
     312                        waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     313                endif 
    304314                waveListStr += "iBin_qxqy_MB" + tagStr + ";" 
    305315                waveListStr += "iBin_qxqy_MT" + tagStr + ";" 
     
    316326 
    317327                //error 
    318                 waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     328                waveListStr="" 
     329                if(!gIgnoreDetB) 
     330                        waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     331                endif 
    319332                waveListStr += "eBin_qxqy_MB" + tagStr + ";" 
    320333                waveListStr += "eBin_qxqy_MT" + tagStr + ";" 
     
    333346        if(binType == 2)         
    334347                // q-values 
    335                 waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     348                waveListStr="" 
     349                if(!gIgnoreDetB) 
     350                        waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     351                endif 
    336352                waveListStr += "qBin_qxqy_MTB" + tagStr + ";" 
    337353                waveListStr += "qBin_qxqy_MLR" + tagStr + ";" 
     
    345361 
    346362                //intensity 
    347                 waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     363                waveListStr="" 
     364                if(!gIgnoreDetB) 
     365                        waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     366                endif 
    348367                waveListStr += "iBin_qxqy_MTB" + tagStr + ";" 
    349368                waveListStr += "iBin_qxqy_MLR" + tagStr + ";" 
     
    357376 
    358377                //error 
    359                 waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     378                waveListStr="" 
     379                if(!gIgnoreDetB) 
     380                        waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     381                endif 
    360382                waveListStr += "eBin_qxqy_MTB" + tagStr + ";" 
    361383                waveListStr += "eBin_qxqy_MLR" + tagStr + ";" 
     
    371393        if(binType == 3)         
    372394                // q-values 
    373                 waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     395                waveListStr="" 
     396                if(!gIgnoreDetB) 
     397                        waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     398                endif 
    374399                waveListStr += "qBin_qxqy_MLRTB" + tagStr + ";" 
    375400                waveListStr += "qBin_qxqy_FLRTB" + tagStr + ";" 
     
    380405 
    381406                //intensity 
    382                 waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     407                waveListStr="" 
     408                if(!gIgnoreDetB) 
     409                        waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     410                endif 
    383411                waveListStr += "iBin_qxqy_MLRTB" + tagStr + ";" 
    384412                waveListStr += "iBin_qxqy_FLRTB" + tagStr + ";" 
     
    389417 
    390418                //error 
    391                 waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     419                waveListStr="" 
     420                if(!gIgnoreDetB) 
     421                        waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     422                endif 
    392423                waveListStr += "eBin_qxqy_MLRTB" + tagStr + ";" 
    393424                waveListStr += "eBin_qxqy_FLRTB" + tagStr + ";" 
     
    404435        if(binType == 4)         
    405436                // q-values 
    406                 waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
    407                 waveListStr += "qBin_qxqy_MB" + tagStr + ";" 
    408                 waveListStr += "qBin_qxqy_MT" + tagStr + ";" 
     437                waveListStr="" 
     438                if(!gIgnoreDetB) 
     439                        waveListStr =  "qBin_qxqy_B" + tagStr + ";" 
     440                endif 
     441//              waveListStr += "qBin_qxqy_MB" + tagStr + ";" 
     442//              waveListStr += "qBin_qxqy_MT" + tagStr + ";" 
    409443                waveListStr += "qBin_qxqy_ML" + tagStr + ";" 
    410444                waveListStr += "qBin_qxqy_MR" + tagStr + ";" 
    411                 waveListStr += "qBin_qxqy_FB" + tagStr + ";" 
    412                 waveListStr += "qBin_qxqy_FT" + tagStr + ";" 
     445//              waveListStr += "qBin_qxqy_FB" + tagStr + ";" 
     446//              waveListStr += "qBin_qxqy_FT" + tagStr + ";" 
    413447                waveListStr += "qBin_qxqy_FL" + tagStr + ";" 
    414448                waveListStr += "qBin_qxqy_FR" + tagStr + ";" 
     
    419453 
    420454                //intensity 
    421                 waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
    422                 waveListStr += "iBin_qxqy_MB" + tagStr + ";" 
    423                 waveListStr += "iBin_qxqy_MT" + tagStr + ";" 
     455                waveListStr="" 
     456                if(!gIgnoreDetB) 
     457                        waveListStr =  "iBin_qxqy_B" + tagStr + ";" 
     458                endif 
     459//              waveListStr += "iBin_qxqy_MB" + tagStr + ";" 
     460//              waveListStr += "iBin_qxqy_MT" + tagStr + ";" 
    424461                waveListStr += "iBin_qxqy_ML" + tagStr + ";" 
    425462                waveListStr += "iBin_qxqy_MR" + tagStr + ";" 
    426                 waveListStr += "iBin_qxqy_FB" + tagStr + ";" 
    427                 waveListStr += "iBin_qxqy_FT" + tagStr + ";" 
     463//              waveListStr += "iBin_qxqy_FB" + tagStr + ";" 
     464//              waveListStr += "iBin_qxqy_FT" + tagStr + ";" 
    428465                waveListStr += "iBin_qxqy_FL" + tagStr + ";" 
    429466                waveListStr += "iBin_qxqy_FR" + tagStr + ";" 
     
    434471 
    435472                //error 
    436                 waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
    437                 waveListStr += "eBin_qxqy_MB" + tagStr + ";" 
    438                 waveListStr += "eBin_qxqy_MT" + tagStr + ";" 
     473                waveListStr="" 
     474                if(!gIgnoreDetB) 
     475                        waveListStr =  "eBin_qxqy_B" + tagStr + ";" 
     476                endif 
     477//              waveListStr += "eBin_qxqy_MB" + tagStr + ";" 
     478//              waveListStr += "eBin_qxqy_MT" + tagStr + ";" 
    439479                waveListStr += "eBin_qxqy_ML" + tagStr + ";" 
    440480                waveListStr += "eBin_qxqy_MR" + tagStr + ";" 
    441                 waveListStr += "eBin_qxqy_FB" + tagStr + ";" 
    442                 waveListStr += "eBin_qxqy_FT" + tagStr + ";" 
     481//              waveListStr += "eBin_qxqy_FB" + tagStr + ";" 
     482//              waveListStr += "eBin_qxqy_FT" + tagStr + ";" 
    443483                waveListStr += "eBin_qxqy_FL" + tagStr + ";" 
    444484                waveListStr += "eBin_qxqy_FR" + tagStr + ";" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Initialize.ipf

    r1050 r1051  
    126126Function V_InitGlobals() 
    127127         
     128         
    128129        Variable/G root:Packages:NIST:VSANS:Globals:gIsLogScale = 0 
    129130        String/G root:Packages:NIST:VSANS:Globals:gCurDispType = "RAW" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Menu.ipf

    r1042 r1051  
    4242//              "IgorOnly_Setup_SANS_Struct" 
    4343//              "IgorOnly_Save_SANS_Struct" 
     44                "Copy_VCALC_to_VSANSFile",Copy_VCALC_to_VSANSFile() 
     45                "-" 
    4446                "Setup_VSANS_DIV_Struct" 
    4547                "Save_VSANS_DIV_Nexus" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf

    r1044 r1051  
    7070Proc V_InitProtocolPanel() 
    7171 
     72        if(exists("     root:Packages:NIST:VSANS:CatVSHeaderInfo:Filenames") == 0) 
     73                Abort "You must generate a file catalog before building protocols" 
     74        endif 
     75         
    7276        //set up the global variables needed for the protocol panel 
    7377        //global strings to put in a temporary protocol textwave 
     
    642646                Variable np = numpnts(intentW)          //fileNameW is LONGER - so don't use numpnts(fileWave) 
    643647                for(ii=0;ii<np;ii+=1) 
    644                         if(cmpstr(intentW[ii],testStr)==0) 
     648                        if(cmpstr(intentW[ii],testStr)==0)              //this is case-INSENSITIVE (necessary, since the case is unknown) 
    645649                                list += fileNameW[ii] + ";" 
    646650                        endif            
     
    20082012                        V_LoadHDF5Data(junkStr,"DIV") 
    20092013                Endif 
    2010  
     2014         
     2015        else 
     2016        // DIV step is being skipped 
     2017                NVAR gDoDIVCor = root:Packages:NIST:VSANS:Globals:gDoDIVCor 
     2018                Variable saved_gDoDIVCor = gDoDIVCor 
     2019                gDoDIVCor = 0                   // protocol says to turn it off for now (reset later) 
    20112020        Endif 
    20122021 
     
    20142023// TODO: 
    20152024// -- currently does not allow adding RAW data files together, so no parsing is done 
    2016 //       
     2025//       -- NOTE detector corrections (including DIV) are done at the V_Raw_to_Work() step 
     2026//   So if the DIV is not part of the protocol, be sure to set/reset the global preference 
    20172027// 
    20182028        //prompt for sam data => read raw data, add to sam folder 
     
    25432553         
    25442554        //done with everything in protocol list 
     2555         
     2556         
     2557        // reset any global preferences that I had changed 
     2558        gDoDIVCor = saved_gDoDIVCor 
     2559         
     2560         
    25452561        Return(0) 
    25462562End 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Testing_Data_Procs.ipf

    r1044 r1051  
    1212// -- decide if it's better to write wholesale, or as individual waves 
    1313// 
    14 Macro Copy_VCALC_to_VSANSFile(labelStr,intent,group_id) 
     14Proc Copy_VCALC_to_VSANSFile(labelStr,intent,group_id) 
    1515        String labelStr = "sample label" 
    1616        String intent = "SAMPLE" 
     
    137137 
    138138 
    139  
    140139// writes out "perfect" detector calibration constants for all 8 tube banks + back detector 
    141140Function V_WritePerfectSpatialCalib(filename) 
     
    251250        return(0) 
    252251End 
     252 
     253// 
     254// a few utilities to patch up the data files so that they are useable 
     255// even without the Back detector containing real data 
     256// 
     257// TODO 
     258// 
     259// Hopefully, the data files as generated from NICE will have a dummy for the back detector 
     260// if not, there's going to be a big mess 
     261// 
     262//              V_writeDetectorData(fileName,detStr,tmpData) 
     263// 
     264Function V_Write_BackDet_to_VSANSFile() 
     265         
     266        String fileName = V_DoSaveFileDialog("pick the file to write to") 
     267        print fileName 
     268//       
     269        String detStr = "B" 
     270         
     271        if(strlen(fileName) > 0) 
     272                Wave detW = V_getDetectorDataW(filename,detStr) 
     273                detW = 1 
     274                V_writeDetectorData(fileName,detStr,detW) 
     275        endif 
     276End 
     277 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Transmission.ipf

    r1050 r1051  
    118118                // TODO  
    119119                // x- fill in the XY box 
    120                 // --  Detector Panel field is hard-wired for "B" 
     120                // x-  Detector Panel field is hard-wired for "B" 
    121121                //       
    122122                        WAVE/T intentW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Intent 
     
    129129                                        PopupMenu popup_2,mode=WhichListItem(fileNameW[ii], list )+1 
    130130                                         
    131                                         SetVariable setvar_6,value =_STR:"B" 
     131                                        SetVariable setvar_6,value =_STR:"ML" 
    132132 
    133133                                        WAVE boxCoord = V_getBoxCoordinates(filenameW[ii]) 
     
    256256                        WAVE xyBoxW = V_getBoxCoordinates(emptyFileName) 
    257257                        // TODO 
    258                         // -- need to get the panel string for the sum. 
    259                         // -- the detector string is currently hard-wired 
    260                         detStr = "B" 
     258                        // x- need to get the panel string for the sum. 
     259                        // x- the detector string is currently hard-wired 
     260                        ControlInfo setvar_6 
     261                        detStr = S_Value                //this was hard-wired to "B", but no read from the panel 
    261262                         
    262263                        // check for box count + error values 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_TubeAdjustments.ipf

    r1050 r1051  
    132132 
    133133// or the other way around 
    134 Proc V_ArrayToTubes(wStr) 
    135         String wStr 
    136          
    137         String/G root:detUsed = wStr 
     134// - get the array into individual tubes ready for fitting. 
     135// 
     136Proc V_ArrayToTubes(detStr) 
     137        String detStr 
     138//      Prompt wStr,"Select detector panel",popup,WaveList("data_*",";","") 
     139        Prompt detStr,"Select detector panel",popup,ksDetectorListAll 
     140         
     141        String/G root:detUsed = detStr 
    138142         
    139143        Variable ii,numTubes=48 
     
    141145         
    142146        Variable dim0,dim1 
    143         dim0 = DimSize($wStr,0) 
    144         dim1 = DimSize($wStr,1) 
     147         
     148        detStr = "root:Packages:NIST:VSANS:RAW:entry:instrument:detector_"+detStr+":data" 
     149         
     150        dim0 = DimSize($detStr,0) 
     151        dim1 = DimSize($detStr,1) 
    145152 
    146153         
     
    154161                 
    155162                if(dim0 == 128) 
    156                         $(str+num2str(ii)) = $(wStr)[p][ii] 
     163                        $(str+num2str(ii)) = $(detStr)[p][ii] 
    157164                else 
    158                         $(str+num2str(ii)) = $(wStr)[ii][p] 
     165                        $(str+num2str(ii)) = $(detStr)[ii][p] 
    159166                endif 
    160167                 
     
    166173 
    167174// (2) -- for each of the tubes, find the x-position (in pixels) of each of the (20) peaks 
    168 // -- load the Analysis Package "MultiPeakFit 2" 
     175// -- automatically loads the Analysis Package "MultiPeakFit 2" 
    169176// 
    170177// automatically find the peaks (after including MultiPeakFit 2) 
     
    194201                Edit/N=Peak_Pixel_Loc peakTableX 
    195202        endif 
    196         DoAlert 0, "Load the Package: Analysis->MultiPeak Fitting->MultiPeak Fitting 2" 
     203         
     204        Execute/P "INSERTINCLUDE <Multi-peak fitting 2.0>" 
     205        DoWindow/K MultiPeak2StarterPanel 
     206 
     207//      DoAlert 0, "Load the Package: Analysis->MultiPeak Fitting->MultiPeak Fitting 2" 
    197208End 
    198209 
     
    10981109// file catalog operation 
    10991110// 
    1100 Macro V_CopyDetectorsToRoot() 
     1111Proc V_CopyDetectorsToRoot() 
    11011112 
    11021113        Duplicate/O root:Packages:NIST:VSANS:RAW:entry:instrument:detector_B:data data_B 
     
    11161127// 
    11171128// 
    1118 Macro V_SaveDetectorsITX() 
     1129Proc V_SaveDetectorsITX() 
    11191130// binary save makes each wave an individual file. Igor text groups them all into one file. 
    11201131//      Save/C data_B,data_FB,data_FL,data_FR,data_FT,data_MB,data_ML,data_MR,data_MT 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Utilities_General.ipf

    r1050 r1051  
    5353Proc V_ChangeDisplay(type) 
    5454        String type 
    55         Prompt type,"WORK data type to display",popup,"RAW;SAM;EMP;BGD;ADJ;" 
     55        Prompt type,"WORK data type to display",popup,"RAW;SAM;EMP;BGD;COR;ABS;STO;SUB;ADJ;" 
    5656 
    5757// make sure that data exists before passing this on... 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_VSANS_Preferences.ipf

    r1050 r1051  
    8989        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization", 1 ) 
    9090        Variable/G root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization = 1 
    91          
     91 
     92 
     93        // Special global to prevent fake data from "B" detector from being written out 
     94        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gIgnoreDetB", 1 ) 
     95        Variable/G root:Packages:NIST:VSANS:Globals:gIgnoreDetB = 0 
     96                 
    9297 
    9398// flag to allow adding raw data files with different attenuation (normally not done)    
     
    208213End 
    209214 
     215Function V_IgnoreDetBPref(ctrlName,checked) : CheckBoxControl 
     216        String ctrlName 
     217        Variable checked 
     218         
     219        NVAR gVal = root:Packages:NIST:VSANS:Globals:gIgnoreDetB 
     220        gVal = checked 
     221End 
    210222 
    211223Function V_PrefDoneButtonProc(ctrlName) : ButtonControl 
     
    274286//      CheckBox PrefCtrl_1n title="Do Tube Shadow Correction?",size={140,14},proc=V_DoMonitorNormPref 
    275287//      CheckBox PrefCtrl_1n value=root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization,pos={255,220},help={"TURN OFF ONLY FOR DEBUGGING."} 
    276                  
     288        CheckBox PrefCtrl_1m title="Ignore Back Detector?",size={140,14},proc=V_IgnoreDetBPref 
     289        CheckBox PrefCtrl_1m value=root:Packages:NIST:VSANS:Globals:gIgnoreDetB,pos={150,220},help={"Will prevent data from Back detector being written to data files."}                 
    277290         
    278291//      CheckBox PrefCtrl_1a,disable=1 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf

    r1042 r1051  
    101101        else 
    102102         
    103                 V_KillWavesFullTree($fromDF,fromStr,0,"",1)                     // this will traverse the whole tree, trying to kill what it can 
    104                  
     103                V_KillWavesFullTree($toDF,toStr,0,"",1)                 // this will traverse the whole tree, trying to kill what it can 
     104 
     105                if(DataFolderExists("root:Packages:NIST:VSANS:"+toStr) == 0)            //if the data folder (RAW, SAM, etc.) was just killed? 
     106                        NewDataFolder/O $("root:Packages:NIST:VSANS:"+toStr) 
     107                endif    
     108                         
    105109                // need to do this the hard way, duplicate/O recursively 
    106110                // see V_CopyToWorkFolder() 
Note: See TracChangeset for help on using the changeset viewer.