Changeset 6954

Timestamp:

04/18/05 20:11:09 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (1 diff)
• mhbase/MBinning.cc (modified) (1 diff)
• mhbase/MBinning.h (modified) (1 diff)
• mhflux/MHCollectionArea.h (modified) (3 diffs)
• mhflux/MHEnergyEst.cc (modified) (1 diff)
• mhflux/MHEnergyEst.h (modified) (1 diff)
• mjobs/MJCut.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -111 +111 @@
      - changed RunEnergy such, that it can correctly treat
        MC files written by ganymed using wobble-mode
+
+   * mbase/MStatusDisplay.cc:
+     - fixed a possible crash in GetFullPad
+
+   * mhbase/MBinning.[h,cc]:
+     - implemented Copy Constructor
+
+   * mhflux/MHCollectionArea.h:
+     - call CalcEfficiency in Finalize
+
+   * mhflux/MHEnergyEst.[h,cc]:
+     - implemented GetWeights
+
 
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -766 +766 @@
 TVirtualPad *MStatusDisplay::GetFullPad(const Int_t i, const Int_t j)
 {
-  
-  TVirtualPad *vpad = GetCanvas(i)->GetPad(j);
-  if (vpad)
+    if (!GetCanvas(i))
+    {
+        *fLog << warn << "MStatusDisplay::GetFullPad: i-th canvas not dound." << endl;
+        return NULL;
+    }
+
+    TVirtualPad *vpad = GetCanvas(i)->GetPad(j);
+    if (!vpad)
+    {
+        *fLog << warn << "MStatusDisplay::GetFullPad: Pad is out of range." << endl;
+        return NULL;
+    }
+
     vpad->SetPad(0.,0.,1.,1.);
-  else
-    *fLog << warn << "MStatusDisplay::GetFullPad: Pad is out of range." << endl;
-
-  return vpad;
-}
-
-
+    return vpad;
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -78 +78 @@
 // --------------------------------------------------------------------------
 //
+// Copy Constructor. If necessary give also name and title.
+//
+MBinning::MBinning(const MBinning &bins, const char *name, const char *title)
+{
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
+
+    SetEdges(bins);
+}
+
+// --------------------------------------------------------------------------
+//
 // Instantiate MBinning with nbins number of bins between lo (lower edge)
 // and hi (upper edge), name name and title title.

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -40 +40 @@
     MBinning(const char *name=NULL, const char *title=NULL);
     MBinning(Int_t nbins, Axis_t lo, Axis_t hi, const char *name=0, const char *opt="", const char *title=NULL);
-    MBinning(const MBinning &bins) { SetEdges(bins); }
+    MBinning(const MBinning &bins, const char *name=NULL, const char *title=NULL);
     MBinning(const TH1 &h, const Char_t axis='x', const char *name=0, const char *title=0);
     MBinning(const TAxis &a, const char *name=0, const char *title=0);

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.h

@@ -36 +36 @@
 
     void Calc(TH2D &hsel, TH2D &hall);
+    void CalcEfficiency();
 
 public:
@@ -43 +44 @@
     Bool_t ReInit(MParList *pList);
     Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
+    Bool_t Finalize() { CalcEfficiency(); return kTRUE; }
 
     void Draw(Option_t *option="");
     void Paint(Option_t *option="");
-
-    void CalcEfficiency();
 
     void SetHistAll(const TH2D &h) { h.Copy(fHistAll); fIsExtern=kTRUE; }
@@ -53 +53 @@
     TH2D &GetHistAll()             { return fHistAll; }
     const TH2D &GetHistAll() const { return fHistAll; }
+    const TH1D &GetHEnergy() const { return fHEnergy; }
 
 /*

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc

@@ -219 +219 @@
 }
 
+void MHEnergyEst::GetWeights(TH1D &hist) const
+{
+    // Project into EnergyEst_ey
+    TH1D *h1 = (TH1D*)fHEnergy.Project3D("rtlprmft_ex");
+    TH1D *h2 = (TH1D*)fHEnergy.Project3D("rtlprmft_ey");
+
+    h1->Copy(hist);
+    hist.Divide(h2);
+
+    delete h1;
+    delete h2;
+
+    hist.SetNameTitle("EnergyRatio", "Ratio between estimated and monte carlo energy");
+    hist.SetXTitle("E [GeV]");
+    hist.SetYTitle("N_{est}/N_{mc} [1]");
+    hist.SetDirectory(0);
+}
+
 void MHEnergyEst::Paint(Option_t *opt)
 {

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h

@@ -49 +49 @@
 
     const TH3D &GetHEnergy() const { return fHEnergy; }
+    void GetWeights(TH1D &hist) const;
 
     void InitMapping(MHMatrix *mat);

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -214 +214 @@
 
     TFile *file = 0;
-    if (fNameResult.IsNull())
+    if (fNameResult.IsNull() && fStoreResult)
     {
         file = (TFile*)gROOT->GetListOfFiles()->FindObject(oname);