Changeset 5483

Timestamp:

11/27/04 13:43:24 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndCharge.h (modified) (2 diffs)
• MExtractTimeAndChargeDigitalFilter.h (modified) (2 diffs)
• MExtractTimeAndChargeSlidingWindow.h (modified) (2 diffs)
• MExtractTimeAndChargeSpline.h (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -22 +22 @@
   Int_t  Process();
 
-  virtual void FindTimeAndChargeHiGain(Byte_t *firstused, Byte_t *logain, Float_t &sum, Float_t &dsum,
-                                       Float_t &time, Float_t &dtime,
-                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-  virtual void FindTimeAndChargeLoGain(Byte_t *firstused, Float_t &sum,  Float_t &dsum,
-                                       Float_t &time, Float_t &dtime,
-                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
@@ -39 +32 @@
   void Print(Option_t *o) const;
   
+  virtual void FindTimeAndChargeHiGain(Byte_t *firstused, Byte_t *logain, Float_t &sum, Float_t &dsum,
+                                       Float_t &time, Float_t &dtime,
+                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+  virtual void FindTimeAndChargeLoGain(Byte_t *firstused, Float_t &sum,  Float_t &dsum,
+                                       Float_t &time, Float_t &dtime,
+                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+
   ClassDef(MExtractTimeAndCharge, 1)   // Time And Charge Extractor Base Class
 };

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -54 +54 @@
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-protected:
-  virtual void FindTimeAndChargeHiGain(Byte_t *firstused, Byte_t *logain, Float_t &sum, Float_t &dsum,
-                                       Float_t &time, Float_t &dtime,
-                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-  virtual void FindTimeAndChargeLoGain(Byte_t *firstused, Float_t &sum,  Float_t &dsum,
-                                       Float_t &time, Float_t &dtime,
-                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
 
 public:
@@ -89 +82 @@
   void Print(Option_t *o) const;
   
+  void FindTimeAndChargeHiGain(Byte_t *firstused, Byte_t *logain, Float_t &sum, Float_t &dsum,
+                               Float_t &time, Float_t &dtime,
+                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+  void FindTimeAndChargeLoGain(Byte_t *firstused, Float_t &sum,  Float_t &dsum,
+                               Float_t &time, Float_t &dtime,
+                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+  
   ClassDef(MExtractTimeAndChargeDigitalFilter, 1)   // Hendrik's digital filter
 };

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.h

@@ -29 +29 @@
   Bool_t ReInit( MParList *pList );
   
-  void FindTimeAndChargeHiGain(Byte_t *first, Byte_t *logain, Float_t &sum, Float_t &dsum,
-                               Float_t &time, Float_t &dtime,
-                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-  void FindTimeAndChargeLoGain(Byte_t *first, Float_t &sum,  Float_t &dsum,
-                               Float_t &time, Float_t &dtime,
-                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-
   Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
   
@@ -50 +43 @@
                      Byte_t windowl=fgLoGainWindowSize);
 
+  void FindTimeAndChargeHiGain(Byte_t *first, Byte_t *logain, Float_t &sum, Float_t &dsum,
+                               Float_t &time, Float_t &dtime,
+                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+  void FindTimeAndChargeLoGain(Byte_t *first, Float_t &sum,  Float_t &dsum,
+                               Float_t &time, Float_t &dtime,
+                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+
   ClassDef(MExtractTimeAndChargeSlidingWindow, 0)   // Task to Extract Times and Charges using a Sliding Window
 };

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -39 +39 @@
   Bool_t ReInit( MParList *pList );
   
-  void FindTimeAndChargeHiGain(Byte_t *first, Byte_t *logain, Float_t &sum, Float_t &dsum,
-                               Float_t &time, Float_t &dtime,
-                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-  void FindTimeAndChargeLoGain(Byte_t *first, Float_t &sum,  Float_t &dsum,
-                               Float_t &time, Float_t &dtime,
-                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
-
   Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
   
@@ -73 +66 @@
   void SetChargeType   ( ExtractionType_t typ=kAmplitude);
   
+  void FindTimeAndChargeHiGain(Byte_t *first, Byte_t *logain, Float_t &sum, Float_t &dsum,
+                               Float_t &time, Float_t &dtime,
+                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+  void FindTimeAndChargeLoGain(Byte_t *first, Float_t &sum,  Float_t &dsum,
+                               Float_t &time, Float_t &dtime,
+                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
+
   ClassDef(MExtractTimeAndChargeSpline, 0)   // Task to Extract Arrival Times and Charges using a Fast Cubic Spline
 };