Changeset 7064 for trunk

Timestamp:

05/19/05 15:38:38 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mbase/MTaskList.cc (modified) (1 diff)
• mbase/MTaskList.h (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (1 diff)
• mhflux/MAlphaFitter.h (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (3 diffs)
• mhflux/MHAlpha.h (modified) (2 diffs)
• mhflux/MHThetaSq.cc (modified) (4 diffs)
• mhflux/MHThetaSq.h (modified) (2 diffs)
• mjobs/MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
    * mmain/MEventDisplay.cc:
      - removed MC trigger display
+
+   * mbase/MTaskList.[h,cc]:
+     - member function to use MTaskList in a TIter
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - improved the output line plotted into the histogram
+     - implemented getter for fSigInt
+
+   * mhflux/MHAlpha.[h,cc]:
+     - added some comments
+     - improved DistancetoPrimitive
+
+   * mhflux/MHThetaSq.[h,cc]:
+     - derives the binning now from the cut value or the MAlphaFitter
 
 
@@ -1317 +1331 @@
 
 
-
  2005/04/14 Thomas Bretz
 
@@ -2610 +2623 @@
      - include MCalibrationPulseTimeCam to display
 
+
+
  2005/02/18 Thomas Bretz
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -928 +928 @@
     return kTRUE;
 }
+
+// --------------------------------------------------------------------------
+//
+// Can be used to create an iterator over all tasks, eg:
+//   MTaskList tlist;
+//   TIter Next(tlist); // Be aware: Use a object here rather than a pointer!
+//   TObject *o=0;
+//   while ((o=Next()))
+//   {
+//       [...]
+//   }
+//
+MTaskList::operator TIterator*() const
+{
+    return new TListIter(fTasks);
+}

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -84 +84 @@
     Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
 
+    operator TIterator*() const;
+
     ClassDef(MTaskList, 1) //collection of tasks to be performed in the eventloop
 };

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -293 +293 @@
 {
     const Double_t w  = GetGausSigma();
-    const Int_t    l  = w<=0 ? 0 : (Int_t)TMath::Ceil(-TMath::Log10(w));
-    const TString fmt = Form("\\sigma_{Li/Ma}=%%.1f  \\omega=%%.%df\\circ  E=%%d  (\\alpha<%%.1f\\circ)  (\\chi_{b}^{2}/ndf=%%.1f  \\chi_{s}^{2}/ndf=%%.1f  c_{0}=%%.1f)",
-                             l<1?1:l);
+    const Double_t m  = fIntegralMax;
+
+    const Int_t    l1 = w<=0 ? 0 : (Int_t)TMath::Ceil(-TMath::Log10(w));
+    const Int_t    l2 = m<=0 ? 0 : (Int_t)TMath::Ceil(-TMath::Log10(m));
+    const TString fmt = Form("\\sigma_{Li/Ma}=%%.1f  \\omega=%%.%df\\circ  E=%%d  B=%%d  (x<%%.%df)  (\\chi_{b}^{2}/ndf=%%.1f  \\chi_{s}^{2}/ndf=%%.1f  c_{0}=%%.1f)",
+                             l1<1?1:l1+1, l2<1?1:l2+1);
 
     TLatex text(x, y, Form(fmt.Data(), fSignificance, w, (int)fEventsExcess,
-                           fIntegralMax, fChiSqBg, fChiSqSignal,
+                           fEventsBackground, m, fChiSqBg, fChiSqSignal,
                            fCoefficients[3]));
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -109 +109 @@
         fCoefficients.Set(3+s+1); fCoefficients.Reset(); }
 
+    Double_t GetSignalIntegralMax() const  { return fSigInt; }
+
     Double_t GetEventsExcess() const       { return fEventsExcess; }
     Double_t GetEventsSignal() const       { return fEventsSignal; }

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -148 +148 @@
 }
 
