Changeset 8775 for trunk/MagicSoft/Mars

Timestamp:

12/03/07 17:44:59 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mdata/MData.h (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (2 diffs)
• mhflux/MAlphaFitter.h (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (2 diffs)
• mhflux/MHAlpha.h (modified) (3 diffs)
• mhist/MHCamera.cc (modified) (3 diffs)
• mmuon/MHSingleMuon.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/12/03 Thomas Bretz
+
+   * mdata/MData.h:
+     - added Print to context menu
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added new member functions to apply scaling to off-data
+
+   * mhflux/MHAlpha.[h,cc]:
+     - added new member functions to apply scaling to off-data
+     - added a public member function which allows to reinitiate fitting
+
+   * mhist/MHCamera.cc:
+     - replaced a loop to reset the used pixels by a call to fUsed.Reset()
+
+   * mmuon/MHSingleMuon.[h,cc]:
+     - keep mean and rms of relative arrival time of the fit
+     - increased class Version accordingly
+
+   * mmuon/MMuonCalibPar.[h,cc]:
+     - keep mean and rms of relative arrival time of the fit
+     - increased class Version accordingly
+
+   * mmuon/MMuonCalibParCalc.cc:
+     - copy result of arrival time fit from histogram to storage container
+
+
 
  2007/11/28 Daniela Dorner

trunk/MagicSoft/Mars/mdata/MData.h

@@ -25 +25 @@
     Double_t operator()() { return GetValue(); }
 
-    void Print(Option_t *opt = "") const;
+    void Print(Option_t *opt = "") const; //*MENU*
     Bool_t AsciiWrite(ostream &out) const;
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -630 +630 @@
 }
 */
+
 Bool_t MAlphaFitter::FitAlpha(const TH3D &hon, const TH3D &hof, Bool_t paint)
 {
@@ -646 +647 @@
 
     return rc;
+}
+
+Bool_t MAlphaFitter::ApplyScaling(const TH3D &hon, TH3D &hof, UInt_t bin) const
+{
+    const TString name1(Form("TempAlpha%06d_on",  gRandom->Integer(1000000)));
+    const TString name0(Form("TempAlpha%06d_off", gRandom->Integer(1000000)));
+
+    TH1D *h1 = hon.ProjectionZ(name1, -1, -1, bin, bin, "E");
+    TH1D *h0 = hof.ProjectionZ(name0, -1, -1, bin, bin, "E");
+    h1->SetDirectory(0);
+    h0->SetDirectory(0);
+
+    const Double_t scale = Scale(*h0, *h1);
+
+    delete h0;
+    delete h1;
+
+    for (int x=0; x<=hof.GetNbinsX()+1; x++)
+        for (int z=0; z<=hof.GetNbinsZ()+1; z++)
+        {
+            hof.SetBinContent(x, bin, z, hof.GetBinContent(x, bin, z)*scale);
+            hof.SetBinError(  x, bin, z, hof.GetBinError(  x, bin, z)*scale);
+        }
+
+    return scale>0;
+}
+
+Bool_t MAlphaFitter::ApplyScaling(const TH3D &hon, TH3D &hof) const
+{
+    for (int y=0; y<=hof.GetNbinsY()+1; y++)
+        ApplyScaling(hon, hof, y);
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -237 +237 @@
     Double_t Scale(TH1D &off, const TH1D &on) const;
 
+    Bool_t ApplyScaling(const TH3D &hon, TH3D &hof, UInt_t bin) const;
+    Bool_t ApplyScaling(const TH3D &hon, TH3D &hof) const;
+
     // Interface to result
     void PaintResult(Float_t x=0.04, Float_t y=0.94, Float_t size=0.035, Bool_t draw=kFALSE) const;

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -1010 +1010 @@
 Bool_t MHAlpha::Finalize()
 {
-    //TH1D *h = fHist.ProjectionZ("AlphaExc_px", -1, 9999, -1, 9999, "E");
-    //h->SetDirectory(0);
-    //Bool_t rc = fFit.Fit(*h);
-    //delete h;
-
-    if (!fFit.FitAlpha(fHist, fOffData))
+    if (!FitAlpha())
     {
         *fLog << warn << "MAlphaFitter - Fit failed..." << endl;
@@ -1099 +1094 @@
 }
 
+void MHAlpha::ApplyScaling()
+{
+    if (!fOffData)
+        return;
+
+    fFit.ApplyScaling(fHist, *const_cast<TH3D*>(fOffData));
+}
+
 Int_t MHAlpha::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -104 +104 @@
     const TH1D &GetHEnergy() const { return fHEnergy; }
 
+    const TH3D *GetOffData() const { return fOffData; }
+
     // Setter
     void SetNameParameter(const char *name) { fNameParameter=name; }
@@ -132 +134 @@
     void ForceUsingSize(Bool_t b=kTRUE) { fForceUsingSize=b; }
 
+    Bool_t FitAlpha()
+    {
+        return fFit.FitAlpha(fHist, fOffData);
+    }
+
     void DrawNicePlot(const char *title="MAGIC Telescope observation", const char *watermark="preliminary") { DrawNicePlot(kTRUE, title, watermark); } //*MENU*
     void DrawNicePlot(Bool_t newc, const char *title=0, const char *watermark=0);
@@ -139 +146 @@
     virtual void InitMapping(MHMatrix *mat, Int_t type=0);
     void StopMapping();
+
+    void ApplyScaling();
 
     // TObject

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.106 2007-10-13 18:56:27 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.107 2007-12-03 17:44:46 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -165 +165 @@
     rc->SetDirectory(NULL);
 
+    // fGeomCam need special treatment due to its TObjArray
     if (rc->fGeomCam && fGeomCam)
     {
@@ -191 +192 @@
 
     fUsed.Set(geom.GetNumPixels());
-    for (Int_t i=0; i<fNcells-2; i++)
-        ResetUsed(i);
+    fUsed.Reset();
 
     fBinEntries.Set(geom.GetNumPixels()+2);

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.16 2007-08-06 16:50:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.17 2007-12-03 17:44:59 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -70 +70 @@
 // your results!!
 //
-// Inputcontainer:
+// InputContainer:
 //   - MGeomCam
 //   - MMuonSearchPar
 //
+//
+// Class Version 2:
+// ----------------
+//   + Double_t fRelTimeMean;   // Result of the gaus fit to the arrival time
+//   + Double_t fRelTimeSigma;  // Result of the gaus fit to the arrival time
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -194 +199 @@
 Bool_t MHSingleMuon::Fill(const MParContainer *par, const Stat_t w)
 {
+    fRelTimeMean  =  0;
+    fRelTimeSigma = -1;
+
     fHistPhi.Reset();
     fHistWidth.Reset();
@@ -247 +255 @@
     fHistTime.Fit(&g1, "QNB");
 
-    //    Double_t err;
-    Double_t sig, mean, dummy;
-    gMinuit->GetParameter(1, mean, dummy);  // get the mean  value
-    gMinuit->GetParameter(2, sig,  dummy);  // get the sigma value
+    Double_t dummy;
+    gMinuit->GetParameter(1, fRelTimeMean,   dummy);  // get the mean  value
+    gMinuit->GetParameter(2, fRelTimeSigma,  dummy);  // get the sigma value
 
     // The mean arrival time which was subtracted before will
     // be added again, now
-    const Double_t tm0 = fMuonSearchPar->GetTime()+mean;
+    const Double_t tm0 = fMuonSearchPar->GetTime()+fRelTimeMean;
 
     for (Int_t i=0; i<entries; i++)
@@ -268 +275 @@
         // if the signal is not near the estimated circle, it is ignored.
         if (TMath::Abs(dist-fMuonSearchPar->GetRadius())<fMargin &&
-            TMath::Abs(pix.GetArrivalTime()-tm0) < 2*sig)
+            TMath::Abs(pix.GetArrivalTime()-tm0) < 2*fRelTimeSigma)
         {
             fHistPhi.Fill(TMath::ATan2(dx, dy)*TMath::RadToDeg(), pix.GetNumPhotons());