Changeset 2896 for trunk/MagicSoft

Timestamp:

01/23/04 17:52:18 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (2 diffs)
• mcalib/MCalibrate.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2004/01/23: Abelardo Moralejo
+
+   * mcalib/MCalibrate.cc, manalysis/MExtractSignal.cc
+     - Added support (using AddSerialNumber) for stereo MC files.
 
  2004/01/23: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -94 +94 @@
 Int_t MExtractSignal::PreProcess(MParList *pList)
 {
-    fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
+    fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
     if (!fRawEvt)
     {
-        *fLog << err << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
         return kFALSE;
     }
 
 
-    fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam");
+    fSignals = (MExtractedSignalCam*)pList->FindCreateObj(AddSerialNumber("MExtractedSignalCam"));
     if (!fSignals)
         return kFALSE;
@@ -109 +109 @@
                                 fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
 
-    fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
+    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (!fPedestals)
       {
-        *fLog << err << "MPedestalCam not found... aborting" << endl;
+        *fLog << err << AddSerialNumber("MPedestalCam") << " not found... aborting" << endl;
         return kFALSE;
       }

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -85 +85 @@
 Int_t MCalibrate::PreProcess(MParList *pList)
 {
-    fSignals = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+    fSignals = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (!fSignals)
     {
-        *fLog << err << "MExtractedSignalCam not found ... aborting" << endl;
+      *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl;
         return kFALSE;
     }
 
-    fCalibrations = (MCalibrationCam*)pList->FindObject("MCalibrationCam");
+    fCalibrations = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam"));
     if (!fCalibrations)
     {
-        *fLog << err << "MCalibrationCam not found ... aborting." << endl;
+      *fLog << err << AddSerialNumber("MCalibrationCam") << " not found ... aborting." << endl;
         return kFALSE;
     }
 
-    fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj("MCerPhotEvt");
+    fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj(AddSerialNumber("MCerPhotEvt"));
     if (!fCerPhotEvt)
         return kFALSE;