Changeset 17643 for trunk

Timestamp:

04/03/14 11:54:28 (10 years ago)

Author:

ftemme

Message:

Added a MParameterD for the Crosstalkcoefficient, so that MSimCamera can access the crosstalk coefficient for the calculation of the accoupling.

Location:

trunk/Mars/msimcamera

Files:

• MSimAPD.cc (modified) (2 diffs)
• MSimAPD.h (modified) (2 diffs)
• MSimCamera.cc (modified) (4 diffs)
• MSimCamera.h (modified) (2 diffs)

trunk/Mars/msimcamera/MSimAPD.cc

@@ -70 +70 @@
 #include "MAvalanchePhotoDiode.h"
 
+#include "MParameters.h"
+
 ClassImp(MSimAPD);
 
@@ -126 +128 @@
         return kFALSE;
     }
+
+    fCrosstalkCoeffParam = (MParameterD*)pList->FindCreateObj("MParameterD","CrosstalkCoeffParam");
+    if (!fCrosstalkCoeffParam)
+    {
+        *fLog << err << "CrosstalkCoeffParam [MParameterD] not found... aborting." << endl;
+        return kFALSE;
+    }
+    fCrosstalkCoeffParam->SetVal(fCrosstalkCoeff);
 
     fRates = (MPedestalCam*)pList->FindObject("AccidentalPhotonRates", "MPedestalCam");

trunk/Mars/msimcamera/MSimAPD.h

@@ -15 +15 @@
 class MPhotonStatistics;
 class MPedestalCam;
+class MParameterD;
 
 class MSimAPD : public MTask
@@ -23 +24 @@
     MPhotonStatistics *fStat;    //! Storing event statistics (needed for the start-time)
     MPedestalCam      *fRates;   //! Accidental Photon Rates for all pixels
+
+    MParameterD       *fCrosstalkCoeffParam;
 
     TObjArray fAPDs;             //! Array keeping the necessary number of APDs

trunk/Mars/msimcamera/MSimCamera.cc

@@ -61 +61 @@
 #include "MAnalogChannels.h"
 
+#include "MParameters.h"
+
 #include "MMcEvt.hxx"            // To be replaced by a CheObs class
 #include "MRawRunHeader.h"
@@ -74 +76 @@
 MSimCamera::MSimCamera(const char* name, const char *title)
     : fEvt(0), fStat(0), fRunHeader(0), fElectronicNoise(0), fGain(0),
-    fCamera(0), fMcEvt(0), fSpline(0), fBaselineGain(kFALSE),
+      fCamera(0), fMcEvt(0),fCrosstalkCoeffParam(0), fSpline(0), fBaselineGain(kFALSE),
       fDefaultOffset(-1), fDefaultNoise(-1), fDefaultGain(-1), fACFudgeFactor(0),
       fACTimeConstant(0)
@@ -140 +142 @@
     {
         *fLog << err << "AccidentalPhotonRates [MPedestalCam] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fCrosstalkCoeffParam = (MParameterD*)pList->FindCreateObj("MParameterD","CrosstalkCoeffParam");
+    if (!fCrosstalkCoeffParam)
+    {
+        *fLog << err << "CrosstalkCoeffParam [MParameterD] not found... aborting." << endl;
         return kFALSE;
     }
@@ -273 +282 @@
         }
 
-        // FIXME: I don't know how to get the variable fCrosstalkProb from
-        // the class APD (see MAvalanchePhotoDiode.h), because there is no
-        // getter for the APD array(fAPDs) in MSimAPD.
-        // So I set the crossTalkProb hardcoded to the value 0.15, which is
-        // equal to the value of the apd of type 4
-        const Double_t crossTalkProb = 0.15;
+        // Get the CrosstalkCoefficient Parameter
+        const Double_t crossTalkProb = fCrosstalkCoeffParam->GetVal();
 
         // To get the area of one Pulse, I only need to calculate the Integral

trunk/Mars/msimcamera/MSimCamera.h

@@ -15 +15 @@
 
 class MSpline3;
+class MParameterD;
 
 class MSimCamera : public MTask
@@ -28 +29 @@
     MAnalogChannels   *fCamera;          //! Output of the analog signals
     MMcEvt            *fMcEvt;           //! For information stored in MMcEvt
+
+    MParameterD       *fCrosstalkCoeffParam;
 
     const MSpline3    *fSpline;          // Pulse Shape