Changeset 19534 for trunk

Timestamp:

06/03/19 09:30:20 (5 years ago)

Author:

tbretz

Message:

Instead of a constant number for Type==1 use BinningImpact. Also, if available, allow to overwrite this number from the environment (fMaxImpact). Updated class version accordingly

Location:

trunk/Mars/msim

Files:

• MHPhotonEvent.cc (modified) (7 diffs)
• MHPhotonEvent.h (modified) (2 diffs)

trunk/Mars/msim/MHPhotonEvent.cc

@@ -69 +69 @@
 //  + replaced TH2D by TH2F
 //
+// Class Version 4:
+// ----------------
+//  + added fMaxImpact
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHPhotonEvent.h"
@@ -140 +144 @@
 //
 MHPhotonEvent::MHPhotonEvent(Double_t max, const char *name, const char *title)
-    : fHistT("", "", 1, 0, 1, 1, 0, 1), fType(-1), fPermanentReset(kFALSE)
+    : fHistT("", "", 1, 0, 1, 1, 0, 1), fType(-1), fPermanentReset(kFALSE), fMaxImpact(25000)
 {
     // pre-initialization of the profile is necessary to get fZmin and fZmax set
@@ -159 +163 @@
 //
 MHPhotonEvent::MHPhotonEvent(Int_t type, const char *name, const char *title)
-    : fHistT("", "", 1, 0, 1, 1, 0, 1), fType(type), fPermanentReset(kFALSE)
+    : fHistT("", "", 1, 0, 1, 1, 0, 1), fType(type), fPermanentReset(kFALSE), fMaxImpact(25000)
 {
     // pre-initialization of the profile is necessary to get fZmin and fZmax set
@@ -195 +199 @@
 {
     Double_t xmax =  -1;
-    Int_t    num  = 100;
+    Int_t    num  = 100;  // N=100: see ReInit
 
     const Int_t f = fPermanentReset ? 2 : 1;
@@ -207 +211 @@
         // case0: Take a value defined by the user
     case 1:
-        xmax = 25000;
+        xmax = fMaxImpact;
         break;
     case 2:
@@ -296 +300 @@
     }
 
+    if (fType==1)
+    {
+        // N=100: see SetupFill
+        MBinning *bins = (MBinning*)pList->FindObject("BinningImpact", "MBinning");
+        if (bins)
+            SetBinningXY(100, bins->GetEdgeHi()*100);
+    }
+
     /*
     // What is the size of the light pool onm the ground?
@@ -454 +466 @@
         fPermanentReset = GetEnvValue(env, prefix, "PermanentReset", fPermanentReset);
     }
+    if (IsEnvDefined(env, prefix, "MaxImpact", print))
+    {
+        rc = kTRUE;
+        fMaxImpact = GetEnvValue(env, prefix, "MaxImpact", fMaxImpact);
+    }
 
     return rc;

trunk/Mars/msim/MHPhotonEvent.h

@@ -29 +29 @@
     Int_t      fType;
     Bool_t     fPermanentReset;
+    Float_t    fMaxImpact;
 
     // MHPhotonEvent
@@ -65 +66 @@
     const TProfile2D &GetHistT() const  { return fHistT; }
 
-    ClassDef(MHPhotonEvent, 3) // Histogram to display the information of MPhotonEvents
+    ClassDef(MHPhotonEvent, 4) // Histogram to display the information of MPhotonEvents
 };