From fbc350a385f404d365ed56e92c6333b910b6a2e9 Mon Sep 17 00:00:00 2001 From: mtadel Date: Wed, 25 Jun 2008 23:58:36 +0000 Subject: [PATCH] Merge of EVE-dev branch. From this point onward root-5.20 is required for compilation. Major changes that might be relevant for developers having EVE related code outside of AliRoot/EVE. 1. Remove calls to TEveElement::UpdateItems(). This method was obsolete and has been removed. 2. Replace calls to TEveElement::GetNChildren() with NumChildren(). The method has been renamed to use the same naming conventions as other methods of the same type. 3. Remove all explisit casts to Color_t that were needed because of overloading of color-setting functions (Color_t, Pixel_t). As this was annoying, the methods taking Pixel_t were renamed to SetXyzzPixel(Pixel_t). 4. Minor changes in internals of TGLViewer and its window-system interface. --- EVE/EveBase/AliEveCosmicRayFitter.cxx | 4 +--- EVE/EveBase/AliEveEventManager.cxx | 1 + EVE/EveBase/AliEveTrackFitter.cxx | 3 --- EVE/EveDet/AliEveFMDLoader.cxx | 2 +- EVE/EveDet/AliEveITSModule.cxx | 6 ++--- EVE/EveDet/AliEveITSModuleStepper.cxx | 3 +-- EVE/EveDet/AliEveMUONChamber.cxx | 2 +- EVE/EveDet/AliEvePMDModule.cxx | 2 +- EVE/EveDet/AliEveTOFSector.cxx | 2 +- EVE/EveDet/AliEveTOFStrip.cxx | 2 +- EVE/EveDet/AliEveTPCSectorViz.cxx | 2 +- EVE/EveDet/AliEveTRDData.cxx | 2 +- EVE/EveDet/AliEveTRDModuleImp.cxx | 6 ++--- EVE/EveHLT/AliEveHOMERSource.cxx | 4 ++-- EVE/EveHLT/AliEveHOMERSource.h | 2 +- EVE/alice-macros/MUON_displayData.C | 4 ++-- EVE/alice-macros/MUON_displaySimu.C | 8 +++---- EVE/alice-macros/SplitGLView.C | 8 ++----- EVE/alice-macros/acorde_hits.C | 2 +- EVE/alice-macros/acorde_raw.C | 4 ++-- EVE/alice-macros/clusters.C | 6 ++--- EVE/alice-macros/emcal_hits.C | 2 +- EVE/alice-macros/esd_Cascade.C | 3 +-- EVE/alice-macros/esd_V0.C | 3 +-- EVE/alice-macros/esd_V0_points.C | 4 ++-- EVE/alice-macros/esd_tracks.C | 22 ++++++++----------- EVE/alice-macros/fmd_hits.C | 2 +- EVE/alice-macros/geom_gentle_trd.C | 2 +- EVE/alice-macros/its_common_foos.C | 28 ++++++++++++------------ EVE/alice-macros/its_hits.C | 2 +- EVE/alice-macros/its_hits_layer_split.C | 2 +- EVE/alice-macros/its_module_stepper.C | 2 +- EVE/alice-macros/kine_tracks.C | 6 ++--- EVE/alice-macros/pmd_digits.C | 10 ++++----- EVE/alice-macros/pmd_hits.C | 2 +- EVE/alice-macros/pmd_raw.C | 6 ++--- EVE/alice-macros/primary_vertex.C | 4 ++-- EVE/alice-macros/primary_vertex_tracks.C | 2 +- EVE/alice-macros/t0_hits.C | 2 +- EVE/alice-macros/tof_digits.C | 2 +- EVE/alice-macros/tof_digits_sector.C | 2 +- EVE/alice-macros/tof_digits_strips.C | 6 ++--- EVE/alice-macros/tof_hits.C | 3 +-- EVE/alice-macros/tof_raw.C | 2 +- EVE/alice-macros/tpc_digits.C | 10 ++++----- EVE/alice-macros/tpc_hits.C | 2 +- EVE/alice-macros/tpc_hits_charge_split.C | 2 +- EVE/alice-macros/tpc_hits_eta_split.C | 2 +- EVE/alice-macros/trd_friend_tracks.C | 2 +- EVE/alice-macros/trd_hits.C | 2 +- EVE/alice-macros/trd_hits_z_split.C | 2 +- EVE/alice-macros/vzero_hits.C | 2 +- EVE/hlt-macros/command_queue.C | 2 +- EVE/hlt-macros/geom_hlt.C | 2 +- EVE/hlt-macros/homer_display.C | 16 +++++++------- 55 files changed, 110 insertions(+), 128 deletions(-) diff --git a/EVE/EveBase/AliEveCosmicRayFitter.cxx b/EVE/EveBase/AliEveCosmicRayFitter.cxx index 96cd9e17229..997791d32d6 100644 --- a/EVE/EveBase/AliEveCosmicRayFitter.cxx +++ b/EVE/EveBase/AliEveCosmicRayFitter.cxx @@ -67,9 +67,8 @@ AliEveCosmicRayFitter::AliEveCosmicRayFitter(const Text_t* name, Int_t n_points) fTrackList = new TEveTrackList("Cosmic ray"); fTrackList->SetTitle("muons"); - fTrackList->SetMainColor((Color_t)8); + fTrackList->SetMainColor(8); gEve->AddElement(fTrackList); - UpdateItems(); fGraphPicked1 = new TGraph(); fGraphPicked1->SetName("Selected points"); @@ -262,7 +261,6 @@ void AliEveCosmicRayFitter::DestroyElements() TEveElement::DestroyElements(); gEve->AddElement(fTrackList, this); fTrackList->DestroyElements(); - UpdateItems(); } /**************************************************************************/ diff --git a/EVE/EveBase/AliEveEventManager.cxx b/EVE/EveBase/AliEveEventManager.cxx index b2883d53467..2d163c507e0 100644 --- a/EVE/EveBase/AliEveEventManager.cxx +++ b/EVE/EveBase/AliEveEventManager.cxx @@ -24,6 +24,7 @@ #include #include +#include #include //============================================================================== diff --git a/EVE/EveBase/AliEveTrackFitter.cxx b/EVE/EveBase/AliEveTrackFitter.cxx index 170d8aa9481..450f7b88483 100644 --- a/EVE/EveBase/AliEveTrackFitter.cxx +++ b/EVE/EveBase/AliEveTrackFitter.cxx @@ -63,7 +63,6 @@ AliEveTrackFitter::AliEveTrackFitter(const Text_t* name, Int_t nPoints) : fTrackList->SetLineColor(8); fTrackList->GetPropagator()->SetEditPathMarks(kTRUE); AddElement(fTrackList); - UpdateItems(); fGraphPicked = new TGraph(); fGraphPicked->SetName("Selected points"); @@ -97,8 +96,6 @@ void AliEveTrackFitter::DestroyElements() // fTrackList is destroyed because DenyDestroy is set. gEve->AddElement(fTrackList, this); fTrackList->DestroyElements(); - - UpdateItems(); } /******************************************************************************/ diff --git a/EVE/EveDet/AliEveFMDLoader.cxx b/EVE/EveDet/AliEveFMDLoader.cxx index 4c565f43ac8..edc1123bcad 100644 --- a/EVE/EveDet/AliEveFMDLoader.cxx +++ b/EVE/EveDet/AliEveFMDLoader.cxx @@ -171,7 +171,7 @@ AliEveFMDLoader::AliEveFMDLoader(const char* name, Bool_t useBoxes, er->AddElement(em); em->SetTransMatrix(*(detector->FindTransform(ring->GetId(), 2*m))); em->SetShape(ring->GetId() == 'I' ? inner : outer); - em->SetMainColor(Color_t(kRed)); + em->SetMainColor(kRed); em->SetMainTransparency(32); em->IncDenyDestroy(); diff --git a/EVE/EveDet/AliEveITSModule.cxx b/EVE/EveDet/AliEveITSModule.cxx index 9e717d88515..4d0ea422656 100644 --- a/EVE/EveDet/AliEveITSModule.cxx +++ b/EVE/EveDet/AliEveITSModule.cxx @@ -89,7 +89,7 @@ void AliEveITSModule::InitStatics(AliEveITSDigitsInfo* info) fgSPDFrameBox = new TEveFrameBox(); fgSPDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz); - fgSPDFrameBox->SetFrameColor((Color_t) 31); + fgSPDFrameBox->SetFrameColor(31); fgSPDFrameBox->SetFrameFill(kTRUE); fgSPDFrameBox->IncRefCount(); fgSPDPalette = new TEveRGBAPalette(info->fSPDMinVal,info->fSPDMaxVal); @@ -102,7 +102,7 @@ void AliEveITSModule::InitStatics(AliEveITSDigitsInfo* info) fgSDDFrameBox = new TEveFrameBox(); fgSDDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz); - fgSDDFrameBox->SetFrameColor((Color_t) 32); + fgSDDFrameBox->SetFrameColor(32); fgSDDFrameBox->SetFrameFill(kTRUE); fgSDDFrameBox->IncRefCount(); fgSDDPalette = new TEveRGBAPalette(info->fSDDMinVal,info->fSDDMaxVal); @@ -116,7 +116,7 @@ void AliEveITSModule::InitStatics(AliEveITSDigitsInfo* info) fgSSDFrameBox = new TEveFrameBox(); fgSSDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz); - fgSSDFrameBox->SetFrameColor((Color_t) 33); + fgSSDFrameBox->SetFrameColor(33); fgSSDFrameBox->SetFrameFill(kTRUE); fgSSDFrameBox->IncRefCount(); fgSSDPalette = new TEveRGBAPalette(info->fSSDMinVal,info->fSSDMaxVal); diff --git a/EVE/EveDet/AliEveITSModuleStepper.cxx b/EVE/EveDet/AliEveITSModuleStepper.cxx index a69b4d8a4f5..e5abf3e45af 100644 --- a/EVE/EveDet/AliEveITSModuleStepper.cxx +++ b/EVE/EveDet/AliEveITSModuleStepper.cxx @@ -99,7 +99,7 @@ void AliEveITSModuleStepper::Capacity() // configuration. Int_t n = fStepper->GetNx()*fStepper->GetNy(); - if (n != GetNChildren()) + if (n != NumChildren()) { DestroyElements(); for (Int_t m=0; mSetName(Form("SPD %d", idx)); mod->SetRnrSelf(kTRUE); - mod->UpdateItems(); fStepper->Step(); idx++; diff --git a/EVE/EveDet/AliEveMUONChamber.cxx b/EVE/EveDet/AliEveMUONChamber.cxx index 92124708ab1..1d7f407ce89 100644 --- a/EVE/EveDet/AliEveMUONChamber.cxx +++ b/EVE/EveDet/AliEveMUONChamber.cxx @@ -29,7 +29,7 @@ AliEveMUONChamber::AliEveMUONChamber(Int_t id, const Text_t* n, const Text_t* t) TEveElement(fFrameColor), TNamed(n,t), fMUONData(0), - fFrameColor((Color_t)2), + fFrameColor(2), fRTS(1), fChamberID(0), fQuadSet1(n,t), diff --git a/EVE/EveDet/AliEvePMDModule.cxx b/EVE/EveDet/AliEvePMDModule.cxx index 829f8d11d9b..1f1490e484e 100644 --- a/EVE/EveDet/AliEvePMDModule.cxx +++ b/EVE/EveDet/AliEvePMDModule.cxx @@ -67,7 +67,7 @@ void AliEvePMDModule::DisplayInit(Int_t ism) TEveFrameBox *pmdModBox = new TEveFrameBox(); pmdModBox->SetAAQuadXY(xism, yism, 0, dxism, dyism); - pmdModBox->SetFrameColor((Color_t) 31); + pmdModBox->SetFrameColor(31); pmdModBox->SetFrameFill(kTRUE); SetFrame(pmdModBox); diff --git a/EVE/EveDet/AliEveTOFSector.cxx b/EVE/EveDet/AliEveTOFSector.cxx index c3e1eda1e20..9a0986bf51b 100644 --- a/EVE/EveDet/AliEveTOFSector.cxx +++ b/EVE/EveDet/AliEveTOFSector.cxx @@ -180,7 +180,7 @@ void AliEveTOFSector::InitStatics() fgTOFsectorFrameBox = new TEveFrameBox(); fgTOFsectorFrameBox->SetAABox(-dx*0.5, -dy*0.5, -dz*0.5, dx, dy, dz); - fgTOFsectorFrameBox->SetFrameColor((Color_t) 32);//31); + fgTOFsectorFrameBox->SetFrameColor(32);//31); //fgTOFsectorPalette = new TEveRGBAPalette(0, 2048); // TOT //fgTOFsectorPalette->SetLimits(0, 2048); diff --git a/EVE/EveDet/AliEveTOFStrip.cxx b/EVE/EveDet/AliEveTOFStrip.cxx index b8d8151c9ca..b788482ea56 100644 --- a/EVE/EveDet/AliEveTOFStrip.cxx +++ b/EVE/EveDet/AliEveTOFStrip.cxx @@ -107,7 +107,7 @@ void AliEveTOFStrip::InitStatics() fgTOFstripFrameBox = new TEveFrameBox(); fgTOFstripFrameBox->SetAAQuadXZ(-dx*0.5, 0, -dz*0.5, dx, dz); - fgTOFstripFrameBox->SetFrameColor((Color_t) 32);//31); + fgTOFstripFrameBox->SetFrameColor(32);//31); //fgTOFstripPalette = new TEveRGBAPalette(0, 2048); // TOT //fgTOFstripPalette = new TEveRGBAPalette(0, 192); // TDC diff --git a/EVE/EveDet/AliEveTPCSectorViz.cxx b/EVE/EveDet/AliEveTPCSectorViz.cxx index 55f61c47ef0..bc883a67674 100644 --- a/EVE/EveDet/AliEveTPCSectorViz.cxx +++ b/EVE/EveDet/AliEveTPCSectorViz.cxx @@ -46,7 +46,7 @@ AliEveTPCSectorViz::AliEveTPCSectorViz(const Text_t* n, const Text_t* t) : fRnrOut1 (kTRUE), fRnrOut2 (kTRUE), - fFrameColor ((Color_t) 4), + fFrameColor (4), fRnrFrame (kTRUE), fAutoTrans (kFALSE), fRTS (1), diff --git a/EVE/EveDet/AliEveTRDData.cxx b/EVE/EveDet/AliEveTRDData.cxx index 8dcc2492dc2..2ba6e7c9eea 100644 --- a/EVE/EveDet/AliEveTRDData.cxx +++ b/EVE/EveDet/AliEveTRDData.cxx @@ -102,7 +102,7 @@ void AliEveTRDDigits::ComputeRepresentation() AddQuad(x[1]-.45*dy, x[2]-.5*dz*scale, x[0], .9*dy, dz*scale); QuadValue(q); - QuadColor(Color_t(color)); + QuadColor(color); QuadId(new TNamed(Form("Charge%d", q), "dummy title")); } // end time loop } // end col loop diff --git a/EVE/EveDet/AliEveTRDModuleImp.cxx b/EVE/EveDet/AliEveTRDModuleImp.cxx index f4d8ef6cfc3..6e57990ac97 100644 --- a/EVE/EveDet/AliEveTRDModuleImp.cxx +++ b/EVE/EveDet/AliEveTRDModuleImp.cxx @@ -272,7 +272,7 @@ void AliEveTRDChamber::LoadClusters(TObjArray *clusters) Int_t id = fRecPoints->SetNextPoint(g[0], g[1], g[2]); fRecPoints->SetPointId(id, new AliTRDcluster(*c)); } - fRecPoints->SetStamp(TEveElement::kCBObjProps); + fRecPoints->StampObjProps(); fLoadRecPoints = kTRUE; } @@ -291,7 +291,7 @@ void AliEveTRDChamber::LoadDigits(AliTRDdigitsManager *digits) fDigits->Reset(); fDigits->SetData(digits); - fDigits->SetStamp(TEveElement::kCBObjProps); + fDigits->StampObjProps(); fDigitsNeedRecompute = kTRUE; fLoadDigits = kTRUE; } @@ -317,7 +317,7 @@ void AliEveTRDChamber::LoadHits(TClonesArray *hits, Int_t &idx) Int_t id = fHits->SetNextPoint(hit->X(), hit->Y(), hit->Z()); fHits->SetPointId(id, new AliTRDhit(*hit)); - fHits->SetStamp(TEveElement::kCBObjProps); + fHits->StampObjProps(); idx++; } return; diff --git a/EVE/EveHLT/AliEveHOMERSource.cxx b/EVE/EveHLT/AliEveHOMERSource.cxx index 5acbb1bea18..b02c10c06be 100644 --- a/EVE/EveHLT/AliEveHOMERSource.cxx +++ b/EVE/EveHLT/AliEveHOMERSource.cxx @@ -25,7 +25,7 @@ AliEveHOMERSource::AliEveHOMERSource(const Text_t* n, const Text_t* t) : /******************************************************************************/ //______________________________________________________________________________ -void AliEveHOMERSource::SetRnrState(Bool_t rnr) +Bool_t AliEveHOMERSource::SetRnrState(Bool_t rnr) { // Set render state of this element and of its children to the same // value. @@ -33,5 +33,5 @@ void AliEveHOMERSource::SetRnrState(Bool_t rnr) if (fSrcState) fSrcState->fState = rnr; - TEveElement::SetRnrState(rnr); + return TEveElement::SetRnrState(rnr); } diff --git a/EVE/EveHLT/AliEveHOMERSource.h b/EVE/EveHLT/AliEveHOMERSource.h index a6f83a0f861..0f009f15f57 100644 --- a/EVE/EveHLT/AliEveHOMERSource.h +++ b/EVE/EveHLT/AliEveHOMERSource.h @@ -76,7 +76,7 @@ public: void SetSource(const SourceId* id, SourceState* st) { fSrcId = id; fSrcState = st; TEveElement::SetRnrState(st->fState); } virtual Bool_t SingleRnrState() const { return kTRUE; } - virtual void SetRnrState(Bool_t rnr); + virtual Bool_t SetRnrState(Bool_t rnr); protected: const SourceId *fSrcId; diff --git a/EVE/alice-macros/MUON_displayData.C b/EVE/alice-macros/MUON_displayData.C index e17f8b9cdd3..05f012c2834 100644 --- a/EVE/alice-macros/MUON_displayData.C +++ b/EVE/alice-macros/MUON_displayData.C @@ -105,7 +105,7 @@ void MUON_displayData(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE, Bool_t TEveElementList* l = new TEveElementList("MUONChambers"); l->SetTitle("MUON chambers"); - l->SetMainColor(Color_t(2)); + l->SetMainColor(2); gEve->AddElement(l); for (Int_t ic = 0; ic < 14; ic++) @@ -134,7 +134,7 @@ void MUON_ESD_tracks() AliESDEvent* esd = AliEveEventManager::AssertESD(); TEveTrackList* lt = new TEveTrackList("ESD-Tracks"); - lt->SetMainColor(Color_t(6)); + lt->SetMainColor(6); //lt->SetMUON(); gEve->AddElement(lt); diff --git a/EVE/alice-macros/MUON_displaySimu.C b/EVE/alice-macros/MUON_displaySimu.C index 199627aaada..470f5199326 100644 --- a/EVE/alice-macros/MUON_displaySimu.C +++ b/EVE/alice-macros/MUON_displaySimu.C @@ -109,7 +109,7 @@ void MUON_displaySimu(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE, Bool_t TEveElementList* l = new TEveElementList("MUONChambers"); l->SetTitle("MUON chambers"); - l->SetMainColor(Color_t(2)); + l->SetMainColor(2); gEve->AddElement(l); for (Int_t ic = 0; ic < 14; ic++) @@ -140,7 +140,7 @@ void MUON_ESD_tracks() AliESDEvent* esd = AliEveEventManager::AssertESD(); TEveTrackList* lt = new TEveTrackList("ESD-Tracks"); - lt->SetMainColor(Color_t(6)); + lt->SetMainColor(6); //lt->SetMUON(); gEve->AddElement(lt); @@ -181,7 +181,7 @@ void MUON_Ref_tracks() AliMUONTrack* trackRef; TEveTrackList* lt = new TEveTrackList("Ref-Tracks"); - lt->SetMainColor(Color_t(6)); + lt->SetMainColor(6); gEve->AddElement(lt); @@ -213,7 +213,7 @@ void MUON_MC_tracks() Int_t nTracks = stack->GetNtrack(); TEveTrackList* lt = new TEveTrackList("MC-Tracks"); - lt->SetMainColor(Color_t(6)); + lt->SetMainColor(6); //lt->SetMUON(); gEve->AddElement(lt); diff --git a/EVE/alice-macros/SplitGLView.C b/EVE/alice-macros/SplitGLView.C index b464877a4dc..030f0b2a27e 100644 --- a/EVE/alice-macros/SplitGLView.C +++ b/EVE/alice-macros/SplitGLView.C @@ -1217,11 +1217,7 @@ void SplitGLView::ItemClicked(TGListTreeItem *item, Int_t, Int_t, Int_t) //v->Activated(); if (v->InheritsFrom("TGLEmbeddedViewer")) { TGLEmbeddedViewer *ev = (TGLEmbeddedViewer *)v; -#if ROOT_VERSION_CODE >= 332547 - gVirtualX->SetInputFocus(ev->GetGLWidget()->GetContainer()->GetId()); -#else - gVirtualX->SetInputFocus(ev->GetGLWindow()->GetContainer()->GetId()); -#endif + gVirtualX->SetInputFocus(ev->GetGLWidget()->GetId()); } } } @@ -1366,7 +1362,7 @@ void SplitGLView::UpdateSummary() TString ename = tracks->GetElementName(); // ename.Remove(ename.First('\'')); table = fgHtmlSummary->AddTable(ename.Data(), 5, - tracks->GetNChildren(), kTRUE, "first"); + tracks->NumChildren(), kTRUE, "first"); table->SetLabel(0, "Momentum"); table->SetLabel(1, "P_t"); table->SetLabel(2, "Phi"); diff --git a/EVE/alice-macros/acorde_hits.C b/EVE/alice-macros/acorde_hits.C index 95b320ebaae..5fc764c6192 100644 --- a/EVE/alice-macros/acorde_hits.C +++ b/EVE/alice-macros/acorde_hits.C @@ -39,7 +39,7 @@ acorde_hits(const char *varexp = "ACORDE.fX:ACORDE.fY:ACORDE.fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points, cont); gEve->Redraw3D(); diff --git a/EVE/alice-macros/acorde_raw.C b/EVE/alice-macros/acorde_raw.C index c0454b49e63..90994e12762 100644 --- a/EVE/alice-macros/acorde_raw.C +++ b/EVE/alice-macros/acorde_raw.C @@ -61,9 +61,9 @@ void acorde_raw() //printf("Module %2d: word_idx = %d, bit_idx = %2d => val = %d\n", // module, word_idx, bit_idx, val); if (val) - eg_shape->SetMainColor((Color_t) 2); + eg_shape->SetMainColor(2); else - eg_shape->SetMainColor((Color_t) 4); + eg_shape->SetMainColor(4); eg_shape->StampColorSelection(); acorde->AddElement(eg_shape); diff --git a/EVE/alice-macros/clusters.C b/EVE/alice-macros/clusters.C index 46b8fd81c82..eead730d782 100644 --- a/EVE/alice-macros/clusters.C +++ b/EVE/alice-macros/clusters.C @@ -90,19 +90,19 @@ void clusters() gEve->AddElement(list); TEvePointSet* shared = new TEvePointSet("Shared Clusters"); - shared->SetMainColor((Color_t)2); + shared->SetMainColor(2); shared->SetMarkerSize(0.4); shared->SetMarkerStyle(2); list->AddElement(shared); TEvePointSet* used = new TEvePointSet("Single-used Clusters"); - used->SetMainColor((Color_t)3); + used->SetMainColor(3); used->SetMarkerSize(0.4); used->SetMarkerStyle(2); list->AddElement(used); TEvePointSet* nonused = new TEvePointSet("Not-used Clusters"); - nonused->SetMainColor((Color_t)4); + nonused->SetMainColor(4); nonused->SetMarkerSize(0.4); nonused->SetMarkerStyle(2); list->AddElement(nonused); diff --git a/EVE/alice-macros/emcal_hits.C b/EVE/alice-macros/emcal_hits.C index 4bea8f4cc7f..66dafa2e611 100644 --- a/EVE/alice-macros/emcal_hits.C +++ b/EVE/alice-macros/emcal_hits.C @@ -38,7 +38,7 @@ emcal_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points, cont); gEve->Redraw3D(); diff --git a/EVE/alice-macros/esd_Cascade.C b/EVE/alice-macros/esd_Cascade.C index 59b2507c7f5..5a4aaf2b178 100644 --- a/EVE/alice-macros/esd_Cascade.C +++ b/EVE/alice-macros/esd_Cascade.C @@ -60,7 +60,7 @@ CascadeList* esd_AliEveCascade(Double_t min_pt=0.1, Double_t max_pt=100) AliESDVertex* primVertex =(AliESDVertex*) esd->GetVertex(); CascadeList* cont = new CascadeList("ESD cascade"); - cont->SetMainColor(Color_t(3)); // green + cont->SetMainColor(3); // green TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( 0.1*esd->GetMagneticField() ); @@ -89,7 +89,6 @@ CascadeList* esd_AliEveCascade(Double_t min_pt=0.1, Double_t max_pt=100) } cont->SetTitle("CascadeList"); - cont->UpdateItems(); cont->MakeCascades(); gEve->Redraw3D(); diff --git a/EVE/alice-macros/esd_V0.C b/EVE/alice-macros/esd_V0.C index 94363ea5011..414dcf118be 100644 --- a/EVE/alice-macros/esd_V0.C +++ b/EVE/alice-macros/esd_V0.C @@ -72,7 +72,7 @@ AliEveV0List* esd_V0(Bool_t onFly=kFALSE) AliESDVertex* primVertex = (AliESDVertex*) esd->GetPrimaryVertex(); AliEveV0List* cont = new AliEveV0List("ESD v0"); - cont->SetMainColor(Color_t(3)); // green + cont->SetMainColor(3); // green TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( 0.1*esd->GetMagneticField() ); @@ -99,7 +99,6 @@ AliEveV0List* esd_V0(Bool_t onFly=kFALSE) } cont->SetTitle("test"); - cont->UpdateItems(); cont->MakeV0s(); gEve->Redraw3D(); diff --git a/EVE/alice-macros/esd_V0_points.C b/EVE/alice-macros/esd_V0_points.C index 174af021b55..b5be45862b9 100644 --- a/EVE/alice-macros/esd_V0_points.C +++ b/EVE/alice-macros/esd_V0_points.C @@ -35,7 +35,7 @@ TEvePointSet* esd_V0_points_offline() points->SetTitle(Form("N=%d", points->Size())); points->SetMarkerStyle(4); points->SetMarkerSize(1.5); - points->SetMarkerColor((Color_t)(kOrange+8)); + points->SetMarkerColor(kOrange+8); gEve->AddElement(points); gEve->Redraw3D(); @@ -52,7 +52,7 @@ TEvePointSet* esd_V0_points_onfly() points->SetTitle(Form("N=%d", points->Size())); points->SetMarkerStyle(4); points->SetMarkerSize(1.5); - points->SetMarkerColor((Color_t)(kPink+10)); + points->SetMarkerColor(kPink+10); gEve->AddElement(points); gEve->Redraw3D(); diff --git a/EVE/alice-macros/esd_tracks.C b/EVE/alice-macros/esd_tracks.C index 61462d2643e..828c2c603b0 100644 --- a/EVE/alice-macros/esd_tracks.C +++ b/EVE/alice-macros/esd_tracks.C @@ -74,7 +74,7 @@ TEveTrackList* esd_tracks(Double_t min_pt=0.1, Double_t max_pt=100) Double_t ptsq; TEveTrackList* cont = new TEveTrackList("ESD Tracks"); - cont->SetMainColor(Color_t(6)); + cont->SetMainColor(6); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( 0.1*esd->GetMagneticField() ); @@ -123,7 +123,7 @@ TEveTrackList* esd_tracks(Double_t min_pt=0.1, Double_t max_pt=100) if (gkMakeTrackParamLines) { TEveLine* l = new TEveLine; l->SetName(Form("Track%d", count)); - l->SetLineColor((Color_t)5); + l->SetLineColor(5); at->FillPolymarker(l, esd->GetMagneticField(), 0, 250, 5); contLines->AddElement(l); } @@ -136,7 +136,6 @@ TEveTrackList* esd_tracks(Double_t min_pt=0.1, Double_t max_pt=100) char tooltip[1000]; sprintf(tooltip,"pT ~ (%.2lf, %.2lf), N=%d", min_pt, max_pt, count); cont->SetTitle(tooltip); // Not broadcasted automatically ... - cont->UpdateItems(); cont->MakeTracks(); @@ -157,7 +156,7 @@ TEveTrackList* esd_tracks_from_array(TCollection* col, AliESDEvent* esd=0) if (esd == 0) esd = AliEveEventManager::AssertESD(); TEveTrackList* cont = new TEveTrackList("ESD Tracks"); - cont->SetMainColor(Color_t(6)); + cont->SetMainColor(6); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( 0.1*esd->GetMagneticField() ); @@ -189,7 +188,6 @@ TEveTrackList* esd_tracks_from_array(TCollection* col, AliESDEvent* esd=0) const tooltip[1000]; sprintf(tooltip,"N=%d", count); cont->SetTitle(tooltip); // Not broadcasted automatically ... - cont->UpdateItems(); cont->MakeTracks(); @@ -271,31 +269,31 @@ TEveElementList* esd_tracks_vertex_cut() tl[0] = new TEveTrackList("Sigma < 3"); tc[0] = 0; tl[0]->GetPropagator()->SetMagField( 0.1*esd->GetMagneticField() ); - tl[0]->SetMainColor(Color_t(3)); + tl[0]->SetMainColor(3); gEve->AddElement(tl[0], cont); tl[1] = new TEveTrackList("3 < Sigma < 5"); tc[1] = 0; tl[1]->GetPropagator()->SetMagField( 0.1*esd->GetMagneticField() ); - tl[1]->SetMainColor(Color_t(7)); + tl[1]->SetMainColor(7); gEve->AddElement(tl[1], cont); tl[2] = new TEveTrackList("5 < Sigma"); tc[2] = 0; tl[2]->GetPropagator()->SetMagField( 0.1*esd->GetMagneticField() ); - tl[2]->SetMainColor(Color_t(46)); + tl[2]->SetMainColor(46); gEve->AddElement(tl[2], cont); tl[3] = new TEveTrackList("no ITS refit; Sigma < 5"); tc[3] = 0; tl[3]->GetPropagator()->SetMagField( 0.1*esd->GetMagneticField() ); - tl[3]->SetMainColor(Color_t(41)); + tl[3]->SetMainColor(41); gEve->AddElement(tl[3], cont); tl[4] = new TEveTrackList("no ITS refit; Sigma > 5"); tc[4] = 0; tl[4]->GetPropagator()->SetMagField( 0.1*esd->GetMagneticField() ); - tl[4]->SetMainColor(Color_t(48)); + tl[4]->SetMainColor(48); gEve->AddElement(tl[4], cont); for (Int_t n=0; nGetNumberOfTracks(); n++) @@ -343,11 +341,10 @@ TEveElementList* esd_tracks_vertex_cut() //PH const Text_t* tooltip = Form("N tracks=%d", tc[ti]); //MT Modified somewhat. char buff[1000]; - sprintf(buff, "%s [%d]", tlist->GetName(), tlist->GetNChildren()); + sprintf(buff, "%s [%d]", tlist->GetName(), tlist->NumChildren()); tlist->SetName(buff); sprintf(buff, "N tracks=%d", tc[ti]); tlist->SetTitle(buff); // Not broadcasted automatically ... - tlist->UpdateItems(); tlist->MakeTracks(); } @@ -358,7 +355,6 @@ TEveElementList* esd_tracks_vertex_cut() char form[1000]; sprintf(form,"N all tracks = %d", count); cont->SetTitle(form); - cont->UpdateItems(); gEve->Redraw3D(); return cont; diff --git a/EVE/alice-macros/fmd_hits.C b/EVE/alice-macros/fmd_hits.C index 125b866d2c3..f185bf45df2 100644 --- a/EVE/alice-macros/fmd_hits.C +++ b/EVE/alice-macros/fmd_hits.C @@ -31,7 +31,7 @@ fmd_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points); gEve->Redraw3D(); diff --git a/EVE/alice-macros/geom_gentle_trd.C b/EVE/alice-macros/geom_gentle_trd.C index da4be1666d6..efbe1bfcc2e 100644 --- a/EVE/alice-macros/geom_gentle_trd.C +++ b/EVE/alice-macros/geom_gentle_trd.C @@ -25,7 +25,7 @@ TEveGeoShape* geom_gentle_trd() { TEveGeoShape* lvl2 = (TEveGeoShape*) *j; lvl2->SetRnrSelf(kTRUE); - lvl2->SetMainColor((Color_t)3); + lvl2->SetMainColor(3); lvl2->SetMainTransparency(80); } diff --git a/EVE/alice-macros/its_common_foos.C b/EVE/alice-macros/its_common_foos.C index 11cfba7110a..581a4ada808 100644 --- a/EVE/alice-macros/its_common_foos.C +++ b/EVE/alice-macros/its_common_foos.C @@ -27,19 +27,19 @@ void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode) if (mode & 1) { TEveElementList* l = new TEveElementList("SPD0"); l->SetTitle("SPDs' first layer"); - l->SetMainColor((Color_t)2); + l->SetMainColor(2); gEve->AddElement(l); for (nsec=0; nsec<10; nsec++) { sSector = bsSector; sSector += nsec; TEveElementList* relSector = new TEveElementList(sSector.Data()); - relSector->SetMainColor((Color_t)2); + relSector->SetMainColor(2); gEve->AddElement(relSector, l); for (nstave=0; nstave<2; nstave++){ sStave = bsStave; sStave += nstave; TEveElementList* relStave = new TEveElementList(sStave.Data()); - relStave->SetMainColor((Color_t)2); + relStave->SetMainColor(2); gEve->AddElement(relStave, relSector); for (nMod=0; nMod<4; nMod++) { @@ -59,20 +59,20 @@ void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode) if (mode & 2) { TEveElementList* l = new TEveElementList("SPD1"); l->SetTitle("SPDs' second layer"); - l->SetMainColor((Color_t)2); + l->SetMainColor(2); gEve->AddElement(l); for (nsec=0; nsec<10; nsec++) { sSector = bsSector; sSector += nsec; TEveElementList* relSector = new TEveElementList(sSector.Data()); - relSector->SetMainColor((Color_t)2); + relSector->SetMainColor(2); gEve->AddElement(relSector, l); for (nstave=0; nstave<4; nstave++){ sStave = bsStave; sStave += nstave; TEveElementList* relStave = new TEveElementList(sStave.Data()); - relStave->SetMainColor((Color_t)2); + relStave->SetMainColor(2); gEve->AddElement(relStave, relSector); for (nMod=0; nMod<4; nMod++) { @@ -92,14 +92,14 @@ void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode) if (mode & 4) { TEveElementList* l = new TEveElementList("SDD2"); l->SetTitle("SDDs' first layer"); - l->SetMainColor((Color_t)3); + l->SetMainColor(3); gEve->AddElement(l); for (nlad=0; nlad<14; nlad++) { sLadder = bsLadder; sLadder += nlad; TEveElementList* relLadder = new TEveElementList(sLadder.Data()); - relLadder->SetMainColor((Color_t)3); + relLadder->SetMainColor(3); gEve->AddElement(relLadder, l); for (nMod=0; nMod<6; nMod++) { AliEveITSModule* m = new AliEveITSModule(i++, di); @@ -113,13 +113,13 @@ void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode) if (mode & 8) { TEveElementList* l = new TEveElementList("SDD3"); l->SetTitle("SDDs' second layer"); - l->SetMainColor((Color_t)3); + l->SetMainColor(3); gEve->AddElement(l); for (nlad=0; nlad<22; nlad++) { sLadder = bsLadder; sLadder += nlad; TEveElementList* relLadder = new TEveElementList(sLadder.Data()); - relLadder->SetMainColor((Color_t)3); + relLadder->SetMainColor(3); gEve->AddElement(relLadder, l); for (nMod=0; nMod<8; nMod++) { AliEveITSModule* m = new AliEveITSModule(i++, di); @@ -133,13 +133,13 @@ void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode) if (mode & 16) { TEveElementList* l = new TEveElementList("SSD4"); l->SetTitle("SSDs' first layer"); - l->SetMainColor((Color_t)4); + l->SetMainColor(4); gEve->AddElement(l); for (nlad=0; nlad<34; nlad++) { sLadder = bsLadder; sLadder += nlad; TEveElementList* relLadder = new TEveElementList(sLadder.Data()); - relLadder->SetMainColor((Color_t)4); + relLadder->SetMainColor(4); gEve->AddElement(relLadder, l); for (nMod=0; nMod<22; nMod++) { AliEveITSModule* m = new AliEveITSModule(i++, di); @@ -153,13 +153,13 @@ void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode) if (mode & 32) { TEveElementList* l = new TEveElementList("SSD5"); l->SetTitle("SSDs' second layer"); - l->SetMainColor((Color_t)4); + l->SetMainColor(4); gEve->AddElement(l); for (nlad=0; nlad<38; nlad++) { sLadder = bsLadder; sLadder += nlad; TEveElementList* relLadder = new TEveElementList(sLadder.Data()); - relLadder->SetMainColor((Color_t)4); + relLadder->SetMainColor(4); gEve->AddElement(relLadder, l); for (nMod=0; nMod<25; nMod++) { AliEveITSModule* m = new AliEveITSModule(i++, di); diff --git a/EVE/alice-macros/its_hits.C b/EVE/alice-macros/its_hits.C index 321a5c89b00..a3c6cecd387 100644 --- a/EVE/alice-macros/its_hits.C +++ b/EVE/alice-macros/its_hits.C @@ -39,7 +39,7 @@ its_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points, cont); gEve->Redraw3D(); diff --git a/EVE/alice-macros/its_hits_layer_split.C b/EVE/alice-macros/its_hits_layer_split.C index 3093080d57f..7c3231cd7fd 100644 --- a/EVE/alice-macros/its_hits_layer_split.C +++ b/EVE/alice-macros/its_hits_layer_split.C @@ -24,7 +24,7 @@ void its_hits_layer_split(const char *varexp = "fX:fY:fZ:GetLayer()", TTree* ht = rl->GetTreeH("ITS", false); TEvePointSetArray* l = new TEvePointSetArray("ITS hits - Layer Slices", ""); - l->SetMarkerColor((Color_t)2); + l->SetMarkerColor(2); l->SetMarkerStyle(2); // cross l->SetMarkerSize(.2); diff --git a/EVE/alice-macros/its_module_stepper.C b/EVE/alice-macros/its_module_stepper.C index b4f6530a367..34e70043933 100644 --- a/EVE/alice-macros/its_module_stepper.C +++ b/EVE/alice-macros/its_module_stepper.C @@ -21,7 +21,7 @@ void its_module_stepper(Int_t det = 0) gEve->DisableRedraw(); AliEveITSModuleStepper* ms = new AliEveITSModuleStepper(di); - ms->SetMainColor(Color_t(8)); + ms->SetMainColor(8); gStyle->SetPalette(1, 0); ms->DisplayDet(det, -1); gEve->AddElement(ms); diff --git a/EVE/alice-macros/kine_tracks.C b/EVE/alice-macros/kine_tracks.C index 4beb46b3936..173a193bdca 100644 --- a/EVE/alice-macros/kine_tracks.C +++ b/EVE/alice-macros/kine_tracks.C @@ -28,7 +28,7 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, gEve->DisableRedraw(); TEveTrackList* cont = new TEveTrackList("Kine Tracks"); - cont->SetMainColor(Color_t(3)); + cont->SetMainColor(3); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); // !!! Watch the '-', apparently different sign convention then for ESD. rnrStyle->SetMagField( -0.1*gAlice->Field()->SolenoidField() ); @@ -84,7 +84,6 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, char tooltip[1000]; sprintf(tooltip,"min pT=%.2lf, min P=%.2lf), N=%d", min_pt, min_p, count); cont->SetTitle(tooltip); // Not broadcasted automatically ... - cont->UpdateItems(); cont->MakeTracks(recurse); gEve->EnableRedraw(); @@ -126,7 +125,7 @@ Color_t set_track_color(TEveTrack* t, Bool_t pdg_col) if (pdg_col) t->SetMainColor(get_pdg_color(t->GetPdg())); else - t->SetMainColor((Color_t)30); + t->SetMainColor(30); } Color_t get_pdg_color(Int_t pdg) @@ -280,7 +279,6 @@ kine_track(Int_t label, } } - cont->UpdateItems(); gEve->Redraw3D(); return cont; } diff --git a/EVE/alice-macros/pmd_digits.C b/EVE/alice-macros/pmd_digits.C index ed24c8856d1..ceb3c5d12a7 100644 --- a/EVE/alice-macros/pmd_digits.C +++ b/EVE/alice-macros/pmd_digits.C @@ -30,7 +30,7 @@ void pmd_digits(Int_t mode = 0) TEveElementList* l = new TEveElementList("PMD"); // l->SetTitle("tooltip"); - // l->SetMainColor((Color_t)3); + // l->SetMainColor(3); gEve->AddElement(l); TEveRGBAPalette* pal = new TEveRGBAPalette(20, 1000); @@ -87,7 +87,7 @@ void pmd_digits(Int_t mode = 0) } TEveElementList* lplane = new TEveElementList(spl.Data()); - // l->SetMainColor((Color_t)3); + // l->SetMainColor(3); gEve->AddElement(lplane, l); for (Int_t iddl = istartDDL; iddl < iendDDL; iddl++) @@ -95,7 +95,7 @@ void pmd_digits(Int_t mode = 0) sddl = bsddl; sddl += iddl; TEveElementList* lddl = new TEveElementList(sddl.Data()); - // l->SetMainColor((Color_t)3); + // l->SetMainColor(3); gEve->AddElement(lddl, lplane); modnumber = iddl*6; @@ -120,8 +120,8 @@ void pmd_digits(Int_t mode = 0) { TEveFrameBox* b = lmodule->GetFrame(); b->SetFrameWidth(1.5); - b->SetFrameColor((Color_t) 1); - b->SetBackColor ((Color_t) (kTeal - 9)); + b->SetFrameColor(1); + b->SetBackColor (kTeal - 9); b->SetFrameFill (kFALSE); b->SetDrawBack (kTRUE); } diff --git a/EVE/alice-macros/pmd_hits.C b/EVE/alice-macros/pmd_hits.C index a295f440a9c..d4062e32d35 100644 --- a/EVE/alice-macros/pmd_hits.C +++ b/EVE/alice-macros/pmd_hits.C @@ -31,7 +31,7 @@ pmd_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points); gEve->Redraw3D(); diff --git a/EVE/alice-macros/pmd_raw.C b/EVE/alice-macros/pmd_raw.C index 19db34ea925..d0715d9b655 100644 --- a/EVE/alice-macros/pmd_raw.C +++ b/EVE/alice-macros/pmd_raw.C @@ -27,7 +27,7 @@ void pmd_raw(Int_t mode = 0) TEveElementList* l = new TEveElementList("PMD"); // l->SetTitle("PMD"); - // l->SetMainColor((Color_t)3); + // l->SetMainColor(3); gEve->AddElement(l); Int_t NSM = 0; @@ -81,7 +81,7 @@ void pmd_raw(Int_t mode = 0) } TEveElementList* lplane = new TEveElementList(spl.Data()); - // l->SetMainColor((Color_t)3); + // l->SetMainColor(3); gEve->AddElement(lplane, l); Int_t iddl = -1; @@ -91,7 +91,7 @@ void pmd_raw(Int_t mode = 0) sddl = bsddl; sddl += iddl; TEveElementList* lddl = new TEveElementList(sddl.Data()); - // l->SetMainColor((Color_t)3); + // l->SetMainColor(3); gEve->AddElement(ddl, lplane); modnumber = iddl*6; diff --git a/EVE/alice-macros/primary_vertex.C b/EVE/alice-macros/primary_vertex.C index f3ced7a91b6..381003fd6ce 100644 --- a/EVE/alice-macros/primary_vertex.C +++ b/EVE/alice-macros/primary_vertex.C @@ -34,13 +34,13 @@ TEveBoxSet* make_vertex_boxes(AliESDVertex* v) bs = new TEveBoxSet("+- 10 x 10 x 20mm"); bs->SetRenderMode(TEveBoxSet::RM_TEveLine); bs->AddBox(Box(-1, x[0], x[1], x[2], 1, 1, 2)); - bs->SetMainColor((Color_t) 2); + bs->SetMainColor(2); gEve->AddElement(bs); bs = new TEveBoxSet("+- 30 sigma_r x 10 sigma_z"); bs->SetRenderMode(TEveBoxSet::RM_TEveLine); bs->AddBox(Box(-1, x[0], x[1], x[2], 30*e[0], 30*e[1], 10*e[2])); - bs->SetMainColor((Color_t) 3); + bs->SetMainColor(3); gEve->AddElement(bs); gEve->Redraw3D(); diff --git a/EVE/alice-macros/primary_vertex_tracks.C b/EVE/alice-macros/primary_vertex_tracks.C index 260db0e3858..760a64e6ff6 100644 --- a/EVE/alice-macros/primary_vertex_tracks.C +++ b/EVE/alice-macros/primary_vertex_tracks.C @@ -14,7 +14,7 @@ TEveTrackList* primary_vertex_tracks() AliESDVertex *pv = esd->GetPrimaryVertex(); TEveTrackList* cont = new TEveTrackList("Tracks for Primary Vertex"); - cont->SetMainColor(Color_t(7)); + cont->SetMainColor(7); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( 0.1*esd->GetMagneticField() ); rnrStyle->fRnrFV = kTRUE; diff --git a/EVE/alice-macros/t0_hits.C b/EVE/alice-macros/t0_hits.C index 93d357c11b5..36249bf2c96 100644 --- a/EVE/alice-macros/t0_hits.C +++ b/EVE/alice-macros/t0_hits.C @@ -39,7 +39,7 @@ t0_hits(const char *varexp = "T0.fX:T0.fY:T0.fZ", points->SetTitle(Form("N=%d", points->Size())); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)3); + points->SetMarkerColor(3); gEve->AddElement(points); gEve->Redraw3D(); diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C index 73d8a3cf7e4..7694eaebad5 100644 --- a/EVE/alice-macros/tof_digits.C +++ b/EVE/alice-macros/tof_digits.C @@ -33,7 +33,7 @@ void tof_digits() TEveElementList* ll = new TEveElementList("TOF"); ll->SetTitle("TOF detector"); - ll->SetMainColor((Color_t)2); + ll->SetMainColor(2); gEve->AddElement(ll); for(Int_t iSector=0; iSectorNSectors(); iSector++) { diff --git a/EVE/alice-macros/tof_digits_sector.C b/EVE/alice-macros/tof_digits_sector.C index 33ae206e8e4..079f9f644af 100644 --- a/EVE/alice-macros/tof_digits_sector.C +++ b/EVE/alice-macros/tof_digits_sector.C @@ -33,7 +33,7 @@ void tof_digits_sector(Int_t sector=0) TEveElementList* ll = new TEveElementList("TOF"); ll->SetTitle("TOF detector"); - ll->SetMainColor((Color_t)2); + ll->SetMainColor(2); gEve->AddElement(ll); AliEveTOFSector* m = new AliEveTOFSector(localGeoManager, sector, dt); diff --git a/EVE/alice-macros/tof_digits_strips.C b/EVE/alice-macros/tof_digits_strips.C index f5ef1e98c77..fa6ae130c2e 100644 --- a/EVE/alice-macros/tof_digits_strips.C +++ b/EVE/alice-macros/tof_digits_strips.C @@ -40,7 +40,7 @@ void tof_digits_strips(Int_t selectedSector=-1) TEveElementList* ll = new TEveElementList("TOF"); ll->SetTitle("TOF detector"); - ll->SetMainColor((Color_t)2); + ll->SetMainColor(2); gEve->AddElement(ll); for(Int_t iSector=0; iSectorNSectors(); iSector++) { @@ -48,7 +48,7 @@ void tof_digits_strips(Int_t selectedSector=-1) sprintf(sectorName,"Sector%2i",iSector); TEveElementList* l = new TEveElementList(sectorName); l->SetTitle(sectorTitle); - l->SetMainColor((Color_t)2); + l->SetMainColor(2); gEve->AddElement(l, ll); @@ -62,7 +62,7 @@ void tof_digits_strips(Int_t selectedSector=-1) sPlate=bsPlate; sPlate+=iPlate; TEveElementList* relPlate = new TEveElementList(sPlate.Data()); - relPlate->SetMainColor((Color_t)2); + relPlate->SetMainColor(2); gEve->AddElement(relPlate, l); diff --git a/EVE/alice-macros/tof_hits.C b/EVE/alice-macros/tof_hits.C index e8c417a24c7..a28c48f73b4 100644 --- a/EVE/alice-macros/tof_hits.C +++ b/EVE/alice-macros/tof_hits.C @@ -7,7 +7,6 @@ * full copyright notice. * **************************************************************************/ - TEvePointSet* tof_hits(const char *varexp = "fX:fY:fZ", const char *selection = "", @@ -39,7 +38,7 @@ tof_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points, cont); gEve->Redraw3D(); diff --git a/EVE/alice-macros/tof_raw.C b/EVE/alice-macros/tof_raw.C index 23ad892721f..a409fff44ee 100644 --- a/EVE/alice-macros/tof_raw.C +++ b/EVE/alice-macros/tof_raw.C @@ -53,7 +53,7 @@ void tof_raw(const char *input = "raw.root", TEveElementList* ll = new TEveElementList("TOF"); ll->SetTitle("TOF detector"); - ll->SetMainColor((Color_t)2); + ll->SetMainColor(2); gEve->AddElement(ll); for(Int_t iSector=0; iSectorNSectors(); iSector++) { diff --git a/EVE/alice-macros/tpc_digits.C b/EVE/alice-macros/tpc_digits.C index d55e8c3b42c..53f13ebbb95 100644 --- a/EVE/alice-macros/tpc_digits.C +++ b/EVE/alice-macros/tpc_digits.C @@ -62,7 +62,7 @@ void tpc_digits(Int_t mode=1) { TEveElementList* l = new TEveElementList("TPC plate 1"); l->SetTitle("TPC Plate"); - l->SetMainColor(Color_t(col)); + l->SetMainColor(col); gEve->AddElement(l); for (Int_t i = 0; i<18; i++) @@ -78,7 +78,7 @@ void tpc_digits(Int_t mode=1) { TEveElementList* l = new TEveElementList("TPC plate 2"); l->SetTitle("TPC Plate"); - l->SetMainColor(Color_t(col)); + l->SetMainColor(col); gEve->AddElement(l); for (Int_t i = 18; i<36; i++) @@ -110,7 +110,7 @@ void tpc_digits(Int_t mode=1) { TEveElementList* l = new TEveElementList("TPC plate 1"); l->SetTitle("TPC Plate"); - l->SetMainColor(Color_t(col)); + l->SetMainColor(col); gEve->AddElement(l); for (Int_t i = 0; i<18; i++) @@ -126,7 +126,7 @@ void tpc_digits(Int_t mode=1) { TEveElementList* l = new TEveElementList("TPC plate 2"); l->SetTitle("TPC Plate"); - l->SetMainColor(Color_t(col)); + l->SetMainColor(col); gEve->AddElement(l); for (Int_t i = 18; i<36; i++) @@ -170,7 +170,7 @@ void tpc_digits_2drange(Int_t start, Int_t end) gEve->DisableRedraw(); { TEveElementList* l = new TEveElementList("TPC sectors"); - l->SetMainColor(Color_t(col)); + l->SetMainColor(col); gEve->AddElement(l); for (Int_t i=start; i<=end; i++) diff --git a/EVE/alice-macros/tpc_hits.C b/EVE/alice-macros/tpc_hits.C index 6f48988a628..fb1f3d55d37 100644 --- a/EVE/alice-macros/tpc_hits.C +++ b/EVE/alice-macros/tpc_hits.C @@ -42,7 +42,7 @@ tpc_hits(const char *varexp = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)3); + points->SetMarkerColor(3); gEve->AddElement(points, cont); gEve->Redraw3D(); diff --git a/EVE/alice-macros/tpc_hits_charge_split.C b/EVE/alice-macros/tpc_hits_charge_split.C index b8dd9eacb7c..f62168913bc 100644 --- a/EVE/alice-macros/tpc_hits_charge_split.C +++ b/EVE/alice-macros/tpc_hits_charge_split.C @@ -22,7 +22,7 @@ void tpc_hits_charge_split(const char *varexp = TEvePointSetArray* l = new TEvePointSetArray("TPC hits - Log-Charge Slices", ""); l->SetSourceCS(TEvePointSelectorConsumer::kTVT_RPhiZ); - l->SetMarkerColor((Color_t)3); + l->SetMarkerColor(3); l->SetMarkerStyle(20); // full circle l->SetMarkerSize(.5); diff --git a/EVE/alice-macros/tpc_hits_eta_split.C b/EVE/alice-macros/tpc_hits_eta_split.C index 8bea364efab..97194a48703 100644 --- a/EVE/alice-macros/tpc_hits_eta_split.C +++ b/EVE/alice-macros/tpc_hits_eta_split.C @@ -22,7 +22,7 @@ void tpc_hits_eta_split(const char *varexp = TEvePointSetArray* l = new TEvePointSetArray("TPC hits - Eta Slices", ""); l->SetSourceCS(TEvePointSelectorConsumer::kTVT_RPhiZ); - l->SetMarkerColor((Color_t)3); + l->SetMarkerColor(3); l->SetMarkerStyle(20); // full circle l->SetMarkerSize(.5); diff --git a/EVE/alice-macros/trd_friend_tracks.C b/EVE/alice-macros/trd_friend_tracks.C index c78e6ed28f9..df942ccebe3 100644 --- a/EVE/alice-macros/trd_friend_tracks.C +++ b/EVE/alice-macros/trd_friend_tracks.C @@ -29,7 +29,7 @@ TEveElementList* trd_friend_tracks(TEveElement *cont = 0) } } - tracks->SetTitle(Form("Tracks %d", tracks->GetNChildren())); + tracks->SetTitle(Form("Tracks %d", tracks->NumChildren())); tracks->SetStamp(TEveElement::kCBObjProps); gEve->AddElement(tracks, cont); diff --git a/EVE/alice-macros/trd_hits.C b/EVE/alice-macros/trd_hits.C index 8ad853b9d86..3ed01cce8be 100644 --- a/EVE/alice-macros/trd_hits.C +++ b/EVE/alice-macros/trd_hits.C @@ -38,7 +38,7 @@ trd_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)7); + points->SetMarkerColor(7); gEve->AddElement(points, cont); gEve->Redraw3D(); diff --git a/EVE/alice-macros/trd_hits_z_split.C b/EVE/alice-macros/trd_hits_z_split.C index 6bb74b67c51..30aaf265045 100644 --- a/EVE/alice-macros/trd_hits_z_split.C +++ b/EVE/alice-macros/trd_hits_z_split.C @@ -16,7 +16,7 @@ void trd_hits_z_split(const char *varexp = "fX:fY:fZ:fZ", TTree* ht = rl->GetTreeH("TRD", false); TEvePointSetArray* l = new TEvePointSetArray("TRD hits - Z Slices", ""); - l->SetMarkerColor((Color_t)7); + l->SetMarkerColor(7); l->SetMarkerStyle(20); // full circle l->SetMarkerSize(.5); diff --git a/EVE/alice-macros/vzero_hits.C b/EVE/alice-macros/vzero_hits.C index 0ae79ea5379..1bdc2f65390 100644 --- a/EVE/alice-macros/vzero_hits.C +++ b/EVE/alice-macros/vzero_hits.C @@ -31,7 +31,7 @@ vzero_hits(const char *varexp = "fX:fY:fZ", sprintf(form,"N=%d", points->Size()); points->SetTitle(form); points->SetMarkerSize(.5); - points->SetMarkerColor((Color_t)2); + points->SetMarkerColor(2); gEve->AddElement(points); gEve->Redraw3D(); diff --git a/EVE/hlt-macros/command_queue.C b/EVE/hlt-macros/command_queue.C index 0b647c336da..54e1e27032e 100644 --- a/EVE/hlt-macros/command_queue.C +++ b/EVE/hlt-macros/command_queue.C @@ -126,7 +126,7 @@ void make_crap(void* arg) rnd.Uniform(-100, 100), rnd.Uniform(-100, 100)); } - ps->SetMainColor((Color_t)kRed); + ps->SetMainColor(kRed); printf("make_crap() -> produced TEvePointSet* %p)\n", ps); ((CommandQueue*)arg)->RegisterCommand diff --git a/EVE/hlt-macros/geom_hlt.C b/EVE/hlt-macros/geom_hlt.C index a786bc30a80..515ec59fdc5 100644 --- a/EVE/hlt-macros/geom_hlt.C +++ b/EVE/hlt-macros/geom_hlt.C @@ -57,7 +57,7 @@ Int_t MUON_geom() TEveElementList* mul = new TEveElementList("MUONChambers"); TEveElementList* muChData = new TEveElementList("MUONChamberData"); mul->SetTitle("MUON chambers"); - mul->SetMainColor(Color_t(3)); + mul->SetMainColor(3); gEve->AddGlobalElement(mul); gEve->AddElement(muChData); diff --git a/EVE/hlt-macros/homer_display.C b/EVE/hlt-macros/homer_display.C index 778091b223c..0404fd58d78 100644 --- a/EVE/hlt-macros/homer_display.C +++ b/EVE/hlt-macros/homer_display.C @@ -246,7 +246,7 @@ Int_t nextEvent(Int_t ADCCut) { // ** Initialize TPC Clusters if ( !gTPCClusters ) { gTPCClusters = new TEvePointSet("TPC Clusters"); - gTPCClusters->SetMainColor((Color_t)kRed); + gTPCClusters->SetMainColor(kRed); gTPCClusters->SetMarkerStyle((Style_t)kFullDotSmall); gEve->AddElement(gTPCClusters); } @@ -263,7 +263,7 @@ Int_t nextEvent(Int_t ADCCut) { // ** Initialize TPC Tracks if ( !gTPCTrack ) { gTPCTrack = new TEveTrackList("TPC Tracks"); - gTPCTrack->SetMainColor((Color_t)kBlue); + gTPCTrack->SetMainColor(kBlue); gEve->AddElement(gTPCTrack); @@ -370,7 +370,7 @@ Int_t drawSPDRawData() { TEveElementList* layer1 = new TEveElementList( "SPD0" ); layer1->SetTitle( "SPDs' first layer" ); - layer1->SetMainColor( (Color_t) 2 ); + layer1->SetMainColor(2); gEve->AddElement( layer1 ); for ( sector=0; sector<10; sector++ ) { @@ -378,7 +378,7 @@ Int_t drawSPDRawData() { sSector += sector; TEveElementList* relSector = new TEveElementList( sSector.Data() ); - relSector->SetMainColor( (Color_t) 2 ); + relSector->SetMainColor(2); gEve->AddElement( relSector, layer1 ); for ( stave=0; stave<2; stave++ ) { @@ -386,7 +386,7 @@ Int_t drawSPDRawData() { sStave += stave; TEveElementList* relStave = new TEveElementList( sStave.Data() ); - relStave->SetMainColor( (Color_t) 2 ); + relStave->SetMainColor(2); gEve->AddElement( relStave, relSector ); for ( module=0; module<4; module++ ) { @@ -408,7 +408,7 @@ Int_t drawSPDRawData() { TEveElementList* layer2 = new TEveElementList( "SPD1" ); layer2->SetTitle( "SPDs' second layer" ); - layer2->SetMainColor( (Color_t) 2 ); + layer2->SetMainColor(2); gEve->AddElement(layer2); for ( sector=0; sector<10; sector++ ) { @@ -416,7 +416,7 @@ Int_t drawSPDRawData() { sSector += sector; TEveElementList* relSector = new TEveElementList( sSector.Data() ); - relSector->SetMainColor( (Color_t) 2 ); + relSector->SetMainColor(2); gEve->AddElement(relSector, layer2 ); for ( stave=0; stave<4; stave++ ) { @@ -424,7 +424,7 @@ Int_t drawSPDRawData() { sStave += stave; TEveElementList* relStave = new TEveElementList( sStave.Data() ); - relStave->SetMainColor( (Color_t) 2 ); + relStave->SetMainColor(2); gEve->AddElement( relStave, relSector ); for ( module=0; module<4; module++) { -- 2.43.0