Changeset 9362 for trunk/MagicSoft/Mars/mhflux

Timestamp:

02/22/09 23:36:01 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHCollectionArea.cc (modified) (2 diffs)
• MHThreshold.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

@@ -211 +211 @@
 void MHCollectionArea::GetImpactMax()
 {
-    if (fHeader->GetImpactMax()<=fMcAreaRadius*100)
+    if (fHeader->GetImpactMax()<=fMcAreaRadius*100 || fHeader->GetImpactMax()<0)
         return;
 
@@ -454 +454 @@
 Int_t MHCollectionArea::Fill(const MParContainer *par, const Stat_t weight)
 {
+    // This is not perfect because it selects the maximum impact only
+    // from the selected events. Hoever, it will get overwritten
+    // in finalize anyway.
+    const Double_t impact = fMcEvt->GetImpact()*0.01; // cm->m
+    if (impact>fMcAreaRadius)
+        fMcAreaRadius = impact;
+
     const Double_t energy = fMcEvt->GetEnergy();
     const Double_t theta  = fMcEvt->GetTelescopeTheta()*TMath::RadToDeg();

trunk/MagicSoft/Mars/mhflux/MHThreshold.cc

@@ -97 +97 @@
         return kFALSE;
     }
-/*
-    MBinning binse;
-    binse.SetEdges(fHEnergy, 'x');
 
-    MBinning *bins = (MBinning*)pl->FindObject("BinningEnergyEst", "MBinning");
-    if (bins)
-        binse.SetEdges(*bins);
+    ApplyBinning(*pl, "Threshold", &fHEnergy);
 
-    binse.Apply(fHEnergy);
-  */
     return kTRUE;
 }