Changeset 6214 for trunk/MagicSoft

Timestamp:

02/02/05 18:42:09 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.cc (modified) (4 diffs)
• mhcalib/MHCalibrationChargeBlindPix.h (modified) (1 diff)
• mhcalib/MHCalibrationRelTimeCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -54 +54 @@
    * mjobs/MJCalibrateSignal.cc
      - put a compiler warning about the default cal. to photo-electrons
+
+   * callisto.cc
+     - add new flag "--use-test" to enable the MJCalibTest facility
+       (default: not used)
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -19 +19 @@
 #include "MJCalibration.h"
 #include "MJCalibrateSignal.h"
+#include "MJCalibTest.h"
 
 using namespace std;
@@ -71 +72 @@
     gLog << "   --print-seq               Print Sequence information" << endl;
     gLog << "   --print-files             Print Files taken from Sequence" << endl;
-    gLog << "   --print-only              Do not excute anything except print" << endl;
+    gLog << "   --print-only              Do not execute anything except print" << endl;
+    gLog << "   --use-test                Apply cal. const. to the same cal. file (for testing)" << endl;
     gLog << "   --config=callisto.rc      Resource file [default=callisto.rc]" << endl;
     gLog << endl;
@@ -117 +119 @@
     //const Bool_t  kPrintFiles = arg.HasOnlyAndRemove("--print-files");
     //const Bool_t  kPrintOnly  = arg.HasOnlyAndRemove("--print-only");
+    const Bool_t  kUseTest    = arg.HasOnlyAndRemove("--use-test");
     const Bool_t  kDebugEnv   = arg.HasOnlyAndRemove("--debug-env");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
@@ -373 +376 @@
             return 1;
         }
+        MJCalibTest job4(Form("MJCalibTest #%d", seq.GetSequence()));
+        if (kUseTest)
+          {
+            job4.SetBadPixels(job3.GetBadPixels());            
+            job4.SetSequence(seq);
+            job4.SetEnv(kConfig);
+            job4.SetEnvDebug(kDebugEnv);
+            job4.SetDisplay(d);;
+            job4.SetOverwrite(kOverwrite);
+            job4.SetPathOut(kOutpathC);
+            job4.SetPathData(kInpathD);
+            //            job4.SetPathIn(kInpathC); 
+
+            if (!job4.ProcessFile(job1.GetPedestalCam()))
+              {
+                gLog << err << "Calculation of calibration failed." << endl << endl;
+                return -1;
+              }
+            
+            if (!job4.GetDisplay())
+              {
+                gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+                return 1;
+              }
+          }
     }
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h

@@ -71 +71 @@
   
   TPaveText *fFitLegend;                     //! Some legend to display the fit results
-  TH1F      *fHSinglePheFADCSlices;          //! A histogram created and deleted only in Draw()
-  TH1F      *fHPedestalFADCSlices;           //! A histogram created and deleted only in Draw()
+  TH1F      *fHSinglePheFADCSlices;          // A histogram created and deleted only in Draw()
+  TH1F      *fHPedestalFADCSlices;           // A histogram created and deleted only in Draw()
 
   // Fit

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -130 +130 @@
 const Axis_t  MHCalibrationRelTimeCam::fgFirst      = -4.975;
 const Axis_t  MHCalibrationRelTimeCam::fgLast       = 10.025;
-const Float_t MHCalibrationRelTimeCam::fgProbLimit  = 0.00000001;
+const Float_t MHCalibrationRelTimeCam::fgProbLimit  = 0.0000000001;
 const TString MHCalibrationRelTimeCam::gsHistName   = "RelTime";
 const TString MHCalibrationRelTimeCam::gsHistTitle  = "Arr. Times";