Changeset 6171

Timestamp:

02/01/05 15:43:23 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.rc (modified) (6 diffs)
• msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.h (modified) (1 diff)

trunk/MagicSoft/Mars/callisto.rc

@@ -1 @@
-
 # ==========================================================================
 #############################################################################
@@ -31 +30 @@
 #MJPedestalC2.PathOut: .
 #MJPedestalC1.ReferenceFile: mjobs/pedestalref.rc
-#MJPedestalC2.ReferenceFile: mjobs/pedestalrefo.rc
+#MJPedestalC2.ReferenceFile: mjobs/pedestalref.rc
 MJCalibration.ReferenceFile: mjobs/calibrationref_Nov04.rc
 MJCalibration.MHCalibrationRelTimeCam.ReferenceFile: mjobs/calibrationref_Nov04.rc
@@ -78 +77 @@
 # Set color to be used
 #MJCalibration.Color:
+# Type of used data format 
+#MJCalibration.DataType: Raw,Root,MC
 # Type of displayed plots
 #MJCalibration.Display: Full,DataCheck,Normal
-# Used for data-check (eg. raw files are read)
-#MJCalibration.DataCheck: No
 # Write additinal debug output
 #MJCalibration.Debug: No
@@ -132 +131 @@
 # Configure MJPedestalC1 and MJPedestalC2
 # -------------------------------------------------------------------------
-# Used for data-check (eg. raw files are read)
-#MJPedestalC1.DataCheck: No
-#MJPedestalC2.DataCheck: No
+# Possible data type: Raw,Root,MC
+#MJPedestalC1.DataType: Root
+#MJPedestalC2.DataType: Root
+#MJPedestalC3.DataType: Root
 # Maximum number of event processed in the loop
 #MJPedestalC1.MaxEvents: 1000
@@ -252 +252 @@
 # If you want to change the behaviour of the pedestal extraction...
 # -------------------------------------------------------------------------
-# Used for data-check (eg. raw files are read)
-#MJPedestalY1.DataCheck: No
-#MJPedestalY2.DataCheck: No
-#MJPedestalY3.DataCheck: No
+# Possible data type: Raw,Root,MC
+#MJPedestalY1.DataType: Root
+#MJPedestalY2.DataType: Root
+#MJPedestalY3.DataType: Root
 #MJPedestalY1.UseData: Yes
 #MJPedestalY2.UseData: Yes
@@ -299 +299 @@
 # Setup calibration of data
 # -------------------------------------------------------------------------
-# Used for data-check (eg. raw files are read)
-#MJCalibrateSignal.RawData: no
-# Used for MC
-#MJCalibrateSignal.MC: no
+# Type of used data format: raw,root,MC
+#MJCalibration.DataType: Root
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.h

@@ -42 +42 @@
   ULong_t fLoGainOutOfRangeRight;               // Number of events out of range to the right side in low gain
 
-  void    FindPeak(Byte_t *ptr, Byte_t &startslice, Int_t &signal, Int_t &sat, Byte_t &satpos) const;
+  void    FindPeak(Byte_t *ptr, Byte_t *logain,
+                   Byte_t &startslice, Int_t &max, Int_t &sat, Byte_t &satpos) const;
 
   Int_t   PreProcess(MParList *pList);