Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 9572) +++ /trunk/MagicSoft/Mars/Changelog (revision 9573) @@ -30,4 +30,28 @@ * 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 Index: /trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc =================================================================== --- /trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (revision 9572) +++ /trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (revision 9573) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $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,5 +84,4 @@ #include -#include #include #include @@ -231,9 +230,10 @@ // 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,9 +253,9 @@ // 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,8 +435,9 @@ 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; Index: /trunk/MagicSoft/Mars/mpointing/MPointing.cc =================================================================== --- /trunk/MagicSoft/Mars/mpointing/MPointing.cc (revision 9572) +++ /trunk/MagicSoft/Mars/mpointing/MPointing.cc (revision 9573) @@ -268,5 +268,6 @@ sout += '\t'; sout += Form("%11f", val); - sout += "° \t"; + sout += UTF8::kDeg; + sout += " \t"; val *= TMath::DegToRad(); Index: /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc (revision 9572) +++ /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc (revision 9573) @@ -126,5 +126,5 @@ // 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,4 +171,5 @@ // 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,4 +278,9 @@ // // +// [2010-02-03 M. Garcz.] +// +// New LUTs for M2 +// +// // Others // ------ Index: /trunk/MagicSoft/Mars/msignal/MSignalCam.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MSignalCam.cc (revision 9572) +++ /trunk/MagicSoft/Mars/msignal/MSignalCam.cc (revision 9573) @@ -18,5 +18,17 @@ ! Author(s): Thomas Bretz, 03/2005 ! -! 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; //! ! ! Index: /trunk/MagicSoft/Mars/msignal/MSignalCam.h =================================================================== --- /trunk/MagicSoft/Mars/msignal/MSignalCam.h (revision 9572) +++ /trunk/MagicSoft/Mars/msignal/MSignalCam.h (revision 9573) @@ -20,9 +20,9 @@ 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,5 +94,5 @@ operator TIterator*() const; - ClassDef(MSignalCam, 1) // class for an event containing cerenkov photons + ClassDef(MSignalCam, 2) // class for an event containing cerenkov photons }; Index: /trunk/MagicSoft/Mars/msimreflector/MMirrorHex.h =================================================================== --- /trunk/MagicSoft/Mars/msimreflector/MMirrorHex.h (revision 9572) +++ /trunk/MagicSoft/Mars/msimreflector/MMirrorHex.h (revision 9573) @@ -24,4 +24,5 @@ Double_t GetMaxR() const { return fMaxR; } Double_t GetA() const; + Double_t GetD() const { return fD; } Bool_t CanHit(const MQuaternion &p) const;