Changeset 984 for trunk/MagicSoft

Timestamp:

10/24/01 13:57:43 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/trigrate.C (modified) (5 diffs)
• mbase/MParList.cc (modified) (6 diffs)
• mbase/MParList.h (modified) (2 diffs)
• mmontecarlo/MMcThresholdCalc.cc (modified) (3 diffs)
• mmontecarlo/MMcThresholdCalc.h (modified) (1 diff)
• mmontecarlo/MMcTriggerRateCalc.cc (modified) (4 diffs)
• mmontecarlo/MMcTriggerRateCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/trigrate.C

@@ -24 +24 @@
 
 
-void trigrate(int dim=0, char *filename = "/big0/Maggi/CamData/Gamma/gamma_15_on.root" )
+void trigrate(int dim=0, char *filename = "data/camera.root" )
 {
     // This macro has two input parameter:
@@ -67 +67 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim)
+    if (hists.GetEntriesFast() != dim && dim)
         return;
 
@@ -83 +83 @@
     //
     MReadTree reader("Events", filename);
+    reader.UseLeaf("fImpact");
+    reader.UseLeaf("fEnergy");
+    reader.UseLeaf("fPhi");
+    reader.UseLeaf("fTheta");
+    reader.UseLeaf("fNumFirstLevel");
+    reader.UseLeaf("fPhotElfromShower");
     tasklist.AddToList(&reader);
 
@@ -88 +94 @@
     cout << "Number of Trigger conditions: " << dim << endl;
 
-    MMcTriggerRateCalc rate(dim, 14, BgR, 100000, 2.75, 10.91e-2);
+    MMcTriggerRateCalc rate(dim, 14, BgR, 100000);
     tasklist.AddToList(&rate);
 
@@ -104 +110 @@
 
     TIter Next(&hists);
-    MHMcRate *rate=NULL;
-    while ((rate=(MHMcRate*)Next()))
-        rate->Print();
+    MHMcRate *r=NULL;
+    while ((r=(MHMcRate*)Next()))
+        r->Print();
 }

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -457 +457 @@
 //  from 1 to from.
 //
