Changeset 588 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

Timestamp:

Nov 2, 2009 10:55:37 AM (13 years ago)

Author:

srkline

Message:

Added conditional compile instructions to some reduction procedure files that have only minor facility-specific changes. These changes are not significant enough to merit a separate facility file that must be maintained with essentially duplicate functions.

#define SYMBOL was attempted, but did not work since the symbols weren't actually defined until after the compile... and I couldn't figure out how to define - then compile. in additon, the table is static until Igor is quit - so multiple symbols could be defined, and compiling would fail.

So... the method now that appears to work is to put a dummy function for each facility in its facility specific "Includes" file. Then the conditional compilation checks for exists("function").

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf (modified) (3 diffs)

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

@@ -102 +102 @@
         
 //      nthreads = 1
-        
-        variable mt= ThreadGroupCreate(nthreads)
+        NVAR mt=root:myGlobals:gThreadGroupID
+        mt = ThreadGroupCreate(nthreads)
         NVAR gInitTime = root:Packages:NIST:SAS:gRanDateTime            //time that SASCALC was started
-
+        Print "thread group ID = ",mt
         
         inputWave[0] = NNeutron/nthreads                //split up the number of neutrons
@@ -153 +153 @@
         while( tgs != 0 )
         variable dummy= ThreadGroupRelease(mt)
+        mt=0
         Print "done with all threads"
 
@@ -1104 +1105 @@
         NVAR doMonteCarlo = root:Packages:NIST:SAS:gDoMonteCarlo                // == 1 if 2D MonteCarlo set by hidden flag
         WAVE rw=root:Packages:NIST:SAS:realsRead
+        
+// Try to nicely exit from a threading error, if possible
+        Variable err=0
+        if(!exists("root:myGlobals:gThreadGroupID"))
+                Variable/G root:myGlobals:gThreadGroupID=0
+        endif
+        NVAR mt=root:myGlobals:gThreadGroupID
+
+        if(mt!=0)       //there was an error with the stopping of the threads, possibly user abort
+                err = ThreadGroupRelease(mt)
+                Print "threading err = ",err
+                if(err == 0)
+                        // all *should* be OK
+                else
+                        return(0)
+                endif
+        endif
 
         NVAR imon = root:Packages:NIST:SAS:gImon