Changeset 1007 for trunk

Timestamp:

10/29/01 13:22:33 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/collarea.C (modified) (2 diffs)
• mmontecarlo/MMcCollectionAreaCalc.cc (modified) (2 diffs)
• mmontecarlo/MMcThresholdCalc.cc (modified) (5 diffs)
• mmontecarlo/MMcThresholdCalc.h (modified) (1 diff)
• mmontecarlo/MMcTriggerRateCalc.cc (modified) (7 diffs)
• mmontecarlo/MMcTriggerRateCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -88 +88 @@
      manalysis/MPedCalcPedRun.cc, manalysis/MPedestalCam.cc,
      mbase/MClone.cc, mbase/MPrint.cc, mbase/MTime.h,
-     mbase/MWriteAsciiFile.cc, mgui/MGeomCam.cc,
-     mhist/MHFadcCam.cc, mhist/MHMcRate.cc,
-     mmc/MMcTrig.cxx, mmontecarlo/MMcThresholdCalc.cc,
-     mmontecarlo/MMcTriggerRateCalc.cc,
-     mraw/MRawCrateArray.cc, mraw/MRawEvtData.cc,
-     mraw/MRawEvtHeader.cc, mraw/MRawFileRead.cc:
+     mbase/MWriteAsciiFile.cc, mgui/MGeomCam.cc, mhist/MHFadcCam.cc, 
+     mhist/MHMcRate.cc, mmc/MMcTrig.cxx, mraw/MRawCrateArray.cc, 
+     mraw/MRawEvtData.cc, mraw/MRawEvtHeader.cc, mraw/MRawFileRead.cc:
      - changed fName, fTitle from pointer to static object
 
+   * mmontecarlo/MMcThresholdCalc.[h,cc], 
+     mmontecarlo/MMcTriggerRateCalc.[h,cc], 
+     mmontecarlo/MMcCollectionAreaCalc.[h,cc]:
+     - changed fName, fTitle from pointer to static object
+     - changed to use auto enabling scheme
+     
    * mraw/MRawFileWrite.cc:
      - changed fName, fTitle from pointer to static object

trunk/MagicSoft/Mars/macros/collarea.C

@@ -25 +25 @@
 void collarea(char *filename = "data/camera.root")
 { 
-    // FIXME: Harald, you should tell the people what the result of
-    // this macro really is.
-
     //
     // first we have to create our empty lists
@@ -42 +39 @@
     //
     MReadTree reader("Events", filename);
-    reader.UseLeaf("fImpact");
-    reader.UseLeaf("fEnergy");
-    reader.UseLeaf("fNumFirstLevel");
+    MMcCollectionAreaCalc effi;
+
     tasklist.AddToList(&reader);
-
-    MMcCollectionAreaCalc effi;
     tasklist.AddToList(&effi);
-
-    MTask task;
-    tasklist.AddToList(&task);
 
     //

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -44 +44 @@
     fTitle = title ? title : "Task to calculate the collection area";
 
-    fObjName = input ? input : "MMcTrig";
+    if (input)
+    {
+        fObjName = input;
+        AddToBranchList(Form("%s.fNumFirstLevel", input));
+    }
+    else
+    {
+        fObjName = "MMcTrig";
+        AddToBranchList("fNumFirstLevel");
+    }
+
+    AddToBranchList("fEnergy");
+    AddToBranchList("fImpact");
 } 
 
@@ -74 +86 @@
 Bool_t MMcCollectionAreaCalc::Process()
 { 
-    const Float_t energy = log10(fMcEvt->GetEnergy());
+    const Float_t energy = fMcEvt->GetEnergy();
     const Float_t impact = fMcEvt->GetImpact()/100.;
 

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

@@ -67 +67 @@
 MMcThresholdCalc::MMcThresholdCalc(const Int_t dim, const char* name,
                                    const char* title)
-    : fDimension(dim), fMcTrig(NULL), fEnergy(NULL)
+    : fMcTrig(NULL), fEnergy(NULL)
 {
     fName  = name  ? name  : "MMcThresholdCalc";
     fTitle = title ? title : "Task to calculate the energy threshold from Monte Carlo";
+
+    fFirst = dim>0 ?   1 : -dim;
+    fLast  = dim>0 ? dim : -dim;
+
+    fNum = fLast-fFirst+1;
+
+    AddToBranchList("fEnergy");
+    AddToBranchList("MMcTrig", "fNumFirstLevel", fFirst, fLast);
 }
 
@@ -103 +111 @@
     }
 
