Changeset 4608 for trunk/MagicSoft/Mars/mcalib

Timestamp:

08/13/04 08:00:25 (21 years ago)

Author:

hbartko

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -169 +169 @@
   if (TestFlag(kRun))
   {
-    fPedestal = (MPedestalCam*)pList->FindObject(fNamePedADCRunContainer, AddSerialNumber("MPedestalCam"));
+    fPedestal = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCRunContainer), "MPedestalCam");
     if (!fPedestal)
     {  
@@ -181 +181 @@
   if (TestFlag(kEvent))
   {
-    fPedestalFromData = (MPedestalCam*)pList->FindObject(fNamePedADCEventContainer, AddSerialNumber("MPedestalCam"));
+    fPedestalFromData = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCEventContainer), "MPedestalCam");
     if (!fPedestalFromData)
     {
@@ -226 +226 @@
   if (TestFlag(kRun))
     {
-      fPedPhot = (MPedPhotCam*)pList->FindCreateObj(AddSerialNumber("MPedPhotCam"), fNamePedPhotRunContainer);
+      fPedPhot = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotRunContainer));
       if (!fPedPhot)
-        {
-        *fLog << err << "container 'MPedPhotCam'" 
-              << " not found ... aborting" << endl;
-        return kFALSE;
-        }
+        return kFALSE;
+        
     }
 
@@ -238 +235 @@
   if (TestFlag(kEvent))
     {  
-      fPedPhotFromData = (MPedPhotCam*)pList->FindCreateObj(AddSerialNumber("MPedPhotCam"), 
-                                                            fNamePedPhotEventContainer);
+      fPedPhotFromData = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotEventContainer));
       if (!fPedPhotFromData)
-        {
-          *fLog << err << "container 'MPedPhotCamFromData'" 
-                << " not found ... aborting" << endl;
-          return kFALSE;
-      }
+        return kFALSE;
+      
     }