Changeset 818 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Jul 15, 2011 11:45:59 AM (12 years ago)

Author:

srkline

Message:

fixed Polarization Protocol to ignore data folders that are not used in the propocol.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

@@ -1272 +1272 @@
         Execute str
         
-// don't load the EMP data, just re-tag it      
-        dataType="EMP"
-        sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
-        Execute str
+
 
 // don't load the BGD data, just re-tag it      
-        dataType="BGD"
-        sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
-        Execute str
-        
+        if(cmpstr(prot[0],"none") != 0)         //if BGD is used, protStr[0] = ""
+                dataType="BGD"
+                sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
+                Execute str
+        endif
+
+// don't load the EMP data, just re-tag it
+//
+        if(cmpstr(prot[1],"none") != 0)         //if EMP is used, protStr[1] = ""
+                dataType="EMP"
+                sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
+                Execute str
+        endif
+                
 //
 // from here down, the steps are identical