Changeset 3249 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/21/04 01:29:16 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrate.cc (modified) (4 diffs)
• MCalibrate.h (modified) (2 diffs)
• MCalibrateData.cc (modified) (3 diffs)
• MCalibrateData.h (modified) (2 diffs)
• MCalibrationCam.h (deleted)
• MCalibrationPINDiode.cc (deleted)
• MCalibrationPINDiode.h (deleted)
• MMcCalibrationCalc.cc (modified) (3 diffs)
• MMcCalibrationCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -35 +35 @@
 //   Input Containers:
 //    MExtractedSingal
-//    MCalibrationCam
+//    MCalibrationChargeCam
 //
 //   Output Containers:
@@ -51 +51 @@
 #include "MGeomCam.h"
 
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MCalibrationPix.h"
 
@@ -76 +76 @@
 // The PreProcess searches for the following input containers:
 //  - MGeomCam
-//  - MCalibrationCam
+//  - MCalibrationChargeCam
 //  - MExtractedSignalCam
 //
@@ -98 +98 @@
       {
 
-        fCalibrations = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam"));
+        fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
         if (!fCalibrations)
           {
-            *fLog << err << AddSerialNumber("MCalibrationCam") << " not found ... aborting." << endl;
+            *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl;
             return kFALSE;
           }

trunk/MagicSoft/Mars/mcalib/MCalibrate.h

@@ -15 +15 @@
 
 class MGeomCam;
-class MCalibrationCam;
+class MCalibrationChargeCam;
 class MExtractedSignalCam;
 class MCerPhotEvt;
@@ -22 +22 @@
 {
 private:
-    MGeomCam            *fGeomCam;      // Camera geometry container
-    MCalibrationCam     *fCalibrations; // Calibration constants 
-    MExtractedSignalCam *fSignals;      // Integrated charge in FADCs counts
-    MCerPhotEvt         *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
+    MGeomCam              *fGeomCam;      // Camera geometry container
+    MCalibrationChargeCam *fCalibrations; // Calibration constants 
+    MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
+    MCerPhotEvt           *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
 
     Float_t fConversionHiLo;

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -60 +60 @@
 #include "MPedestalPix.h"
 
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MCalibrationPix.h"
 
@@ -89 +89 @@
 //  - MGeomCam
 //  - MPedestalCam
-//  - MCalibrationCam
+//  - MCalibrationChargeCam
 //  - MExtractedSignalCam
 //
@@ -116 +116 @@
    if(fCalibrationMode>kNone)
       {
-        fCalibrations = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam"));
+        fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
         if (!fCalibrations)
           {
-            *fLog << err << AddSerialNumber("MCalibrationCam") << " not found ... aborting." << endl;
+            *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl;
             return kFALSE;
           }

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -24 +24 @@
 class MGeomCam;
 class MPedestalCam;
-class MCalibrationCam;
+class MCalibrationChargeCam;
 class MExtractedSignalCam;
 
@@ -33 +33 @@
 {
 private:
-    MPedestalCam        *fPedestal;     // Pedestals/slice [ADC counts]
-    MCalibrationCam     *fCalibrations; // Calibration constants 
-    MExtractedSignalCam *fSignals;      // Integrated charge in FADCs counts
+    MPedestalCam          *fPedestal;     // Pedestals/slice [ADC counts]
+    MCalibrationChargeCam *fCalibrations; // Calibration constants 
+    MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
 
     MPedPhotCam         *fPedPhot;      // Pedestals/(used slices) [photons]

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -35 +35 @@
 //
 //  Output Containers:
-//   MCalibrationCam
+//   MCalibrationChargeCam
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -48 +48 @@
 
 #include "MCalibrationPix.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 
 #include "MGeomCam.h"
@@ -99 +99 @@
     fADC2Phot = 0;
 
-    fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
+    fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (!fCalCam)
     {
-        *fLog << err << AddSerialNumber("MCalibrationCam") << "not found... aborting." << endl;
+        *fLog << err << AddSerialNumber("MCalibrationChargeCam") << "not found... aborting." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h

@@ -6 +6 @@
 #endif
 
-class MCalibrationCam;
+class MCalibrationChargeCam;
 class MGeomCam;
 class MHillas;
@@ -18 +18 @@
 {
 private:
-    MCalibrationCam     *fCalCam;
-    MGeomCam            *fGeom;
-    MHillas             *fHillas;
-    MNewImagePar        *fNew;
-    MMcEvt              *fMcEvt;
-    MMcFadcHeader       *fHeaderFadc;
+    MCalibrationChargeCam     *fCalCam;
+    MGeomCam                  *fGeom;
+    MHillas                   *fHillas;
+    MNewImagePar              *fNew;
+    MMcEvt                    *fMcEvt;
+    MMcFadcHeader             *fHeaderFadc;
 
     Float_t fADC2Phot;
@@ -32 +32 @@
     Bool_t CheckRunType(MParList *pList) const;
     Int_t  PreProcess(MParList *pList);
+    Bool_t ReInit(MParList *pList);
     Int_t  Process();
     Int_t  PostProcess();
-    Bool_t ReInit(MParList *pList);
 
 public: