Changeset 5307 for trunk/MagicSoft/Mars/msignal

Timestamp:

10/22/04 15:59:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTime.cc (modified) (1 diff)
• MExtractTimeAndCharge.cc (modified) (5 diffs)
• MExtractTimeAndCharge.h (modified) (2 diffs)
• MExtractTimeAndChargeDigitalFilter.cc (modified) (1 diff)
• MExtractTimeAndChargeDigitalFilter.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -148 +148 @@
 Bool_t MExtractTime::ReInit(MParList *pList)
 {
-  
-  MExtractor::ReInit(pList);
-
-  fArrTime->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fLoGainFirst, fLoGainLast);
-
-  return kTRUE;
-}
-
-
+    if (!MExtractor::ReInit(pList))
+        return kFALSE;
+
+    fArrTime->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fLoGainFirst, fLoGainLast);
+
+    return kTRUE;
+}
 
 void MExtractTime::FindTimeHiGain(Byte_t *firstused, Float_t &time, Float_t &dtime, 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -74 +74 @@
 
 const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -2.8; 
+
 // --------------------------------------------------------------------------
 //
@@ -83 +84 @@
 MExtractTimeAndCharge::MExtractTimeAndCharge(const char *name, const char *title)
 {
-
-  fName  = name  ? name  : "MExtractTimeAndCharge";
-  fTitle = title ? title : "Base class for signal and time extractors";
-  
-  SetLoGainStartShift();
+    fName  = name  ? name  : "MExtractTimeAndCharge";
+    fTitle = title ? title : "Base class for signal and time extractors";
+
+    SetLoGainStartShift();
 }
 
@@ -105 +105 @@
 Int_t MExtractTimeAndCharge::PreProcess(MParList *pList)
 {
-
-  if (!MExtractTime::PreProcess(pList))
-    return kFALSE;
-  
-  fSignals = (MExtractedSignalCam*)pList->FindCreateObj(AddSerialNumber("MExtractedSignalCam"));
-  if (!fSignals)
-    {
-      *fLog << err << GetDescriptor()
-            << ": Could not find nor create MExtractedSignalCam,... aborting." << endl;
-      return kFALSE;
-    }
-  
-  
-  return kTRUE;
+    if (!MExtractTime::PreProcess(pList))
+        return kFALSE;
+
+    fSignals = (MExtractedSignalCam*)pList->FindCreateObj(AddSerialNumber("MExtractedSignalCam"));
+    if (!fSignals)
+        return kFALSE;
+
+    return kTRUE;
 }
 
@@ -132 +126 @@
 Bool_t MExtractTimeAndCharge::ReInit(MParList *pList)
 {
-  
-  MExtractTime::ReInit(pList);
-
-  fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fNumHiGainSamples,
-                              fLoGainFirst, fLoGainLast, fNumLoGainSamples);
-
-  *fLog << dec << endl;
-  *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
+    if (!MExtractTime::ReInit(pList))
+        return kFALSE;
+
+    fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fNumHiGainSamples,
+                                fLoGainFirst, fLoGainLast, fNumLoGainSamples);
+
+    *fLog << dec << endl;
+    *fLog << inf << "Taking " << fNumHiGainSamples
         << " HiGain samples from slice " << (Int_t)fHiGainFirst
         << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;
-  *fLog << inf << GetDescriptor() << ": Taking " << fNumLoGainSamples
+    *fLog << inf << "Taking " << fNumLoGainSamples
         << " LoGain samples from slice " << (Int_t)fLoGainFirst
         << " to " << (Int_t)fLoGainLast << " incl" << endl;
 
-  return kTRUE;
+    return kTRUE;
 }
 
@@ -258 +252 @@
     return MExtractTime::ReadEnv(env, prefix, print) ? kTRUE : rc;
 }
+
+void MExtractTimeAndCharge::Print(Option_t *o) const
+{
+    *fLog << all;
+    if (IsA()==MExtractTimeAndCharge::Class())
+        *fLog << GetDescriptor() << ":" << endl;
+
+    *fLog << " LoGainStartShift: " << fLoGainStartShift << endl;
+    MExtractTime::Print(o);
+}

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -13 +13 @@
   static const Float_t fgLoGainStartShift; // Default for fLoGainStartShift (now set to: -2.8)
   
-  Byte_t  fLoGainFirstSave;        // Temporary variable to store the original position of low-gain start slice
+  Byte_t  fLoGainFirstSave;       //! Temporary variable to store the original position of low-gain start slice
   Float_t fLoGainStartShift;      // Shift to start searching the low-gain signal obtained from the high-gain times.
   
@@ -36 +36 @@
   
   void SetLoGainStartShift( const Float_t f=fgLoGainStartShift )  { fLoGainStartShift = f + fOffsetLoGain;  }
+
+  void Print(Option_t *o) const;
   
-  ClassDef(MExtractTimeAndCharge, 0)   // Time And Charge Extractor Base Class
+  ClassDef(MExtractTimeAndCharge, 1)   // Time And Charge Extractor Base Class
 };
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -940 +940 @@
   return kTRUE;
 }
+
+void MExtractTimeAndChargeDigitalFilter::Print(Option_t *o) const
+{
+    *fLog << all;
+    *fLog << GetDescriptor() << ":" << endl;
+
+    *fLog << " Time Shift HiGain:  " << fTimeShiftHiGain << endl;
+    *fLog << " Time Shift LoGain:  " << fTimeShiftLoGain << endl;
+    *fLog << " Window Size HiGain: " << fWindowSizeHiGain << endl;
+    *fLog << " Window Size LoGain: " << fWindowSizeLoGain << endl;
+    *fLog << " Binning Res HiGain: " << fBinningResolutionHiGain << endl;
+    *fLog << " Binning Res LoGain: " << fBinningResolutionHiGain << endl;
+  
+    MExtractTimeAndCharge::Print(o);
+}

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -86 +86 @@
     fSignalStartBinLoGain = sl; 
   }
+
+  void Print(Option_t *o) const;
   
   ClassDef(MExtractTimeAndChargeDigitalFilter, 1)   // Hendrik's digital filter