Changeset 9573 for trunk

Timestamp:

04/19/10 13:40:16 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mmuon/MHSingleMuon.cc (modified) (5 diffs)
• mpointing/MPointing.cc (modified) (1 diff)
• mpointing/MPointingDevCalc.cc (modified) (3 diffs)
• msignal/MSignalCam.cc (modified) (1 diff)
• msignal/MSignalCam.h (modified) (2 diffs)
• msimreflector/MMirrorHex.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
    * mgeom/MGeom.[h,cc]:
      - implemented function to return the distance squared
+
+   * mjobs/MJSimulation.cc:
+     - display degree symbol correctly in plots
+     - added artificial star-files to output
+     - for the moment the output of the reflector files is suppressed
+
+   * mmuon/MHSingleMuon.cc:
+     - catch if the fit failed
+     - replaced use of gMinuit by direct access to the function
+
+   * mpointing/MPointing.cc:
+     - replaced deg-symbol by UTF8 character
+
+   * mpointing/MPointingDevCalc.cc:
+     - added more information
+
+   * msignal/MSignalCam.[h,cc]:
+     - made the data members describing the image persistent.
+       they are not guranteed to have correct contents. Use
+       MNewImagePar instead.
+     - increased class version number accordingly
+
+   * msimreflector/MMirrorHex.h:
+     - added Getter for fD
 
 

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.19 2009-03-01 21:48:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.20 2010-04-19 12:40:16 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -84 +84 @@
 
 #include <TF1.h>
-#include <TMinuit.h>
 #include <TPad.h>
 #include <TCanvas.h>
@@ -231 +230 @@
 
         // use only the inner pixles. FIXME: This is geometry dependent
-        if(gpix.GetAidx()>0)
+        if (gpix.GetAidx()>0)
             continue;
 
         fHistWidth.Fill(dist*fGeomCam->GetConvMm2Deg(), pix.GetNumPhotons());
     }
+
     // Setup the function and perform the fit
     TF1 g1("g1", "gaus");//, -fHistTime.GetXmin(), fHistTime.GetXmax());
@@ -253 +253 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
-    fHistTime.Fit(&g1, "QNB");
-
-    Double_t dummy;
-    gMinuit->GetParameter(1, fRelTimeMean,   dummy);  // get the mean  value
-    gMinuit->GetParameter(2, fRelTimeSigma,  dummy);  // get the sigma value
+    if (fHistTime.Fit(&g1, "QNB"))
+        return kTRUE;
+
+    fRelTimeMean  = g1.GetParameter(1);
+    fRelTimeSigma = g1.GetParameter(2);
 
     // The mean arrival time which was subtracted before will
@@ -435 +435 @@
     fHistWidth.Fit(&f1, "QRN");
 
-    chi = f1.GetChisquare()/f1.GetNDF();
-
-    Double_t ferr;
-    gMinuit->GetParameter(2, width, ferr); // get the sigma value
+    if (!gMinuit)
+        return kFALSE;
+
+    chi   = f1.GetChisquare()/f1.GetNDF();
+    width = f1.GetParameter(2);
 
     return kTRUE;

trunk/MagicSoft/Mars/mpointing/MPointing.cc

@@ -268 +268 @@
         sout += '\t';
         sout += Form("%11f", val);
-        sout += "°     \t";
+        sout += UTF8::kDeg;
+        sout += "     \t";
         val *= TMath::DegToRad();
 

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -126 +126 @@
 //               shifted a little bit.
 //
-//   16.04.2006: Around this date a roque lamp focussing hass been done
+//   16.04.2006: Around this date a roque lamp focussing has been done
 //
 //   25.04.2006: A missalignment introduced with the roque adjust has been
@@ -171 +171 @@
 //   01. Feb. 2010              New pointing models for both telescopes
 //   26. Feb. 2010              New pointing models for both telescopes
+//   31. Mar. 2010              New pointing models for both telescopes
 //
 // From 2.2.2006 beginnig of the night (21:05h, run >=81855) to 24.2.2006
@@ -277 +278 @@
 //
 //
+// [2010-02-03 M. Garcz.]
+//
+// New LUTs for M2
+//
+//
 // Others
 // ------

trunk/MagicSoft/Mars/msignal/MSignalCam.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 03/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Copyright: MAGIC Software Development, 2000-2010
+!
+! Version 2:
+! ----------
+!
+! Made persistent (the correct contets is not guranteed, because it is
+! calculated from the outside (e.g. in MImgCleanStd))
+!
+!    Short_t       fNumIslands;                  //!
+!    Short_t       fNumSinglePixels;             //!
+!    Float_t       fSizeSinglePixels;            //!
+!    Float_t       fSizeSubIslands;              //!
+!    Float_t       fSizeMainIsland;              //!
 !
 !

trunk/MagicSoft/Mars/msignal/MSignalCam.h

@@ -20 +20 @@
     friend class MSignalCamIter;
 private:
-    Short_t       fNumIslands;
-    Short_t       fNumSinglePixels;
-    Float_t       fSizeSinglePixels;
-    Float_t       fSizeSubIslands;
-    Float_t       fSizeMainIsland;
+    Short_t       fNumIslands;                  //!
+    Short_t       fNumSinglePixels;             //!
+    Float_t       fSizeSinglePixels;            //!
+    Float_t       fSizeSubIslands;              //!
+    Float_t       fSizeMainIsland;              //!
 
     Int_t         fNumPixelsSaturatedHiGain;
@@ -94 +94 @@
     operator TIterator*() const;
 
-    ClassDef(MSignalCam, 1) // class for an event containing cerenkov photons
+    ClassDef(MSignalCam, 2) // class for an event containing cerenkov photons
 };
 

trunk/MagicSoft/Mars/msimreflector/MMirrorHex.h

@@ -24 +24 @@
     Double_t GetMaxR() const { return fMaxR; }
     Double_t GetA() const;
+    Double_t GetD() const { return fD; }
 
     Bool_t CanHit(const MQuaternion &p) const;