Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4166)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4167)
@@ -25,5 +25,9 @@
        calibration
 
-
+   * mjobs/MExtractSignal.[h,cc]
+     - made changes in MProcessFileP such that it fits with the new 
+       calibration. THIS IS ONLY A TEMPORARY SOLUTION. PEDESTALS AND 
+       DATA FILES MUST BE TREATED EQUALLY! OTHERWISE THERE IS NOT 
+       MATCHING FOR THE HIT CLEANING!!!
 
  2004/05/24: Javier Rico
Index: trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc	(revision 4166)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc	(revision 4167)
@@ -47,4 +47,5 @@
 #include "MPedestalCam.h"
 #include "MCalibrationChargeCam.h"
+#include "MCalibrationQECam.h"
 #include "MHCamEvent.h"
 
@@ -139,86 +140,87 @@
 Bool_t MJExtractSignal::ProcessFileD(MPedestalCam &pedcam)
 {
-    if (!fRuns)
-    {
-        *fLog << err << "No Runs choosen... abort." << endl;
-        return kFALSE;
-    }
-    if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
+
+  if (!fRuns)
+    {
+      *fLog << err << "No Runs choosen... abort." << endl;
+      return kFALSE;
+    }
+  if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
         *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
         return kFALSE;
     }
-
-    *fLog << inf;
-    fLog->Separator(GetDescriptor());
-    *fLog << "Calculate MExtractedSignalCam from Runs " << fRuns->GetRunsAsString() << endl;
-    *fLog << endl;
-
-    // Setup Lists
-    MParList plist;
-    plist.AddToList(&pedcam);
-
-    MTaskList tlist;
-    plist.AddToList(&tlist);
-
-    // Setup Parameters
-
-    // Make sure, that at least an empty MBadPixelsCam is available
-    // This is necessary for input which don't contain a MBadPixelsCam
-    MBadPixelsCam badcam;
-    plist.AddToList(&badcam);
-
-    // Setup Task-lists
-    MReadMarsFile read("Events");
-    read.DisableAutoScheme();
-    static_cast<MRead&>(read).AddFiles(*fRuns);
-
-    MGeomApply      apply; // Only necessary to craete geometry
-    MBadPixelsMerge merge(&fBadPixels);
-    MExtractSignal  extract;
-
-    MHCamEvent evt("ExtSignal");
-    evt.SetType(0);
-    MFillH fill(&evt, "MExtractedSignalCam");
-
-    MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
-    write.AddContainer("MExtractedSignalCam", "Events");
-    write.AddContainer("MTime",               "Events");
-    write.AddContainer("MRawEvtHeader",       "Events");
-    write.AddContainer("MPedestalCam",        "RunHeaders");
-    write.AddContainer("MRawRunHeader",       "RunHeaders");
-    write.AddContainer("MBadPixelsCam",       "RunHeaders");
-
-    tlist.AddToList(&read);
-    tlist.AddToList(&apply);
-    tlist.AddToList(&merge);
-    tlist.AddToList(&extract);
-    if (TestBit(kEnableGraphicalOutput))
-        tlist.AddToList(&fill);
-    tlist.AddToList(&write);
-
-    // Create and setup the eventloop
-    MEvtLoop evtloop(fName);
-    evtloop.SetParList(&plist);
-    evtloop.SetDisplay(fDisplay);
-    evtloop.SetLogStream(fLog);
-
-    // Execute first analysis
-    if (!evtloop.Eventloop())
-    {
-        *fLog << err << GetDescriptor() << ": Failed." << endl;
-        return kFALSE;
-    }
-
-    tlist.PrintStatistics();
-
-    //DisplayResult(plist);
-
-    //if (!WriteResult())
-    //    return kFALSE;
-
-    *fLog << inf << GetDescriptor() << ": Done." << endl;
-
-    return kTRUE;
+  
+  *fLog << inf;
+  fLog->Separator(GetDescriptor());
+  *fLog << "Calculate MExtractedSignalCam from Runs " << fRuns->GetRunsAsString() << endl;
+  *fLog << endl;
+  
+  // Setup Lists
+  MParList plist;
+  plist.AddToList(&pedcam);
+  
+  MTaskList tlist;
+  plist.AddToList(&tlist);
+
+  // Setup Parameters
+  
+  // Make sure, that at least an empty MBadPixelsCam is available
+  // This is necessary for input which don't contain a MBadPixelsCam
+  MBadPixelsCam badcam;
+  plist.AddToList(&badcam);
+  
+  // Setup Task-lists
+  MReadMarsFile read("Events");
+  read.DisableAutoScheme();
+  static_cast<MRead&>(read).AddFiles(*fRuns);
+  
+  MGeomApply      apply; // Only necessary to craete geometry
+  MBadPixelsMerge merge(&fBadPixels);
+  MExtractSignal  extract;
+  
+  MHCamEvent evt("ExtSignal");
+  evt.SetType(0);
+  MFillH fill(&evt, "MExtractedSignalCam");
+  
+  MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
+  write.AddContainer("MExtractedSignalCam", "Events");
+  write.AddContainer("MTime",               "Events");
+  write.AddContainer("MRawEvtHeader",       "Events");
+  write.AddContainer("MPedestalCam",        "RunHeaders");
+  write.AddContainer("MRawRunHeader",       "RunHeaders");
+  write.AddContainer("MBadPixelsCam",       "RunHeaders");
+  
+  tlist.AddToList(&read);
+  tlist.AddToList(&apply);
+  tlist.AddToList(&merge);
+  tlist.AddToList(&extract);
+  if (TestBit(kEnableGraphicalOutput))
+    tlist.AddToList(&fill);
+  tlist.AddToList(&write);
+  
+  // Create and setup the eventloop
+  MEvtLoop evtloop(fName);
+  evtloop.SetParList(&plist);
+  evtloop.SetDisplay(fDisplay);
+  evtloop.SetLogStream(fLog);
+  
+  // Execute first analysis
+  if (!evtloop.Eventloop())
+    {
+      *fLog << err << GetDescriptor() << ": Failed." << endl;
+      return kFALSE;
+    }
+  
+  tlist.PrintStatistics();
+  
+  //DisplayResult(plist);
+  
+  //if (!WriteResult())
+  //    return kFALSE;
+  
+  *fLog << inf << GetDescriptor() << ": Done." << endl;
+  
+  return kTRUE;
 }
 
