Changeset 3768 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/16/04 19:17:36 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcCalibrationUpdate.cc (modified) (7 diffs)
• MMcCalibrationUpdate.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -39 +39 @@
 //   MMcFadcHeader
 //   MRawRunHeader
-//  [MCalibrationCam] (if it existed previously)
+//  [MCalibrationChargeCam] (if it existed previously)
+//  [MCalibrationQECam] (if it existed previously)
 //
 //  Output Containers:
 //   MPedPhotCam
-//  [MCalibrationCam] (if it did not exist previously)
+//  [MCalibrationChargeCam] (if it did not exist previously)
+//  [MCalibrationQECam] (if it did not exist previously)
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -78 +80 @@
     fTitle = title ? title : "Write MC pedestals and conversion factors into MCalibration Container";
 
-    fADC2PhInner = 1.;
-    fADC2PhOuter = 1.;
+    //
+    // As default we set 1 photon = 1 ADC count.
+    // (this will make Size to be in ADC counts if no previous calibration has been made)
+    // Hence:
+    //
+    fADC2PhElInner = MCalibrationQEPix::gkDefaultAverageQE;
+    fADC2PhElOuter = MCalibrationQEPix::gkDefaultAverageQE;
 
     fAmplitude = -1.;
@@ -114 +121 @@
 {
     fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
-    if (!fCalCam)
+    fQECam = (MCalibrationQECam*) pList->FindObject(AddSerialNumber("MCalibrationQECam"));
+
+    if (!fCalCam || !fQECam)
     {
         fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam"));
-        if (!fCalCam)
+        fQECam = (MCalibrationQECam*) pList->FindCreateObj(AddSerialNumber("MCalibrationQECam"));
+        if (!fCalCam || !fQECam)
             return kFALSE;
     }
@@ -123 +133 @@
     {
         fFillCalibrationCam = kFALSE;
-        *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl;
-    }
-
-    fQECam = (MCalibrationQECam*) pList->FindObject(AddSerialNumber("MCalibrationQECam"));
-    if (!fQECam)
-    {
-        fQECam = (MCalibrationQECam*) pList->FindCreateObj(AddSerialNumber("MCalibrationQECam"));
-        if (!fQECam)
-            return kFALSE;
-    }
-    else
-    {
-        fFillQECam = kFALSE;
-        *fLog << inf << AddSerialNumber("MCalibrationQECam") << " already exists... " << endl;
-    }
-
+        *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " and " <<
+          AddSerialNumber("MCalibrationQECam") << " already exist... " << endl;
+    }
 
     fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam"));
@@ -246 +243 @@
 
     if (fOuterPixelsGainScaling)
-      fADC2PhOuter = fADC2PhInner * (fAmplitude / fAmplitudeOuter);
+      fADC2PhElOuter = fADC2PhElInner * (fAmplitude / fAmplitudeOuter);
     else
-      fADC2PhOuter = fADC2PhInner;
+      fADC2PhElOuter = fADC2PhElInner;
 
 
@@ -272 +269 @@
         // and outer pixels).
         //
-        Float_t adc2phot = (fGeom->GetPixRatio(i) < fGeom->GetPixRatio(0))?
-          fADC2PhOuter : fADC2PhInner;
-
-        //
-        // FIXME: This has now to be split into a adc2phe part and a phe2phot (==QE) part
-        //
-        const Float_t qe = MCalibrationQEPix::gkDefaultAverageQE;
-        calpix.SetMeanConvFADC2Phe(adc2phot*qe); // here, the FADC to phe part should go.
+        Float_t adc2photel = (fGeom->GetPixRatio(i) < fGeom->GetPixRatio(0))?
+          fADC2PhElOuter : fADC2PhElInner;
+
+        calpix.SetMeanConvFADC2Phe(adc2photel);
         calpix.SetMeanConvFADC2PheVar(0.);
         calpix.SetMeanFFactorFADC2Phot(0.);
@@ -334 +327 @@
 
         MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
-        //        MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)    (*fQECam) [i];
-
-        Float_t qe       = MCalibrationQEPix::gkDefaultAverageQE;
+        MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i];
+
+        qepix.SetAvNormFFactor(1.);
+        // This factor should convert the default average QE to average QE for a spectrum
+        // like that of Cherenkov light. See the documentration of MCalibrationQEPix.
+
+        Float_t qe       = qepix.GetAverageQE();
         Float_t adc2phot = calpix.GetMeanConvFADC2Phe() / qe;
         Float_t hi2lo    = calpix.GetConversionHiLo();

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -28 +28 @@
     MExtractedSignalCam   *fSignalCam;
 
-    Float_t fADC2PhInner; // Conversion factor from ADC counts to photo-electrons
-    Float_t fADC2PhOuter; // for inner and outer pixels.
+    Float_t fADC2PhElInner; // Conversion factor from ADC counts to photo-electrons
+    Float_t fADC2PhElOuter; // for inner and outer pixels.
 
     Bool_t  fFillCalibrationCam;
-    Bool_t  fFillQECam;    
     Bool_t  fOuterPixelsGainScaling;