Changeset 9347 for trunk/MagicSoft/Mars/msim

Timestamp:

02/18/09 12:07:41 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msim

Files:

• MHPhotonEvent.cc (modified) (8 diffs)
• MHPhotonEvent.h (modified) (1 diff)
• MSimAbsorption.cc (modified) (1 diff)

trunk/MagicSoft/Mars/msim/MHPhotonEvent.cc

@@ -115 +115 @@
     fHistWL.SetName("Spectrum");
     fHistWL.SetTitle("Wavelength distribution");
-    fHistWL.SetXTitle("\\lamba [nm]");
+    fHistWL.SetXTitle("\\lambda [nm]");
     fHistWL.SetYTitle("Counts");
     fHistWL.SetDirectory(NULL);
@@ -124 +124 @@
     fHistH.SetYTitle("Counts");
     fHistH.SetDirectory(NULL);
-
-    // FIXME: Get this information from the corsika run-header
-    MBinning(70, 275, 625).Apply(fHistWL);
-    MBinning(100, 0, 25).Apply(fHistH);
 }
 
@@ -169 +165 @@
 // --------------------------------------------------------------------------
 //
+// Find good limits for a binning num x [-max;max]
+// and apply it to fHistXY and fHistT.
+//
+void MHPhotonEvent::SetBinningXY(Int_t num, Double_t max)
+{
+    Double_t min = -max;
+
+    MH::FindGoodLimits(num, num, min, max, kFALSE);
+
+    MBinning binsd, binsa, binsz;
+    binsd.SetEdges(num, min, max);
+
+    SetBinning(&fHistXY, &binsd, &binsd);
+    SetBinning(&fHistT,  &binsd, &binsd);
+}
+
+// --------------------------------------------------------------------------
+//
 // Search for MRflEvtData, MRflEvtHeader and MGeomCam
 //
@@ -175 +189 @@
     Double_t xmax =  -1;
     Int_t    num  = 100;
+
+    const Int_t f = fPermanentReset ? 2 : 1;
+    MBinning(100/f, 0, 25).Apply(fHistH);
+    MBinning(70, 275, 625).Apply(fHistWL);
 
     switch (fType)
@@ -182 +200 @@
         // case0: Take a value defined by the user
     case 1:
-        {
-            MCorsikaRunHeader *h = (MCorsikaRunHeader*)pList->FindObject("MCorsikaRunHeader");
-            if (!h)
-            {
-                *fLog << err << "MCorsikaRunHeader not found... aborting." << endl;
-                return kFALSE;
-            }
-            xmax = 25000;//h->GetImpactMax()*1.25; // Estimate scattering in the atmosphere
-            break;
-        }
+        xmax = 25000;
+        break;
     case 2:
         {
@@ -222 +232 @@
     }
 
-    Double_t xmin = -xmax;
+    SetBinningXY(num, xmax);
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// ReInit overwrites the binning of the Wavelength histogram
+// by the wavlenegth band from MCorsikaRunHeader.
+// The bin-width is 5nm (fPermanentReset==kTRUE) or 10nm (kFALSE).
+//
+Bool_t MHPhotonEvent::ReInit(MParList *pList)
+{
+    MCorsikaRunHeader *h = (MCorsikaRunHeader*)pList->FindObject("MCorsikaRunHeader");
+    if (!h)
+    {
+        *fLog << err << "MCorsikaRunHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    /*
+    // What is the size of the light pool onm the ground?
+    if (fType==1)
+        SetBinningXY(100, h->GetImpactMax());
+    */
+
+    const Int_t f = fPermanentReset ? 2 : 1;
+
+    Double_t xmin = h->GetWavelengthMin();
+    Double_t xmax = h->GetWavelengthMax();
+    Int_t    num  = TMath::CeilNint((xmax-xmin)/(5*f));
 
     MH::FindGoodLimits(num, num, xmin, xmax, kFALSE);
 
-    MBinning binsd, binsa, binsz;
-    binsd.SetEdges(num, xmin, xmax);
-
-    SetBinning(&fHistXY, &binsd, &binsd);
-    SetBinning(&fHistT,  &binsd, &binsd);
+    MBinning(abs(num), xmin, xmax).Apply(fHistWL);
 
     return kTRUE;
@@ -250 +286 @@
     // Check if we want to use this class as a single event display
     if (fPermanentReset && evt->GetNumPhotons()>0)
-    {
-        fHistXY.Reset();
-        fHistUV.Reset();
-        fHistT.Reset();
-    }
+        Clear();
 
     // Get number of photons
@@ -365 +397 @@
     fHistH.Draw();
 }
+
+// --------------------------------------------------------------------------
+//
+// PermanentReset: Off
+//
+Int_t MHPhotonEvent::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "PermanentReset", print))
+    {
+        rc = kTRUE;
+        fPermanentReset = GetEnvValue(env, prefix, "PermanentReset", fPermanentReset);
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/msim/MHPhotonEvent.h

@@ -28 +28 @@
     Bool_t     fPermanentReset;
 
+    // MHPhotonEvent
     void Init(const char *name, const char *title);
+    void SetBinningXY(Int_t num, Double_t max);
 
+    // MParContainer
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+
+    // MH
     Bool_t SetupFill(const MParList *pList);
+    Bool_t ReInit(MParList *pList);
     Int_t  Fill(const MParContainer *par, const Stat_t weight=1);
     //Bool_t Finalize();
 
 public:
-    MHPhotonEvent(Double_t max=0, const char *name=0, const char *title=0);
-    MHPhotonEvent(Int_t type,     const char *name=0, const char *title=0);
+    MHPhotonEvent(Double_t max, const char *name=0, const char *title=0);
+    MHPhotonEvent(Int_t type=3, const char *name=0, const char *title=0);
 
+    void PermanentReset(Bool_t b=kTRUE) { fPermanentReset=b; }
+
+    // TObject
     void Draw(Option_t *o="");
     void Paint(Option_t *o="");
+
+    void Clear(Option_t *o="")
+    {
+        fHistXY.Reset();
+        fHistUV.Reset();
+        fHistT.Reset();
+        fHistWL.Reset();
+        fHistH.Reset();
+    }
 
     ClassDef(MHPhotonEvent, 2) // Histogram to display the information of MPhotonEvents

trunk/MagicSoft/Mars/msim/MSimAbsorption.cc

@@ -296 +296 @@
     {
         // Get i-th photon from the list
-        MPhotonData &ph = (*fEvt)[i];
+        const MPhotonData &ph = (*fEvt)[i];
 
         // Depending on fUseTheta get the incident angle of the wavelength