Changeset 7775 for trunk

Timestamp:

07/03/06 09:59:59 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhflux/MHThetaSqN.cc (modified) (3 diffs)
• mhflux/MHThetaSqN.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2006/07/03 Thomas Bretz
+
+   * mhflux/MHThetaSqN.[h,cc]:
+     - added counter and output some statistics afterwards
+
+
+
  2006/06/29 Thomas Bretz
 
    * mmain/MEventDisplay.cc:
      - added decoding of calibration pattern
+
+   * mbase/MContinue.cc:
+     - small change to some output
+
+   * mmc/MMcTrig.hxx, mmc/MMcTrigHeader.hxx:
+     - increased version number 
+
+   * mmc/Mdefine.h:
+     - increased CAMERA_PIXELS from 3500 to 3800
 
 

trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc

@@ -68 +68 @@
 MHThetaSqN::MHThetaSqN(const char *name, const char *title)
     : MHAlpha(name, title), fDisp(0), fSrcPosCam(0), fSignificanceCutLevel(1.7),
-    fNumBinsSignal(3), fNumBinsTotal(75), fNumOffSourcePos(3), fDoOffCut(kTRUE)
+    fNumBinsSignal(3), fNumBinsTotal(75), fNumOffSourcePos(3), fDoOffCut(kTRUE),
+    fCounter(4)
 {
     //
@@ -176 +177 @@
 
     fThetaSqCut = fSignificanceCutLevel*fFit.GetSignalIntegralMax()/1.7;
+
+    fCounter.Reset();
 
     return kTRUE;
@@ -280 +283 @@
 
         const Double_t dist = src0.Mod()*TMath::Sin(rad/2);
-        if (dist<TMath::Sqrt(fFit.GetSignalIntegralMax()))
+        const Double_t cut  = TMath::Sqrt(fFit.GetSignalIntegralMax());
+        if (dist<cut)
         {
-            *fLog << warn << "WARNING - Source regions overlap: ";
-            *fLog << "distance " << dist << " less than theta-sq cut ";
-            *fLog << TMath::Sqrt(fFit.GetSignalIntegralMax()) << "!" << endl;
+            *fLog << warn << "WARNING - Source regions overlap: distance ";
+            *fLog << dist << " less than theta-sq cut " << cut << "!" << endl;
+            if (dist*1.7<cut*1.0)
+                fCounter[3]++;
+            else
+                if (dist*1.7<cut*1.5)
+                    fCounter[2]++;
+                else
+                    fCounter[1]++;
+
         }
+        else
+            fCounter[0]++;
     }
 
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Print execution statistics
+//
+Bool_t MHThetaSqN::Finalize()
+{
+    if (GetNumExecutions()>0)
+    {
+        *fLog << inf << endl;
+        *fLog << GetDescriptor() << " execution statistics:" << endl;
+        PrintSkipped(fCounter[3], "Region distance below 1.0sigma (68.3%)");
+        PrintSkipped(fCounter[2], "Region distance below 1.5sigma (86.6%)");
+        PrintSkipped(fCounter[1], "Region distance below 1.7sigma (91.1%)");
+        *fLog << " " << (int)fCounter[0] << " (" << Form("%5.1f", 100.*fCounter[0]/GetNumExecutions()) << "%) Evts ok!" << endl;
+        //*fLog << " " << (int)fCounter[0] << " (" << Form("%5.1f", 100.*fCounter[0]/GetNumExecutions()) << "%) Evts survived calculation!" << endl;
+        *fLog << endl;
+    }
+
+    return MHAlpha::Finalize();
 }
 

trunk/MagicSoft/Mars/mhflux/MHThetaSqN.h

@@ -27 +27 @@
     Bool_t fDoOffCut;
 
+    TArrayI fCounter;        //!
+
     // MHThetaSqN
     TVector2 GetVec(const TVector2 &v, Int_t n1) const;
@@ -45 +47 @@
 
     // MH
-    Bool_t   SetupFill(const MParList *pl);
-    Bool_t   Fill(const MParContainer *par, const Stat_t weight);
+    Bool_t SetupFill(const MParList *pl);
+    Bool_t Fill(const MParContainer *par, const Stat_t weight);
+    Bool_t Finalize();
 
     // MParContainer
@@ -61 +64 @@
     void SetNumOffSourcePos(UInt_t n=3)  { fNumOffSourcePos=TMath::Max(n, 1U); }
 
-    void SetSignificanceCutLevel(Double_t l=1.7)  { fSignificanceCutLevel=l; }
+    void SetSignificanceCutLevel(Double_t l=1.7) { fSignificanceCutLevel=l; }
 
     void SetDoOffCut(Bool_t b=kTRUE)     { fDoOffCut = b; }