-    UInt_t from = fDimension>0 ?          1 : -fDimension;
-    UInt_t to   = fDimension>0 ? fDimension : -fDimension;
+    UInt_t num;
 
-    fNum = to-from+1;
-
-    Int_t num;
-
-    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", from, to));
+    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", fFirst, fLast));
     num = fMcTrig->GetEntriesFast();
     if (num != fNum)
@@ -119 +122 @@
     }
 
-    fEnergy = new TObjArray(pList->FindCreateObjList("MHMcEnergy", from, to));
+    fEnergy = new TObjArray(pList->FindCreateObjList("MHMcEnergy", fFirst, fLast));
     num = fMcTrig->GetEntriesFast();
     if (num != fNum)
@@ -143 +146 @@
     const Float_t reciproc = 1./energy;
 
-    for (Int_t i=0; i<fNum; i++)
+    for (UInt_t i=0; i<fNum; i++)
         if (GetTrig(i)->GetFirstLevel()>0)
             GetHEnergy(i)->Fill(lg10, reciproc);
@@ -157 +160 @@
 Bool_t MMcThresholdCalc::PostProcess()
 {
-    for (Int_t i=0; i<fNum; i++)
+    for (UInt_t i=0; i<fNum; i++)
     {
         MHMcEnergy &hist = *GetHEnergy(i);

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h

@@ -24 +24 @@
 {
 private:
-    Int_t fDimension;
-    Int_t fNum;
+    UInt_t fFirst;
+    UInt_t fLast;
+
+    UInt_t fNum;
 
     const MMcEvt  *fMcEvt;       // Container with Monte Carlo information

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -47 +47 @@
     fMcRate = NULL;
 
-    fDimension = dim;
-
     for (int i=0;i<10;i++)
         fTrigger[i] = dim&&trigbg ? trigbg[i] : 0;
@@ -56 +54 @@
 
     fPartId=part;
+
+
+    fFirst = dim>0 ?   1 : -dim;
+    fLast  = dim>0 ? dim : -dim;
+
+    fNum = fLast-fFirst+1;
+
+    AddToBranchList("fImpact");
+    AddToBranchList("fEnergy");
+    AddToBranchList("fPhi");
+    AddToBranchList("fTheta");
+    AddToBranchList("fPhotElfromShower");
+    AddToBranchList("MMcTrig", "fNumFirstLevel", fFirst, fLast);
 }
 
@@ -124 +135 @@
     }
 
-    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));
+    UInt_t num;
+
+    fMcTrig = new TObjArray(pList->FindObjectList("MMcTrig", fFirst, fLast));
     num = fMcTrig->GetEntriesFast();
     if (num != fNum)
@@ -140 +146 @@
     }
 
-    fMcRate = new TObjArray(pList->FindObjectList("MHMcRate", from, to));
+    fMcRate = new TObjArray(pList->FindObjectList("MHMcRate", fFirst, fLast));
     num = fMcRate->GetEntriesFast();
     if (num != fNum)
@@ -149 +155 @@
     }
 
-    for (int i=0; i<fNum; i++)
+    for (UInt_t i=0; i<fNum; i++)
     {
         MHMcRate &rate = *GetRate(i);
@@ -191 +197 @@
     //  Counting number of triggers
     //
-    for (int i=0; i<fNum; i++)
+    for (UInt_t i=0; i<fNum; i++)
     {
         fTrigger[i] += GetTrig(i)->GetFirstLevel();
@@ -210 +216 @@
     // Computing trigger rate
     //
-    for (int i=0; i<fNum; i++)
+    for (UInt_t i=0; i<fNum; i++)
         GetRate(i)->CalcRate(fTrigger[i], fAnalShow, fShowers);
 

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h

@@ -25 +25 @@
     TObjArray *fMcTrig;
 
-    Int_t      fDimension;     // Information about the trigger conditions
-                               // in the root file to be read.
-    Int_t      fNum;           // decoded dimension
+    UInt_t     fNum;           // decoded dimension
+    UInt_t     fFirst;
+    UInt_t     fLast;
 
     Float_t    fTrigger[10];   // Number of triggered showers