Changeset 1986 for trunk/MagicSoft

Timestamp:

04/23/03 15:02:13 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhistmc/MHMcCT1CollectionArea.cc (modified) (8 diffs)
• mhistmc/MHMcCT1CollectionArea.h (modified) (2 diffs)
• mmontecarlo/MMcCT1CollectionAreaCalc.cc (deleted)
• mmontecarlo/MMcCT1CollectionAreaCalc.h (deleted)
• mmontecarlo/Makefile (modified) (1 diff)
• mmontecarlo/MonteCarloLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/23: Abelardo Moralejo
+
+    * mhistmc/MHMcCT1CollectionArea.[h,cc]
+      - Now the class inherits from MH instead of directly from 
+        MParContainer. Implemented SetupFill, so that the binning
+        definitions are read from the parlist.
+
+    * mmontecarlo/MMcCT1CollectionAreaCalc.[h,cc]
+      - Removed. This class was superfluous, since the same job 
+        can be done using MFillH.
+
+    * mmontecarlo/Makefile, MontecarloLinkDef.h
+      - removed class MMcCT1CollectionAreaCalc.
+
+    * macros/CT1collarea.C
+      - adapted to changes above.
 
  2003/04/23: Antonio Stamerra

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.cc

@@ -34 +34 @@
 #include <TCanvas.h>
 
+#include "MMcEvt.hxx"
 #include "MH.h"
 #include "MBinning.h"
+#include "MParList.h"
+#include "MLog.h"
+#include "MLogManip.h"
+
 
 ClassImp(MHMcCT1CollectionArea);
@@ -46 +51 @@
 //   - collection area (result)
 //
-MHMcCT1CollectionArea::MHMcCT1CollectionArea(const char *name, const char *title, Int_t nbins, Axis_t minEnergy, Axis_t maxEnergy)
+MHMcCT1CollectionArea::MHMcCT1CollectionArea(const char *name, const char *title)
 { 
   //
@@ -64 +69 @@
   fHistCol = new TH2D;
 
-  SetBins(nbins, minEnergy, maxEnergy);
-
   fHistCol->SetName(fName);
   fHistAll->SetName("AllEvents");
@@ -93 +96 @@
 // --------------------------------------------------------------------------
 //
-// Set binning of histograms. Binning of energy axis can be changed, that
-//   of theta axis is always the same (to match the CT1 MC sample theta dist):
-//
-void MHMcCT1CollectionArea::SetBins(Int_t nbins, Axis_t minEnergy, Axis_t maxEnergy)
-{
-  MBinning binsx;
-  binsx.SetEdges(nbins, minEnergy, maxEnergy);
-
-  MBinning binsy;
-  const Double_t yedge[7] = {12.5, 17.5, 23.5, 29.5, 35.5, 42., 48.};
-  const TArrayD yed(7,yedge);
-  binsy.SetEdges(yed);
-
-  MH::SetBinning(fHistAll, &binsx, &binsy);
-  MH::SetBinning(fHistSel, &binsx, &binsy);
-  MH::SetBinning(fHistCol, &binsx, &binsy);
-}
-
-
-// --------------------------------------------------------------------------
-//
 // Delete the three histograms
 //
@@ -125 +107 @@
 // --------------------------------------------------------------------------
 //
+// Set the binnings and prepare the filling of the histograms
+//
+Bool_t MHMcCT1CollectionArea::SetupFill(const MParList *plist)
+{
+    const MBinning* binsenergy = (MBinning*)plist->FindObject("MBinningE");
+    const MBinning* binstheta  = (MBinning*)plist->FindObject("MBinningTheta");
+
+    if (!binsenergy || !binstheta)
+    {
+        *fLog << err << dbginf << "At least one MBinning not found... aborting."
+ << endl;
+        return kFALSE;
+    }
+
+    SetBinning(fHistAll, binsenergy, binstheta);
+    SetBinning(fHistSel, binsenergy, binstheta);
+    SetBinning(fHistCol, binsenergy, binstheta);
+
+    fHistAll->Sumw2();
+    fHistSel->Sumw2();
+    fHistCol->Sumw2();
+
+    return kTRUE;
+}
+
+
+// --------------------------------------------------------------------------
+//
 // Fill data into the histogram which contains the selected showers
 //
-void MHMcCT1CollectionArea::FillSel(Double_t energy, Double_t theta)
-{
-  fHistSel->Fill(log10(energy), theta);
+Bool_t MHMcCT1CollectionArea::Fill(const MParContainer *par)
+{ 
+  MMcEvt &mcevt = *(MMcEvt*)par;
+
+  fHistSel->Fill(log10(mcevt.GetEnergy()), kRad2Deg*mcevt.GetTelescopeTheta());
+  return kTRUE;
 }
 
@@ -209 +222 @@
   // set here by hand, so make sure that the MC sample you are using is the 
   // right one (check all these quantities in your files and compare with
-  // is written below. In some theta bins, there are two different 
+  // what is written below. In some theta bins, there are two different 
   // productions, with different energy limits but with the same spectral 
   // slope. We account for this when calculating the original number of 
@@ -354 +367 @@
 
           const Double_t eff = Ns/Na;
-          const Double_t err = sqrt((1.-eff)*Ns)/Na;
+          const Double_t efferr = sqrt((1.-eff)*Ns)/Na;
 
 
@@ -360 +373 @@
 
           fHistCol->SetBinContent(ix, thetabin, eff*area);
-          fHistCol->SetBinError(ix, thetabin, err*area);
+          fHistCol->SetBinError(ix, thetabin, efferr*area);
 
         }

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.h

@@ -2 +2 @@
 #define MARS_MHMcCT1CollectionArea
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MH
+#include "MH.h"
 #endif
 
 class TH2D;
 
-
-class MHMcCT1CollectionArea : public MParContainer
+class MHMcCT1CollectionArea : public MH
 {
 private:
@@ -15 +14 @@
     TH2D *fHistSel; //  the selected showers
     TH2D *fHistCol; //  the collection area
-    void SetBins(Int_t nbins, Axis_t minEnergy, Axis_t maxEnergy);
 
 public:
-    MHMcCT1CollectionArea(const char *name=NULL, const char *title=NULL, Int_t nbins=30, Axis_t minEnergy=2., Axis_t maxEnergy=5.);
+    MHMcCT1CollectionArea(const char *name=NULL, const char *title=NULL);
     ~MHMcCT1CollectionArea();
 
-    void FillSel(Double_t energy, Double_t radius);
+    virtual Bool_t SetupFill(const MParList *pList);
+    virtual Bool_t Fill(const MParContainer *par);
 
     void DrawAll(Option_t *option="");

trunk/MagicSoft/Mars/mmontecarlo/Makefile

@@ -32 +32 @@
            MMcTimeGenerate.cc \
            MMcTriggerRateCalc.cc \
-           MMcCT1CollectionAreaCalc.cc \
            MMcEnergyEst.cc
 

trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h

@@ -9 +9 @@
 #pragma link C++ class MMcCollectionAreaCalc+;
 #pragma link C++ class MMcTriggerRateCalc+;
-#pragma link C++ class MMcCT1CollectionAreaCalc+;
 #pragma link C++ class MMcEnergyEst+;
 #endif