Changeset 1108 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

12/11/01 15:22:10 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcCollectionAreaCalc.cc (modified) (1 diff)
• MMcThresholdCalc.cc (modified) (1 diff)
• MMcTriggerRateCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -44 +44 @@
     fTitle = title ? title : "Task to calculate the collection area";
 
-    if (input)
-    {
-        fObjName = input;
-        AddToBranchList(Form("%s.fNumFirstLevel", input));
-    }
-    else
-    {
-        fObjName = "MMcTrig";
-        AddToBranchList("fNumFirstLevel");
-    }
+    fObjName = input ? input : "MMcTrig";
+    AddToBranchList(Form("%s.fNumFirstLevel", input));
 
-    AddToBranchList("fEnergy");
-    AddToBranchList("fImpact");
+    AddToBranchList("MMcEvt.fEnergy");
+    AddToBranchList("MMcEvt.fImpact");
 } 
 

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

@@ -77 +77 @@
     fNum = fLast-fFirst+1;
 
-    AddToBranchList("fEnergy");
+    AddToBranchList("MMcEvt.fEnergy");
     AddToBranchList("MMcTrig", "fNumFirstLevel", fFirst, fLast);
 }

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -61 +61 @@
     fNum = fLast-fFirst+1;
 
-    AddToBranchList("fImpact");
-    AddToBranchList("fEnergy");
-    AddToBranchList("fPhi");
-    AddToBranchList("fTheta");
-    AddToBranchList("fPhotElfromShower");
+    AddToBranchList("MMcEvt.fImpact");
+    AddToBranchList("MMcEvt.fEnergy");
+    AddToBranchList("MMcEvt.fPhi");
+    AddToBranchList("MMcEvt.fTheta");
+    AddToBranchList("MMcEvt.fPhotElfromShower");
     AddToBranchList("MMcTrig", "fNumFirstLevel", fFirst, fLast);
 }