Changeset 896

Timestamp:

Jan 31, 2013 12:15:12 PM (10 years ago)

Author:

ajj

Message:

• Added variable declarations to EventModeProcessing?.ipf to let it compile without the XOP
• Turning off file checking for me!

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/SANS_2D_Resolution.ihf (modified) (previous)
• NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -82 +82 @@
                 checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"s*ine"))                //zero for me
                 checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"ajj"))          //and zero for me
-
+                checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"andrewjackson"))                //and zero for me
                 
                 // turn off file checking if the proper alias to the NCNR procedures is there

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

@@ -1480 +1480 @@
         SetDataFolder root:Packages:NIST:Event
 
+
+
         Variable fileref
         String buffer
@@ -1493 +1495 @@
         numLines = 0
 
+        //Have to declare local variables for Loadwave so that this compiles without XOP.
+        String S_waveNames
+        //  and those for the XOP
+        Variable V_nXYevents,V_num1,V_num2,V_num3,V_num0,V_totBytes,V_numPP,V_numT0,V_numDL,V_numFF,V_numZero
+        Variable V_numBad,V_numRemoved
         
         // what I really need is the number of XY events