Changeset 9427 for trunk

Timestamp:

04/16/09 12:14:40 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• msimcamera/MSimAPD.cc (modified) (3 diffs)
• msimcamera/MSimAPD.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -87 +87 @@
      - write rates to an output container
 
-  * ceres.rc:
-    - adapted
+   * ceres.rc:
+     - adapted
+
+   * msimcamera/MSimAPD.[h,cc]:
+     - take the acidental rate from a container
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -32 +32 @@
    * PDEs and mirror reflectivities have been linearily extrapolated
      to match the wavelegth range between 290nm and 900nm
+
+   * There is no default pulse shape anymoe it must be given in 
+     the resource file
 
  ;callisto:

trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc

@@ -66 +66 @@
 #include "MPhotonData.h"
 
+#include "MPedestalCam.h"
+#include "MPedestalPix.h"
+
 #include "MAvalanchePhotoDiode.h"
 
@@ -122 +125 @@
     }
 
+    fRates = (MPedestalCam*)pList->FindObject("AccidentalPhotonRates", "MPedestalCam");
+    if (!fRates)
+    {
+        *fLog << inf;
+        *fLog << "AccidentalPhotonRates [MPedestalCam] not found..." << endl;
+        *fLog << " using " << fFreq << " as default for all G-APDs." << endl;
+    }
+
     return kTRUE;
 }
@@ -197 +208 @@
 
     for (UInt_t idx=0; idx<npix; idx++)
-        static_cast<APD*>(fAPDs.UncheckedAt(idx))->FillRandom(fFreq, fStat->GetTimeFirst());
+    {
+        const Double_t freq = fRates ? (*fRates)[idx].GetPedestal() : fFreq;
+        static_cast<APD*>(fAPDs.UncheckedAt(idx))->FillRandom(freq, fStat->GetTimeFirst());
+    }
 
     // Get number of photons

trunk/MagicSoft/Mars/msimcamera/MSimAPD.h

@@ -14 +14 @@
 class MPhotonEvent;
 class MPhotonStatistics;
+class MPedestalCam;
 
 class MSimAPD : public MTask
@@ -21 +22 @@
     MPhotonEvent      *fEvt;     //! Event storing the photon information
     MPhotonStatistics *fStat;    //! Storing event statistics (needed for the start-time)
+    MPedestalCam      *fRates;   //! Accidental Photon Rates for all pixels
 
     TObjArray fAPDs;             //! Array keeping the necessary number of APDs