Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4607)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4608)
@@ -19,4 +19,24 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2004/08/12: Hendrik Bartko
+
+   * msignal/MExtractor.cc:
+     - corrected the setting of AddSerialNumber for Find(Create)Object
+
+   * msignal/MExtractTime.cc:
+     - corrected the setting of AddSerialNumber for FindObject
+
+   * mbadpixels/MBadPixelsCalc.cc
+     - corrected the setting of AddSerialNumber for FindObject
+
+   * mbadpixels/MBadPixelsTreat.cc
+     - corrected the setting of AddSerialNumber for FindObject
+
+   * mimage/MImgCleanStd.cc
+     - corrected the setting of AddSerialNumber for FindObject
+
+
 
   2004/08/12: Markus Gaug
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4607)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4608)
@@ -102,5 +102,5 @@
     if (fPedestalLevel>0)
     {
-      fPedPhotCam = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer,  AddSerialNumber("MPedPhotCam"));
+      fPedPhotCam = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
         if (!fPedPhotCam)
         {
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 4607)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 4608)
@@ -121,5 +121,5 @@
     }
 
-    fPedPhot = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
+    fPedPhot = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
     if (!fPedPhot)
     {
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 4607)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 4608)
@@ -169,5 +169,5 @@
   if (TestFlag(kRun))
   {
-    fPedestal = (MPedestalCam*)pList->FindObject(fNamePedADCRunContainer, AddSerialNumber("MPedestalCam"));
+    fPedestal = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCRunContainer), "MPedestalCam");
     if (!fPedestal)
     {  
@@ -181,5 +181,5 @@
   if (TestFlag(kEvent))
   {
-    fPedestalFromData = (MPedestalCam*)pList->FindObject(fNamePedADCEventContainer, AddSerialNumber("MPedestalCam"));
+    fPedestalFromData = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCEventContainer), "MPedestalCam");
     if (!fPedestalFromData)
     {
@@ -226,11 +226,8 @@
   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,12 +235,8 @@
   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;
+      
     }
   
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 4607)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 4608)
@@ -510,5 +510,5 @@
     }
 
-    fPed = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
+    fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
     if (!fPed)
     {
Index: trunk/MagicSoft/Mars/msignal/MExtractTime.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTime.cc	(revision 4607)
+++ trunk/MagicSoft/Mars/msignal/MExtractTime.cc	(revision 4608)
@@ -129,5 +129,5 @@
   
 
-  fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
+  fPedestals = (MPedestalCam*)pList->FindObject( AddSerialNumber(fNamePedContainer), "MPedestalCam");
   if (!fPedestals)
     {
Index: trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 4607)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 4608)
@@ -143,5 +143,5 @@
         return kFALSE;
 
-    fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
+    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedContainer), "MPedestalCam");
     if (!fPedestals)
     {