Changeset 5146

Timestamp:

09/29/04 23:16:47 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTime.h (modified) (2 diffs)
• msignal/MExtractTimeAndCharge.cc (modified) (5 diffs)
• msignal/MExtractTimeAndCharge.h (modified) (2 diffs)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (added)
• msignal/MExtractTimeAndChargeDigitalFilter.h (added)
• msignal/Makefile (modified) (1 diff)
• msignal/SignalLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/29: Hendrik Bartko, Diego Tescaro, Markus Gaug
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]
+     - Hendriks digital filter finally implemented
+
+   * msignal/Makefile
+   * msignal/SignalLinkDef.h
+     - added MExtractTimeAndChargeDigitalFilter and  MExtractTimeAndCharge
+
+   * msignal/MExtractTime.h
+     - made PreProcess, ReInit and Process protected
+
+
  2004/09/29: Thomas Bretz
 

trunk/MagicSoft/Mars/msignal/MExtractTime.h

@@ -12 +12 @@
 {
 private:
+
   static const Float_t fgOffsetLoGain;  // Default for fOffsetLoGain (now set to 1.51 (= 5ns)
 
-  Int_t  PreProcess(MParList *pList);
-  Bool_t ReInit(MParList *pList);
-  Int_t  Process();
-
 protected:
+  
   Float_t fOffsetLoGain;     // Offset of the low-gain signal w.r.t. the High-Gain slices
 
@@ -27 +25 @@
   virtual void FindTimeLoGain(Byte_t *firstused, Float_t &time, Float_t &dtime,
                               Byte_t &sat, const MPedestalPix &ped) const;
+
+  Int_t  PreProcess( MParList *pList );
+  Bool_t ReInit    ( MParList *pList );
+  Int_t  Process   ();
 
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -126 +126 @@
 void MExtractTimeAndCharge::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)
+                                                    Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag)
 {
   return;
@@ -133 +133 @@
 void MExtractTimeAndCharge::FindTimeAndChargeLoGain(Byte_t *firstused, Float_t &sum, Float_t &dsum, 
                                                     Float_t &time, Float_t &dtime,
-                                                    Byte_t &sat, const MPedestalPix &ped)
+                                                    Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag)
 {
   return;
@@ -170 +170 @@
                               sumhi, deltasumhi, 
                               timehi, deltatimehi, 
-                              sathi, ped);
+                              sathi, ped, pixel.HasABFlag());
       
       Float_t sumlo =0., deltasumlo =0.;
@@ -179 +179 @@
                               sumlo, deltasumlo, 
                               timelo, deltatimelo, 
-                              satlo, ped);
+                              satlo, ped, pixel.HasABFlag());
 
       MExtractedSignalPix &pix = (*fSignals)[pixid];
@@ -186 +186 @@
       pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo);
       pix.SetGainSaturation(sathi, sathi, satlo);
-      
-      pix.SetNumHiGainSlices(fNumHiGainSamples);
-      pix.SetNumLoGainSlices(fNumLoGainSamples);      
       
       tix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -10 +10 @@
 {
 private:
+
   Int_t  PreProcess(MParList *pList);
   Bool_t ReInit(MParList *pList);
@@ -15 +16 @@
 
 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);
+                                       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);
+                                       Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
 
 public:

trunk/MagicSoft/Mars/msignal/Makefile

@@ -48 +48 @@
            MExtractTimeFastSpline.cc \
            MExtractTimeHighestIntegral.cc \
+           MExtractTimeAndCharge.cc \
+           MExtractTimeAndChargeDigitalFilter.cc \
            MArrivalTime.cc \
            MArrivalTimeCalc.cc \

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -29 +29 @@
 #pragma link C++ class MExtractTimeHighestIntegral+;
 
+#pragma link C++ class MExtractTimeAndCharge+;
+#pragma link C++ class MExtractTimeAndChargeDigitalFilter+;
+
+
 #pragma link C++ class MArrivalTimeCam+;
 #pragma link C++ class MArrivalTimePix+;