Changeset 13435

Timestamp:

04/24/12 14:41:37 (13 years ago)

Author:

kraehenb

Message:

Changed CalFitsTest.py to work with the current version of caltest.h.

Location:

fact/tools/pyscripts/sandbox/kraehenb

Files:

• CalFitsPerformance.py (modified) (1 diff)
• CalFitsTest.py (modified) (2 diffs)

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

@@ -61 +61 @@
 #    print [(x,y) for x,y in zip(npthr.nonzero()[0],npthr.nonzero()[1])] #print the coordinates, range 0-1399,0-284
     
-    #Various versions to get the integral, all with approximately the same miserable speed (3 Hz), except for the last one with ~4.3 Hz
+    #Various versions to get the integral, all with approximately the same miserable speed (3 Hz), except for the last one (vectorized function) with ~4.3 Hz
     #Missing: add deadtime after an integration, remove start & end of the array
 #    integrals = [np.sum(npcalevent[x,y+5:y+15]) for x,y in np.transpose(npthr.nonzero())]

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

@@ -32 +32 @@
 print "Trigger type: ", caltest.event_triggertype
 print "Uncalibrated data: ", caltest.event_data
-print "Calibrated data: ", caltest.event_caldata
+print "Calibrated data: ", caltest.npcaldata
 print "Board times: ", caltest.event_boardtimes
 print "Trigger offsets: ", caltest.event_offset
@@ -52 +52 @@
 #        break
 #    print caltest.event_id, caltest.event_triggertype, caltest.event_caldata[10]
+#    pass
 #print