Changeset 5557 for trunk/MagicSoft/Mars/callisto.cc

Timestamp:

12/03/04 20:11:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/callisto.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/callisto.cc

@@ -280 +280 @@
     {
         //
-        // Calculate pedestal for calibration
-        //
-        MJPedestal job1(Form("MJPedestalC #%d", seq.GetSequence()));
+        // Calculate pedestal for pedestal-calculation and calibration
+        //
+        MJPedestal job1(Form("MJPedestalC1 #%d", seq.GetSequence()));
+        job1.SetNoStorage();
         job1.SetSequence(seq);
         job1.SetEnv(kConfig);
@@ -305 +306 @@
 
         //
-        // Do calibration
-        //
-        MJCalibration job2(Form("MJCalibration #%d", seq.GetSequence()));
+        // Calculate pedestal and pedestal resolution
+        //
+        MJPedestal job2(Form("MJPedestalC2 #%d", seq.GetSequence()));
+        job2.SetNoStorage();
         job2.SetSequence(seq);
         job2.SetEnv(kConfig);
         job2.SetEnvDebug(kDebugEnv);
         job2.SetDisplay(d);;
+        job2.SetOverwrite(kOverwrite);
+        job2.SetPathData(kInpathD);
+        // job1.SetPathOut(kOutpathC); // not yet needed
+        // job1.SetPathIn(kInpathC);   // not yet needed
+
+        job2.SetExtractorResolution();
+        job2.SetExtractor(job1.GetExtractor());
+        job2.SetPedestals(job1.GetPedestalCam());
         job2.SetBadPixels(job1.GetBadPixels());
-        job2.SetOverwrite(kOverwrite);
-        job2.SetPathOut(kOutpathC);
-        job2.SetPathData(kInpathD);
+
+        if (!job2.ProcessFile())
+        {
+            gLog << err << "Calculation of pedestal resolution failed." << endl << endl;
+            return -1;
+        }
+
+        if (!job2.GetDisplay())
+        {
+            gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+            return 1;
+        }
+
+        //
+        // Do calibration
+        //
+        MJCalibration job3(Form("MJCalibration #%d", seq.GetSequence()));
+        job3.SetSequence(seq);
+        job3.SetEnv(kConfig);
+        job3.SetEnvDebug(kDebugEnv);
+        job3.SetDisplay(d);;
+        job3.SetOverwrite(kOverwrite);
+        job3.SetPathOut(kOutpathC);
+        job3.SetPathData(kInpathD);
         // job2.SetPathIn(kInpathC); // not yet needed
 
-        if (!job2.ProcessFile(job1.GetPedestalCam()))
+        job3.SetBadPixels(job2.GetBadPixels());
+        job3.SetExtractor(job2.GetExtractor());
+        job3.SetExtractorCam(job2.GetPedestalCam());
+
+        if (!job3.ProcessFile(job1.GetPedestalCam()))
         {
             gLog << err << "Calculation of calibration failed." << endl << endl;
@@ -324 +359 @@
         }
 
-        if (!job2.GetDisplay())
+        if (!job3.GetDisplay())
         {
             gLog << warn << "Display closed by user... execution aborted." << endl << endl;
@@ -338 +373 @@
         // Calculate starting pedestal for data extraction
         //
-        MJPedestal job1(Form("MJPedestalY #%d", seq.GetSequence()));
+        MJPedestal job1(Form("MJPedestalY1 #%d", seq.GetSequence()));
+        job1.SetNoStorage();
         job1.SetSequence(seq);
         job1.SetEnv(kConfig);
         job1.SetEnvDebug(kDebugEnv);
         job1.SetDisplay(d);;
+        job1.SetOverwrite(kOverwrite);
+        job1.SetPathData(kInpathD);
         job1.SetPathIn(kInpathY);
         //job1.SetPathOut(kOutpathY);   // not yet needed
-        job1.SetPathData(kInpathD);
-        job1.SetOverwrite(kOverwrite);
+        job1.SetUseData();
 
         if (!job1.ProcessFile())
@@ -360 +397 @@
         }
 
+        //
+        // Calculate pedestal and pedestal resolution
+        //
+        MJPedestal job2(Form("MJPedestalY2 #%d", seq.GetSequence()));
+        job2.SetNoStorage();
+        job2.SetSequence(seq);
+        job2.SetEnv(kConfig);
+        job2.SetEnvDebug(kDebugEnv);
+        job2.SetDisplay(d);;
+        job2.SetOverwrite(kOverwrite);
+        job2.SetPathData(kInpathD);
+        // job1.SetPathOut(kOutpathC); // not yet needed
+        // job1.SetPathIn(kInpathC);   // not yet needed
+
+        job2.SetUseData();
+        job2.SetExtractorResolution();
+        job2.SetExtractor(job1.GetExtractor());
+        job2.SetPedestals(job1.GetPedestalCam());
+        job2.SetBadPixels(job1.GetBadPixels());
+
+        if (!job2.ProcessFile())
+        {
+            gLog << err << "Calculation of pedestal resolution failed." << endl << endl;
+            return -1;
+        }
+
+        if (!job2.GetDisplay())
+        {
+            gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+            return 1;
+        }
+/*
         //
         // Extract signal and calibrate it
@@ -381 +450 @@
             gLog << warn << "Display closed by user... execution aborted." << endl << endl;
             return 1;
-        }
+        }*/
     }