Changeset 3487
- Timestamp:
- 03/12/04 16:07:58 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc
r3471 r3487 153 153 ULong_t sqsb = 0; // sum sqares signal+background 154 154 155 Int_t sat = 0; // saturates? 156 Int_t nb = 0; 157 Int_t nsb = 0; 155 Int_t sat = 0; // saturates? 156 Int_t ishi = 0; // has a high content? 157 Int_t nb = 0; 158 Int_t nsb = 0; 158 159 159 160 if (*max==255) 160 161 sat++; 162 163 if (*max>80) 164 ishi++; 161 165 162 166 while (ptr<end) … … 177 181 } 178 182 179 if (sat>1) 183 if (sat==0 && ishi) 184 { 185 // Area: x9 186 ptr = pixel.GetLoGainSamples(); 187 max = ptr+pixel.GetIdxMaxLoGainSample(); 188 end = ptr+fRawEvt->GetNumLoGainSamples(); 189 190 sumb = 0; // sum background 191 sqb = 0; // sum sqares background 192 nb = 0; 193 194 while (ptr<end) 195 { 196 // Background already calced from hi-gains! 197 sumb += *ptr; 198 sqb += *ptr* *ptr; 199 nb++; 200 } 201 } 202 203 if (sat>1 && !ishi) 180 204 { 181 205 // Area: x9 -
trunk/MagicSoft/Mars/mastro/MAstroCamera.cc
r3457 r3487 286 286 mean *= 1./num; 287 287 288 DrawStar(mean(1), mean(0), *radec, !hasmean );288 DrawStar(mean(1), mean(0), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(1), mean(0))); 289 289 } 290 290 } -
trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc
r3478 r3487 468 468 // return; 469 469 470 const Int_t v0x = (int)(v0.X()*TMath::RadToDeg());471 const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg());470 // const Int_t v0x = (int)(v0.X()*TMath::RadToDeg()); 471 // const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg()); 472 472 473 473 Int_t idx[] = {1, 1, 1, 1}; … … 568 568 } 569 569 570 void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent )570 void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent, const char *txt) 571 571 { 572 572 const Double_t ra = v.Phi()*TMath::RadToDeg()/15; … … 577 577 str += Form(" Dec=%.1fd", dec); 578 578 str += Form(" Mag=%.1f", -2.5*log10(v.Mag())); 579 if (txt) 580 str += Form(" (%s)", txt); 579 581 580 582 // draw star on the camera display -
trunk/MagicSoft/Mars/mastro/MAstroCatalog.h
r3457 r3487 87 87 Float_t atof(const TString &s); 88 88 89 //#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03) 89 90 Bool_t fPlainScreen; //! Just a dummy!!!! ([Set,Is]Freezed) 91 //#endif 90 92 91 93 protected: … … 110 112 void Draw(const TVector2 &v0, const TRotation &rot, TArrayI &dx, TArrayI &dy, Int_t stepx, Int_t stepy, Int_t type); 111 113 void DrawNet(const TVector2 &v0, const TRotation &rot, Int_t type); 112 void DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t );114 void DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t, const char *txt=0); 113 115 void Paint(Option_t *o=""); 114 116 Int_t DistancetoPrimitive(Int_t px, Int_t py); … … 173 175 void SetGuiActive(Bool_t b=kTRUE) { b ? SetBit(kGuiActive) : ResetBit(kGuiActive); } 174 176 175 void SetPlainScreen(Bool_t b=kTRUE) { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE* 177 void SetPlainScreen(Bool_t b=kTRUE) { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE* *GETTER=IsPlainScreen 176 178 Bool_t IsPlainScreen() const { return TestBit(kPlainScreen); } 177 179 -
trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc
r3387 r3487 1954 1954 // 1955 1955 gPad = n; 1956 //n->cd(); 1956 1957 1957 1958 // … … 1983 1984 // 1984 1985 n->SetBatch(kFALSE); 1985 if (num<0) 1986 *fLog << "done." << endl; 1986 *fLog << "done." << endl; 1987 1987 } 1988 1988 … … 1994 1994 SetStatusLine2("Updating header of PS file..."); 1995 1995 1996 *fLog << inf << " - Updating header of PS file... " << flush; 1996 if (num<0) 1997 *fLog << " - Updating header of PS file... " << flush; 1997 1998 UpdatePSHeader(name); 1998 *fLog << inf << "done." << endl; 1999 if (num<0) 2000 *fLog << inf << "done." << endl; 1999 2001 2000 2002 gVirtualPS = psave; … … 2002 2004 padsav->cd(); 2003 2005 2004 *fLog << inf << "done." << endl; 2006 if (num<0) 2007 *fLog << inf << "done." << endl; 2005 2008 2006 2009 SetStatusLine2(Form("Done (%dpages)", page-1)); -
trunk/MagicSoft/Mars/merpp.cc
r3442 r3487 61 61 gLog << all << endl; 62 62 gLog << "Sorry the usage is:" << endl; 63 gLog << " merpp [-h] [-?] [-a] [-vn] [-cn] [-u ]" << endl;63 gLog << " merpp [-h] [-?] [-a] [-vn] [-cn] [-u, -f]" << endl; 64 64 gLog << " inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl; 65 65 gLog << " inputfile.raw: Magic DAQ binary file." << endl; … … 71 71 gLog << " -u, --update Update file" << endl; 72 72 gLog << " -a, --no-colors Do not use Ansii color codes" << endl; 73 gLog << " -f Force overwrite of an existing file" << endl; 73 74 gLog << " --sql=mysql://user:password@url Insert run into database <raw data only>" << endl; 74 75 gLog << " --start=yyyy-mm-dd/hh:mm:ss.mmm Start event time for merpping report files" << endl; … … 118 119 const Int_t kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 1; 119 120 Bool_t kUpdate = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u"); 121 const Bool_t kForce = arg.HasOnlyAndRemove("-f"); 120 122 121 123 gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2); … … 194 196 } 195 197 196 if (fileexist && !kUpdate )198 if (fileexist && !kUpdate && !kForce) 197 199 { 198 200 gLog << err << "Sorry, file '" << kNameout << "' already existing." << endl; -
trunk/MagicSoft/Mars/mfilter/MFCosmics.cc
r3262 r3487 167 167 168 168 allpix++; 169 169 170 // 170 171 // We consider a pixel as presumably due to cosmics … … 193 194 *fLog << " " << setw(7) << fCut[0] << " (" << setw(3) ; 194 195 *fLog << (int)(fCut[0]*100/GetNumExecutions()) ; 195 *fLog << "%) Evts skipped due to: Cosmics Rejection applied" ;196 *fLog << "%) Detected cosmics " ; 196 197 *fLog << " (with fMaxEmptyPixels = " << fMaxEmptyPixels*100 << "%)" << endl; 197 198 198 199 *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) ; 199 200 *fLog << (int)(fCut[1]*100/GetNumExecutions()) ; 200 *fLog << "%) Evts survived the cosmics rejection!" << endl;201 *fLog << "%) No cosmics!" << endl; 201 202 *fLog << endl; 202 203 -
trunk/MagicSoft/Mars/mhist/MHCamera.h
r3471 r3487 42 42 TList *fNotify; //! 43 43 44 //#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03) 44 45 Bool_t fFreezed; //! Just a dummy!!!! ([Set,Is]Freezed) 45 46 //Int_t fOptStat; 47 //TGStatusBar *fStatusBar; 46 //#endif 48 47 49 48 void Init(); … … 202 201 void DisplayAsCamera() { SetDrawOption(""); } // *MENU* 203 202 204 void SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* 203 void SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* *GETTER=IsFreezed 205 204 Bool_t IsFreezed() const { return TestBit(kFreezed); } 206 205 //void SetOptStat(Int_t os=-1) { fOptStat = os; } // *MENU*
Note:
See TracChangeset
for help on using the changeset viewer.