Changeset 8673
- Timestamp:
- 08/17/07 11:53:49 (17 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8672 r8673 19 19 -*-*- END OF LINE -*-*- 20 20 21 2007/08/17 Thomas Bretz 22 23 * sponde.cc: 24 - removed switch for simple and accurate mode 25 26 * mbase/MMath.cc: 27 - fixed a problem in LiMaExc which could result in NaN 28 (if signal and background is 0) 29 30 * mbase/MStatusDisplay.cc: 31 - remove canvases in batch-mode from the global list of canvases, 32 this could result in crahses if two canvases in the display 33 had the same name 34 35 * mhflux/MHCollectionArea.[h,cc]: 36 - output the maximum impact found in Finalize 37 38 * mhflux/MHEnergyEst.cc: 39 - made the y-axis in the Eest vs Emc plot logarithmic 40 41 42 21 43 2007/08/16 Markus Meyer 22 44 23 45 * resources/calibration.rc: 24 46 - update of muon calibration factors for the periods 41 to 50 25 . 47 48 26 49 27 50 2007/08/15 Thomas Bretz -
trunk/MagicSoft/Mars/mbase/MMath.cc
r8585 r8673 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.3 6 2007-06-19 11:14:33tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.37 2007-08-17 10:53:48 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 153 153 Double_t sN = s + alpha*alpha*b; 154 154 155 return Ns<0 || sN<0 ? 0 : Ns/TMath::Sqrt(sN); 155 if (Ns<0 || sN<0) 156 return 0; 157 158 if (Ns==0 && sN==0) 159 return 0; 160 161 return Ns/TMath::Sqrt(sN); 156 162 } 157 163 -
trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc
r8309 r8673 1010 1010 TCanvas &MStatusDisplay::AddTab(const char *name) 1011 1011 { 1012 /* 1013 if (HasCanvas(name)) 1014 { 1015 *fLog << warn; 1016 *fLog << "WARNING - A canvas '" << name << "' is already existing in the Status Display." << endl; 1017 *fLog << " This can cause unexpected crahes!" << endl; 1018 }*/ 1019 1012 1020 if (gROOT->IsBatch()) 1013 1021 { … … 1017 1025 1018 1026 TCanvas *c = new TCanvas(name, name, -cw, ch); 1027 1028 gROOT->GetListOfCanvases()->Remove(c); 1029 1019 1030 fBatch->Add(c); 1020 1031 return *c; … … 1342 1353 if (!c) 1343 1354 return kFALSE; 1355 1356 // If you encounter unexpected crashes here, check if 1357 // a canvas is existing twice in the list or has been 1358 // deleted by accident. (Check AddTab) 1344 1359 1345 1360 if (gROOT->IsBatch()) -
trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc
r8265 r8673 284 284 // GetCollectionAreaEff(), 285 285 // GetCollectionAreaAbs(), fMcAreaRadius); 286 const TString txt = Form(" A_{abs}=%.0fm^{2} r=%.0fm",286 const TString txt = Form("r_{max}=%.0fm --> A_{max}=%.0fm^{2}", 287 287 GetCollectionAreaAbs(), fMcAreaRadius); 288 288 … … 457 457 return kTRUE; 458 458 } 459 460 Bool_t MHCollectionArea::Finalize() 461 { 462 *fLog << all << "Maximum simulated impact found: " << fMcAreaRadius << "m" << endl; 463 464 CalcEfficiency(); 465 466 return kTRUE; 467 } -
trunk/MagicSoft/Mars/mhflux/MHCollectionArea.h
r8047 r8673 44 44 Bool_t ReInit(MParList *pList); 45 45 Bool_t Fill(const MParContainer *par, const Stat_t weight=1); 46 Bool_t Finalize() { CalcEfficiency(); return kTRUE; }46 Bool_t Finalize(); 47 47 48 48 void Draw(Option_t *option=""); -
trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc
r8666 r8673 504 504 505 505 pad2->cd(1); 506 gPad->SetLogy(); 506 507 h = MakePlot(fHEnergy, "xy"); 507 508 h->SetXTitle("E_{mc} [GeV]"); -
trunk/MagicSoft/Mars/sponde.cc
r8544 r8673 52 52 gLog << " --refill Refill the excess histogram from result file" << endl; 53 53 gLog << " (usefull to change the binning)" << endl; 54 gLog << " --accurate Fill original energy/theta distribution from data" << endl;55 gLog << " (do not weight the histogram)" << endl;54 // gLog << " --accurate Fill original energy/theta distribution from data" << endl; 55 // gLog << " (do not weight the histogram)" << endl; 56 56 gLog << " --raw-mc Use the mc sample as it is" << endl << endl; 57 57 gLog << " Options:" << endl; … … 121 121 122 122 const Bool_t kRefill = arg.HasOnlyAndRemove("--refill"); 123 const Bool_t kSimple = !arg.HasOnlyAndRemove("--accurate");123 // const Bool_t kSimple = !arg.HasOnlyAndRemove("--accurate"); 124 124 const Bool_t kRawMc = arg.HasOnlyAndRemove("--raw-mc"); 125 125 … … 224 224 225 225 job.EnableRefilling(kRefill); 226 job.EnableSimpleMode(kSimple);226 // job.EnableSimpleMode(kSimple); 227 227 job.EnableRawMc(kRawMc); 228 228
Note:
See TracChangeset
for help on using the changeset viewer.