Changeset 7691 for trunk/MagicSoft/Mars

Timestamp:

05/05/06 07:30:44 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHEnergyEst.cc (modified) (8 diffs)
• MHEnergyEst.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc

@@ -71 +71 @@
     fTitle = title ? title : "3-D histogram   E-true E-est Theta";
 
+    fNameEnergy = "MEnergyEst";
+    fNameResult = "MinimizationValue";
+
     fHEnergy.SetDirectory(NULL);
     fHEnergy.SetName("EnergyEst");
@@ -184 +187 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Divide chisq and bias by number of executions
+// Print result
+//
 Bool_t MHEnergyEst::Finalize()
 {
@@ -191 +199 @@
     fResult->SetVal(fChisq);
 
+    *fLog << all << endl;
     Print();
 
@@ -196 +205 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Print result
+//
 void MHEnergyEst::Print(Option_t *o) const
 {
-    //    const Double_t resp =   TMath::Power(10,  res)-1;
-    //    const Double_t resm = 1-TMath::Power(10, -res);
-
     const Double_t res = TMath::Sqrt(fChisq-fBias*fBias);
     if (TMath::IsNaN(res))
@@ -209 +219 @@
 
     TH1D *h = (TH1D*)fHResolution.ProjectionZ("Resolution");
-    h->Fit("gaus", "Q0");
+    h->Fit("gaus", "Q0", "", -1.0, 0.25);
 
     TF1 *f = h->GetFunction("gaus");
@@ -225 +235 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return Correction Coefficients (weights)
+// hist = E_mc/E_est
+//
 void MHEnergyEst::GetWeights(TH1D &hist) const
 {
@@ -301 +316 @@
             }
 
-            hx->Fit("gaus", "Q");
+            hx->Fit("gaus", "Q", "", -1.0, 0.25);
             gPad=NULL;
             gStyle->SetOptFit(101);
@@ -545 +560 @@
     fMatrix = NULL; 
 }
-

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h

@@ -22 +22 @@
 {
 private:
+    TString      fNameEnergy;
+    TString      fNameResult;
+
     MMcEvt      *fMcEvt;  //!
     MParameterD *fEnergy; //!
     MParameterD *fResult; //!
 
-    Int_t     fMap[100]; // FIXME!
+    Int_t        fMap[100]; // FIXME!
     MHMatrix    *fMatrix; //!
 
@@ -40 +43 @@
 
     Double_t GetVal(Int_t i) const;
+    void     CalcChisq(Double_t &chisq, Double_t &prob) const;
 
     Bool_t SetupFill(const MParList *pList);
@@ -58 +62 @@
     void Print(Option_t *o="") const;
 
-    ClassDef(MHEnergyEst, 1) //
+    ClassDef(MHEnergyEst, 2) //
 
 };