Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 2460) +++ /trunk/MagicSoft/Mars/Changelog (revision 2461) @@ -14,4 +14,5 @@ workaround for thread safty by the more correct check whether we are running in the main Thread (TThread::Self()) + - added double-cast to TProgressBar::SetPosition * mbase/MTask.h: @@ -39,4 +40,7 @@ because 'more' also counts the ANSI color codes to determin the line-length) + + * mhistmc/MHMcCollectionArea.cc: + - added UseCurrentStyle such that the axis labels are displayed * mbase/MTime.[h,cc]: Index: /trunk/MagicSoft/Mars/mbase/MTime.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MTime.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mbase/MTime.cc (revision 2461) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -24,11 +24,19 @@ ///////////////////////////////////////////////////////////////////////////// -// // -// MTime // -// // -// A generalized MARS time stamp // -// // +// +// MTime +// +// A generalized MARS time stamp +// +// +// Version 1: +// ---------- +// - first version +// +// Version 2: +// ---------- +// - removed fTimeStamp[2] +// ///////////////////////////////////////////////////////////////////////////// - #include "MTime.h" @@ -43,8 +51,8 @@ void MTime::Print(Option_t *) const { - fLog->setf(ios::showbase); - *fLog << "MTime Information: " << hex - << " " << setfill('0') << setw(2) << fTimeStamp[0] - << " " << setfill('0') << setw(2) << fTimeStamp[1] << endl << endl; + *fLog << GetDescriptor() << ": " << dec; + *fLog << setfill('0') << setw(2) << (int)fHour << ":"; + *fLog << setfill('0') << setw(2) << (int)fMin << ":"; + *fLog << setfill('0') << setw(2) << (int)fSec << "."; + *fLog << setfill('0') << setw(9) << fNanoSec << endl; } - Index: /trunk/MagicSoft/Mars/mbase/MTime.h =================================================================== --- /trunk/MagicSoft/Mars/mbase/MTime.h (revision 2460) +++ /trunk/MagicSoft/Mars/mbase/MTime.h (revision 2461) @@ -17,5 +17,5 @@ { private: - UInt_t fTimeStamp[2]; // type of raw event which should be processed by this task + //UInt_t fTimeStamp[2]; // type of raw event which should be processed by this task UInt_t fDuration; // time of validity @@ -31,35 +31,19 @@ fTitle = title; - SetTime(0, 0); + SetTime((ULong_t)0); } - MTime(UInt_t t1, UInt_t t0) - { - SetTime(t1, t0); - } - - MTime(MTime& t) - { - fTimeStamp[0] = t.fTimeStamp[0]; - fTimeStamp[1] = t.fTimeStamp[1]; - fDuration = t.fDuration; - } + MTime(MTime& t) { *this = t; } void operator=(MTime &t) { - fTimeStamp[0] = t.fTimeStamp[0]; - fTimeStamp[1] = t.fTimeStamp[1]; fDuration = t.fDuration; + fHour = t.fHour; + fMin = t.fMin; + fSec = t.fSec; + fNanoSec = t.fNanoSec; } - ~MTime() {} - void Print(Option_t *t=NULL) const; - - void SetTime(UInt_t t1, UInt_t t0) - { - fTimeStamp[0] = t1; - fTimeStamp[1] = t0; - } void SetCT1Time(UInt_t t1, UInt_t t0) @@ -117,13 +101,4 @@ } - UInt_t GetTimeLo() - { - return fTimeStamp[0]; - } - UInt_t GetTimeHi() - { - return fTimeStamp[1]; - } - UInt_t GetDuration() { @@ -140,5 +115,5 @@ } - ClassDef(MTime, 1) //A generalized MARS time stamp + ClassDef(MTime, 2) //A generalized MARS time stamp }; Index: /trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc =================================================================== --- /trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (revision 2461) @@ -905,5 +905,5 @@ // int isecs_since_midday; // seconds passed since midday before sunset (JD of run start) // int isecfrac_200ns; // fractional part of isecs_since_midday - fTime->SetTime(event.isecfrac_200ns, event.isecs_since_midday); + fTime->SetCT1Time(event.isecfrac_200ns, event.isecs_since_midday); fTime->SetDuration((Int_t)fRawRunHeader->GetMJD()); fTime->SetReadyToSave(); Index: /trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc (revision 2461) @@ -117,5 +117,5 @@ MHillasSrc &hil = *(MHillasSrc*)par; - fHist.Fill(fabs(hil.GetAlpha()), fEnergy->GetEnergy(), 0.0001*fTime->GetTimeLo(), w); + fHist.Fill(fabs(hil.GetAlpha()), fEnergy->GetEnergy(), *fTime, w); return kTRUE; } Index: /trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc (revision 2461) @@ -104,5 +104,5 @@ const MMcEvt &mcevt = *(MMcEvt*)par; - fHist.Fill(mcevt.GetEnergy(), 0.0001*fTime->GetTimeLo(), w); + fHist.Fill(mcevt.GetEnergy(), *fTime, w); return kTRUE; Index: /trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc (revision 2461) @@ -63,5 +63,5 @@ fHist.SetDirectory(NULL); - fHist.SetXTitle("time [s]"); + fHist.SetXTitle("t [s]"); fHist.SetYTitle("\\bar{\\Theta} [ \\circ]"); } @@ -122,7 +122,5 @@ Bool_t MHThetabarTime::Fill(const MParContainer *par, const Stat_t w) { - const Int_t time = fTime->GetTimeLo(); - - fHist.Fill(0.0001*time, fMcEvt->GetTheta()*kRad2Deg, w); + fHist.Fill(*fTime, fMcEvt->GetTheta()*kRad2Deg, w); return kTRUE; Index: /trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc (revision 2461) @@ -146,5 +146,5 @@ Bool_t MHTimeDiffTheta::Fill(const MParContainer *par, const Stat_t w) { - const Double_t time = 200e-9*fTime->GetTimeLo() + fTime->GetTimeHi(); + const Double_t time = *fTime; fHist.Fill(time-fLastTime, fMcEvt->GetTelescopeTheta()*kRad2Deg, w); Index: /trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc (revision 2461) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! Author(s): Wolfgang Wittek 1/2002 ! @@ -25,12 +25,11 @@ ////////////////////////////////////////////////////////////////////////////// -// // -// MHTimeDiffTime // -// // -// calculates the 2D-histogram time-difference vs. time // -// // -// // +// +// MHTimeDiffTime +// +// calculates the 2D-histogram time-difference vs. time +// +// ////////////////////////////////////////////////////////////////////////////// - #include "MHTimeDiffTime.h" @@ -139,5 +138,5 @@ Bool_t MHTimeDiffTime::Fill(const MParContainer *par, const Stat_t w) { - const Double_t time = 200e-9*fTime->GetTimeLo() + fTime->GetTimeHi(); + const Double_t time = *fTime; fHist.Fill(time-fLastTime, time, w); @@ -146,6 +145,2 @@ return kTRUE; } - - - - Index: /trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc =================================================================== --- /trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (revision 2460) +++ /trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (revision 2461) @@ -125,5 +125,4 @@ Clear(); } - // -------------------------------------------------------------------------- @@ -216,5 +215,6 @@ } } - *fLog << endl; + if (fPixLoGainOn->GetSize()) + *fLog << endl; } @@ -226,6 +226,6 @@ { fDAQEvtNumber = uiN; - fTrigPattern[0] = (UInt_t) (ulTP/4294967296.0) ; - fTrigPattern[1] = (UInt_t) (ulTP-fTrigPattern[0]*4294967296.0); + fTrigPattern[0] = (UInt_t)(ulTP/4294967296.0) ; + fTrigPattern[1] = (UInt_t)(ulTP-fTrigPattern[0]*4294967296.0); } @@ -239,22 +239,19 @@ fin.read((char*)&fDAQEvtNumber, 4); // Total=4 - UInt_t fAbsTime[2]; - fin.read((char*)fAbsTime, 8); // Total=12 + UInt_t abstime[2]; + fin.read((char*)abstime, 8); // Total=12 // // store the time of the event in the corresponding container // - const Double_t mhz = 9.375; // [1e6 ticks/s] - const Double_t t = (Double_t)fAbsTime[0]/mhz; // [ns] + const Double_t mhz = 9.375; // [1e6 ticks/s] + const Double_t t = (Double_t)abstime[0]/mhz; // [ns] const UShort_t ns = (UShort_t)fmod(t*1e-3, 1e9); const Byte_t s = (Byte_t)fmod(t/1e12, 60); const Byte_t m = (Byte_t)fmod(t/60e12, 60); const Byte_t h = (Byte_t)(t/3600e12); - fTime->SetTime(h, m, s, ns); - fTime->SetTime(fAbsTime[0], fAbsTime[1]); Byte_t dummy[4]; - fin.read((char*)&fNumTrigLvl1, 4); // Total=16 fin.read((char*)&fNumTrigLvl2, 4); // Total=20