Changeset 5434 for trunk

Timestamp:

11/19/04 10:31:26 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• msignal/MExtractTimeAndCharge.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2004/11/13: Hendrik Bartko
+ 2004/11/18: Hendrik Bartko
 
    * msignal/MC_weights_2GSamples.dat:
@@ -109 +109 @@
        "fNameTimeCam"
 
+   * msignal/MExtractTimeAndCharge.[h,cc]
+     - initialize MExtractedSignalCam with the name chosen in the base 
+       class.
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -105 +105 @@
 Int_t MExtractTimeAndCharge::PreProcess(MParList *pList)
 {
-    if (!MExtractTime::PreProcess(pList))
-        return kFALSE;
-
-    fSignals = (MExtractedSignalCam*)pList->FindCreateObj(AddSerialNumber("MExtractedSignalCam"));
-    if (!fSignals)
-        return kFALSE;
-
-    return kTRUE;
+
+  if (!MExtractTime::PreProcess(pList))
+    return kFALSE;
+  
+  fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
+  if (!fSignals)
+    {
+      *fLog << err << fNameSignalCam.Data() << " could not be found nor created... aborting" << endl;
+      return kFALSE;
+    }
+  
+  return kTRUE;
 }