Changeset 2173 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

06/13/03 16:42:37 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcCollectionAreaCalc.cc (modified) (1 diff)
• MMcEnergyEst.cc (modified) (4 diffs)
• MMcEnergyEst.h (modified) (1 diff)
• MMcThresholdCalc.cc (modified) (1 diff)
• MMcTimeGenerate.cc (modified) (1 diff)
• MMcTriggerRateCalc.cc (modified) (3 diffs)
• MMcTriggerRateCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -49 +49 @@
 
 ClassImp(MMcCollectionAreaCalc);
+
+using namespace std;
 
 MMcCollectionAreaCalc::MMcCollectionAreaCalc(const char *input,

trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc

@@ -62 +62 @@
 #include "MLogManip.h"
 
+ClassImp(MMcEnergyEst);
+
+using namespace std;
 
 //------------------------------------------------------------------------
@@ -67 +70 @@
 // fcn calculates the function to be minimized (using TMinuit::Migrad)
 //
-void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag)
+static void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag)
 {
   MEvtLoop *evtloop = (MEvtLoop*)gMinuit->GetObjectFit();
@@ -82 +85 @@
   f = eval->GetChisq();
 }
-
-ClassImp(MMcEnergyEst);
 
 // --------------------------------------------------------------------------
@@ -323 +324 @@
 // Print current values of parameters
 //
-void MMcEnergyEst::Print(Option_t *o)
+void MMcEnergyEst::Print(Option_t *o) const
 {
   for (Int_t i = 0; i < fA.GetSize(); i++)

trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.h

@@ -47 +47 @@
 
   void FindParams();
-  void Print(Option_t *o="");
+  void Print(Option_t *o="") const;
 
   ClassDef(MMcEnergyEst, 1) // Class for optimization of Energy estimator

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

@@ -52 +52 @@
 ClassImp(MMcThresholdCalc);
 
-const Float_t MMcThresholdCalc::fSqrt2 = sqrt(2);
+using namespace std;
+
+const Float_t MMcThresholdCalc::fSqrt2 = sqrt(2.);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mmontecarlo/MMcTimeGenerate.cc

@@ -86 +86 @@
     const UInt_t t = fTime->GetTimeLo();
 
-    fTime->SetTime(t+dt*10000, 0); // [0.1ms]
+    fTime->SetTime((int)(t+dt*10000), 0); // [0.1ms]
 
     return kTRUE;

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -29 +29 @@
 #include "MMcTriggerRateCalc.h"
 
+#include <math.h>
+
+#include <TCanvas.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
 
 #include "MParList.h"
-#include "MHMcRate.h"
 
 #include "MMcEvt.hxx"
@@ -42 +45 @@
 
 #include "MH.h"
-#include <TCanvas.h>
-#include <math.h>
-
+#include "MHMcRate.h"
 
 ClassImp(MMcTriggerRateCalc);
+
+using namespace std;
 
 void MMcTriggerRateCalc::Init(int dim, float *trigbg, float simbg,
@@ -364 +367 @@
 // Draw rate as a funtion of discriminator threshold.
 //
-void MMcTriggerRateCalc::Draw()
+void MMcTriggerRateCalc::Draw(Option_t *)
 {
     /*

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h

@@ -67 +67 @@
     TH1F* GetHist(Int_t i) {return fHist[i];}
 
-    void Draw();
+    void Draw(const Option_t *o="");
 
     ClassDef(MMcTriggerRateCalc, 0)     // Task to compute the trigger rate