Changeset 13461 for fact

Timestamp:

04/26/12 14:24:02 (13 years ago)

Author:

kraehenb

Message:

Added passing NROI and NPIX to weave.

File:

• fact/tools/pyscripts/sandbox/kraehenb/CalFitsPerformanceWeave.py (modified) (2 diffs)

fact/tools/pyscripts/sandbox/kraehenb/CalFitsPerformanceWeave.py

@@ -61 +61 @@
     int singles = 0;
     double threshold = 2.5;
-    for(int px=0; px<1440; px++) {
-        lastslice = npcalevent(px*300);
-        for(int sl=1; sl<300-14; sl++) {
-            slice = npcalevent(px*300+sl);
+    for(int px=0; px<npix; px++) {
+        lastslice = npcalevent(px*nroi);
+        for(int sl=1; sl<nroi-14; sl++) {
+            slice = npcalevent(px*nroi+sl);
             if((lastslice<threshold)&&(slice>threshold)) {
                 integral = 0;
                 for(int l=5; l<15; l++) {
-                    integral += npcalevent(px*1440+sl+l);
+                    integral += npcalevent(px*nroi+sl+l);
                 }
                 c_integrals(singles) = integral;
@@ -79 +79 @@
 //    std::cout << std::endl << singles << std::endl;
     """
-    weave.inline(cppcode, ['c_integrals', 'npcalevent'], type_converters=converters.blitz)
+    
+    #Passing the caltest object to weave is not possible
+    #The int() statement is necessary to add additional data type information to the variable (ie. otherwise some things would work in the C-code, other would not)
+    nroi = int(caltest.nroi)
+    npix = int(caltest.npix)
+    
+    weave.inline(cppcode, ['c_integrals', 'npcalevent','nroi','npix'], type_converters=converters.blitz)
     
 #    print "CalFitsPerformanceWeave"