Changeset 1921 for trunk/MagicSoft

Timestamp:

04/08/03 10:52:14 (22 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMultiDimDistCalc.cc (modified) (1 diff)
• mfilter/MFCT1SelFinal.cc (modified) (3 diffs)
• mfilter/MFCT1SelFinal.h (modified) (3 diffs)
• mhist/MHHadronness.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
    * manalysis/MMcTriggerLvl2Calc.cc
      - added call to Fill method of MHMcTriggerLvl2
+
+
+ 2003/04/09: Wolfgang Wittek
+
+   * mfilter/MFCT1SelFinal.[h,cc]
+     - add new member function SetHadronnessName()
+
+   * mhist/MHHadronness.[h,cc]
+     - reset to SetOptStat(111100)
+     - correct acceptance
+
+   * manalysis/MMultiDimDistCalc.[h,cc]
+     - swap arguments if FindCreateObj
+
 
 

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -152 +152 @@
     }
 
-    fHadronness = (MHadronness*)plist->FindCreateObj(fHadronnessName, "MHadronness");
+    fHadronness = (MHadronness*)plist->FindCreateObj("MHadronness", fHadronnessName);
     if (!fHadronness)
         return kFALSE;

trunk/MagicSoft/Mars/mfilter/MFCT1SelFinal.cc

@@ -64 +64 @@
     fTitle = title ? title : "Class to evaluate the Final Cuts";
 
-    fHilName    = HilName;
-    fHilSrcName = HilSrcName;
+    fHilName        = HilName;
+    fHilSrcName     = HilSrcName;
+    fHadronnessName = "MHadronness";
 
     // default values of cuts
@@ -106 +107 @@
     }
 
-    fHadronness = (MHadronness*)pList->FindObject("MHadronness");
+    fHadronness = (MHadronness*)pList->FindObject(fHadronnessName, "MHadronness");
     if (!fHadronness)
     {
@@ -171 +172 @@
     *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) 
           << (int)(fCut[1]*100/GetNumExecutions()) 
-          << "%) Evts skipped due to: hadroness > "<< fHadronnessMax << endl;
+          << "%) Evts skipped due to: hadronness > "<< fHadronnessMax 
+          << " (hadronness from '" << fHadronnessName << "')" << endl;
 
     *fLog << " " << setw(7) << fCut[2] << " (" << setw(3) 

trunk/MagicSoft/Mars/mfilter/MFCT1SelFinal.h

@@ -35 +35 @@
     TString      fHilName;
     TString      fHilSrcName;
+    TString      fHadronnessName;
  
     Float_t      fHadronnessMax;
@@ -46 +47 @@
                   const char *name=NULL, const char *title=NULL);
 
+    void SetHadronnessName(const TString name) { fHadronnessName = name; }
     Bool_t IsExpressionTrue() const  { return fResult; }
 
@@ -54 +56 @@
     void SetCuts(Float_t hadmax, Float_t alphamax); 
 
-    ClassDef(MFCT1SelFinal, 0)   // Class to evaluate final cuts
+    ClassDef(MFCT1SelFinal, 1)   // Class to evaluate final cuts
 };
 

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -266 +266 @@
     Float_t max=0;
 
+
     for (Int_t i=1; i<=n; i++)
     {
-        const Stat_t ip = sump!=0 ? fPhness->Integral(1, i)/sump : 0;
-        const Stat_t ig = sumg!=0 ? fGhness->Integral(1, i)/sumg : 0;
+        const Stat_t ip = sump!=0 ? fPhness->Integral(1, i) : 0;
+        const Stat_t ig = sumg!=0 ? fGhness->Integral(1, i) : 0;
 
         fIntPhness->SetBinContent(i, ip);
@@ -463 +464 @@
     m->Draw();
     */
+
+    gStyle->SetOptStat(111100);
+
     return &c;
 }