Changeset 6919 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/08/05 11:55:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (3 diffs)
• MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -344 +344 @@
     MHCalibrationChargePINDiode hpndiod;
     MHCalibrationRelTimeCam     hrelcam;
+
+    hchacam.SetOscillations(kFALSE);
+    hbndcam.SetOscillations(kFALSE);
+    hrelcam.SetOscillations(kFALSE);
 
     MCalibrationChargeCam      calcam;
@@ -730 +734 @@
         filcam.SetFilter(&fcalib);
         filtme.SetFilter(&fcalib);
-        if (IsUseBlindPixel())
-            filbnd.SetFilter(&fcalib);
-        if (IsUsePINDiode())
-            filpin.SetFilter(&fcalib);
+        filbnd.SetFilter(&fcalib);
+        filpin.SetFilter(&fcalib);
         chcalc.SetFilter(&fcalib);
         recalc.SetFilter(&fcalib);
@@ -745 +747 @@
         if (fIsRelTimesUpdate)
           tlist2.AddToList(&filtme);
-        tlist2.AddToList(&filbnd);
-        tlist2.AddToList(&filpin);
+        if (IsUseBlindPixel())
+            tlist2.AddToList(&filbnd);
+        if (IsUsePINDiode())
+            tlist2.AddToList(&filpin);
         tlist2.AddToList(&chcalc);
         if (fIsRelTimesUpdate)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -327 +327 @@
     MHCamera disp4 (geomcam, "RSigmaPerCharge",   "Reduced Sigma per Charge");
     MHCamera disp5 (geomcam, "NumPhes",           "Number Photo-electrons");
-    MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Conversion Factor to Phes");
+    MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Phes per Charge (before flat-field)");
     MHCamera disp7 (geomcam, "TotalFFactor",      "Total F-Factor(F-Factor Method)");
     MHCamera disp8 (geomcam, "CascadesQEFFactor", "Cascades QE (F-Factor Method)");
@@ -452 +452 @@
 
     disp5.SetYTitle("Photo-electons [1]");
-    disp6.SetYTitle("Conv.Factor [PhE/FADC cnts]");
+    disp6.SetYTitle("Phes/<Q> [FADC cnts^{-1}]");
     disp7.SetYTitle("Total F-Factor [1]");