Changeset 9369 for trunk/MagicSoft/Mars/msimcamera

Timestamp:

03/01/09 21:54:27 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msimcamera

Files:

• MSimAPD.cc (modified) (4 diffs)
• MSimAPD.h (modified) (1 diff)

trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc

@@ -77 +77 @@
 //
 MSimAPD::MSimAPD(const char* name, const char *title)
-: fGeom(0), fEvt(0), fStat(0)
+: fGeom(0), fEvt(0), fStat(0), fType(1)
 {
     fName  = name  ? name  : "MSimAPD";
@@ -131 +131 @@
 Bool_t MSimAPD::ReInit(MParList *plist)
 {
-    if (UInt_t(fAPDs.GetEntriesFast())!=fGeom->GetNumPixels())
-    {
-        fAPDs.Delete();
-
-        // FIXME:
-        //   * initialize an empty APD and read the APD setup from a file to
-        //     allow different APDs.
-        //   * Make the arguments a data member of MSimAPD
-
-        for (UInt_t i=0; i<fGeom->GetNumPixels(); i++)
-            //fAPDs.Add(new APD(60, 0.2, 3, 8.75));
-            //fAPDs.Add(new APD(60/2, 0.2, 3e-9, 8.75e-9*4));
-            fAPDs.Add(new APD(60/2, 0.2, 3, 8.75*4));
-    }
+    if (UInt_t(fAPDs.GetEntriesFast())==fGeom->GetNumPixels())
+        return kTRUE;
+
+    fAPDs.Delete();
+
+    // FIXME:
+    //   * initialize an empty APD and read the APD setup from a file to
+    //     allow different APDs.
+    //   * Make the arguments a data member of MSimAPD
+
+    Int_t   ncells    = 0;
+    Float_t crosstalk = 0;
+    Float_t deadtime  = 0;
+    Float_t recovery  = 0;
+
+    switch (fType)
+    {
+    case 1:
+        ncells    = 30;
+        crosstalk = 0.2;
+        deadtime  = 3;
+        recovery  = 8.75*4;
+        break;
+
+    case 2:
+        ncells    = 60;
+        crosstalk = 0.2;
+        deadtime  = 3;
+        recovery  = 8.75;
+        break;
+
+    default:
+        *fLog << err << "ERROR - APD type " << fType << " undefined." << endl;
+        return kFALSE;
+    }
+
+    for (UInt_t i=0; i<fGeom->GetNumPixels(); i++)
+        fAPDs.Add(new APD(ncells, crosstalk, deadtime, recovery));
 
     return kTRUE;
@@ -216 +240 @@
 //
 // NameGeomCam
+// Type: 1
 //
 Int_t MSimAPD::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
@@ -226 +251 @@
     }
 
+    if (IsEnvDefined(env, prefix, "Type", print))
+    {
+        rc = kTRUE;
+        fType = GetEnvValue(env, prefix, "Type", fType);
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/msimcamera/MSimAPD.h

@@ -28 +28 @@
     Double_t fFreq;              // Frequency of random phtons which hit the APDs
 
+    Int_t fType;
+
     // MParContainer
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);