- Timestamp:
- 02/23/10 10:43:20 (15 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9551 r9552 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2010/02/23 Thomas Bretz 22 23 * mbase/MAGIC.cc: 24 - projections are supposed to work again in root 5.26 25 (not tested yet) 26 27 * mbase/MGMap.cc, mbase/MObjLookup.cc: 28 - key and val are Long64 in newer root versions 29 30 * mdata/MDataPhrase.cc: 31 - need inclusion of TFormulaPrimitive in root 5.26 32 33 * mhflux/MMcSpectrumWeight.cc: 34 - root 5.26 has a different calling convention for TH1::Intgeral 35 36 * mjobs/MJob.cc: 37 - added a suggested parenthesis 38 39 * mjtrain/MJTrainDisp.cc: 40 - cast the MH3 histogram correctly to a TH2 41 42 20 43 21 44 2010/02/22 Daniela Dorner -
trunk/MagicSoft/Mars/mbase/MAGIC.cc
r9518 r9552 40 40 bool MARS::CheckRootVer() 41 41 { 42 if (strcmp(gROOT->GetVersion(), "5.22/00")>0 )42 if (strcmp(gROOT->GetVersion(), "5.22/00")>0 && strcmp(gROOT->GetVersion(), "5.26/00")<0) 43 43 { 44 44 cout << "WARNING - Especially root 5.24/00 has a severe bug in projection 2D histograms" << endl; -
trunk/MagicSoft/Mars/mbase/MGMap.cc
r9195 r9552 158 158 void MGMap::Delete(Option_t *) 159 159 { 160 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 160 161 Long_t key, val; 162 #else 163 Long64_t key, val; 164 #endif 165 161 166 TExMapIter map(this); 162 167 while (map.Next(key, val)) … … 424 429 void MGMap::Paint(Option_t *) 425 430 { 431 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 426 432 Long_t key, val; 433 #else 434 Long64_t key, val; 435 #endif 436 427 437 TExMapIter map(this); 428 438 while (map.Next(key, val)) … … 441 451 scale /= TMath::Hypot((float)w, (float)h)/2; 442 452 453 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 443 454 Long_t key, val; 455 #else 456 Long64_t key, val; 457 #endif 458 444 459 TExMapIter map(this); 445 460 while (map.Next(key, val)) … … 458 473 TObject *MGMap::PickObject(Int_t px, Int_t py, TString &str) const 459 474 { 475 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 460 476 Long_t key, val; 477 #else 478 Long64_t key, val; 479 #endif 480 461 481 TExMapIter map(this); 462 482 while (map.Next(key, val)) … … 500 520 Int_t min = INT_MAX; 501 521 522 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 502 523 Long_t key, val; 524 #else 525 Long64_t key, val; 526 #endif 527 503 528 TExMapIter map(this); 504 529 while (map.Next(key, val)) -
trunk/MagicSoft/Mars/mbase/MObjLookup.cc
r8930 r9552 44 44 TExMapIter iter(&fMap); 45 45 46 Long_t key; 47 Long_t value; 46 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 47 Long_t key, value; 48 #else 49 Long64_t key, value; 50 #endif 48 51 49 52 while (iter.Next(key, value)) -
trunk/MagicSoft/Mars/mdata/MDataPhrase.cc
r8907 r9552 115 115 #include <TPRegexp.h> 116 116 #include <TFormula.h> 117 #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00) 118 #include <TFormulaPrimitive.h> 119 #endif 117 120 118 121 #include "MLog.h" -
trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc
r9337 r9552 489 489 // Ratio between the number of events in the zenith angle 490 490 // bin corresponding to x and the new spectrum. 491 #if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00) 491 492 const Double_t f = h.Integral(x, x, -1, 9999)/norm; 493 #else 494 const Double_t f = h.Integral(x, x)/norm; 495 #endif 492 496 493 497 // Fill histogram with the "new spectrum" between -
trunk/MagicSoft/Mars/mjobs/MJob.cc
r9497 r9552 414 414 } 415 415 416 if ( flags&2==0)416 if ((flags&2)==0) 417 417 { 418 418 *fLog << err << "ERROR - " << dirname << " is not a directory." << endl; -
trunk/MagicSoft/Mars/mjtrain/MJTrainDisp.cc
r8888 r9552 60 60 #include "MJTrainDisp.h" 61 61 62 #include <TH2.h> 62 63 #include <TLine.h> 63 64 #include <TCanvas.h> … … 113 114 MH::SetPalette("pretty"); 114 115 115 TH 1 &hist = *(TH1*)mh3.GetHist().Clone();116 TH2 &hist = *static_cast<TH2*>(mh3.GetHist().Clone()); 116 117 hist.SetBit(TH1::kNoStats); 117 118 hist.SetDirectory(0);
Note:
See TracChangeset
for help on using the changeset viewer.