Changeset 3254

Timestamp:

02/21/04 01:58:06 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMcCalibrationUpdate.h (modified) (2 diffs)
• mcalib/MCalibrationCalc.cc (deleted)
• mcalib/MCalibrationCalc.h (deleted)
• mjobs/MJExtractSignal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

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

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -6 +6 @@
 #endif
 
-class MCalibrationCam;
+class MCalibrationChargeCam;
 class MPedPhotCam;
 class MGeomCam;
@@ -20 +20 @@
     Bool_t ReInit(MParList *pList);
 
-    MCalibrationCam     *fCalCam;
-    MPedPhotCam         *fPedPhotCam;
-    MGeomCam            *fGeom;
-    MMcFadcHeader       *fHeaderFadc;
-    MExtractedSignalCam *fSignalCam;
+    MCalibrationChargeCam *fCalCam;
+    MPedPhotCam           *fPedPhotCam;
+    MGeomCam              *fGeom;
+    MMcFadcHeader         *fHeaderFadc;
+    MExtractedSignalCam   *fSignalCam;
 
     Float_t fADC2PhInner; // Conversion factor from ADC counts to photons

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -46 +46 @@
 
 #include "MPedestalCam.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MHCamEvent.h"
 
@@ -401 +401 @@
 }
 
-Bool_t MJExtractSignal::ProcessP(MPedestalCam &pedcam, MCalibrationCam &calcam)
+Bool_t MJExtractSignal::ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam)
 {
     if (!ReadPedPhotCam())
@@ -409 +409 @@
 }
 
-Bool_t MJExtractSignal::ProcessFileP(MPedestalCam &pedcam, MCalibrationCam &calcam)
+Bool_t MJExtractSignal::ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam)
 {
     if (!fRuns)
@@ -491 +491 @@
 
 /*
-Bool_t MJExtractSignal::ProcessFile(MPedestalCam *pedcam, MCalibrationCam *calcam)
+Bool_t MJExtractSignal::ProcessFile(MPedestalCam *pedcam, MCalibrationChargeCam *calcam)
 {
     if (!fRuns)