Changeset 12915

Timestamp:

02/22/12 14:27:11 (13 years ago)

Author:

neise

Message:

renamed maxPos, maxAmp & sums --> pulse_amplitude, _time_of_maximum & _integral_simple

File:

• fact/tools/pyscripts/pyfact/pyfact_rename.py (modified) (4 diffs)

fact/tools/pyscripts/pyfact/pyfact_rename.py

@@ -110 +110 @@
         self.v_bsl = np.zeros(self.npix)  # array of baseline values (all ZERO)
         self.data_saverage_out = None
-        self.maxPos = None
-        self.maxAmp = None
+        self.pulse_time_of_maximum = None
+        self.pulse_amplitude = None
 
     def next_event(self):
@@ -200 +200 @@
             self.data_saverage_out
         filling arrays:
-            self.maxPos
-            self.maxAmp
+            self.pulse_time_of_maximum
+            self.pulse_amplitude
 
         """
@@ -210 +210 @@
             pass
 
-        maxPos = np.argmax( self.data_saverage_out[:,min:max], 1)
-        maxAmp = np.max( self.data_saverage_out[:,min:max], 1)
-        self.maxPos = maxPos
-        self.maxAmp = maxAmp
+        pulse_time_of_maximum = np.argmax( self.data_saverage_out[:,min:max], 1)
+        pulse_amplitude = np.max( self.data_saverage_out[:,min:max], 1)
+        self.pulse_time_of_maximum = pulse_time_of_maximum
+        self.pulse_amplitude = pulse_amplitude
 
     def sum_around_peak(self, left=13, right=23):
@@ -219 +219 @@
 
         using:
-            self.maxPos
+            self.pulse_time_of_maximum
             self.acal_data
         filling array:
-            self.sums
+            self.pulse_integral_simple
             
         """
         
-        if self.maxPos == None:
+        if self.pulse_time_of_maximum == None:
             print 'error pyfact.sum_around_peak was called without prior call of find_peak'
-            print ' variable self.maxPos is needed'
+            print ' variable self.pulse_time_of_maximum is needed'
             pass
 
         # find left and right limit and sum the amplitudes in the range
-        sums = np.empty(self.npix)
+        pulse_integral_simple = np.empty(self.npix)
         for pixel in range(self.npix):
-            min = self.maxPos[pixel]-left
-            max = self.maxPos[pixel]+right
-            sums[pixel] = self.acal_data[pixel,min:max].sum()
-        
-        self.sums = sums
+            min = self.pulse_time_of_maximum[pixel]-left
+            max = self.pulse_time_of_maximum[pixel]+right
+            pulse_integral_simple[pixel] = self.acal_data[pixel,min:max].sum()
+        
+        self.pulse_integral_simple = pulse_integral_simple
         
     def baseline_read_values(self, file, bsl_hist='bsl_sum/hplt_mean'):