Changeset 2207 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

06/23/03 11:19:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcCollectionAreaCalc.cc (modified) (3 diffs)
• MMcCollectionAreaCalc.h (modified) (1 diff)
• MMcThresholdCalc.cc (modified) (3 diffs)
• MMcThresholdCalc.h (modified) (2 diffs)
• MMcTimeGenerate.cc (modified) (3 diffs)
• MMcTimeGenerate.h (modified) (2 diffs)
• MMcTriggerRateCalc.cc (modified) (6 diffs)
• MMcTriggerRateCalc.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc ¶

@@ -65 +65 @@
 } 
 
-Bool_t MMcCollectionAreaCalc::PreProcess (MParList *pList)
+Int_t MMcCollectionAreaCalc::PreProcess (MParList *pList)
 {
     // connect the raw data with this task
@@ -151 +151 @@
 }
 
-Bool_t MMcCollectionAreaCalc::Process()
+Int_t MMcCollectionAreaCalc::Process()
 {
     const Double_t energy = fMcEvt->GetEnergy();
@@ -178 +178 @@
 }
 
-Bool_t MMcCollectionAreaCalc::PostProcess()
+Int_t MMcCollectionAreaCalc::PostProcess()
 { 
     //

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h ¶

@@ -30 +30 @@
     Bool_t fAllEvtsTriggered;
 
+    Bool_t ReInit(MParList *plist);
+
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
     MMcCollectionAreaCalc(const char *input=NULL,
                           const char *name=NULL, const char *title=NULL);
-
-    Bool_t ReInit(MParList *plist);
-
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
 
     ClassDef(MMcCollectionAreaCalc, 0) // Task to calculate the collection area histogram

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc ¶

@@ -100 +100 @@
 // connect Monte Carlo data with this task
 //
-Bool_t MMcThresholdCalc::PreProcess(MParList* pList)
+Int_t MMcThresholdCalc::PreProcess(MParList* pList)
 {
     //
@@ -142 +142 @@
 // distribution to get the energy threshold.
 //
-Bool_t MMcThresholdCalc::Process()
+Int_t MMcThresholdCalc::Process()
 {
     const Float_t energy   = fMcEvt->GetEnergy();
@@ -160 +160 @@
 // Some iterations are done to be sure the fit parameters converge.
 //
-Bool_t MMcThresholdCalc::PostProcess()
+Int_t MMcThresholdCalc::PostProcess()
 {
     for (UInt_t i=0; i<fNum; i++)

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h ¶

@@ -14 +14 @@
 #endif
 #ifndef ROOT_TObjArray
-#include "TObjArray.h"
+#include <TObjArray.h>
 #endif
 
@@ -39 +39 @@
     MHMcEnergy *GetHEnergy(UInt_t i) { return (MHMcEnergy*)(*fEnergy)[i]; }
 
+    Int_t PreProcess(MParList* pList);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
-
     MMcThresholdCalc(const Int_t dim = 0,
                      const char* name = NULL, const char* title = NULL);
     ~MMcThresholdCalc();
-
-    Bool_t PreProcess(MParList* pList);
-    Bool_t Process();
-    Bool_t PostProcess();
 
     ClassDef(MMcThresholdCalc, 0) // Task to compute the energy threshold

trunk/MagicSoft/Mars/mmontecarlo/MMcTimeGenerate.cc ¶

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !   Author(s): Harald Kornmayer 1/2001
 !
@@ -63 +63 @@
 //  options, either Montecarlo files with a single trigger option.
 //
-Bool_t MMcTimeGenerate::PreProcess (MParList *pList)
+Int_t MMcTimeGenerate::PreProcess (MParList *pList)
 {
     // connect the raw data with this task
@@ -77 +77 @@
 //
 //
-Bool_t MMcTimeGenerate::Process()
+Int_t MMcTimeGenerate::Process()
 {
     Double_t dt;

trunk/MagicSoft/Mars/mmontecarlo/MMcTimeGenerate.h ¶

@@ -20 +20 @@
     Double_t fDeadTime;
 
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+
 public:
     MMcTimeGenerate(const char *name=NULL, const char *title=NULL);
@@ -25 +28 @@
     ~MMcTimeGenerate();
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-
     ClassDef(MMcTimeGenerate, 0) // To generate a random time
 };

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc ¶

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !   Author(s): Harald Kornmayer 1/2001
 !
 !   Copyright: MAGIC Software Development, 2000-2003
 !
-!   Modified 4/7/2002 Abelardo Moralejo: now the dimension of fTrigger is
-!    set dinamically, to allow an arbitrary large number of trigger 
-!    conditions to be processed.
-!
 !
 \* ======================================================================== */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Modified 4/7/2002 Abelardo Moralejo: now the dimension of fTrigger is
+//  set dinamically, to allow an arbitrary large number of trigger
+//  conditions to be processed.
+//
+/////////////////////////////////////////////////////////////////////////////
 #include "MMcTriggerRateCalc.h"
 
@@ -32 +36 @@
 
 #include <TCanvas.h>
+#include <TGraphErrors.h>
 
 #include "MLog.h"
@@ -215 +220 @@
 //  options, either Montecarlo files with a single trigger option.
 //
-Bool_t MMcTriggerRateCalc::PreProcess (MParList *pList)
+Int_t MMcTriggerRateCalc::PreProcess (MParList *pList)
 {
     // connect the raw data with this task
@@ -266 +271 @@
 //  MHMcRate container.
 //
-Bool_t MMcTriggerRateCalc::Process()
+Int_t MMcTriggerRateCalc::Process()
 {
     //
@@ -318 +323 @@
 //  The PostProcess-function calculates and shows the trigger rate
 //
-Bool_t MMcTriggerRateCalc::PostProcess()
+Int_t MMcTriggerRateCalc::PostProcess()
 {
     for (UInt_t i=0; i<fNum; i++)
@@ -374 +379 @@
      sure, that the histograms are not overwritten.
      Also the comment for the function doesn't match the rules.
-
+     BTW: please replace all arrays by Root lists (TArray*, TList, etc)
   TCanvas *c = MH::MakeDefCanvas("Rate");
 

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h ¶

@@ -9 +9 @@
 #endif
 
-#include <TGraphErrors.h>
-
 class MParList;
 class MMcEvt;
@@ -17 +15 @@
 class MMcTrig;
 class MHMcRate;
+class TH1F;
 
 class MMcTriggerRateCalc : public MTask
 {
 private:
-    MMcEvt    *fMcEvt;        //!
+    MMcEvt    *fMcEvt;     //!
 
     TObjArray *fMcRate;
@@ -29 +28 @@
     MMcCorsikaRunHeader *fMcCorRunHeader; 
 
-    UInt_t     fNum;           // decoded dimension
+    UInt_t     fNum;       // decoded dimension
     UInt_t     fFirst;
     UInt_t     fLast;
 
-    Float_t*   fTrigNSB;   // Number of triggers due to NSB alone
+    Float_t   *fTrigNSB;   // Number of triggers due to NSB alone
     Float_t    fSimNSB;    // Number of simulated NSB-only events
 
-    Float_t*   fTrigger;       // Number of triggered showers
-    Float_t    fShowers;       // Number of simulated showers
-    Float_t    fAnalShow;      // Number of analysed showers
+    Float_t   *fTrigger;   // Number of triggered showers
+    Float_t    fShowers;   // Number of simulated showers
+    Float_t    fAnalShow;  // Number of analysed showers
 
-    Int_t      fPartId;        // Incident particle that generates showers
+    Int_t      fPartId;    // Incident particle that generates showers
+
+    TH1F      *fHist[5];
 
     void Init(int dim, float *trigbg,
@@ -48 +49 @@
     MMcTrig  *GetTrig(UInt_t i) const { return (MMcTrig*)((*fMcTrig)[i]); }
 
-    TH1F*     fHist[5];
+    Bool_t ReInit(MParList *plist);
+
+    Int_t PreProcess(MParList *pList);
+    Int_t Process();
+    Int_t PostProcess();
 
 public:
@@ -59 +64 @@
     ~MMcTriggerRateCalc();
 
-    Bool_t ReInit(MParList *plist);
-
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     TH1F* GetHist(Int_t i) {return fHist[i];}