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

Timestamp:

Oct 7, 2008 1:09:04 PM (14 years ago)

Author:

ajj

Message:

Moving data folders into root:Packages:NIST

This could be hairy.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf (modified) (9 diffs)

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

@@ -1375 +1375 @@
         //fileList has NAMES ONLY - since it was derived from the file header
         String testStr
-        testStr = "root:"+type+":fileList"
+        testStr = "root:Packages:NIST:"+type+":fileList"
         if(Exists(testStr) == 2)                //2 if string variable exists
                 SVAR curFiles = $testStr
@@ -1616 +1616 @@
                 If(cmpstr(prot[1],"none") == 0)
                         //clean out the EMP folder?
-                        //KillDataFolder root:EMP
-                        //NewDataFolder/O root:EMP
+                        //KillDataFolder root:Packages:NIST:EMP
+                        //NewDataFolder/O root:Packages:NIST:EMP
                         break
                 Endif
@@ -1750 +1750 @@
                 Endif
                 //get the sample trans and thickness from the activeType folder
-                String destStr = "root:"+activeType+":realsread"
+                String destStr = "root:Packages:NIST:"+activeType+":realsread"
                 Wave dest = $destStr
                 Variable c0 = dest[4]           //sample transmission
@@ -1777 +1777 @@
                                 //if none desired, make sure that the old mask is deleted
                                 //junkStr = GetDataFolder(1)
-                                //SetDataFolder root:MSK
-                                KillWaves/Z root:MSK:data
+                                //SetDataFolder root:Packages:NIST:MSK
+                                KillWaves/Z root:Packages:NIST:MSK:data
                                 //SetDataFolder junkStr
                                 DoAlert 0,"No Mask file selected, data not masked"
@@ -1794 +1794 @@
                 //if none desired, make sure that the old mask is deleted
                 //junkStr = GetDataFolder(1)
-                //SetDataFolder root:MSK
-                KillWaves/Z root:MSK:data
+                //SetDataFolder root:Packages:NIST:MSK
+                KillWaves/Z root:Packages:NIST:MSK:data
                 //SetDataFolder junkStr
         Endif
@@ -1863 +1863 @@
                 //then save
                 //get name from textwave of the activeType dataset
-                String textStr = "root:"+activeType+":textread"
+                String textStr = "root:Packages:NIST:"+activeType+":textread"
                 Wave/T textPath = $textStr
                 If(WaveExists(textPath) == 1)
@@ -1994 +1994 @@
                 endif
                         
-                Wave/T tw=$"root:RAW:TextRead"
-                Wave rw=$"root:RAW:RealsRead"
-                Wave iw=$"root:RAW:IntegersRead"
+                Wave/T tw=$"root:Packages:NIST:RAW:TextRead"
+                Wave rw=$"root:Packages:NIST:RAW:RealsRead"
+                Wave iw=$"root:Packages:NIST:RAW:IntegersRead"
                 String acctStr = tw[3]
                 //NG5 attenuator transmission is assumed to be the same as the table for NG7
@@ -2051 +2051 @@
                 //need the detector sensitivity file - make a guess, allow to override
                 String junkStr=""
-                if(! waveexists($"root:DIV:data"))
+                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
@@ -2064 +2064 @@
                         Log_Lin("bisLog")       
                 endif   
-                Wave divData = $"root:div:Data"
-                Wave data = $"root:raw:data"            //this will be the linear data
+                Wave divData = $"root:Packages:NIST:div:Data"
+                Wave data = $"root:Packages:NIST:raw:data"              //this will be the linear data
                 // correct by detector sensitivity
                 data /= divData
                 
                 // now do the sum, only in the box      
-//              detCnt = sum($"root:raw:data", -inf, inf )
+//              detCnt = sum($"root:Packages:NIST:raw:data", -inf, inf )
 //              Print "box is now ",x1,x2,y1,y2
                 detCnt = SumCountsInBox(x1,x2,y1,y2,"RAW")