Index: trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc (revision 3486) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc (revision 3487) @@ -153,10 +153,14 @@ ULong_t sqsb = 0; // sum sqares signal+background - Int_t sat = 0; // saturates? - Int_t nb = 0; - Int_t nsb = 0; + Int_t sat = 0; // saturates? + Int_t ishi = 0; // has a high content? + Int_t nb = 0; + Int_t nsb = 0; if (*max==255) sat++; + + if (*max>80) + ishi++; while (ptr1) + if (sat==0 && ishi) + { + // Area: x9 + ptr = pixel.GetLoGainSamples(); + max = ptr+pixel.GetIdxMaxLoGainSample(); + end = ptr+fRawEvt->GetNumLoGainSamples(); + + sumb = 0; // sum background + sqb = 0; // sum sqares background + nb = 0; + + while (ptr1 && !ishi) { // Area: x9 Index: trunk/MagicSoft/Mars/mastro/MAstroCamera.cc =================================================================== --- trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (revision 3486) +++ trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (revision 3487) @@ -286,5 +286,5 @@ mean *= 1./num; - DrawStar(mean(1), mean(0), *radec, !hasmean); + DrawStar(mean(1), mean(0), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(1), mean(0))); } } Index: trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc =================================================================== --- trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (revision 3486) +++ trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (revision 3487) @@ -468,6 +468,6 @@ // return; - const Int_t v0x = (int)(v0.X()*TMath::RadToDeg()); - const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg()); + // const Int_t v0x = (int)(v0.X()*TMath::RadToDeg()); + // const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg()); Int_t idx[] = {1, 1, 1, 1}; @@ -568,5 +568,5 @@ } -void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent) +void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent, const char *txt) { const Double_t ra = v.Phi()*TMath::RadToDeg()/15; @@ -577,4 +577,6 @@ str += Form(" Dec=%.1fd", dec); str += Form(" Mag=%.1f", -2.5*log10(v.Mag())); + if (txt) + str += Form(" (%s)", txt); // draw star on the camera display Index: trunk/MagicSoft/Mars/mastro/MAstroCatalog.h =================================================================== --- trunk/MagicSoft/Mars/mastro/MAstroCatalog.h (revision 3486) +++ trunk/MagicSoft/Mars/mastro/MAstroCatalog.h (revision 3487) @@ -87,5 +87,7 @@ Float_t atof(const TString &s); +//#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03) Bool_t fPlainScreen; //! Just a dummy!!!! ([Set,Is]Freezed) +//#endif protected: @@ -110,5 +112,5 @@ void Draw(const TVector2 &v0, const TRotation &rot, TArrayI &dx, TArrayI &dy, Int_t stepx, Int_t stepy, Int_t type); void DrawNet(const TVector2 &v0, const TRotation &rot, Int_t type); - void DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t); + void DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t, const char *txt=0); void Paint(Option_t *o=""); Int_t DistancetoPrimitive(Int_t px, Int_t py); @@ -173,5 +175,5 @@ void SetGuiActive(Bool_t b=kTRUE) { b ? SetBit(kGuiActive) : ResetBit(kGuiActive); } - void SetPlainScreen(Bool_t b=kTRUE) { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE* + void SetPlainScreen(Bool_t b=kTRUE) { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE* *GETTER=IsPlainScreen Bool_t IsPlainScreen() const { return TestBit(kPlainScreen); } Index: trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc (revision 3486) +++ trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc (revision 3487) @@ -1954,4 +1954,5 @@ // gPad = n; + //n->cd(); // @@ -1983,6 +1984,5 @@ // n->SetBatch(kFALSE); - if (num<0) - *fLog << "done." << endl; + *fLog << "done." << endl; } @@ -1994,7 +1994,9 @@ SetStatusLine2("Updating header of PS file..."); - *fLog << inf << " - Updating header of PS file... " << flush; + if (num<0) + *fLog << " - Updating header of PS file... " << flush; UpdatePSHeader(name); - *fLog << inf << "done." << endl; + if (num<0) + *fLog << inf << "done." << endl; gVirtualPS = psave; @@ -2002,5 +2004,6 @@ padsav->cd(); - *fLog << inf << "done." << endl; + if (num<0) + *fLog << inf << "done." << endl; SetStatusLine2(Form("Done (%dpages)", page-1)); Index: trunk/MagicSoft/Mars/merpp.cc =================================================================== --- trunk/MagicSoft/Mars/merpp.cc (revision 3486) +++ trunk/MagicSoft/Mars/merpp.cc (revision 3487) @@ -61,5 +61,5 @@ gLog << all << endl; gLog << "Sorry the usage is:" << endl; - gLog << " merpp [-h] [-?] [-a] [-vn] [-cn] [-u]" << endl; + gLog << " merpp [-h] [-?] [-a] [-vn] [-cn] [-u, -f]" << endl; gLog << " inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl; gLog << " inputfile.raw: Magic DAQ binary file." << endl; @@ -71,4 +71,5 @@ gLog << " -u, --update Update file" << endl; gLog << " -a, --no-colors Do not use Ansii color codes" << endl; + gLog << " -f Force overwrite of an existing file" << endl; gLog << " --sql=mysql://user:password@url Insert run into database " << endl; gLog << " --start=yyyy-mm-dd/hh:mm:ss.mmm Start event time for merpping report files" << endl; @@ -118,4 +119,5 @@ const Int_t kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 1; Bool_t kUpdate = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u"); + const Bool_t kForce = arg.HasOnlyAndRemove("-f"); gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2); @@ -194,5 +196,5 @@ } - if (fileexist && !kUpdate) + if (fileexist && !kUpdate && !kForce) { gLog << err << "Sorry, file '" << kNameout << "' already existing." << endl; Index: trunk/MagicSoft/Mars/mfilter/MFCosmics.cc =================================================================== --- trunk/MagicSoft/Mars/mfilter/MFCosmics.cc (revision 3486) +++ trunk/MagicSoft/Mars/mfilter/MFCosmics.cc (revision 3487) @@ -167,4 +167,5 @@ allpix++; + // // We consider a pixel as presumably due to cosmics @@ -193,10 +194,10 @@ *fLog << " " << setw(7) << fCut[0] << " (" << setw(3) ; *fLog << (int)(fCut[0]*100/GetNumExecutions()) ; - *fLog << "%) Evts skipped due to: Cosmics Rejection applied " ; + *fLog << "%) Detected cosmics " ; *fLog << " (with fMaxEmptyPixels = " << fMaxEmptyPixels*100 << "%)" << endl; *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) ; *fLog << (int)(fCut[1]*100/GetNumExecutions()) ; - *fLog << "%) Evts survived the cosmics rejection!" << endl; + *fLog << "%) No cosmics!" << endl; *fLog << endl; Index: trunk/MagicSoft/Mars/mhist/MHCamera.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 3486) +++ trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 3487) @@ -42,8 +42,7 @@ TList *fNotify; //! +//#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03) Bool_t fFreezed; //! Just a dummy!!!! ([Set,Is]Freezed) - - //Int_t fOptStat; - //TGStatusBar *fStatusBar; +//#endif void Init(); @@ -202,5 +201,5 @@ void DisplayAsCamera() { SetDrawOption(""); } // *MENU* - void SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* + void SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* *GETTER=IsFreezed Bool_t IsFreezed() const { return TestBit(kFreezed); } //void SetOptStat(Int_t os=-1) { fOptStat = os; } // *MENU*