Changeset 5307 for trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (modified) (5 diffs)

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);
+}