Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4741)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4742)
@@ -28,4 +28,14 @@
                          and SetSourcePosition
 
+
+ 2004/08/26: Markus Gaug
+
+   * mjobs/MJExtractCalibTest.[h,cc]
+     - derived from MJob
+     - removed obsolete code (which has been moved to MJob)
+
+   * macros/calibration.C
+     - adapt code to changes done in MJob
+     
 
  2004/08/26: Thomas Bretz
Index: trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc	(revision 4741)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc	(revision 4742)
@@ -71,5 +71,5 @@
 #include "MContinue.h"
 #include "MFillH.h"
-#include "MCalibrate.h"
+#include "MCalibrateData.h"
 #include "MCalibrateRelTimes.h"
 #include "MPedPhotCalc.h"
@@ -233,17 +233,15 @@
 
 
-void MJExtractCalibTest::SetOutputPath(const char *path)
-{
-  fOutputPath = path;
-  if (fOutputPath.EndsWith("/"))
-    fOutputPath = fOutputPath(0, fOutputPath.Length()-1);
-}
-
 const char* MJExtractCalibTest::GetOutputFile() const
 {
+
+  if (fSequence.IsValid())
+    return Form("%s/test%06d.root", (const char*)fPathOut, fSequence.GetSequence());
+  
   if (!fRuns)
     return "";
   
-  return Form("%s/%s-Test.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
+  return Form("%s/%s-Test.root", (const char*)fPathOut, (const char*)fRuns->GetRunsAsFileName());
+  
 }
 
@@ -302,13 +300,17 @@
   MGeomApply            apply; // Only necessary to craete geometry
   MExtractSlidingWindow extract2;
-  MCalibrate            photcalc;
-  photcalc.SetCalibrationMode(MCalibrate::kFfactor);
+  MCalibrateData        photcalc;
+  photcalc.SetCalibrationMode(MCalibrateData::kFfactor);
   MPedPhotCalc          pedphotcalc;  
   MBadPixelsTreat       badtreat;
   badtreat.SetUseInterpolation();
   MCalibrationTestCalc  testcalc;
-  testcalc.SetOutputPath(fOutputPath);
-  testcalc.SetOutputFile(Form("%s-TestCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
-
+
+  if (!fSequence.IsValid())
+    {
+      testcalc.SetOutputPath(fPathOut);
+      testcalc.SetOutputFile(Form("%s-TestCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
+    }
+  
   MHCamEvent evt("ExtSignal");
   evt.SetType(0);
@@ -515,5 +517,5 @@
 {
     
-    if (fOutputPath.IsNull())
+    if (fPathOut.IsNull())
         return kTRUE;
     
@@ -549,5 +551,5 @@
 {
     
-    if (fOutputPath.IsNull())
+    if (fPathOut.IsNull())
         return kTRUE;
     
@@ -575,2 +577,11 @@
 
 
+Bool_t MJExtractCalibTest::CheckEnv()
+{
+    if (HasEnv("DataCheckDisplay"))
+      fDisplayType = GetEnv("DataCheckDisplay", kFALSE) ? kDataCheckDisplay : kNormalDisplay;
+
+    SetOverwrite(GetEnv("Overwrite", fOverwrite));
+
+    return MJob::CheckEnv();
+}
Index: trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h	(revision 4741)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h	(revision 4742)
@@ -2,4 +2,7 @@
 #define MARS_MJExtractCalibTest
 
+#ifndef MARS_MJob
+#include "MJob.h"
+#endif
 #ifndef MARS_MCalibrationTestCam
 #include "MCalibrationTestCam.h"
@@ -23,9 +26,8 @@
 class MExtractor;
 class MExtractTime;
-class MJExtractCalibTest : public MParContainer
+class MJExtractCalibTest : public MJob
 {
 private:
 
-  TString fOutputPath;
   Bool_t  fUseCosmicsFilter;
   
@@ -58,9 +60,10 @@
   Bool_t ProcessFileT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam);  
 
+  Bool_t CheckEnv();
+  
 public:
   MJExtractCalibTest(const char *name=NULL, const char *title=NULL);
   
   void SetInput(MRunIter *iter) { fRuns = iter; }
-  void SetOutputPath(const char *path=".");
   
   const char* GetOutputFile() const;