Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 5557)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 5690)
@@ -325,4 +325,6 @@
 
 const TString MImgCleanStd::gsNamePedPhotCam="MPedPhotCam"; // default name of the 'MPedPhotCam' container
+const TString MImgCleanStd::gsNameCerPhotEvt="MCerPhotEvt"; // default name of the 'MCerPhotEvt' container
+const TString MImgCleanStd::gsNameGeomCam   ="MGeomCam";    // default name of the 'MGeomCam' container
 
 // --------------------------------------------------------------------------
@@ -337,5 +339,6 @@
                            const char *name, const char *title)
     : fCleaningMethod(kStandard), fCleanLvl1(lvl1),
-      fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotCam(gsNamePedPhotCam)
+    fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotCam(gsNamePedPhotCam),
+    fNameGeomCam(gsNameGeomCam), fNameCerPhotEvt(gsNameCerPhotEvt)
 
 {
@@ -540,15 +543,15 @@
 Int_t MImgCleanStd::PreProcess (MParList *pList)
 {
-    fCam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
+    fCam = (MGeomCam*)pList->FindObject(AddSerialNumber(fNameGeomCam), "MGeomCam");
     if (!fCam)
     {
-        *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
+        *fLog << err << fNameGeomCam << " [MGeomCam] not found (no geometry information available)... aborting." << endl;
         return kFALSE;
     }
 
-    fEvt = (MCerPhotEvt*)pList->FindObject(AddSerialNumber("MCerPhotEvt"));
+    fEvt = (MCerPhotEvt*)pList->FindObject(AddSerialNumber(fNameCerPhotEvt), "MCerPhotEvt");
     if (!fEvt)
     {
-        *fLog << err << "MCerPhotEvt not found... aborting." << endl;
+        *fLog << err << fNameCerPhotEvt << " [MCerPhotEvt] not found... aborting." << endl;
         return kFALSE;
     }
@@ -557,5 +560,5 @@
     if (!fPed)
     {
-        *fLog << err << "MPedPhotCam not found... aborting." << endl;
+        *fLog << err << fNamePedPhotCam << " [MPedPhotCam] not found... aborting." << endl;
         return kFALSE;
     }
@@ -755,10 +758,10 @@
     case kImgCleanLvl1:
         fCleanLvl1 = lvl;
-        *fLog << "Cleaning level 1 set to " << lvl << " sigma." << endl;
+        *fLog << "Cleaning level 1 set to " << lvl << endl;
         return kTRUE;
 
     case kImgCleanLvl2:
         fCleanLvl2 = lvl;
-        *fLog << "Cleaning level 2 set to " << lvl << " sigma." << endl;
+        *fLog << "Cleaning level 2 set to " << lvl << endl;
         return kTRUE;
     }
@@ -805,4 +808,8 @@
     if (gsNamePedPhotCam!=fNamePedPhotCam)
         out << "   " << GetUniqueName() << ".SetNamePedPhotCam(\"" << fNamePedPhotCam << "\");" << endl;
+    if (gsNameGeomCam!=fNameGeomCam)
+        out << "   " << GetUniqueName() << ".SetNameGeomCam(\"" << fNameGeomCam << "\");" << endl;
+    if (gsNameCerPhotEvt!=fNameCerPhotEvt)
+        out << "   " << GetUniqueName() << ".SetNameCerPhotEvt(\"" << fNameCerPhotEvt << "\");" << endl;
 }
 
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.h	(revision 5557)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.h	(revision 5690)
@@ -29,4 +29,6 @@
 private:
     static const TString gsNamePedPhotCam; // default name of the 'MPedPhotCam' container
+    static const TString gsNameGeomCam;    // default name of the 'MGeomCam' container
+    static const TString gsNameCerPhotEvt; // default name of the 'MCerPhotEvt' container
 
     const MGeomCam     *fCam;  //!
@@ -44,4 +46,6 @@
 
     TString  fNamePedPhotCam; // name of the 'MPedPhotCam' container
+    TString  fNameGeomCam;    // name of the 'MGeomCam' container
+    TString  fNameCerPhotEvt; // name of the 'MCerPhotEvt' container
 
 
@@ -73,7 +77,10 @@
 
     Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);
+
     void SetNamePedPhotCam(const char *name)  { fNamePedPhotCam = name; }
+    void SetNameCerPhotEvt(const char *name)  { fNameCerPhotEvt = name; }
+    void SetNameGeomCam(const char *name)     { fNameGeomCam = name; }
 
-    ClassDef(MImgCleanStd, 2)    // task doing the image cleaning
+    ClassDef(MImgCleanStd, 3)    // task doing the image cleaning
 };