Changeset 984 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcThresholdCalc.cc (modified) (3 diffs)
• MMcThresholdCalc.h (modified) (1 diff)
• MMcTriggerRateCalc.cc (modified) (4 diffs)
• MMcTriggerRateCalc.h (modified) (2 diffs)

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: