Ignore:
Timestamp:
Mar 16, 2010 5:50:17 PM (12 years ago)
Author:
srkline
Message:

A variety of changes to get some of the basic reduction functions working with HFIR raw data files.

Patch now works correctly without duplicating file names in the popup list.

Transmissions can be assigned and calculated now that I've changed the critera for deciding if a file is a transmission file. Hopefully this will always work - it's based on the beamstop y-position being less than 30 mm for all four beam stops.

When checking for a DIV file, it returns an OK if the extension is .xml, since the raw data and div files can't be distinguished like the binary VAX data.

The file catalog is correct, but still excruciatingly slow.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

    r601 r641  
    20622062                String junkStr="" 
    20632063                if(! waveexists($"root:Packages:NIST:DIV:data")) 
    2064                          junkStr = PromptForPath("Select the detector sensitivity file") 
    2065                         If(strlen(junkStr)==0 || CheckIfRawData(junkStr))               //raw check==1 if RAW, DIV is not 
     2064                        junkStr = PromptForPath("Select the detector sensitivity file") 
     2065                        Print junkStr 
     2066#if(exists("HFIR")==6) 
     2067                        if(strlen(junkStr)==0 || !CheckIfDIVData(junkStr))              //if either is false, exit 
     2068                                //Print strlen(junkStr) 
     2069                                //Print CheckIfDIVData(junkStr) 
    20662070                                SetDataFolder root: 
    20672071                                Abort "No DIV (PLEX) file selected. Please use setABSParams again, selecting the empty beam file and then the detector sensitivity (Plex_) file" 
    2068                         Endif 
    2069                          ReadHeaderAndWork("DIV", junkStr) 
     2072                        endif 
     2073#else 
     2074                        if(strlen(junkStr)==0 || CheckIfRawData(junkStr))               //for NCNR, not raw is sufficient, but better in the future to confirm it is DIV if either is false, exit 
     2075                                SetDataFolder root: 
     2076                                Abort "No DIV (PLEX) file selected. Please use setABSParams again, selecting the empty beam file and then the detector sensitivity (Plex_) file" 
     2077                        endif 
     2078#endif 
     2079                        ReadHeaderAndWork("DIV", junkStr) 
    20702080                endif 
    20712081                //toggle SANS_Data to linear display if needed, so that we're working with linear scaled data 
Note: See TracChangeset for help on using the changeset viewer.