Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5559)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5560)
@@ -26,4 +26,17 @@
     - fixed bug which I introdued on friday (PostProcess was
       defined twice)
+
+   * macros/RanForest.C:
+     - replaced kGAMMA by MMcEvt::kGAMMA
+
+   * mhist/MHCamEvent.[h,cc]:
+     - allow to set name for MGeomCam
+
+   * mjobs/MJCalibration.cc:
+     - removed some obsolete comments
+     - reset SetNoiseCalculation for both extractors
+     - do not allow 'wrong' time&charge calibration (without
+       extractors cam)
+
 
 
Index: trunk/MagicSoft/Mars/macros/RanForest.C
===================================================================
--- trunk/MagicSoft/Mars/macros/RanForest.C	(revision 5559)
+++ trunk/MagicSoft/Mars/macros/RanForest.C	(revision 5560)
@@ -38,8 +38,8 @@
     tlist.AddToList(&read);
 
-    MFParticleId fgamma("MMcEvt", '=', kGAMMA);
+    MFParticleId fgamma("MMcEvt", '=', MMcEvt::kGAMMA);
     tlist.AddToList(&fgamma);
 
-    MFParticleId fhadrons("MMcEvt", '!', kGAMMA);
+    MFParticleId fhadrons("MMcEvt", '!', MMcEvt::kGAMMA);
     tlist.AddToList(&fhadrons);
 
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 5559)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 5560)
@@ -89,4 +89,6 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
+
+    fNameGeom = "MGeomCam";
 }
 
@@ -150,12 +152,12 @@
     }
 
-    MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
+    MGeomCam *cam = (MGeomCam*)plist->FindObject(fNameGeom, "MGeomCam");
     if (!cam)
     {
-        *fLog << err << GetDescriptor() << ": No MGeomCam found." << endl;
+        *fLog << err << fNameGeom << " [MGeomCam] not found... abort." << endl;
         return kFALSE;
     }
 
-    // Delete a posible old histogram from a previous loop
+    // Delete a possible old histogram from a previous loop
     if (fSum)
         delete (fSum);
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.h	(revision 5559)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.h	(revision 5560)
@@ -18,5 +18,6 @@
     MCamEvent *fEvt;       //! the current event
 
-    TString fNameEvt;      // Nameof MCamEvent to fill into histogram
+    TString fNameEvt;      // Name of MCamEvent to fill into histogram
+    TString fNameGeom;     // Name of geometry container
 
     Int_t fType;           // Type to used for calling GetPixelContent
@@ -37,5 +38,6 @@
     ~MHCamEvent();
 
-    void SetNameEvt(const TString name) { fNameEvt = name; }
+    void SetNameEvt(const TString name)  { fNameEvt = name; }
+    void SetNameGeom(const TString name) { fNameGeom = name; }
     void SetType(Int_t type) { fType = type; }
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 5559)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 5560)
@@ -1658,23 +1658,5 @@
     fillcam.SetBit(MFillH::kDoNotDisplay);
     filltme.SetBit(MFillH::kDoNotDisplay);
-/*
-
-     fillpin.SetNameTab("PINDiode");
-     fillbnd.SetNameTab("BlindPix");
-     fillcam.SetNameTab("Charge");
-     filltme.SetNameTab("RelTimes");
-
-     TString drawoption;
-
-    if (fDisplayType == kDataCheckDisplay)
-        drawoption += "datacheck";
-    if (fDisplayType == kFullDisplay)
-        drawoption += "all";
-
-    fillcam.SetDrawOption(drawoption.Data());
-    fillbnd.SetDrawOption(drawoption.Data());
-    fillpin.SetDrawOption(drawoption.Data());
-    filltme.SetDrawOption(drawoption.Data());
-  */
+
     //
     // Set default extractors in case, none has been set...
@@ -1695,11 +1677,21 @@
         else
         {
-            *fLog << warn;
+            *fLog << err << GetDescriptor() << "ERROR - ";
             *fLog << "Used Extractor derives from MExtractTimeAndCharge, " << endl;
             *fLog << "but MExtractorCam size " << fExtractorCam.GetSize() << " ";
             *fLog << "mismatch pedcam size " << pedcam.GetSize() << "! " << endl;
+            return kFALSE;
         }
     }
 
+    //
+    // Switch off noise calculation
+    //
+    fExtractor->SetNoiseCalculation(kFALSE);
+    fTimeExtractor->SetNoiseCalculation(kFALSE);
+
+    //
+    // Setup more tasks and tasklist
+    //
     MTaskEnv taskenv("ExtractSignal");
     taskenv.SetDefault(fExtractor);