-Double_t MHAlpha::GetVal() const
-{
-    return static_cast<const MHillasSrc*>(fParameter)->GetAlpha();
-}
-
 Float_t MHAlpha::FitEnergyBins(Bool_t paint)
 {
@@ -206 +201 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the value from fParemeter which should be filled into the plots
+//
+Double_t MHAlpha::GetVal() const
+{
+    return static_cast<const MHillasSrc*>(fParameter)->GetAlpha();
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Store the pointer to the parameter container storing the plotted value
+// (here MHillasSrc) in fParameter.
+//
+// return whether it was found or not.
+//
 Bool_t MHAlpha::GetParameter(const MParList &pl)
 {
@@ -921 +933 @@
     return rc;
 }
+
+Int_t MHAlpha::DistancetoPrimitive(Int_t px, Int_t py)
+{
+    // If pad has no subpad return (we are in one of the subpads)
+    if (gPad->GetPad(1)==NULL)
+        return 9999;
+
+    // If pad has a subpad we are in the main pad. Check its value.
+    return gPad->GetPad(1)->DistancetoPrimitive(px,py)==0 ? 0 : 9999;
+}

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -34 +34 @@
     MParContainer *fParameter;  //!
 
-private:
     const TH3D *fOffData;
 
     MAlphaFitter fFit;          // SEEMS THAT STREAMER HAS SOME PROBLEMS... MAYBE IF FUNC IS USED AT THE SAME TIME FOR FITS (PAINT)
 
+private:
     TH1D fHEnergy;              // excess events vs energy
     TH1D fHTheta;               // excess events vs theta
@@ -74 +74 @@
     void PaintText(Double_t val, Double_t error) const;
 
-    Int_t DistancetoPrimitive(Int_t px, Int_t py) { return 0; }
+    Int_t DistancetoPrimitive(Int_t px, Int_t py);
 
     virtual Bool_t      GetParameter(const MParList &pl);

trunk/MagicSoft/Mars/mhflux/MHThetaSq.cc

@@ -29 +29 @@
 // This is a MHAlpha using "ThetaSquared [MParameterD]" as 'alpha'
 //
+// The default binning is determined from the integration range set in
+// MAlphaFitter.
+//
 // For more detailes see MHAlpha.
 //
@@ -39 +42 @@
 #include "MBinning.h"
 #include "MParList.h"
+#include "MTaskList.h"
+#include "MParameters.h"
 
 #include "MLog.h"
@@ -88 +93 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Overwrites the binning in Alpha (ThetaSq) with a binning for which
+// the upper edge of the 5th bin (bin=5) fit the signal integration window.
+// In total 75 bins are setup.
+//
+// In case of fOffData!=NULL the binnings are taken later from fOffData anyhow.
+//
+Bool_t MHThetaSq::SetupFill(const MParList *pl)
+{
+    // Default is from default fitter
+    // if a user defined fitter is in the parlist: use this range
+    MAlphaFitter *fit = (MAlphaFitter*)pl->FindObject("MAlphaFitter");
+    if (!fit)
+        fit = &fFit;
+
+    MParameterD *cut = (MParameterD*)pl->FindObject("ThetaSquaredCut", "MParameterD");
+    if (cut)
+        fit->SetSignalIntegralMax(cut->GetVal());
+
+    // Get Histogram binnings
+    MBinning binst, binse;
+    binst.SetEdges(fHist, 'x');
+    binse.SetEdges(fHist, 'y');
+
+    // Calculate bining which fits alpha-cut
+    const Double_t intmax = fit->GetSignalIntegralMax();
+    const UInt_t   nbins  = 75;
+    const UInt_t   nsig   =  5;
+
+    MBinning binsa(nbins, 0, nbins*intmax/nsig);
+
+    // Apply binning
+    binsa.Apply(fHistTime);
+    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+
+    // Remark: Binnings might be overwritten in MHAlpha::SetupFill
+    return MHAlpha::SetupFill(pl);
+}
+
+// --------------------------------------------------------------------------
+//
+// Store the pointer to the parameter container storing the plotted value
+// (here ThetaSq) in fParameter.
+//
+// return whether it was found or not.
+//
 Bool_t MHThetaSq::GetParameter(const MParList &pl)
 {
@@ -98 +150 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the value from fParemeter which should be filled into the plots
+//
 Double_t MHThetaSq::GetVal() const
 {

trunk/MagicSoft/Mars/mhflux/MHThetaSq.h

@@ -6 +6 @@
 #endif
 
+class MTaskList;
+
 class MHThetaSq : public MHAlpha
 {
 private:
-    MParameterD  *fThetaSq;     //!
+    MParameterD  *fThetaSq; //!
 
     Bool_t      GetParameter(const MParList &pl);
@@ -18 +20 @@
     }
 
+    Bool_t SetupFill(const MParList *pl);
+
 public:
     MHThetaSq(const char *name=NULL, const char *title=NULL);

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -433 +433 @@
     tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
     tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
+    tlist.AddToList(&tlist2, "Events");
     if (!ismc)
         tlist.AddToList(&fillw,  "CC");
-    tlist.AddToList(&tlist2, "Events");
     tlist.AddToList(&write);