Changeset 3688 for trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

Timestamp:

04/08/04 20:44:11 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -50 +50 @@
 #include "MCalibrationChargeCam.h"
 
+#include "MCalibrationQEPix.h"
+#include "MCalibrationQECam.h"
+
 #include "MGeomCam.h"
 #include "MRawRunHeader.h"
@@ -103 +106 @@
     {
         *fLog << err << AddSerialNumber("MCalibrationChargeCam") << "not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fQECam = (MCalibrationQECam*) pList->FindObject(AddSerialNumber("MCalibrationQECam"));
+    if (!fQECam)
+    {
+        *fLog << err << AddSerialNumber("MCalibrationQECam") << "not found... aborting." << endl;
         return kFALSE;
     }
@@ -244 +254 @@
 
     const Int_t num = fCalCam->GetSize();
+
     for (int i=0; i<num; i++)
     {
+
         MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
-
-        const Float_t factor = fADC2Phot*calpix.GetMeanConversionBlindPixelMethod();
-
-        calpix.SetConversionBlindPixelMethod(factor, 0., 0.);
+        //        MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)    (*fQECam) [i];
+
+        const Float_t qe     = MCalibrationQEPix::gkDefaultAverageQE;
+        const Float_t factor = fADC2Phot/qe*calpix.GetMeanConvFADC2Phe();
+        //
+        // FIXME: Now, only the conversion to PHe is stored, need also the quantum efficiency simulated!!!
+        //
+        calpix.SetMeanConvFADC2Phe(factor);
+        calpix.SetMeanConvFADC2PheVar(0.);
+        calpix.SetMeanFFactorFADC2Phot(0.);
     }