@@ -259,13 +261,13 @@
 }
 
-Bool_t MJExtractSignal::ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam)
+Bool_t MJExtractSignal::ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam)
 {
     if (!ReadPedPhotCam())
-        return ProcessFileP(pedcam, calcam);
-
-    return kTRUE;
-}
-
-Bool_t MJExtractSignal::ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam)
+        return ProcessFileP(pedcam, calcam, qecam);
+
+    return kTRUE;
+}
+
+Bool_t MJExtractSignal::ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam)
 {
     if (!fRuns)
@@ -293,4 +295,5 @@
     plist.AddToList(&pedcam);
     plist.AddToList(&calcam);
+    plist.AddToList(&qecam);
     plist.AddToList(&fPedPhotCam);
     plist.AddToList(&fBadPixels);
Index: trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h	(revision 4166)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h	(revision 4167)
@@ -16,4 +16,5 @@
 class MPedestalCam;
 class MCalibrationChargeCam;
+class MCalibrationQECam;
 
 class MJExtractSignal : public MParContainer
@@ -33,5 +34,5 @@
 
     Bool_t ProcessFileD(MPedestalCam &pedcam);
-    Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam);
+    Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
 
 public:
@@ -50,5 +51,5 @@
 
     Bool_t ProcessD(MPedestalCam &pedcam);
-    Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam);
+    Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
 
     ClassDef(MJExtractSignal, 0) // Tool to create a pedestal file (MPedestalCam)