Changeset 1646 for trunk/MagicSoft

Timestamp:

11/19/02 13:25:44 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/MagicHillas.C (modified) (2 diffs)
• mmain/MMonteCarlo.cc (modified) (2 diffs)
• mmontecarlo/MMcCollectionAreaCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -111 +111 @@
     MHillasCalc    hcalc;
     MHillasSrcCalc csrc1;
-    MHillasSrcCalc csrc2;
 
     //
@@ -141 +140 @@
     tlist.AddToList(&hcalc);
     tlist.AddToList(&csrc1);
-    tlist.AddToList(&csrc2);
 
     tlist.AddToList(&hfill1);

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -186 +186 @@
 #include "MEvtLoop.h"
 
-#include "MReadTree.h"
+#include "MReadMarsFile.h"
 
 #include "MHMcRate.h"
@@ -239 +239 @@
     //  - Then we can fill the efficiency histograms
     //
-    MReadTree read("Events", fInputFile);
+    MReadMarsFile read("Events", fInputFile);
     tlist.AddToList(&read);
 

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -25 +25 @@
 
 //////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//  MHMcCollectionAreaCalc                                                  //
-//                                                                          //
+//
+//  MHMcCollectionAreaCalc
+//
+//  Remark: The initialization is maily done in the ReInit function.
+//          Please make sure, that you don't use MReadTree when processing
+//          a file. Use a 'ReInit'-calling task like MReadMarsFile
+//
 //////////////////////////////////////////////////////////////////////////////
 
@@ -73 +77 @@
         return kFALSE;
 
-
-    fTotalNumSimulatedShowers = 0;
-    fCorsikaVersion           = 0;
+    fTheta                    = -1;
+    fTotalNumSimulatedShowers =  0;
+    fCorsikaVersion           =  0;
     fAllEvtsTriggered         = kFALSE;
 
@@ -95 +99 @@
 
     if (fTheta>=0 && fTheta!=runheader->GetTelesTheta())
-        *fLog << warn << dbginf << "Warning - Read files have different TelesTheta..." << endl;
+    {
+        *fLog << warn << dbginf << "Warning - Read files have different TelesTheta (";
+        *fLog << fTheta << ", " << runheader->GetTelesTheta() << ")..." << endl;
+    }
 
     fTheta = runheader->GetTelesTheta();
@@ -123 +130 @@
 Bool_t MMcCollectionAreaCalc::Process()
 {
+//    *fLog << all << fMcEvt << " " << (int)fAllEvtsTriggered << " " << fCollArea << endl;
     const Float_t energy = fMcEvt->GetEnergy();
     const Float_t impact = fMcEvt->GetImpact()/100.;