Changeset 8776 for trunk

Timestamp:

12/03/07 17:46:31 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mmuon/MHSingleMuon.h (modified) (3 diffs)
• mmuon/MMuonCalibPar.cc (modified) (4 diffs)
• mmuon/MMuonCalibPar.h (modified) (3 diffs)
• mmuon/MMuonCalibParCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
    * mhflux/MHAlpha.[h,cc]:
      - added new member functions to apply scaling to off-data
-     - added a public member function which allows to reinitiate fitting
+     - 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()
+     - replaced a loop to reset the used pixels by a call
+       to fUsed.Reset()
 
    * mmuon/MHSingleMuon.[h,cc]:
@@ -43 +45 @@
 
    * mmuon/MMuonCalibParCalc.cc:
-     - copy result of arrival time fit from histogram to storage container
+     - copy result of arrival time fit from histogram to storage
+       container
 
 

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h

@@ -28 +28 @@
     TH1F     fHistTime;   // Histogram of arrival time distribution along the arc.
 
+    Double_t fRelTimeMean;   // Result of the gaus fit to the arrival time
+    Double_t fRelTimeSigma;  // Result of the gaus fit to the arrival time
+
     Bool_t FindRangeAboveThreshold(const TProfile &h, Float_t thres, Int_t &first, Int_t &last) const;
 
@@ -43 +46 @@
     const TProfile &GetHistWidth() const { return fHistWidth; }
 
+    Double_t GetRelTimeMean() const  { return fRelTimeMean; }
+    Double_t GetRelTimeSigma() const { return fRelTimeSigma; }
+
     Float_t CalcSize() const;
 
@@ -48 +54 @@
     void Paint(Option_t *o="");
 
-    ClassDef(MHSingleMuon, 1)
+    ClassDef(MHSingleMuon, 2)
 };
 

trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.cc

@@ -19 +19 @@
 !   Author(s): Markus Meyer 10/2004 <mailto:meyer@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -34 +34 @@
 // these information by using the MMuonCalibParCalc. See also these class
 // manuals.
+//
+// Class Version 2:
+// ----------------
+//   + Float_t fRelTimeMean;   // Result of the gaus fit to the arrival time
+//   + Float_t fRelTimeSigma;  // Result of the gaus fit to the arrival time
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -69 +74 @@
 //    fEstImpact   = -1.;
     fPeakPhi     =  0.;
+
+    fRelTimeMean    =  0;
+    fRelTimeSigma   = -1;
 }
 
@@ -81 +89 @@
     *fLog << " - Size of muon   [phe] = " << fMuonSize    << endl;
     *fLog << " - Peak Phi       [deg] = " << fPeakPhi     << endl;
+    *fLog << " - Rel.Time Mean   [ns] = " << fRelTimeMean  << endl;
+    *fLog << " - Rel.Time Sigma  [ns] = " << fRelTimeSigma << endl;
 }
 

trunk/MagicSoft/Mars/mmuon/MMuonCalibPar.h

@@ -26 +26 @@
     Float_t fPeakPhi;       // The angle which indicates the peak position in the estimated circle
 
+    Float_t fRelTimeMean;      // [ns] Result of the gaus fit to the arrival time
+    Float_t fRelTimeSigma;     // [ns] Result of the gaus fit to the arrival time
+
 public:
     MMuonCalibPar(const char *name=NULL, const char *title=NULL);
@@ -41 +44 @@
     //Bool_t  IsUseUnmap()        const { return fUseUnmap; }
     Float_t GetPeakPhi()        const { return fPeakPhi; }
+    Float_t GetRelTimeMean()    const { return fRelTimeMean; }
+    Float_t GetRelTimeSigma()   const { return fRelTimeSigma; }
 
 //    void    SetArcLength(Float_t len)       { fArcLength = len; }
@@ -51 +56 @@
     //void    SetUseUnmap()                   { fUseUnmap = kTRUE; }
     void    SetPeakPhi(Float_t phi)         { fPeakPhi = phi; }
+    void    SetTime(Float_t mean, Float_t sigma) { fRelTimeMean=mean; fRelTimeSigma=sigma; }
 
     void    Print(Option_t *opt=NULL) const;
 
-    ClassDef(MMuonCalibPar, 1) // Container to hold muon calibration parameters
+    ClassDef(MMuonCalibPar, 2) // Container to hold muon calibration parameters
 };
     

trunk/MagicSoft/Mars/mmuon/MMuonCalibParCalc.cc

@@ -175 +175 @@
     fMuonCalibPar->SetArcPhi(arcphi);
 
+    fMuonCalibPar->SetTime(fHist->GetRelTimeMean(), fHist->GetRelTimeSigma());
+
 //    const Float_t conv = TMath::RadToDeg()*fGeomCam->GetConvMm2Deg();
 //    fMuonCalibPar->SetArcLength(fMuonCalibPar->GetArcPhi()