-TObjArray MParList::FindObjectList(const char *name, const UInt_t from, const UInt_t to) const
+TObjArray MParList::FindObjectList(const char *name, UInt_t first, const UInt_t last) const
 {
     TObjArray list;
 
-    if (to>0 && to<=from)
-    {
-        *fLog << dbginf << "Cannot create entries backwards (to<from)...skipped." << endl;
+    if (first>0 && last<first)
+    {
+        *fLog << dbginf << "Cannot create entries backwards (last<first)...skipped." << endl;
         return list;
     }
@@ -472 +472 @@
     strcpy(auxname, name);
 
+    if (first==0 && last!=0)
+        first = 1;
+
     //
     // If only 'from' is specified the number of entries are ment
     //
-    const Bool_t exc = from>0 && to==0;
-
-    const UInt_t first = exc ?    0 : from;
-    const UInt_t last  = exc ? from : to;
-
-    for (UInt_t num=first; num<last; num++)
-    {
-        if (from!=0 || to!=0)
-            sprintf(auxname+len, ";%d", num+1);
+    for (UInt_t i=first; i<=last; i++)
+    {
+        if (first!=0 || last!=0)
+            sprintf(auxname+len, ";%d", i);
 
         TObject *obj = FindObject(auxname);
@@ -505 +503 @@
 //  from 1 to from.
 //
-TObjArray MParList::FindCreateObjList(const char *cname, const UInt_t from, const UInt_t to, const char *oname)
+TObjArray MParList::FindCreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname)
 {
     TObjArray list;
 
-    if (to>0 && to<=from)
-    {
-        *fLog << dbginf << "Cannot create entries backwards (to<from)...skipped." << endl;
+    if (first>0 && last<first)
+    {
+        *fLog << dbginf << "Cannot create entries backwards (last<first)...skipped." << endl;
         return list;
     }
@@ -523 +521 @@
     // If only 'from' is specified the number of entries are ment
     //
-    const Bool_t exc = from>0 && to==0;
-
-    const UInt_t first = exc ?    0 : from;
-    const UInt_t last  = exc ? from : to;
-
-    for (UInt_t num=first; num<last; num++)
-    {
-        if (from!=0 || to!=0)
-            sprintf(auxname+len, ";%d", num+1);
+    if (first==0 && last!=0)
+        first = 1;
+
+    for (UInt_t i=first; i<=last; i++)
+    {
+        if (first!=0 || last!=0)
+            sprintf(auxname+len, ";%d", i);
 
         TObject *obj = FindCreateObj(auxname, oname);
@@ -558 +554 @@
 //  compiled programs if you are not 100% sure what you are doing.
 //
-TObjArray MParList::CreateObjList(const char *cname, const UInt_t from, const UInt_t to, const char *oname)
+TObjArray MParList::CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname)
 {
     TObjArray list;
+
+    if (first>0 && last<first)
+    {
+        gLog << dbginf << "Cannot create entries backwards (last<first)...skipped." << endl;
+        return list;
+    }
 
     //
@@ -584 +586 @@
     // If only 'from' is specified the number of entries are ment
     //
-    const Bool_t exc = from>0 && to==0;
-
-    const UInt_t first = exc ?    0 : from;
-    const UInt_t last  = exc ? from : to;
-
-    for (UInt_t num=first; num<last; num++)
-    {
-        if (from!=0 || to!=0)
-            sprintf(auxname+len, ";%d", num+1);
+    if (first==0 && last!=0)
+        first = 1;
+
+    for (UInt_t i=first; i<=last; i++)
+    {
+        if (first!=0 || last!=0)
+            sprintf(auxname+len, ";%d", i);
 
         //

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -20 +20 @@
 #include "MParContainer.h"
 #endif
+
+#include <TObjArray.h>
 
 class MLog;
@@ -49 +51 @@
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
 
-    TObjArray FindObjectList(const char *name, const UInt_t from, const UInt_t to=0) const;
-    TObjArray FindCreateObjList(const char *cname, const UInt_t from, const UInt_t to=0, const char *oname=NULL);
+    TObjArray FindObjectList(const char *name, UInt_t first, const UInt_t last) const;
+    TObjArray FindObjectList(const char *name, const UInt_t num) const
+    {
+        return FindObjectList(name, 0, num);
+    }
 
-    static TObjArray CreateObjList(const char *cname, const UInt_t from, const UInt_t to=0, const char *oname=NULL);
+    TObjArray FindCreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname=NULL);
+    TObjArray FindCreateObjList(const char *cname, const UInt_t num, const char *oname=NULL)
+    {
+        return FindCreateObjList(cname, 0, num, oname);
+    }
+
+    static TObjArray CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname=NULL);
+    static TObjArray CreateObjList(const char *cname, const UInt_t num, const char *oname=NULL)
+    {
+        return CreateObjList(cname, 0, num, oname);
+    }
 
     void Reset();

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

@@ -103 +103 @@
     }
 
+    UInt_t from = fDimension>0 ?          1 : -fDimension;
+    UInt_t to   = fDimension>0 ? fDimension : -fDimension;
 
-    const UInt_t from = fDimension<=0 ? -fDimension : 0;
+    fNum = to-from+1;
 
-    if (fDimension<=0)
-        fDimension = -fDimension;
+    Int_t num;
 
-    if (fDimension==0)
-        fDimension=1;
-
-    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", from, fDimension));
-    if (fMcTrig->GetEntriesFast() != fDimension)
+    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", from, to));
+    num = fMcTrig->GetEntriesFast();
+    if (num != fNum)
     {
-        *fLog << dbginf << "Error: Not all requested MMcTrig objects are available...aborting." << endl;
+        *fLog << dbginf << fNum << " MMcTrig objects requested, ";
+        *fLog << num << " are available... aborting." << endl;
         return kFALSE;
     }
 
-    fEnergy = new TObjArray(pList->FindCreateObjList("MHMcEnergy", from, fDimension));
-    if (fMcTrig->GetEntriesFast() != fDimension && fDimension)
+    fEnergy = new TObjArray(pList->FindCreateObjList("MHMcEnergy", from, to));
+    num = fMcTrig->GetEntriesFast();
+    if (num != fNum)
     {
-        *fLog << dbginf << "Error: Not all requested MHMcEnergy objects are available...aborting." << endl;
+        *fLog << dbginf << fNum << " MHMcEnergy objects requested, ";
+        *fLog << num << " are available... aborting." << endl;
         return kFALSE;
     }
@@ -141 +143 @@
     const Float_t reciproc = 1./energy;
 
-    for (Int_t i=0; i<fDimension; i++)
+    for (Int_t i=0; i<fNum; i++)
         if (GetTrig(i)->GetFirstLevel()>0)
             GetHEnergy(i)->Fill(lg10, reciproc);
@@ -155 +157 @@
 Bool_t MMcThresholdCalc::PostProcess()
 {
-    for (Int_t i=0; i<fDimension; i++)
+    for (Int_t i=0; i<fNum; i++)
     {
         MHMcEnergy &hist = *GetHEnergy(i);

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h

@@ -25 +25 @@
 private:
     Int_t fDimension;
+    Int_t fNum;
 
     const MMcEvt  *fMcEvt;       // Container with Monte Carlo information

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -43 +43 @@
     *fTitle = title ? title : "Task to calc the trigger rate ";
 
-    fDimension=dim;
+    fDimension = dim;
 
     for (int i=0;i<10;i++)
@@ -111 +111 @@
     }
 
-    const UInt_t from = fDimension<=0 ? -fDimension : 0;
-
-    if (fDimension<=0)
-        fDimension = -fDimension;
-
-    if (fDimension==0)
-        fDimension=1;
-
-    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", from, fDimension));
-    if (fMcTrig->GetEntriesFast() != fDimension)
-    {
-        *fLog << dbginf << "Error: Not all requested MMcTrig objects are available...aborting." << endl;
+    UInt_t from = fDimension>0 ?          1 : -fDimension;
+    UInt_t to   = fDimension>0 ? fDimension : -fDimension;
+
+    fNum = to-from+1;
+
+    Int_t num;
+
+    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", from, to));
+    num = fMcTrig->GetEntriesFast();
+    if (num != fNum)
+    {
+        *fLog << dbginf << fNum << " MMcTrig objects requested, ";
+        *fLog << num << " are available... aborting." << endl;
         return kFALSE;
     }
 
-    fMcRate = new TObjArray(pList->FindObjectList("MHMcRate", from, fDimension));
-    if (fMcRate->GetEntriesFast() != fDimension)
-    {
-        *fLog << dbginf << "Error: Not all requested MHMcRate objects are available...aborting." << endl;
+    fMcRate = new TObjArray(pList->FindObjectList("MHMcRate", from, to));
+    num = fMcRate->GetEntriesFast();
+    if (num != fNum)
+    {
+        *fLog << dbginf << fNum << " MHMcRate objects requested, ";
+        *fLog << num << " are available... aborting." << endl;
         return kFALSE;
     }
 
-    for (int i=0; i<fDimension; i++)
+    for (int i=0; i<fNum; i++)
     {
         MHMcRate &rate = *GetRate(i);
@@ -175 +178 @@
     //  Counting number of triggers
     //
-    for (int i=0; i<fDimension; i++)
+    for (int i=0; i<fNum; i++)
     {
         fTrigger[i] += GetTrig(i)->GetFirstLevel();
@@ -194 +197 @@
     // Computing trigger rate
     //
-    for (int i=0; i<fDimension; i++)
+    for (int i=0; i<fNum; i++)
         GetRate(i)->CalcRate(fTrigger[i], fAnalShow, fShowers);
 

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h

@@ -27 +27 @@
     Int_t      fDimension;     // Information about the trigger conditions
                                // in the root file to be read.
+    Int_t      fNum;           // decoded dimension
 
     Float_t    fTrigger[10];   // Number of triggered showers
@@ -38 +39 @@
 
     MHMcRate *GetRate(UInt_t i) const { return (MHMcRate*)((*fMcRate)[i]); }
-    MMcTrig *GetTrig(UInt_t i) const { return (MMcTrig*)((*fMcTrig)[i]); }
+    MMcTrig  *GetTrig(UInt_t i) const { return (MMcTrig*)((*fMcTrig)[i]); }
 
 public: