Changeset 8651 for trunk/MagicSoft/Mars

Timestamp:

07/28/07 00:16:22 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJSpectrum.cc (modified) (8 diffs)
• mjobs/MJSpectrum.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/07/2 Thomas Bretz
+
+   * mjobs/MJSpectrum.[h,cc]:
+     - added CutQ 
+     - added some checks for the Zenith angle distribution
+
+
 
  2007/07/26 Daniela Dorner

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -86 +86 @@
 
 MJSpectrum::MJSpectrum(const char *name, const char *title)
-    : fCut0(0),fCut1(0), fCut2(0), fCut3(0), fEstimateEnergy(0),
+    : fCutQ(0), fCut0(0),fCut1(0), fCut2(0), fCut3(0), fEstimateEnergy(0),
     fCalcHadronness(0), fRefill(kFALSE), fSimpleMode(kTRUE),
     fRawMc(kFALSE), fNoThetaWeights(kFALSE)
@@ -96 +96 @@
 MJSpectrum::~MJSpectrum()
 {
+    if (fCutQ)
+        delete fCutQ;
     if (fCut0)
         delete fCut0;
@@ -159 +161 @@
 
     fLog->Separator("Used Cuts");
+    fCutQ->Print();
     fCut0->Print();
     fCut1->Print();
@@ -246 +249 @@
         arr.DisplayIn(*fDisplay, "Hist");
 
+    if (!ReadTask(fCutQ, "CutQ"))
+        return -1;
     if (!ReadTask(fCut0, "Cut0"))
         return -1;
@@ -375 +380 @@
 // Display the final theta distribution.
 //
-void MJSpectrum::DisplayResult(const TH2D &h2) const
+Bool_t MJSpectrum::DisplayResult(const TH2D &h2) const
 {
     if (!fDisplay || !fDisplay->CdCanvas("ZdDist"))
@@ -395 +400 @@
     pad->cd(1);
     TH1D *theta = (TH1D*)gPad->FindObject("Theta");
-    if (theta)
-    {
-        proj.Scale(theta->GetMaximum()/proj.GetMaximum());
-        theta->SetMaximum(1.05*TMath::Max(theta->GetMaximum(), proj.GetMaximum()));
-    }
+    if (!theta)
+    {
+        *fLog << err << "ERROR - Theta-Histogram vanished... cannot proceed." << endl;
+        return kFALSE;
+    }
+
+    if (proj.GetMaximum()==0)
+    {
+        *fLog << err;
+        *fLog << "ERROR - The Zenith Angle distribution of your Monte Carlos doesn't overlap";
+        *fLog << "        with the the Zenith Angle distribution of your observation.";
+        theta->SetLineColor(kRed);
+        return kFALSE;;
+    }
+
+    proj.Scale(theta->GetMaximum()/proj.GetMaximum());
+    theta->SetMaximum(1.05*TMath::Max(theta->GetMaximum(), proj.GetMaximum()));
+
     proj.Draw("same");
+
+    // Compare both histograms
+    const Double_t prob = proj.Chi2Test(theta, "");
+    if (prob==1)
+        return kTRUE;
+
+    if (prob>0.99)
+    {
+        *fLog << inf;
+        *fLog << "The Zenith Angle distribution of your Monte Carlos fits well";
+        *fLog << "with the the Zenith Angle distribution of your observation.";
+        return kTRUE;
+    }
+
+    // <0.01: passen gar nicht
+    // ==1: passen perfekt
+    // >0.99: passer sehr gut
+
+    if (prob<0.01)
+    {
+        *fLog << err;
+        *fLog << "ERROR - The Zenith Angle distribution of your Monte Carlos does not fit";
+        *fLog << "        with the the Zenith Angle distribution of your observation.";
+        theta->SetLineColor(kRed);
+        return kFALSE;
+    }
+
+    *fLog << warn;
+    *fLog << "WARNING - The Zenith Angle distribution of your Monte Carlos doesn't fits well";
+    *fLog << "          with the the Zenith Angle distribution of your observation.";
+    return kTRUE;
 }
 
@@ -1131 +1180 @@
     }
 
-    DisplayResult(fSimpleMode ? hist : (TH2D&)mh1.GetHist());
+    if (!DisplayResult(fSimpleMode ? hist : (TH2D&)mh1.GetHist()))
+        return kFALSE;
 
     // ------------------------- Final loop --------------------------
@@ -1245 +1295 @@
     tlist2.AddToList(&fill1a);
     tlist2.AddToList(&fill30);
+    tlist2.AddToList(fCutQ);
     tlist2.AddToList(fCut0);
     tlist2.AddToList(&taskenv0);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -24 +24 @@
 {
 private:
+    MTask *fCutQ;
     MTask *fCut0;
     MTask *fCut1;
@@ -46 +47 @@
     // Display Output
     void    PrintSetup(const MAlphaFitter &fit) const;
-    void    DisplayResult(const TH2D &mh1) const;
+    Bool_t  DisplayResult(const TH2D &mh1) const;
     Bool_t  IntermediateLoop(MParList &plist, MH3 &h1, TH1D &temp1, const MDataSet &set, MMcSpectrumWeight &w) const;
     TArrayD FitSpectrum(TH1D &spectrum) const;