Changeset 641 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

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:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf (modified) (1 diff)

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

@@ -2062 +2062 @@
                 String junkStr=""
                 if(! waveexists($"root:Packages:NIST:DIV:data"))
-                         junkStr = PromptForPath("Select the detector sensitivity file")
-                        If(strlen(junkStr)==0 || CheckIfRawData(junkStr))               //raw check==1 if RAW, DIV is not
+                        junkStr = PromptForPath("Select the detector sensitivity file")
+                        Print junkStr
+#if(exists("HFIR")==6)
+                        if(strlen(junkStr)==0 || !CheckIfDIVData(junkStr))              //if either is false, exit
+                                //Print strlen(junkStr)
+                                //Print CheckIfDIVData(junkStr)
                                 SetDataFolder root:
                                 Abort "No DIV (PLEX) file selected. Please use setABSParams again, selecting the empty beam file and then the detector sensitivity (Plex_) file"
-                        Endif
-                         ReadHeaderAndWork("DIV", junkStr)
+                        endif
+#else
+                        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
+                                SetDataFolder root:
+                                Abort "No DIV (PLEX) file selected. Please use setABSParams again, selecting the empty beam file and then the detector sensitivity (Plex_) file"
+                        endif
+#endif
+                        ReadHeaderAndWork("DIV", junkStr)
                 endif
                 //toggle SANS_Data to linear display if needed, so that we're working with linear scaled data