Changeset 4773

Timestamp:

08/27/04 17:57:22 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/mccalibrate.C (modified) (2 diffs)
• macros/pedphotcalc.C (modified) (2 diffs)
• macros/starmc.C (modified) (1 diff)
• mjobs/MJExtractSignal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/mccalibrate.C

@@ -103 +103 @@
   MMcCalibrationUpdate  mccalibupdate;
 
-  MCalibrate calib; 
-  // MCalibrate transforms signals from ADC counts into photons. In the first
+  MCalibrateData calib; 
+  // MCalibrateData transforms signals from ADC counts into photons. In the first
   // loop it applies a "dummy" calibration supplied by MMcCalibrationUpdate, just 
   // to equalize inner and outer pixels. At the end of the first loop, in the
@@ -110 +110 @@
   // are calculated.
 
-  calib.SetCalibrationMode(MCalibrate::kFfactor);
+  calib.SetCalibrationMode(MCalibrateData::kFfactor);
 
   MImgCleanStd clean;

trunk/MagicSoft/Mars/macros/pedphotcalc.C

@@ -68 +68 @@
 #include "MExtractFixedWindow.h" 
 #include "MCerPhotEvt.h"
-#include "MCalibrate.h"
+#include "MCalibrateData.h"
 #include "MPedPhotCalc.h"
 #include "MPedPhotCam.h"
@@ -316 +316 @@
   static_cast<MRead&>(read3).AddFiles(pruns);  
 
-  MCalibrate      photcalc;
-  photcalc.SetCalibrationMode(MCalibrate::kFfactor);
+  MCalibrateData  photcalc;
+  photcalc.SetCalibrationMode(MCalibrateData::kFfactor);
   MPedPhotCalc    pedphotcalc;  
 

trunk/MagicSoft/Mars/macros/starmc.C

@@ -121 +121 @@
   MMcCalibrationUpdate  mccalibupdate;
 
-  MCalibrate calib; // Transforms signals from ADC counts into photons.
-  calib.SetCalibrationMode(MCalibrate::kFfactor);
+  MCalibrateData calib; // Transforms signals from ADC counts into photons.
+  calib.SetCalibrationMode(MCalibrateData::kFfactor);
 
   //    MBlindPixelCalc   blind;

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -424 +424 @@
     MGeomApply     apply; // Only necessary to craete geometry
     MExtractSignal extract;
-    MCalibrate     calib;
+    MCalibrateData calib;
     MPedPhotCalc   calc;
 
@@ -492 +492 @@
     MGeomApply     apply; // Only necessary to craete geometry
     MExtractSignal extract;
-    MCalibrate     calib;
+    MCalibrateData  calib;
     MPedPhotCalc   calc;