Changeset 3252 for trunk/MagicSoft

Timestamp:

02/21/04 01:46:30 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
    * mcalib/MCalibrateData.[h,cc]
    * mcalib/MMcCalibrationCalc.[h,cc]
+   * mjobs/MJCalibration.[h,cc]
    * manalysis/MGeomApply.cc
    * mcalib/Makefile

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -2 +2 @@
 #define MARS_MJCalibration
 
-#ifndef MARS_MCalibrationCam
-#include "MCalibrationCam.h"
+#ifndef MARS_MCalibrationChargeCam
+#include "MCalibrationChargeCam.h"
 #endif
 #ifndef MARS_MBadPixelsCam
@@ -23 +23 @@
     MRunIter *fRuns;
 
-    MCalibrationCam fCalibrationCam;
-    MBadPixelsCam   fBadPixels;
+    MCalibrationChargeCam fCalibrationCam;
+    MBadPixelsCam         fBadPixels;
 
     void DrawProjection(MHCamera *obj1, Int_t fit) const;
@@ -40 +40 @@
     TString GetOutputFile() const;
 
-    const MCalibrationCam &GetCalibrationCam() const { return fCalibrationCam; }
-    const MBadPixelsCam   &GetBadPixels()      const { return fBadPixels; }
+    const MCalibrationChargeCam &GetCalibrationCam() const { return fCalibrationCam; }
+    const MBadPixelsCam         &GetBadPixels()      const { return fBadPixels; }
 
     void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }