Index: trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc	(revision 5856)
+++ trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc	(revision 5857)
@@ -62,6 +62,4 @@
 #include "MCalibrateData.h"
 
-#include "MRawRunHeader.h"
-
 #include "MGeomCam.h"
 
@@ -79,5 +77,5 @@
 //
 MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title)
-    : fRunHeader(NULL), fGeom(NULL), fParList(NULL), 
+    : fGeom(NULL), fParList(NULL), 
       fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
       fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
@@ -99,20 +97,4 @@
 {
 
-  /*
-  fTrigPattern = (MTriggerPattern*)pList->FindObject("MTriggerPattern");
-  if (!fTrigPattern)
-    {
-      *fLog << err << "MTriggerPattern not found... abort." << endl;
-      return kFALSE;
-    }
-  */
-
-  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-  if (!fRunHeader)
-    {
-      *fLog << err << "MRawRunHeader not found... abort." << endl;
-      return kFALSE;
-    }
-
   fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
   if (!fGeom)
@@ -126,11 +108,4 @@
     {
       *fLog << err << "MParList not found... abort." << endl;
-      return kFALSE;
-    }
-
-  MTaskList *tlist = (MTaskList*)pList->FindObject("MTaskList");
-  if (!tlist)
-    {
-      *fLog << err << "MTaskList not found... abort." << endl;
       return kFALSE;
     }
@@ -146,14 +121,22 @@
   
   // 
-  // Look for the MCalibrationIntensityBlindCam
-  //
-  fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
-  if (fIntensBlind)
-    *fLog << inf << "Found MCalibrationIntensityBlindCam ... " << flush;
-  else
-    return kFALSE;
-  
-  // 
-  // Look for the MFillH name "FillChargeCam". In case yes, initialize the 
+  // Look for the MFillH-class "MHCalibrationBlindCam". In case yes, initialize the 
+  // corresponding IntensityCam
+  //
+  if (pList->FindObject(AddSerialNumber("MHCalibrationBlindCam")))
+  {
+
+    *fLog << inf << "Found MHCalibrationBlindCam ... " << flush;
+
+    fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam");
+    if (!fIntensBlind)
+      {
+        *fLog << err << "Could not find nor create MCalibrationIntensitBlindCam abort... " << endl;
+        return kFALSE;
+      }
+  }
+  
+  // 
+  // Look for the MFillH-class "MHCalibrationChargeCam". In case yes, initialize the 
   // corresponding IntensityCam
   //
@@ -165,11 +148,10 @@
 
     if (!fChargeCalc)
-      fChargeCalc   = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
+      fChargeCalc   = (MCalibrationChargeCalc*)pList->FindObject("MCalibrationChargeCalc");
 
     if (!fCalibrate)
-      fCalibrate   = (MCalibrateData*)tlist->FindObject("MCalibrateData");
+      fCalibrate   = (MCalibrateData*)pList->FindObject("MCalibrateData");
     
     *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
-    *fLog << err << fCalibrate << flush;
 
     if (!fIntensCharge)
@@ -207,5 +189,5 @@
     fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam");
     if (!fRelTimeCalc)
-      fRelTimeCalc   = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
+      fRelTimeCalc   = (MCalibrationRelTimeCalc*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
 
     *fLog << inf << "Found MHCalibrationRelTimeCam ... " << flush;
@@ -257,9 +239,4 @@
 Int_t MCalibCalcFromPast::Process()
 {
-
-  /*
-  if (!(fTrigPattern->GetPrescaled() & MTriggerPattern::kCalibration))
-    return kTRUE;
-  */
 
   if (fNumEvents++ < fNumEventsDump)
Index: trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h	(revision 5856)
+++ trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h	(revision 5857)
@@ -8,5 +8,4 @@
 class MParList;
 class MGeomCam;
-class MRawRunHeader;
 class MPedCalcFromLoGain;
 class MCalibrationChargeCalc;
@@ -25,5 +24,4 @@
   static const UInt_t fgNumEventsDump;               //! Default for fNumEventsDump
   
-  MRawRunHeader                   *fRunHeader;       //! Run Header
   MGeomCam                        *fGeom;            //! Camera Geometry
   MParList                        *fParList;         //! Parameter List
Index: trunk/MagicSoft/Mars/mcalib/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mcalib/Makefile	(revision 5856)
+++ trunk/MagicSoft/Mars/mcalib/Makefile	(revision 5857)
@@ -21,5 +21,6 @@
 INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../mhcalib -I../mhbase \
            -I../manalysis -I../mraw -I../mtools -I../mmc -I../mhist  \
-           -I../mimage -I../msignal -I../mbadpixels -I../mpedestal
+           -I../mimage -I../msignal -I../mbadpixels -I../mpedestal \
+           -I../mtrigger
 
 # mhbase:    MBinning MH 
@@ -34,4 +35,5 @@
 	   MCalibColorSet.cc \
 	   MCalibColorSteer.cc \
+	   MCalibCalcFromPast.cc \
 	   MCalibrateData.cc \
 	   MCalibrateRelTimes.cc \