Modified macros to be compilable by ACLiC
authorquark <quark@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 30 Jan 2012 20:52:05 +0000 (20:52 +0000)
committerquark <quark@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 30 Jan 2012 20:52:05 +0000 (20:52 +0000)
122 files changed:
EVE/alice-macros/MUON_displayData.C
EVE/alice-macros/MUON_displaySimu.C
EVE/alice-macros/MUON_geom.C
EVE/alice-macros/MUON_geomAll.C
EVE/alice-macros/MUON_makeGeom.C
EVE/alice-macros/ana_list.C
EVE/alice-macros/aod_HF.C
EVE/alice-macros/beams_info.C
EVE/alice-macros/clusters_from_index.C
EVE/alice-macros/clusters_from_label.C
EVE/alice-macros/emcal_all.C
EVE/alice-macros/emcal_hits.C
EVE/alice-macros/esd_V0.C
EVE/alice-macros/esd_V0_points.C
EVE/alice-macros/esd_cascade.C
EVE/alice-macros/esd_cascade_points.C
EVE/alice-macros/esd_hlt_tracks.C
EVE/alice-macros/esd_kink.C
EVE/alice-macros/esd_kink_points.C
EVE/alice-macros/esd_spd_tracklets.C
EVE/alice-macros/esd_tracks.C
EVE/alice-macros/esd_zdc.C
EVE/alice-macros/event_first.C
EVE/alice-macros/event_goto.C
EVE/alice-macros/event_last.C
EVE/alice-macros/event_next.C
EVE/alice-macros/event_prev.C
EVE/alice-macros/fmd_digits.C
EVE/alice-macros/fmd_esd.C
EVE/alice-macros/fmd_hits.C
EVE/alice-macros/fmd_hits2.C
EVE/alice-macros/fmd_raw.C
EVE/alice-macros/geom_acorde.C
EVE/alice-macros/geom_all.C
EVE/alice-macros/geom_ddip.C
EVE/alice-macros/geom_emcal.C
EVE/alice-macros/geom_fmd.C
EVE/alice-macros/geom_gentle.C
EVE/alice-macros/geom_gentle_bright.C
EVE/alice-macros/geom_gentle_default.C
EVE/alice-macros/geom_gentle_green.C
EVE/alice-macros/geom_gentle_muon.C
EVE/alice-macros/geom_gentle_notransparency.C
EVE/alice-macros/geom_gentle_projector.C
EVE/alice-macros/geom_gentle_tpc.C
EVE/alice-macros/geom_gentle_transparent.C
EVE/alice-macros/geom_gentle_transparentdark.C
EVE/alice-macros/geom_gentle_transparentlight.C
EVE/alice-macros/geom_gentle_trd.C
EVE/alice-macros/geom_gentle_yellow.C
EVE/alice-macros/geom_hmpid.C
EVE/alice-macros/geom_its.C
EVE/alice-macros/geom_phos.C
EVE/alice-macros/geom_pmd.C
EVE/alice-macros/geom_simple.C
EVE/alice-macros/geom_t0.C
EVE/alice-macros/geom_tpc.C
EVE/alice-macros/geom_trd_tof.C
EVE/alice-macros/geom_vzero.C
EVE/alice-macros/geom_zdc.C
EVE/alice-macros/histo2d.C
EVE/alice-macros/histo2d_all_events.C
EVE/alice-macros/hits_from_label.C
EVE/alice-macros/hmpid_clusters.C
EVE/alice-macros/hmpid_digits.C
EVE/alice-macros/hmpid_raw.C
EVE/alice-macros/its_digits.C
EVE/alice-macros/its_hits.C
EVE/alice-macros/its_hits_layer_split.C
EVE/alice-macros/its_module_stepper.C
EVE/alice-macros/its_raw.C
EVE/alice-macros/jetplane.C
EVE/alice-macros/kine_print.C
EVE/alice-macros/kine_tracks.C
EVE/alice-macros/lego.C
EVE/alice-macros/make_residuals.C
EVE/alice-macros/muon_clusters.C
EVE/alice-macros/muon_digits.C
EVE/alice-macros/muon_raw.C
EVE/alice-macros/muon_trackRefs.C
EVE/alice-macros/phos_clusters.C
EVE/alice-macros/pmd_digits.C
EVE/alice-macros/pmd_hits.C
EVE/alice-macros/pmd_raw.C
EVE/alice-macros/primary_vertex.C
EVE/alice-macros/primary_vertex_tracks.C
EVE/alice-macros/print_kine_from_label.C
EVE/alice-macros/region_marker.C
EVE/alice-macros/set_momentum_vectors.C
EVE/alice-macros/t0_digits.C
EVE/alice-macros/t0_hits.C
EVE/alice-macros/t0_raw.C
EVE/alice-macros/tof_clusters.C
EVE/alice-macros/tof_digits.C
EVE/alice-macros/tof_digits_sector.C
EVE/alice-macros/tof_digits_strips.C
EVE/alice-macros/tof_hits.C
EVE/alice-macros/tof_raw.C
EVE/alice-macros/tpc_calib_viewer.C
EVE/alice-macros/tpc_clusters.C
EVE/alice-macros/tpc_digits.C
EVE/alice-macros/tpc_hits.C
EVE/alice-macros/tpc_hits_charge_split.C
EVE/alice-macros/tpc_hits_eta_split.C
EVE/alice-macros/tpc_raw.C
EVE/alice-macros/track_fitter.C
EVE/alice-macros/trd_analyse.C
EVE/alice-macros/trd_clusters.C
EVE/alice-macros/trd_digits.C
EVE/alice-macros/trd_gtutracks.C
EVE/alice-macros/trd_hits.C
EVE/alice-macros/trd_hits_z_split.C
EVE/alice-macros/trd_loader.C
EVE/alice-macros/trd_qaRec.C
EVE/alice-macros/trd_rawloader.C
EVE/alice-macros/trd_tracklets.C
EVE/alice-macros/trd_tracks.C
EVE/alice-macros/vplot_tpc.C
EVE/alice-macros/vzero_digits.C
EVE/alice-macros/vzero_dump.C
EVE/alice-macros/vzero_hits.C
EVE/alice-macros/vzero_raw.C

index cf9436d..9d0a0ea 100644 (file)
 ///
 /// \author B. Vulpescu, LPC
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <Riostream.h>
+#include <Rtypes.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TString.h>
+#include <TSystem.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveTrack.h>
+
+#include <MUON/mapping/AliMpSegmentation.h>
+#include <MUON/mapping/AliMpDDLStore.h>
+#include <MUON/mapping/AliMpCDB.h>
+#include <MUON/AliMUONTrackExtrap.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDMuonTrack.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveMUONData.h>
+#include <EVE/EveDet/AliEveMUONChamber.h>
+#include <EVE/EveDet/AliEveMUONTrack.h>
+#endif
+
 class AliEveMUONData;
 class AliEveEventManager;
 
@@ -20,6 +44,8 @@ AliEveMUONData     *g_muon_data       = 0;
 Int_t  g_currentEvent = -1;
 Bool_t g_fromRaw      = kFALSE;
 
+void MUON_ESD_tracks();
+
 void MUON_displayData(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE, Bool_t clustersFromESD = kTRUE)
 {
   //
@@ -131,7 +157,7 @@ void MUON_ESD_tracks()
   AliESDEvent* esd = AliEveEventManager::AssertESD();
 
   // TEveTrackList* lt = new TEveTrackList("ESD-Tracks");
-  AliEveMUONTrackList* lt = new TEveTrackList("ESD-Tracks");
+  AliEveMUONTrackList* lt = new AliEveMUONTrackList("ESD-Tracks");
   lt->SetMainColor(6);
   //lt->SetMUON();
 
index 4fa6fa7..bc921a3 100644 (file)
 ///
 /// \author B. Vulpescu, LPC
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <Riostream.h>
+#include <Rtypes.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TString.h>
+#include <TSystem.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveTrack.h>
+
+#include <MUON/mapping/AliMpSegmentation.h>
+#include <MUON/mapping/AliMpDDLStore.h>
+#include <MUON/mapping/AliMpCDB.h>
+#include <MUON/AliMUONRecoCheck.h>
+#include <MUON/AliMUONTrack.h>
+#include <MUON/AliMUONTrackExtrap.h>
+#include <MUON/AliMUONVTrackStore.h>
+#include <STEER/STEERBase/AliStack.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDMuonTrack.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveMUONData.h>
+#include <EVE/EveDet/AliEveMUONChamber.h>
+#include <EVE/EveDet/AliEveMUONTrack.h>
+#else
 class AliEveMUONData;
 class AliEveEventManager;
+#endif
 
 AliEveMUONData     *g_muon_data       = 0;
 
 Int_t  g_currentEvent = -1;
 Bool_t g_fromRaw      = kFALSE;
 
+void MUON_ESD_tracks();
+void MUON_Ref_tracks();
+void MUON_MC_tracks();
 
 void MUON_displaySimu(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE, Bool_t clustersFromESD = kTRUE)
 {
@@ -201,13 +232,10 @@ void MUON_Ref_tracks()
 //______________________________________________________________________________
 void MUON_MC_tracks()
 {
-  Double_t RADDEG = 180.0/TMath::Pi();
-
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
   rl->LoadKinematics();
   AliStack* stack = rl->Stack();
 
-  Int_t nPrimary = stack->GetNprimary();
   Int_t nTracks  = stack->GetNtrack();
 
   TEveTrackList* lt = new TEveTrackList("MC-Tracks");
@@ -216,7 +244,6 @@ void MUON_MC_tracks()
 
   gEve->AddElement(lt);
 
-  Int_t pdgCode;
   TParticle *part;
   TEveRecTrack rt;
 
index d9867dc..9f7ad9b 100644 (file)
 ///
 /// \author B. Vulpescu, LPC
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoNode.h>
+#endif
+
 void MUON_geom()
 {
   gGeoManager = gEve->GetGeometry("geometry.root");
@@ -37,6 +45,6 @@ void MUON_geom()
 
   gEve->Redraw3D();
 
-  printf("MUON_geom.C done\n");
+  Info("MUON_geom.C", "Done");
 
 }
index 85071a3..98ed319 100644 (file)
 ///
 /// \author B. Vulpescu, LPC
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void MUON_geomAll()
 {
   gGeoManager = gEve->GetGeometry("geometry.root");
index af2fc9d..e8b8acb 100644 (file)
 /// \file MUON_makeGeom.C
 ///
 /// \author B. Vulpescu, LPC
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
 
+#include <MUON/mapping/AliMpCDB.h>
+#include <STEER/STEER/AliRun.h>
+#endif
+
+void MUON_makeGeom()
 {
   AliMpCDB::LoadMpSegmentation2(); 
-  gAlice->Init("$ALICE_ROOT/MUON/Config.C");
+  gAlice->SetConfigFunction("$ALICE_ROOT/MUON/Config.C");
   //gAlice->Init("Config.C");
 
   gGeoManager->Export("geometry.root");
index 4f22920..c48ecca 100755 (executable)
@@ -29,7 +29,7 @@
 #include <TEveManager.h>
 
 #include <TRD/AliTRDarrayADC.h>
-#include <EveDet/AliEveListAnalyser.h>
+#include <EVE/EveDet/AliEveListAnalyser.h>
 #endif
 
 void ana_list(TEveElement *cont = 0)
index d2acc35..585dffc 100644 (file)
@@ -6,8 +6,34 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TEveVSDStructs.h>
+#include <TEveTrackPropagator.h>
+#include <TEvePointSet.h>
+#include <TEveManager.h>
+
+#include <STEER/STEERBase/AliExternalTrackParam.h>
+#include <STEER/STEERBase/AliVVertex.h>
+#include <STEER/AOD/AliAODVertex.h>
+#include <STEER/AOD/AliAODEvent.h>
+#include <STEER/AOD/AliAODTrack.h>
+#include <STEER/AOD/AliAODMCParticle.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <PWG3/vertexingHF/AliAODRecoDecayHF.h>
+#include <PWG3/vertexingHF/AliAODRecoDecayHF2Prong.h>
+
+#include <EVE/EveBase/AliEveHF.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+
+#include <PWG3/vertexingHF/macros/LoadLibraries.C>
+
+#else
 class AliAODRecoDecayHF;
+#endif
 
 void aod_hf_init_rectrack(TEveRecTrack& rt, AliExternalTrackParam* tp)
 {
@@ -59,7 +85,7 @@ AliEveHF* aod_make_HF(TEveTrackPropagator* rnrStyle, AliAODVertex* primAODVtx,
 AliEveHFList* aod_HF()
 {
   Bool_t useParFiles=kFALSE;
-  gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/LoadLibraries.C");
+  gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/macros/LoadLibraries.C");
   LoadLibraries(useParFiles);
 
   AliAODEvent* aod = AliEveEventManager::AssertAOD();
@@ -69,8 +95,8 @@ AliEveHFList* aod_HF()
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libCORRFW");
-    gSystem->Load("libPWGHFbase");
-    gSystem->Load("libPWGHFvertexingHF");
+    gSystem->Load("libPWG3base");
+    gSystem->Load("libPWG3vertexingHF");
   */
 
   // load MC particles
@@ -78,7 +104,7 @@ AliEveHFList* aod_HF()
     (TClonesArray*) aod->FindListObject(AliAODMCParticle::StdBranchName());
   if (!mcArray) {
     printf("MC particles branch not found!\n");
-    return;
+    return 0;
   }
 
   AliAODVertex* primVtx_aod = (AliAODVertex*) aod->GetPrimaryVertex();
@@ -113,8 +139,8 @@ AliEveHFList* aod_HF()
     //Int_t labD0 = rd->MatchToMC(421,mcArray);
     //if(labD0<0) continue;
 
-    AliAODTrack *negAODTr = rd->GetDaughter(0);
-    AliAODTrack *posAODTr = rd->GetDaughter(1);
+    AliAODTrack *negAODTr = dynamic_cast<AliAODTrack *>(rd->GetDaughter(0));
+    AliAODTrack *posAODTr = dynamic_cast<AliAODTrack *>(rd->GetDaughter(1));
 
     AliVVertex  *secv = rd->GetSecondaryVtx();
 
index 82c7c30..e2b876f 100644 (file)
@@ -6,10 +6,17 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveElement.h>
+
+#include <EVE/EveBase/AliEveBeamsInfo.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 AliEveBeamsInfo* beams_info(){
 
   AliEveEventManager *mng = AliEveEventManager::GetMaster();
-  AliEveBeamsInfo *beamsinfo = mng->FindGlobal("BeamsInfo");
+  AliEveBeamsInfo *beamsinfo = dynamic_cast<AliEveBeamsInfo *>(mng->FindGlobal("BeamsInfo"));
 
   if ( beamsinfo == 0) {
      beamsinfo = new AliEveBeamsInfo();
index 944557d..127d00e 100644 (file)
@@ -6,6 +6,16 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliTrackPointArray.h>
+#include <EveBase/AliEveEventManager.h>
+#include <EveBase/AliEveMultiView.h>
+#endif
 
 TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0)
 {
@@ -28,8 +38,8 @@ TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0)
   const AliTrackPointArray* pArr = at->GetTrackPointArray();
   if (pArr == 0) {
     Warning("clusters_from_index", "TrackPointArray not stored with ESD track.");
-    continue;
   }
+  
   Int_t np =  pArr->GetNPoints();
   const Float_t* x = pArr->GetX();
   const Float_t* y = pArr->GetY();
@@ -42,7 +52,7 @@ TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0)
 
 
   if(clusters->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("clusters_from_index", Form("No clusters for index '%d'", index));
+    Warning("clusters_from_index", "No clusters for index '%d'", index);
     delete clusters;
     return 0;
   }
index 830fada..82022c6 100644 (file)
@@ -6,6 +6,17 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <STEER/ESD/AliTrackPointArray.h>
+#include <EveBase/AliEveEventManager.h>
+#include <EveBase/AliEveMultiView.h>
+#endif
 
 TEvePointSet* clusters_from_label(Int_t label=0, TEveElement* cont=0)
 {
@@ -36,7 +47,7 @@ TEvePointSet* clusters_from_label(Int_t label=0, TEveElement* cont=0)
   }
 
   if(clusters->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("clusters_from_label", Form("No clusters match label '%d'", label));
+    Warning("clusters_from_label", "No clusters match label '%d'", label);
     delete clusters;
     return 0;
   }
index 1801dac..035d203 100644 (file)
 //  Author: Magali Estienne (magali.estienne@cern.ch)
 //  June 30 2008
 //************************************************************************
-
+#if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TGeoMatrix.h>
 #include <TMath.h>
-
-
+#include <TString.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+
+#include <EMCAL/AliEMCAL.h>
+#include <EMCAL/AliEMCALLoader.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <STEER/ESD/AliTrackPointArray.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#include <EVE/EveDet/AliEveEMCALData.h>
+#include <EVE/EveDet/AliEveEMCALSModule.h>
+
+#else
 class AliEveEMCALData;
+#endif
+
 AliEveEMCALData     *emcal_data       = 0;
 
 void emcal_all(const UInt_t evtNum = 0, Bool_t digFile = 0, 
index 4d47af0..f72b71f 100644 (file)
@@ -6,6 +6,18 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TString.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+#include <TEveTreeTools.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <STEER/STEER/AliRunLoader.h>
+
+#endif
 
 TEvePointSet*
 emcal_hits(const char *varexp    = "fX:fY:fZ",
@@ -23,7 +35,7 @@ emcal_hits(const char *varexp    = "fX:fY:fZ",
   ps.Select();
 
   if (points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("emcal_hits", Form("No hits match '%s'", selection));
+    Warning("emcal_hits", "No hits match '%s'",selection);
     delete points;
     return 0;
   }
index f743e69..edb45f3 100644 (file)
@@ -7,7 +7,23 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-void esd_v0_init_rectrack(TEveRecTrack& rt, AliExternalTrackParam* tp)
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveVSDStructs.h>
+#include <TEveTrackPropagator.h>
+#include <TEveManager.h>
+
+#include <STEER/STEERBase/AliExternalTrackParam.h>
+#include <STEER/STEERBase/AliPID.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDVertex.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <STEER/ESD/AliESDv0.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveV0.h>
+#endif
+
+
+void esd_v0_init_rectrack(TEveRecTrack& rt, const AliExternalTrackParam* tp)
 {
   Double_t      pbuf[3], vbuf[3];
 
@@ -157,20 +173,4 @@ AliEveV0List* esd_V0(Bool_t onFly=kFALSE)
   gEve->Redraw3D();
 
   return cont;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file
index b5be458..d98b236 100644 (file)
@@ -7,6 +7,15 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDv0.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void esd_VO_fill_pointset(TEvePointSet* ps, Bool_t onFly)
 {
   AliESDEvent* esd = AliEveEventManager::AssertESD();
index b340c99..88ab466 100644 (file)
@@ -6,8 +6,21 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-
-void esd_cascade_init_rectrack(TEveRecTrack& rt, AliExternalTrackParam* tp)
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TMath.h>
+#include <TEveManager.h>
+#include <TEveVSDStructs.h>
+#include <TEveTrackPropagator.h>
+
+#include <STEER/STEERBase/AliExternalTrackParam.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDcascade.h>
+#include <STEER/ESD/AliESDVertex.h>
+#include <EVE/EveBase/AliEveCascade.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
+void esd_cascade_init_rectrack(TEveRecTrack& rt, const AliExternalTrackParam* tp)
 {
   Double_t      pbuf[3], vbuf[3];
 
index eaa1d73..a251cb2 100644 (file)
@@ -5,6 +5,15 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDcascade.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
 
 void esd_cascade_fill_pointset(TEvePointSet* ps)
 {
index 36861cb..03b40e1 100644 (file)
 //* about the suitability of this software for any purpose. It is          *
 //* provided "as is" without express or implied warranty.                  *
 //**************************************************************************
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TObject.h>
+#include <TClass.h>
+#include <TFile.h>
+#include <TTree.h>
+#include <TEveTrack.h>
+#include <TEveUtil.h>
+#include <TEveManager.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+
+#include "esd_tracks.C"
+#endif
 
 /**
  * Display ESD Tracks from the HLTesdTree in AliEVE.
index a3c9df0..21483aa 100644 (file)
@@ -6,8 +6,23 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-
-void esd_kink_init_rectrackMother(TEveRecTrack& rt, AliExternalTrackParam* tp)
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TVector3.h>
+#include <TEveVector.h>
+#include <TEveTrackPropagator.h>
+#include <TEveVSDStructs.h>
+#include <TEveManager.h>
+
+#include <STEER/STEERBase/AliExternalTrackParam.h>
+#include <STEER/STEERBase/AliPID.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <STEER/ESD/AliESDkink.h>
+#include <EVE/EveBase/AliEveKink.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
+void esd_kink_init_rectrackMother(TEveRecTrack& rt, const AliExternalTrackParam* tp)
 {
   Double_t pbuf[3], vbuf[3];
 
@@ -18,7 +33,7 @@ void esd_kink_init_rectrackMother(TEveRecTrack& rt, AliExternalTrackParam* tp)
   rt.fBeta = 1; // ep/TMath::Sqrt(ep*ep + mc*mc);
 }
 
-void esd_kink_init_rectrackDaughter(TEveRecTrack& rt, AliExternalTrackParam* tp, TEveVector* svt,TEveVector* spt)
+void esd_kink_init_rectrackDaughter(TEveRecTrack& rt, const AliExternalTrackParam* tp, TEveVector* svt,TEveVector* spt)
 {
   rt.fSign = tp->GetSign();
   rt.fV.Set(*svt);
@@ -41,7 +56,7 @@ AliEveKink* esd_make_kink(TEveTrackPropagator* rnrStyleMoth,TEveTrackPropagator*
   const TVector3 r1(kink->GetPosition());
   rcKink.fVKink.Set(r1);
   
-  for (Int_t j=0; j<3; ++j) rckink.fKinkAngle[j]=kink->GetAngle(j);
+  for (Int_t j=0; j<3; ++j) rcKink.fKinkAngle[j]=kink->GetAngle(j);
   
   Double_t r[3], r2[3];
 
index 16c704a..c21972c 100644 (file)
@@ -6,6 +6,17 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TMath.h>
+#include <TVector3.h>
+#include <TEvePointSet.h>
+#include <TEveManager.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <STEER/ESD/AliESDkink.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
 
 void esd_kink_fill_pointset(TEvePointSet* ps)
 {
index 999492d..35d35ca 100644 (file)
@@ -6,6 +6,21 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TMath.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveTrack.h>
+#include <TEveTrackPropagator.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDVertex.h>
+#include <STEER/ESD/AliMultiplicity.h>
+#include <STEER/STEERBase/AliMagF.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveTracklet.h>
+#include <EVE/EveBase/AliEveTrackCounter.h>
+#endif
 
 TEveElementList* esd_spd_tracklets(Float_t radius=8, Width_t line_width=2,
                                   Float_t dPhiWindow=0.080, Float_t dThetaWindow=0.025, 
@@ -14,8 +29,8 @@ TEveElementList* esd_spd_tracklets(Float_t radius=8, Width_t line_width=2,
   // radius - cylindrical radius to which the tracklets should be extrapolated
 
   AliESDEvent     *esd = AliEveEventManager::AssertESD();
-  AliESDVertex    *pv  = esd->GetPrimaryVertexSPD();
-  AliMultiplicity *mul = esd->GetMultiplicity();
+  const AliESDVertex    *pv  = esd->GetPrimaryVertexSPD();
+  const AliMultiplicity *mul = esd->GetMultiplicity();
 
   AliMagF *field = AliEveEventManager::AssertMagField();
 
index 93a7147..16a988f 100644 (file)
@@ -8,31 +8,26 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-
 #include <TString.h>
 #include <TSystem.h>
 #include <TROOT.h>
 #include <TMath.h>
 #include <TGListTree.h>
-
 #include <TEveVSDStructs.h>
 #include <TEveManager.h>
 #include <TEveTrackPropagator.h>
 
-#include <EveBase/AliEveTrack.h>
-#include <EveBase/AliEveTrackCounter.h>
-#include <EveBase/AliEveMagField.h>
-#include <EveBase/AliEveEventManager.h>
-
 #include <AliESDEvent.h>
 #include <AliESDfriend.h>
 #include <AliESDtrackCuts.h>
 #include <AliESDtrack.h>
 #include <AliESDfriendTrack.h>
 #include <AliExternalTrackParam.h>
-
 #include <AliPWG0Helper.h>
-
+#include <EveBase/AliEveTrack.h>
+#include <EveBase/AliEveTrackCounter.h>
+#include <EveBase/AliEveMagField.h>
+#include <EveBase/AliEveEventManager.h>
 #endif
 
 
index a84ffa6..f19b0b6 100644 (file)
@@ -1,3 +1,19 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoShape.h>
+#include <TGeoMatrix.h>
+#include <TStyle.h>
+#include <TEveRGBAPalette.h>
+#include <TEveGeoShape.h>
+#include <TEveStraightLineSet.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDZDC.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 TEveRGBAPalette *g_zdc_palette = 0;
 Float_t          g_zdc_scale   = 0.1;
 Float_t          g_zdc_dist    = 11695;
@@ -67,9 +83,8 @@ void esd_zdc()
   gEve->AddElement(l);
 
   TEveElementList *c  = 0;
-  TEveGeoShape    *s  = 0;
-  Double_t        *te = 0;
-  Text_t          *tb = 0;
+  const Double_t  *te = 0;
+  const Text_t    *tb = 0;
 
   // ZNC geometry ------------------------------------
   tb = "ZNC";
@@ -153,16 +168,13 @@ void esd_zdc()
   /*
   TEveStraightLineSet *ls = 0;
 
-    This part has to be fixed: the getters now depend on the beam type: pp or PbPb,
-    and in case of PbPb we also habe to provide the beam. Peter
-  Double32_t *cNA = esd->GetZNACentroid();
+  const Double32_t *cNA = esd->GetZNACentroid();
   ls = zdc_make_cross("ZNA Centroid", "ZNA",
                       cNA[0], cNA[1],  g_zdc_dist * g_zdc_scale,
                       g_zdc_cross, g_zdc_cross, g_zdc_cross);
   l->AddElement(ls);
 
-  Double32_t *cNC = esd->GetZNCCentroid();
+  const Double32_t *cNC = esd->GetZNCCentroid();
   ls = zdc_make_cross("ZNA Centroid", "ZNA",
                       cNC[0], cNC[1], -g_zdc_dist * g_zdc_scale,
                       g_zdc_cross, g_zdc_cross, g_zdc_cross);
index 7c9f56e..e29b8ba 100644 (file)
@@ -7,6 +7,10 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void event_first()
 {
   if (AliEveEventManager::GetMaster() == 0) {
index 13b2291..9e7329c 100644 (file)
@@ -7,6 +7,10 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 /// \ingroup evemacros
 /// \file event_goto.C
 
index 3b71e73..9505715 100644 (file)
@@ -7,6 +7,10 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void event_last()
 {
   if (AliEveEventManager::GetMaster() == 0) {
index cca4857..06e592c 100644 (file)
@@ -7,6 +7,10 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void event_next()
 {
   if (AliEveEventManager::GetMaster() == 0) {
index e7fc6b9..14881a6 100644 (file)
@@ -7,6 +7,10 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void event_prev()
 {
   if (AliEveEventManager::GetMaster() == 0) {
index 3886fd1..442a687 100644 (file)
@@ -1,3 +1,11 @@
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TEveManager.h>
+
+#include <EVE/EveDet/AliEveFMDLoader.h>
+#endif
+
 void fmd_digits()
 {
   gStyle->SetPalette(1);
index e29be95..bc28e4e 100644 (file)
@@ -1,3 +1,11 @@
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TEveManager.h>
+
+#include <EVE/EveDet/AliEveFMDLoader.h>
+#endif
+
 void fmd_esd()
 {
   gStyle->SetPalette(1);
index 17de6d3..b4c2655 100644 (file)
@@ -1,3 +1,11 @@
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TEveManager.h>
+
+#include <EVE/EveDet/AliEveFMDLoader.h>
+#endif
+
 void fmd_hits()
 {
   gStyle->SetPalette(1);
index 799084b..0f254d5 100644 (file)
@@ -7,6 +7,19 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TTree.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+#include <TEveTreeTools.h>
+#include <TEvePointSet.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveFMDLoader.h>
+#endif
+
 TEvePointSet*
 fmd_hits2(const char *varexp    = "fX:fY:fZ",
          const char *selection = "")
index d3b6639..24e6f40 100644 (file)
@@ -1,3 +1,11 @@
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TEveManager.h>
+
+#include <EVE/EveDet/AliEveFMDLoader.h>
+#endif
+
 void fmd_raw()
 {
   gStyle->SetPalette(1);
index 261644e..2057829 100644 (file)
@@ -7,6 +7,16 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoNode.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void geom_acorde()
 {
   AliEveEventManager::AssertGeometry();
index 0ad115b..83be8d3 100644 (file)
@@ -7,6 +7,13 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_all()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index 43ea6f5..d4ad06c 100644 (file)
@@ -7,6 +7,13 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_ddip()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index 6da499f..00120c9 100644 (file)
@@ -7,6 +7,13 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_emcal()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index 4aef2d5..1db20bb 100644 (file)
@@ -7,6 +7,16 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#include <TEveElement.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void geom_fmd()
 {
   gGeoManager = AliEveEventManager::AssertGeometry();
index 1b3c9df..7695668 100644 (file)
@@ -7,6 +7,15 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+#endif
+
 TEveGeoShape* geom_gentle(Bool_t register_as_global=kTRUE)
 {
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
index ccb930c..d9cc7f3 100644 (file)
@@ -1,9 +1,25 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
+
 void geom_gentle_bright(Bool_t register_as_global=kTRUE)
 {
-
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
+  TEveGeoShape *gsre1;
+  TEveGeoShape *gsre2;
+  TEveGeoShape *gsre3;
+  
+  
+{ TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -17,7 +33,7 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre1->BeginChildren();
 
 //ITS
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
   TEveElement::List_i j = lvl1->BeginChildren();
@@ -42,11 +58,11 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
   its3->SetRnrSelf(kTRUE);
   its3->SetMainColor(kYellow);
 //  its3->SetMainTransparency(60);
-
+  }
 //TPC
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
   TEveElement::List_i j = lvl1->BeginChildren();
@@ -82,11 +98,12 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
 //  tpc3->SetMainColor(1);
 //  tpc3->SetMainTransparency(70);
   m++;
-
+  }
+  
 //TRD+TOF
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
   TEveElement::List_i j = lvl1->BeginChildren();
@@ -101,11 +118,11 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
   tof1->SetRnrSelf(kTRUE);
   tof1->SetMainColor(kMagenta+3);
 //  tof1->SetMainTransparency(80);
-
+  }
 //PHOS
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -116,11 +133,11 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(kRed);
 //      lvl2->SetMainTransparency(20);
     }
-
+  }
 //HMPID
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -131,19 +148,21 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(kBlue);
 //      lvl2->SetMainTransparency(20);
     }
+  }
+}
 
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
+{ TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
 
   gsre2->SetRnrSelf(kFALSE);
   TEveElement::List_i i = gsre2->BeginChildren();
-
+  
 //ITS
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
   TEveElement::List_i j = lvl1->BeginChildren();
@@ -169,11 +188,11 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
   its3->SetRnrSelf(kTRUE);
   its3->SetMainColor(1);
   its3->SetMainTransparency(80);
-
+  }
 //TPC
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -184,12 +203,12 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
-
+  }
 //PHOS
 
   i++;
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -201,11 +220,11 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainTransparency(80);
 
     }
-
+  }
 //HMPID
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -216,19 +235,21 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
+  }
+}
 
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
+{ TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
 
   gsre3->SetRnrSelf(kFALSE);
   TEveElement::List_i i = gsre3->BeginChildren();
-
+  
 //ITS
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
   TEveElement::List_i j = lvl1->BeginChildren();
@@ -250,11 +271,11 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
   TEveGeoShape* its3 = (TEveGeoShape*) *k;
   its3->SetRnrSelf(kTRUE);
   its3->SetMainColor(1);
-
+  }
 //TPC
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -266,12 +287,12 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainTransparency(80);
 
     }
-
+  }
 //PHOS
 
   i++;
   i++;
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -282,11 +303,12 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
-
+  }
 //HMPID
 
   i++;
 
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -297,15 +319,15 @@ void geom_gentle_bright(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
-
-
+  }
+}
 //fix all the viewers
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 06c82e3..c3e850f 100644 (file)
@@ -1,31 +1,54 @@
-void geom_gentle_default(Bool_t register_as_global=kTRUE)
-{
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
 
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
 
-  if (register_as_global)
+void geom_gentle_default(Bool_t register_as_global=kTRUE)
+{
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+  // Geometry 3D
   {
-    gEve->AddGlobalElement(gsre1);
+    TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
+
+    if (register_as_global)
+    {
+      gEve->AddGlobalElement(gsre1);
+    }
   }
-
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
-
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
-
+  
+  // Geometry rphi
+  {
+    TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
+  }
+  
+  // Geometry rhoz
+  {
+    TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
+  }
+  
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
-
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index f585648..eed7337 100644 (file)
-void geom_gentle_green(Bool_t register_as_global=kTRUE)
-{
-
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
-
-  if (register_as_global)
-  {
-    gEve->AddGlobalElement(gsre1);
-  }
-
-  // Fix visibility, color and transparency
-
-  gsre1->SetRnrSelf(kFALSE);
-  TEveElement::List_i i = gsre1->BeginChildren();
-
-//ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kMagenta-5);
-  its1->SetMainTransparency(60);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kCyan-5);
-  its2->SetMainTransparency(60);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kGreen-5);
-  its3->SetMainTransparency(60);
-
-//TPC
-
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kFALSE);
-  lvl3->SetMainColor(1);
-  lvl3->SetMainTransparency(70);
-  TEveElement::List_i l = lvl3->BeginChildren();
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
 
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
 
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainColor(1);
-  tpc1->SetMainTransparency(70);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetRnrSelf(kTRUE);
-  tpc2->SetMainColor(1);
-  tpc2->SetMainTransparency(70);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainColor(1);
-  tpc3->SetMainTransparency(70);
-  m++;
-
-//TRD+TOF
-
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* trd1 = (TEveGeoShape*) *j;
-  trd1->SetRnrSelf(kTRUE);
-  trd1->SetMainColor(kMagenta-8);
-  trd1->SetMainTransparency(80);
-  j++;
-
-  TEveGeoShape* tof1 = (TEveGeoShape*) *j;
-  tof1->SetRnrSelf(kTRUE);
-  tof1->SetMainColor(kMagenta-1);
-  tof1->SetMainTransparency(80);
-
-//PHOS
-
-  i++;
+void geom_gentle_green(Bool_t register_as_global=kTRUE)
+{
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+  {TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+    if (register_as_global)
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(kGreen-8);
-      lvl2->SetMainTransparency(20);
+      gEve->AddGlobalElement(gsre1);
     }
 
-//HMPID
-
-  i++;
+    // Fix visibility, color and transparency
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+    gsre1->SetRnrSelf(kFALSE);
+    TEveElement::List_i i = gsre1->BeginChildren();
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+  //ITS
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(kBlue-5);
-      lvl2->SetMainTransparency(20);
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kMagenta-5);
+    its1->SetMainTransparency(60);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kCyan-5);
+    its2->SetMainTransparency(60);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kGreen-5);
+    its3->SetMainTransparency(60);
     }
+  //TPC
 
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
-
-  // Fix visibility, color and transparency
-
-  gsre2->SetRnrSelf(kFALSE);
-  TEveElement::List_i i = gsre2->BeginChildren();
-
-//ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(1);
-  its1->SetMainTransparency(80);
-
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(1);
-  its2->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(1);
-  its3->SetMainTransparency(80);
-
-//TPC
-
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kFALSE);
+    lvl3->SetMainColor(1);
+    lvl3->SetMainTransparency(70);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainColor(1);
+    tpc1->SetMainTransparency(70);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetRnrSelf(kTRUE);
+    tpc2->SetMainColor(1);
+    tpc2->SetMainTransparency(70);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainColor(1);
+    tpc3->SetMainTransparency(70);
+    m++;
     }
+  //TRD+TOF
 
-//PHOS
-
-  i++;
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
-
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* trd1 = (TEveGeoShape*) *j;
+    trd1->SetRnrSelf(kTRUE);
+    trd1->SetMainColor(kMagenta-8);
+    trd1->SetMainTransparency(80);
+    j++;
+
+    TEveGeoShape* tof1 = (TEveGeoShape*) *j;
+    tof1->SetRnrSelf(kTRUE);
+    tof1->SetMainColor(kMagenta-1);
+    tof1->SetMainTransparency(80);
     }
+  //PHOS
 
-//HMPID
-
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(kGreen-8);
+        lvl2->SetMainTransparency(20);
+      }
     }
+  //HMPID
 
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
-
-  // Fix visibility, color and transparency
-
-  gsre3->SetRnrSelf(kFALSE);
-  TEveElement::List_i i = gsre3->BeginChildren();
-
-//ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(kBlue-5);
+        lvl2->SetMainTransparency(20);
+      }
+    }
+  }
+  
+  {TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
 
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
+    // Fix visibility, color and transparency
 
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(1);
-  k++;
+    gsre2->SetRnrSelf(kFALSE);
+    TEveElement::List_i i = gsre2->BeginChildren();
 
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(1);
-  k++;
+  //ITS
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(1);
+    its1->SetMainTransparency(80);
+
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(1);
+    its2->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(1);
+    its3->SetMainTransparency(80);
+    }
+  //TPC
 
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(1);
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
+    }
+  //PHOS
 
-//TPC
+    i++;
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  i++;
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+      }
+    }
+  //HMPID
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
-
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
     }
+  }
+  
+  { TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
 
-//PHOS
+    // Fix visibility, color and transparency
 
-  i++;
-  i++;
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+    gsre3->SetRnrSelf(kFALSE);
+    TEveElement::List_i i = gsre3->BeginChildren();
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+  //ITS
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(1);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(1);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(1);
     }
+  //TPC
 
-//HMPID
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  i++;
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+      }
+    }
+  //PHOS
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
+    i++;
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
     }
+  //HMPID
 
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
+    }
 
+  }
+  
 //fix all the viewers
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
-
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 0118de7..c0f40c0 100644 (file)
@@ -5,6 +5,14 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+#endif
 
 /// \ingroup evemacros
 /// \file geom_gentle_muon.C
index 3e2d26b..94ec3f9 100644 (file)
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 void geom_gentle_notransparency(Bool_t register_as_global=kTRUE)
 {
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+{
+    TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
+    TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
+    gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+    f.Close();
 
-  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
-  TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
-  f.Close();
-
-  if (register_as_global)
-  {
-    gEve->AddGlobalElement(gsre1);
-  }
-
-  // Fix visibility, color and transparency
-
-  gsre1->SetRnrSelf(kFALSE);
-  TEveElement::List_i i = gsre1->BeginChildren();
-
-//ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainTransparency(5);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainTransparency(5);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainTransparency(5);
-
-//TPC
-
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kTRUE);
-  lvl3->SetMainTransparency(5);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainTransparency(5);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetMainColor(kGray);
-  tpc2->SetMainTransparency(5);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainTransparency(5);
-  m++;
-
-//TRD+TOF
-
-  i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainTransparency(5);
-  j++;
+    if (register_as_global)
+    {
+      gEve->AddGlobalElement(gsre1);
+    }
 
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainTransparency(5);
-  j++;
+    // Fix visibility, color and transparency
 
-//PHOS
+    gsre1->SetRnrSelf(kFALSE);
+    TEveElement::List_i i = gsre1->BeginChildren();
 
-  i++;
+  //ITS
+    {
+      TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+      lvl1->SetRnrSelf(kFALSE);
+      TEveElement::List_i j = lvl1->BeginChildren();
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+      lvl2->SetRnrSelf(kFALSE);
+      TEveElement::List_i k = lvl2->BeginChildren();
+
+      TEveGeoShape* its1 = (TEveGeoShape*) *k;
+      its1->SetRnrSelf(kTRUE);
+      its1->SetMainTransparency(5);
+      k++;
+
+      TEveGeoShape* its2 = (TEveGeoShape*) *k;
+      its2->SetRnrSelf(kTRUE);
+      its2->SetMainTransparency(5);
+      k++;
+
+      TEveGeoShape* its3 = (TEveGeoShape*) *k;
+      its3->SetRnrSelf(kTRUE);
+      its3->SetMainTransparency(5);
+    }
+  //TPC
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
     {
+      TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+      lvl1->SetRnrSelf(kFALSE);
+      TEveElement::List_i j = lvl1->BeginChildren();
+
       TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(5);
+      lvl2->SetRnrSelf(kFALSE);
+      TEveElement::List_i k = lvl2->BeginChildren();
+
+      TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+      lvl3->SetRnrSelf(kTRUE);
+      lvl3->SetMainTransparency(5);
+      TEveElement::List_i l = lvl3->BeginChildren();
+
+      TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+      lvl4->SetRnrSelf(kFALSE);
+      TEveElement::List_i m = lvl4->BeginChildren();
+
+      TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+      tpc1->SetRnrSelf(kTRUE);
+      tpc1->SetMainTransparency(5);
+      m++;
+
+      TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+      tpc2->SetMainColor(kGray);
+      tpc2->SetMainTransparency(5);
+      m++;
+
+      TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+      tpc3->SetRnrSelf(kTRUE);
+      tpc3->SetMainTransparency(5);
+      m++;
     }
 
-//HMPID
+  //TRD+TOF
 
-  i++;
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kTRUE);
+    lvl2->SetMainTransparency(5);
+    j++;
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *j;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainTransparency(5);
+    j++;
+    }
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
+  //PHOS
 
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+    i++;
     {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(5);
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(5);
+      }
     }
+    
+  //HMPID
 
+    i++;
+    {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(5);
+      }
+    }
+}
 
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
+}
 
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
+}
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 85b7eef..64d150d 100644 (file)
@@ -1,9 +1,25 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 void geom_gentle_projector(Bool_t register_as_global=kTRUE)
 {
-
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+  {
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -16,116 +32,120 @@ void geom_gentle_projector(Bool_t register_as_global=kTRUE)
   gsre1->SetRnrSelf(kFALSE);
   TEveElement::List_i i = gsre1->BeginChildren();
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kBlue-6);
-  its1->SetMainTransparency(50);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainTransparency(50);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kGreen-10);
-  its3->SetMainTransparency(50);
-
+//ITS
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kBlue-6);
+    its1->SetMainTransparency(50);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainTransparency(50);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kGreen-10);
+    its3->SetMainTransparency(50);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kTRUE);
-  lvl3->SetMainTransparency(50);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainTransparency(50);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetMainColor(kGray);
-  tpc2->SetMainTransparency(50);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainTransparency(50);
-  m++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainTransparency(50);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainTransparency(50);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetMainColor(kGray);
+    tpc2->SetMainTransparency(50);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainTransparency(50);
+    m++;
+  }
 //TRD+TOF
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainTransparency(50);
-  j++;
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainTransparency(50);
-  j++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kTRUE);
+    lvl2->SetMainTransparency(50);
+    j++;
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *j;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainTransparency(50);
+    j++;
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(50);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(50);
+      }
+  }
 //HMPID
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(50);
+      }
+  }
+}
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(50);
-    }
-
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -134,73 +154,77 @@ void geom_gentle_projector(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre2->BeginChildren();
 
 //ITS
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kGreen-10);
+        its1->SetMainTransparency(70);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainTransparency(70);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kBlue-6);
+    its3->SetMainTransparency(70);
+  }
+}
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kGreen-10);
-      its1->SetMainTransparency(70);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainTransparency(70);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kBlue-6);
-      its3->SetMainTransparency(70);
-
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   gsre3->SetRnrSelf(kFALSE);
   TEveElement::List_i i = gsre3->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-      its1->SetMainTransparency(70);
-  its1->SetMainColor(kGreen-10);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-      its2->SetMainTransparency(70);
-//  its2->SetMainColor(kRed+2);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kBlue-6);
-  its3->SetMainTransparency(70);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+        its1->SetMainTransparency(70);
+    its1->SetMainColor(kGreen-10);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+        its2->SetMainTransparency(70);
+  //  its2->SetMainColor(kRed+2);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kBlue-6);
+    its3->SetMainTransparency(70);
+  }
+}
+  
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 854e63a..dd55ec0 100644 (file)
@@ -1,8 +1,25 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 void geom_gentle_tpc(Bool_t register_as_global=kTRUE)
 {
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -17,109 +34,111 @@ void geom_gentle_tpc(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre1->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kRed);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kRed+2);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kRed+4);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kRed);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kRed+2);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kRed+4);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kTRUE);
-  lvl3->SetMainColor(kBlue);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainColor(kGray);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetRnrSelf(kTRUE);
-  tpc2->SetMainColor(kGray);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainColor(kGray);
-  m++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainColor(kBlue);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainColor(kGray);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetRnrSelf(kTRUE);
+    tpc2->SetMainColor(kGray);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainColor(kGray);
+    m++;
+  }
 //TRD+TOF
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-
-    }
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
 
+      }
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+      }
+  }
 //HMPID
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+      }
+  }
+}
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-    }
-
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -128,73 +147,77 @@ void geom_gentle_tpc(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre2->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kRed);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kRed+2);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kRed+4);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kRed);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kRed+2);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kRed+4);
+  }
 //TPC
 
   i++;
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-
-    }
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
 
+      }
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+      }
+  }
 //HMPID
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+      }
+  }
+  
+}
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-    }
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -203,76 +226,78 @@ void geom_gentle_tpc(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre3->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kRed);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kRed+2);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kRed+4);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kRed);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kRed+2);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kRed+4);
+  }
 //TPC
 
   i++;
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
 
-    }
+      }
+  }
 
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+      }
+  }
 //HMPID
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+      }
+  }
+}
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);   
 
index 9243c27..b90a55d 100644 (file)
@@ -1,9 +1,25 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 void geom_gentle_transparent(Bool_t register_as_global=kTRUE)
 {
-
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -17,101 +33,101 @@ void geom_gentle_transparent(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre1->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainTransparency(80);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kTRUE);
-  lvl3->SetMainTransparency(80);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetMainColor(kGray);
-  tpc2->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainTransparency(80);
-  m++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainTransparency(80);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetMainColor(kGray);
+    tpc2->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainTransparency(80);
+    m++;
+  }
 //TRD+TOF
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainTransparency(80);
-  j++;
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainTransparency(80);
-  j++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kTRUE);
+    lvl2->SetMainTransparency(80);
+    j++;
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *j;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainTransparency(80);
+    j++;
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 //HMPID
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -121,23 +137,28 @@ void geom_gentle_transparent(Bool_t register_as_global=kTRUE)
       lvl2->SetRnrSelf(kTRUE);
       lvl2->SetMainTransparency(80);
     }
+  }
+}
 
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
+}
 
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
+}
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 69c4cdd..af7bb8f 100644 (file)
@@ -7,12 +7,28 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 void geom_gentle_transparentdark(Bool_t register_as_global=kTRUE)
 {
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
 
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -28,130 +44,132 @@ void geom_gentle_transparentdark(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre1->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(0);
-  its1->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(0);
-  its2->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(0);
-  its3->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(0);
+    its1->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(0);
+    its2->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(0);
+    its3->SetMainTransparency(80);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kTRUE);
-  lvl3->SetMainColor(0);
-  lvl3->SetMainTransparency(80);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainColor(0);
-  tpc1->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetMainColor(kGray);
-  tpc2->SetMainColor(0);
-  tpc2->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainColor(0);
-  tpc3->SetMainTransparency(80);
-  m++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainColor(0);
+    lvl3->SetMainTransparency(80);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainColor(0);
+    tpc1->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetMainColor(kGray);
+    tpc2->SetMainColor(0);
+    tpc2->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainColor(0);
+    tpc3->SetMainTransparency(80);
+    m++;
+  }
 //TRD+TOF
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainColor(0);
-  lvl2->SetMainTransparency(80);
-  j++;
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kTRUE);
-  lvl2->SetMainColor(0);
-  lvl2->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kTRUE);
+    lvl2->SetMainColor(0);
+    lvl2->SetMainTransparency(80);
+    j++;
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *j;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainColor(0);
+    lvl3->SetMainTransparency(80);
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 //HMPID
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-    }
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+      }
+  }
+}
 
 //======================================
 
   // The resulting geometry is NOT added into the global scene!
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -160,90 +178,91 @@ void geom_gentle_transparentdark(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre2->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(0);
-  its1->SetMainTransparency(80);
-
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(0);
-  its2->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(0);
-  its3->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(0);
+    its1->SetMainTransparency(80);
+
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(0);
+    its2->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(0);
+    its3->SetMainTransparency(80);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 //PHOS
 
   i++;
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+
+      }
+  }
 //HMPID
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+      }
+  }
+}
 //======================================
 
   // The resulting geometry is NOT added into the global scene!
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -252,84 +271,86 @@ void geom_gentle_transparentdark(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre3->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(0);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(0);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(0);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(0);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(0);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(0);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+
+      }
+  }
 //PHOS
 
   i++;
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 //HMPID
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-//  TEveElement::List_i j = lvl1->BeginChildren();
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-    }
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+  //  TEveElement::List_i j = lvl1->BeginChildren();
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
+      }
+  }
+}
 
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 44d3247..89e4262 100644 (file)
@@ -1,9 +1,26 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
+
 void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
 {
-
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -17,124 +34,128 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre1->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(1);
-  its1->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(1);
-  its2->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(1);
-  its3->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(1);
+    its1->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(1);
+    its2->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(1);
+    its3->SetMainTransparency(80);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kFALSE);
-  lvl3->SetMainColor(1);
-  lvl3->SetMainTransparency(80);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainColor(1);
-  tpc1->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetRnrSelf(kTRUE);
-  tpc2->SetMainColor(1);
-  tpc2->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainColor(1);
-  tpc3->SetMainTransparency(80);
-  m++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kFALSE);
+    lvl3->SetMainColor(1);
+    lvl3->SetMainTransparency(80);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainColor(1);
+    tpc1->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetRnrSelf(kTRUE);
+    tpc2->SetMainColor(1);
+    tpc2->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainColor(1);
+    tpc3->SetMainTransparency(80);
+    m++;
+  }
 //TRD+TOF
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* trd1 = (TEveGeoShape*) *j;
-  trd1->SetRnrSelf(kTRUE);
-  trd1->SetMainColor(1);
-  trd1->SetMainTransparency(80);
-  j++;
-
-  TEveGeoShape* tof1 = (TEveGeoShape*) *j;
-  tof1->SetRnrSelf(kTRUE);
-  tof1->SetMainColor(1);
-  tof1->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* trd1 = (TEveGeoShape*) *j;
+    trd1->SetRnrSelf(kTRUE);
+    trd1->SetMainColor(1);
+    trd1->SetMainTransparency(80);
+    j++;
+
+    TEveGeoShape* tof1 = (TEveGeoShape*) *j;
+    tof1->SetRnrSelf(kTRUE);
+    tof1->SetMainColor(1);
+    tof1->SetMainTransparency(80);
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 //HMPID
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
+  }
+    
+}
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
-    }
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -143,37 +164,37 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre2->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(1);
-  its1->SetMainTransparency(80);
-
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(1);
-  its2->SetMainTransparency(80);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(1);
-  its3->SetMainTransparency(80);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(1);
+    its1->SetMainTransparency(80);
+
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(1);
+    its2->SetMainTransparency(80);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(1);
+    its3->SetMainTransparency(80);
+  }
 //TPC
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -184,12 +205,13 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
+  }
 
 //PHOS
 
   i++;
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -201,11 +223,12 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
       lvl2->SetMainTransparency(80);
 
     }
+  }
 
 //HMPID
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -216,10 +239,14 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
+  }
+    
+}
 
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -228,65 +255,67 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre3->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(1);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(1);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(1);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(1);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(1);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(1);
+  }
 //TPC
 
   i++;
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-    }
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
 
+      }
+  }
 //PHOS
 
   i++;
   i++;
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(1);
-      lvl2->SetMainTransparency(80);
-    }
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(1);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 
 //HMPID
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -297,7 +326,8 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
       lvl2->SetMainColor(1);
       lvl2->SetMainTransparency(80);
     }
-
+  }
+}
 
 //fix all the viewers
 
@@ -305,7 +335,7 @@ void geom_gentle_transparentlight(Bool_t register_as_global=kTRUE)
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index b59ab31..355715e 100644 (file)
@@ -7,6 +7,15 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+#endif
+
 TEveGeoShape* geom_gentle_trd()
 {
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo_trd.root");
index f45760c..1c851a9 100644 (file)
@@ -7,12 +7,28 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TFile.h>
+#include <TGLViewer.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoShape.h>
+#include <TEveGeoShapeExtract.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 void geom_gentle_yellow(Bool_t register_as_global=kTRUE)
 {
-
+  TEveGeoShape* gsre1;
+  TEveGeoShape* gsre2;
+  TEveGeoShape* gsre3;
+  
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre1 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre1 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   if (register_as_global)
@@ -26,121 +42,122 @@ void geom_gentle_yellow(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre1->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kYellow-4);
-  its1->SetMainTransparency(50);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kYellow-7);
-  its2->SetMainTransparency(50);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kYellow-9);
-  its3->SetMainTransparency(50);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kYellow-4);
+    its1->SetMainTransparency(50);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kYellow-7);
+    its2->SetMainTransparency(50);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kYellow-9);
+    its3->SetMainTransparency(50);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
-  lvl3->SetRnrSelf(kTRUE);
-  lvl3->SetMainColor(kGray);
-  lvl3->SetMainTransparency(80);
-  TEveElement::List_i l = lvl3->BeginChildren();
-
-  TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
-  lvl4->SetRnrSelf(kFALSE);
-  TEveElement::List_i m = lvl4->BeginChildren();
-
-  TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
-  tpc1->SetRnrSelf(kTRUE);
-  tpc1->SetMainColor(kGray+2);
-  tpc1->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
-  tpc2->SetMainColor(kGray);
-  tpc2->SetMainColor(kGray+2);
-  tpc2->SetMainTransparency(80);
-  m++;
-
-  TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
-  tpc3->SetRnrSelf(kTRUE);
-  tpc3->SetMainColor(kGray+2);
-  tpc3->SetMainTransparency(80);
-  m++;
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* lvl3 = (TEveGeoShape*) *k;
+    lvl3->SetRnrSelf(kTRUE);
+    lvl3->SetMainColor(kGray);
+    lvl3->SetMainTransparency(80);
+    TEveElement::List_i l = lvl3->BeginChildren();
+
+    TEveGeoShape* lvl4 = (TEveGeoShape*) *l;
+    lvl4->SetRnrSelf(kFALSE);
+    TEveElement::List_i m = lvl4->BeginChildren();
+
+    TEveGeoShape* tpc1 = (TEveGeoShape*) *m;
+    tpc1->SetRnrSelf(kTRUE);
+    tpc1->SetMainColor(kGray+2);
+    tpc1->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc2 = (TEveGeoShape*) *m;
+    tpc2->SetMainColor(kGray);
+    tpc2->SetMainColor(kGray+2);
+    tpc2->SetMainTransparency(80);
+    m++;
+
+    TEveGeoShape* tpc3 = (TEveGeoShape*) *m;
+    tpc3->SetRnrSelf(kTRUE);
+    tpc3->SetMainColor(kGray+2);
+    tpc3->SetMainTransparency(80);
+    m++;
+  }
 //TRD+TOF
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kFALSE);
-      lvl2->SetMainColor(0);
-      lvl2->SetMainTransparency(80);
-
-    }
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kFALSE);
+        lvl2->SetMainColor(0);
+        lvl2->SetMainTransparency(80);
 
+      }
+  }
 //PHOS
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(30);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(30);
+      }
+  }
 //HMPID
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(30);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); ++j)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(30);
+      }
+  }
+}
   // The resulting geometry is NOT added into the global scene!
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rphi_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre2 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre2 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -149,83 +166,86 @@ void geom_gentle_yellow(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre2->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kYellow-4);
-  its1->SetMainTransparency(50);
-
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kYellow-7);
-  its2->SetMainTransparency(50);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kYellow-9);
-  its3->SetMainTransparency(50);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kYellow-4);
+    its1->SetMainTransparency(50);
+
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kYellow-7);
+    its2->SetMainTransparency(50);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kYellow-9);
+    its3->SetMainTransparency(50);
+  }
 //TPC
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(kGray);
-      lvl2->SetMainTransparency(80);
-    }
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(kGray);
+        lvl2->SetMainTransparency(80);
+      }
+  }
 //PHOS
 
   i++;
   i++;
+  
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(30);
-
-    }
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(30);
 
+      }
+  }
 //HMPID
 
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(30);
-    }
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(30);
+      }
+  }
+}
 
   // The resulting geometry is NOT added into the global scene!
-
+{
   TFile f("$ALICE_ROOT/EVE/alice-data/gentle_rhoz_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
-  TEveGeoShape* gsre3 = TEveGeoShape::ImportShapeExtract(gse);
+  gsre3 = TEveGeoShape::ImportShapeExtract(gse);
   f.Close();
 
   // Fix visibility, color and transparency
@@ -234,64 +254,65 @@ void geom_gentle_yellow(Bool_t register_as_global=kTRUE)
   TEveElement::List_i i = gsre3->BeginChildren();
 
 //ITS
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-  TEveElement::List_i j = lvl1->BeginChildren();
-
-  TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-  lvl2->SetRnrSelf(kFALSE);
-  TEveElement::List_i k = lvl2->BeginChildren();
-
-  TEveGeoShape* its1 = (TEveGeoShape*) *k;
-  its1->SetRnrSelf(kTRUE);
-  its1->SetMainColor(kYellow-4);
-  k++;
-
-  TEveGeoShape* its2 = (TEveGeoShape*) *k;
-  its2->SetRnrSelf(kTRUE);
-  its2->SetMainColor(kYellow-7);
-  k++;
-
-  TEveGeoShape* its3 = (TEveGeoShape*) *k;
-  its3->SetRnrSelf(kTRUE);
-  its3->SetMainColor(kYellow-9);
-
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+    TEveElement::List_i j = lvl1->BeginChildren();
+
+    TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+    lvl2->SetRnrSelf(kFALSE);
+    TEveElement::List_i k = lvl2->BeginChildren();
+
+    TEveGeoShape* its1 = (TEveGeoShape*) *k;
+    its1->SetRnrSelf(kTRUE);
+    its1->SetMainColor(kYellow-4);
+    k++;
+
+    TEveGeoShape* its2 = (TEveGeoShape*) *k;
+    its2->SetRnrSelf(kTRUE);
+    its2->SetMainColor(kYellow-7);
+    k++;
+
+    TEveGeoShape* its3 = (TEveGeoShape*) *k;
+    its3->SetRnrSelf(kTRUE);
+    its3->SetMainColor(kYellow-9);
+  }
 //TPC
 
   i++;
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
 
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainColor(kGray);
-      lvl2->SetMainTransparency(80);
-
-    }
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainColor(kGray);
+        lvl2->SetMainTransparency(80);
 
+      }
+  }
 //PHOS
 
   i++;
   i++;
-
-  TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
-  lvl1->SetRnrSelf(kFALSE);
-
-  for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
-    {
-      TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
-      lvl2->SetRnrSelf(kTRUE);
-      lvl2->SetMainTransparency(30);
-    }
-
+  
+  {
+    TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
+    lvl1->SetRnrSelf(kFALSE);
+
+    for (TEveElement::List_i j = lvl1->BeginChildren(); j != lvl1->EndChildren(); j++)
+      {
+        TEveGeoShape* lvl2 = (TEveGeoShape*) *j;
+        lvl2->SetRnrSelf(kTRUE);
+        lvl2->SetMainTransparency(30);
+      }
+  }
 //HMPID
 
   i++;
-
+  {
   TEveGeoShape* lvl1 = (TEveGeoShape*) *i;
   lvl1->SetRnrSelf(kFALSE);
 
@@ -301,12 +322,14 @@ void geom_gentle_yellow(Bool_t register_as_global=kTRUE)
       lvl2->SetRnrSelf(kTRUE);
       lvl2->SetMainTransparency(30);
     }
-
+  }
+  
+}
   TEveElement* top = gEve->GetCurrentEvent();
 
   AliEveMultiView *mv = AliEveMultiView::Instance();
 
-  mv->InitGeomGentle(gsre1, gsre2, gsre3);
+  mv->InitGeomGentle(gsre1, gsre2, gsre3, 0);
 
   gEve->FullRedraw3D(kTRUE, kTRUE);
 
index 512139a..d7e0f55 100644 (file)
@@ -7,6 +7,12 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_hmpid()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index f2b47df..5fe3695 100644 (file)
@@ -7,6 +7,12 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_its()
 {
   gGeoManager = gEve->GetDefaultGeometry();
@@ -33,7 +39,7 @@ void geom_its_sdd()
 {
   gGeoManager = gEve->GetDefaultGeometry();
 
-  TEveGeoTopNode *its_re;
+  //TEveGeoTopNode *its_re;
   TGeoNode       *n1, *n2;
 
   n1 = gGeoManager->GetTopVolume()->FindNode("ITSV_1");
@@ -51,7 +57,7 @@ void geom_its_ssd()
 {
   gGeoManager = gEve->GetDefaultGeometry();
 
-  TEveGeoTopNode *its_re;
+  //TEveGeoTopNode *its_re;
   TGeoNode       *n1, *n2;
 
   n1 = gGeoManager->GetTopVolume()->FindNode("ITSV_1");
index e8b395a..7f2d8cc 100644 (file)
@@ -6,6 +6,11 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
 
 void geom_phos()
 {
index 43dc09c..55b6c15 100644 (file)
@@ -6,6 +6,11 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
 
 void geom_pmd()
 {
index 9b2fb05..2532ad2 100644 (file)
@@ -6,6 +6,11 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
 
 void geom_simple()
 {
index 9fcdd90..0b3dc43 100644 (file)
@@ -7,6 +7,14 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_t0()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index 66cfee2..c1428c2 100644 (file)
@@ -7,6 +7,13 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_tpc()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index 5324421..3d8ffbd 100644 (file)
@@ -7,12 +7,22 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_trd_tof()
 {
   gGeoManager = gEve->GetDefaultGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("B077_1");
 
+       if(!node)
+               return;
+
   TEveGeoTopNode* its_re = new TEveGeoTopNode(gGeoManager, node);
   gEve->AddGlobalElement(its_re);
   gEve->Redraw3D();
index 9c99655..75218a0 100644 (file)
@@ -7,6 +7,14 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_vzero()
 {
   static const TEveException kEH("geom_vzero() ");
index d502633..be85ffe 100644 (file)
@@ -7,6 +7,14 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveGeoNode.h>
+#endif
+
 void geom_zdc()
 {
   gGeoManager = gEve->GetDefaultGeometry();
index 873c871..4bb66ac 100644 (file)
@@ -6,12 +6,38 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGLViewer.h>
+#include <TGLWidget.h>
+#include <TH2.h>
+#include <TMath.h>
+#include <TTree.h>
+#include <TEveBrowser.h>
+#include <TEveCalo.h>
+#include <TEveCaloData.h>
+#include <TEveCaloLegoOverlay.h>
+#include <TEveLegoEventHandler.h>
+#include <TEveManager.h>
+#include <TEveScene.h>
+#include <TEveTrans.h>
+#include <TEveViewer.h>
+#include <TEveWindow.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
+
 double pi = TMath::Pi();
 TEveViewer *g_histo2d_v   = 0;
 TEveScene  *g_histo2d_s   = 0;
 TEveScene  *g_histo2d_s2  = 0;
 TEveCaloLegoOverlay* g_histo2d_lego_overlay = 0;
 
+Double_t GetPhi(Double_t phi);
+TEveCaloLego* CreateHistoLego(TEveCaloData* data);
+TEveCalo3D* Create3DView(TEveCaloData* data);
+AliEveMultiView* CreateProjections(TEveCaloData* data, TEveCalo3D *calo3d);
 
 TEveCaloDataHist* histo2d()
 { 
@@ -23,8 +49,7 @@ TEveCaloDataHist* histo2d()
    TH2F *histopos = new TH2F("histopos","Histo 2d positive",100,-1.5,1.5,80,-pi,pi);
    TH2F *histoneg = new TH2F("histoneg","Histo 2d negative",100,-1.5,1.5,80,-pi,pi);
 
-   cout<<"Event: "<<AliEveEventManager::GetMaster()->GetEventId()
-       <<", Number of tracks: "<<esd->GetNumberOfTracks()<<endl;
+   Info("histo2d", "Event: %d, Number of tracks: %d\n", AliEveEventManager::GetMaster()->GetEventId(), esd->GetNumberOfTracks() );
 
    // Getting current tracks, filling histograms 
    for ( int n = 0; n < esd->GetNumberOfTracks(); ++n ) {    
index 189ef70..cedfa13 100644 (file)
@@ -6,6 +6,29 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGLViewer.h>
+#include <TGLWidget.h>
+#include <TH2.h>
+#include <TMath.h>
+#include <TTree.h>
+#include <TEveBrowser.h>
+#include <TEveCalo.h>
+#include <TEveCaloData.h>
+#include <TEveCaloLegoOverlay.h>
+#include <TEveLegoEventHandler.h>
+#include <TEveManager.h>
+#include <TEveProjectionManager.h>
+#include <TEveProjectionAxes.h>
+#include <TEveScene.h>
+#include <TEveTrans.h>
+#include <TEveViewer.h>
+#include <TEveWindow.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 double pi = TMath::Pi();
 TEveViewer *g_histo2d_all_events_v0 = 0;
 TEveViewer *g_histo2d_all_events_v1 = 0;
@@ -18,6 +41,10 @@ TEveScene  *g_histo2d_all_events_s3 = 0;
 TEveCaloLegoOverlay* g_histo2d_all_events_lego_overlay = 0;
 TEveWindowSlot* g_histo2d_all_events_slot = 0;
 
+Double_t GetPhi(Double_t phi);
+TEveCaloLego* CreateHistoLego(TEveCaloData* data, TEveWindowSlot* slot);
+TEveCalo3D* Create3DView(TEveCaloData* data, TEveWindowSlot* slot);
+void CreateProjections(TEveCaloData* data, TEveCalo3D *calo3d, TEveWindowSlot* slot1, TEveWindowSlot* slot2);
 
 TEveCaloDataHist* histo2d_all_events()
 {
@@ -25,7 +52,7 @@ TEveCaloDataHist* histo2d_all_events()
    TEveCaloDataHist* data_t;
    
    if ( g_histo2d_all_events_slot == 0 ) {
-      cout<<"Filling histogram..."<<endl;
+      Info("histo2d_all_events", "Filling histogram...");
    
       // Access to esdTree
       AliESDEvent* esd = AliEveEventManager::AssertESD();
@@ -91,7 +118,7 @@ TEveCaloDataHist* histo2d_all_events()
 
       gEve->Redraw3D(kTRUE);
 
-      cout<<"Filling histogram... Finished"<<endl;
+      Info("histo2d_all_events", "...Finished");
    }
 
    return data_t;
index c0bfe31..2dea742 100644 (file)
@@ -7,7 +7,19 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-void hits_from_label(Int_t label=0, TEveElement* cont)
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveUtil.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+
+#include "its_hits.C"
+#include "tof_hits.C"
+#include "tpc_hits.C"
+#include "trd_hits.C"
+#endif
+
+void hits_from_label(Int_t label=0, TEveElement* cont=0)
 {
   TEveUtil::LoadMacro("its_hits.C");
 
index bb7c2e0..b097ae6 100644 (file)
@@ -6,23 +6,21 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-#ifdef __CINT__
 
-class TEveElement;
-class TEvePointSet;
-
-#else
-
-#include <TEveManager.h>
-#include <TEvePointSet.h>
-#include <EveBase/AliEveEventManager.h>
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
 #include <TBranch.h>
 #include <TTree.h>
-#include <AliRunLoader.h>
-#include <AliCluster3D.h>
-
-#include <TClonesArray.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
 
+#include <STEER/STEER/AliCluster3D.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EveBase/AliEveEventManager.h>
+#else
+class TEveElement;
+class TEvePointSet;
 #endif
 
 TEvePointSet* hmpid_clusters(TEveElement* cont=0)
index 16cb5fd..f236a1f 100644 (file)
@@ -1,3 +1,24 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TBranch.h>
+#include <TGeoMatrix.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TEveElement.h>
+#include <TEveFrameBox.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+#include <TEveRGBAPalette.h>
+#include <TEveTrans.h>
+#include <TEveQuadSet.h>
+
+#include <HMPID/AliHMPIDDigit.h>
+#include <HMPID/AliHMPIDv3.h>
+#include <STEER/STEER/AliCluster3D.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void hmpid_digits()
 {
   const Char_t *name[]={ "HMPID0", "HMPID1", "HMPID2", "HMPID3",
@@ -7,7 +28,7 @@ void hmpid_digits()
   rl->LoadDigits("HMPID");
 
   TTree *dTree = rl->GetTreeD("HMPID", kFALSE);
-  if (!dTree) return 0;
+  if (!dTree) return;
 
   TEveElementList* list = new TEveElementList("HMPID Digits");
   gEve->AddElement(list);
index d557caa..d3c0bb4 100644 (file)
@@ -1,3 +1,20 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoMatrix.h>
+#include <TStyle.h>
+#include <TEveElement.h>
+#include <TEveFrameBox.h>
+#include <TEveManager.h>
+#include <TEveRGBAPalette.h>
+#include <TEveTrans.h>
+#include <TEveQuadSet.h>
+
+#include <HMPID/AliHMPIDDigit.h>
+#include <HMPID/AliHMPIDv3.h>
+#include <HMPID/AliHMPIDRawStream.h>
+#include <RAW/AliRawReader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void hmpid_raw()
 {
   const Char_t *name[] = { "HMPID0", "HMPID1", "HMPID2", "HMPID3",
index dc31073..1d1cdca 100644 (file)
 #include <EveBase/AliEveEventManager.h>
 #include <EveDet/AliEveITSDigitsInfo.h>
 
-
-void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode,
-                            Bool_t check_empty    = kTRUE,
-                            Bool_t scaled_modules = kFALSE);
+#include "its_common_foos.C"
 
 #endif
 
index fc41f73..96649ed 100644 (file)
@@ -7,6 +7,17 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EveBase/AliEveEventManager.h>
+#endif
+
 TEvePointSet*
 its_hits(const char *varexp    = "fX:fY:fZ",
         const char *selection = "",
@@ -24,7 +35,7 @@ its_hits(const char *varexp    = "fX:fY:fZ",
   ps.Select();
 
   if(points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("its_hits", Form("No hits match '%s'", selection));
+    Warning("its_hits", "No hits match '%s'", selection);
     delete points;
     return 0;
   }
index 7c3231c..25a7255 100644 (file)
@@ -6,6 +6,16 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EveBase/AliEveEventManager.h>
+#endif
 
 void its_hits_layer_split(const char *varexp    = "fX:fY:fZ:GetLayer()",
                           const char *selection = "")
index 618c74c..9929ef5 100644 (file)
@@ -6,8 +6,18 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGLViewer.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
 
-#include <vector> // bypass a cint problem in root-5.20
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveITSModuleStepper.h>
+#include <EVE/EveDet/AliEveITSDigitsInfo.h>
+#endif
 
 class AliEveITSModuleStepper;
 
@@ -32,6 +42,11 @@ void its_module_stepper(Int_t det = 0)
 
   TGLViewer* v = gEve->GetDefaultGLViewer();
   v->SetCurrentCamera(TGLViewer::kCameraOrthoXOY);
-  TGLCameraMarkupStyle* mup = v->GetCameraMarkup();
-  if(mup) mup->SetShow(kFALSE);
+  
+  /*
+   * Disabling obsolete code
+   * 
+   */
+  //TGLCameraMarkupStyle* mup = v->GetCameraMarkup();
+  //if(mup) mup->SetShow(kFALSE);
 }
index f68d659..d404212 100644 (file)
@@ -14,9 +14,7 @@
 #include <EveBase/AliEveEventManager.h>
 #include <EveDet/AliEveITSDigitsInfo.h>
 
-void its_display_raw_digits(AliEveITSDigitsInfo* di, Int_t mode,
-                            Bool_t check_empty    = kTRUE,
-                            Bool_t scaled_modules = kFALSE);
+#include "its_common_foos.C"
 
 #endif
 
index 49b7c62..a815e7c 100644 (file)
@@ -7,6 +7,24 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TGLViewer.h>
+#include <TStyle.h>
+#include <TEveBrowser.h>
+#include <TEveManager.h>
+#include <TEveViewer.h>
+#include <TEveWindow.h>
+#include <TEveScene.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <STEER/AOD/AliAODEvent.h>
+#include <STEER/AOD/AliAODTrack.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveJetPlane.h>
+#endif
+
 TEveViewer *gJPView   = 0;
 TEveScene  *gJPScene  = 0;
 
@@ -40,7 +58,7 @@ AliEveJetPlane* jetplane()
 
   TClonesArray* jets = aod->GetJets();
   Int_t njets = jets->GetEntries();
-  printf("Event: %5d Number of jets: %5d \n", iev, njets);
+  Info("jetplane", "Event: %5d Number of jets: %5d \n", iev, njets);
 
   for (Int_t ij = 0; ij < njets; ij++)
   {
@@ -52,7 +70,7 @@ AliEveJetPlane* jetplane()
 
   TClonesArray* tracks = aod->GetTracks();
   Int_t ntracks = tracks->GetEntries();
-  printf("Event: %5d Number of tracks: %5d \n", iev, ntracks);
+  Info("jetplane", "Event: %5d Number of tracks: %5d \n", iev, ntracks);
 
   for (Int_t ij = 0; ij < ntracks; ij++)
   {
index ad3a650..ec89d31 100644 (file)
@@ -9,9 +9,14 @@
 
 // Import tracks from kinematics-tree / particle-stack.
 // Preliminary/minimal solution.
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TParticle.h>
+#include <TParticlePDG.h>
 
-#include "TParticlePDG.h"
-
+#include <STEER/STEERBase/AliStack.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
 void
 kine_print(Double_t min_pt = 0, Double_t min_p = 0)
 {
@@ -20,7 +25,7 @@ kine_print(Double_t min_pt = 0, Double_t min_p = 0)
   AliStack* stack = rl->Stack();
   if (!stack) {
     Error("kine_tracks.C", "can not get kinematics.");
-    return 0;
+    return;
   }
 
   printf("\n");
index 08d38c6..89dcf86 100644 (file)
 /// \author Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-
 #include <TParticle.h>
 #include <TParticlePDG.h>
-
 #include <TEveManager.h>
 #include <TEveTrackPropagator.h>
 
-#include <EveBase/AliEveEventManager.h>
-#include <EveBase/AliEveMagField.h>
-#include <EveBase/AliEveTrack.h>
-#include <EveBase/AliEveKineTools.h>
-
-#include <AliRunLoader.h>
-#include <AliStack.h>
-#include <AliMagF.h>
-
+#include <STEER/STEERBase/AliMagF.h>
+#include <STEER/STEERBase/AliStack.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveMagField.h>
+#include <EVE/EveBase/AliEveTrack.h>
+#include <EVE/EveBase/AliEveKineTools.h>
 #endif
 
 // Use magnetic-field as retrieved from GRP.
index daddd08..e9a36b1 100644 (file)
@@ -5,11 +5,17 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveElement.h>
+
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveLego.h>
+#endif
 
 AliEveLego* lego(){
 
    AliEveEventManager *mng = AliEveEventManager::GetMaster();
-   AliEveLego *lego = mng->FindGlobal("LegoHisto2D");
+   AliEveLego *lego = dynamic_cast<AliEveLego*>(mng->FindGlobal("LegoHisto2D"));
 
    if ( lego == 0) {
       lego = new AliEveLego();
index 643a16f..aa4444d 100644 (file)
@@ -1,12 +1,29 @@
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TCanvas.h>
 #include <TGButton.h>
 #include <TGButtonGroup.h>
+#include <TFile.h>
 #include <TGLabel.h>
 #include <TGNumberEntry.h>
 #include <TG3DLine.h>
 #include <TApplication.h>
 #include <TGComboBox.h>
 #include <TLatex.h>
+#include <TTree.h>
+#include <TEveUtil.h>
+
+#include <STEER/CDB/AliCDBManager.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDfriendTrack.h>
+#include <STEER/STEER/AliGeomManager.h>
+#include <EVE/EveBase/AliEveEventManager.h>
 
+/* Not sure which ConfigCalibTrain.C macro ? 
+ * From ANALYSIS or from PWGPP?
+ */
+#include "ANALYSIS/macros/ConfigCalibTrain.C" 
+#endif
 
 class ButtonWindow : public TGMainFrame {
 
@@ -54,9 +71,7 @@ ButtonWindow::ButtonWindow() : TGMainFrame(gClient->GetRoot(), 10, 10, kHorizont
    TGLabel *label1 = 0;
    TGLabel *label2 = 0;
    TGLabel *label3 = 0;
-   TGLabel *label4 = 0;
-   TGLabel *label5 = 0;
-   TGLabel *label6 = 0;
+  
    TGHorizontal3DLine *separator = 0;
 
    TGGroupFrame *margins = new TGGroupFrame(controls, "Residuals Drawing Options");
@@ -323,7 +338,7 @@ ButtonWindow::ButtonWindow() : TGMainFrame(gClient->GetRoot(), 10, 10, kHorizont
 void ButtonWindow::DrawResiduals()
 {
 
-      TString selection1, selection2, selection3, selection4, selection5 selection6, selection7, selection8, selection9, selection10;
+      TString selection1, selection2, selection3, selection4, selection5, selection6, selection7, selection8, selection9, selection10;
 
       switch(option1->GetSelected())
       {
@@ -514,48 +529,45 @@ void ButtonWindow::DrawResiduals()
         drawSelectionMerged2 = customDrawSelection->GetText();
 
 
-      cout << cutSelectionMerged << endl;
-      cout << "abs(ESDfriend.fTracks[].fTPCOut.fP[4])<0.5" <<endl;
-
-      cout << drawSelectionMerged1 << endl;
-      cout << "track[].fP[0]:track[].fX" << endl;
-
-      cout << drawSelectionMerged2 << endl;
-      cout << "abs(track[].fP[0])<20" << endl;
-
-      cout << "nEntries: " << nEntries->GetNumber() << endl;
-      cout << "firstEntry: " << firstEntry->GetNumber() << endl;
-
-
+      Info("make_residuals::DrawResiduals", "%s abs(ESDfriend.fTracks[].fTPCOut.fP[4])<0.5", cutSelectionMerged.Data());
+      Info("make_residuals::DrawResiduals", "%s track[].fP[0]:track[].fX", drawSelectionMerged1.Data());
+      Info("make_residuals::DrawResiduals", "%s abs(track[].fP[0])<20", drawSelectionMerged2.Data());
+      Info("make_residuals::DrawResiduals", "nEntries: %f", nEntries->GetNumber());
+      Info("make_residuals::DrawResiduals", "firstEntry: %f", firstEntry->GetNumber());
+      
       TEveUtil::LoadMacro("ConfigCalibTrain.C");
 
       AliESDEvent *esd = AliEveEventManager::AssertESD();
 
       ConfigCalibTrain(esd->GetRunNumber());
 
+      /* OBSOLETE CODE - No function members defined
+       * 
       AliESDfriendTrack::MakeDebugStreamer(kTRUE);
 
       TTreeSRedirector *pcstreamRes = AliESDfriendTrack::GetDebugStreamer();
-
+      */
+      
       TFile fRes("AliESDfriends.root");
 
       TTree *treeRes = (TTree*)fRes.Get("esdFriendTree");     
 
       TCanvas* cnv = new TCanvas();
-
+      
+      
       treeRes->Draw("ESDfriend.fTracks[].MakeResidualGraph(1)",cutSelectionMerged," ",nEntries->GetNumber(),firstEntry->GetNumber());
 //      treeRes->Draw("ESDfriend.fTracks[].MakeResidualGraph(1)","abs(ESDfriend.fTracks[].fTPCOut.fP[4])<0.5"," ",nEntries,firstEntry);
 
-      delete pcstreamRes;
+      //delete pcstreamRes;
+
+      /*  OBSOLETE CODE -dump not defined
 
       TFile fRes("residual.root");
 
       dump.Draw(drawSelectionMerged1,drawSelectionMerged2);
-
+      */
 //      dump.Draw("track[].fP[0]:track[].fX","abs(track[].fP[0])<20");
 
-
-
 }
 
 //_____________________________________________________________________________
index 7765d0d..c384510 100644 (file)
 ///
 /// \author P. Pillot, L. Aphecetche; Subatech
 
-#ifndef __CINT__
-
-#include "AliMUONVCluster.h"
-#include "AliMUONVClusterStore.h"
-
-#include "AliRunLoader.h"
-
-#include "EveBase/AliEveEventManager.h"
-
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <Riostream.h>
+#include <TTree.h>
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 
-#include <TTree.h>
-#include <Riostream.h>
-
+#include <MUON/AliMUONVCluster.h>
+#include <MUON/AliMUONVClusterStore.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
 #endif
 class TIter;
 class TEvePointSet;
index 842db14..d972ae8 100644 (file)
 /// \author P. Pillot, L. Aphecetche; Subatech
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-
-#include "AliMUONGeometryTransformer.h"
-#include "AliMUONVDigit.h"
-#include "AliMUONVDigitStore.h"
-
-#include "AliMpPad.h"
-#include "AliMpSegmentation.h"
-#include "AliMpVSegmentation.h"
-#include "AliMpCDB.h"
-
-#include "AliRunLoader.h"
-
-#include "EveBase/AliEveEventManager.h"
-
-#include <TEveManager.h>
-#include <TEveQuadSet.h>
-
+#include <Riostream.h>
 #include <TTree.h>
 #include <TStyle.h>
-#include <Riostream.h>
+#include <TEveManager.h>
+#include <TEveQuadSet.h>
 
+#include <MUON/AliMUONGeometryTransformer.h>
+#include <MUON/AliMUONVDigit.h>
+#include <MUON/AliMUONVDigitStore.h>
+#include <MUON/mapping/AliMpPad.h>
+#include <MUON/mapping/AliMpSegmentation.h>
+#include <MUON/mapping/AliMpVSegmentation.h>
+#include <MUON/mapping/AliMpCDB.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
 #endif
 
 //______________________________________________________________________________
index 163cbfd..1eff67c 100644 (file)
 /// \author P. Pillot, L. Aphecetche; Subatech
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-
-#include "AliMUONDigitMaker.h"
-#include "AliMUONDigitStoreV2R.h"
-
-#include "AliMpCDB.h"
-
-#include "AliRawReader.h"
-
-#include "EveBase/AliEveEventManager.h"
-
-#include <TEveManager.h>
-#include <TEveUtil.h>
-#include <TEveQuadSet.h>
-
 #include <TStyle.h>
 #include <Riostream.h>
 #include <TROOT.h>
+#include <TEveManager.h>
+#include <TEveUtil.h>
+#include <TEveQuadSet.h>
 
+#include <MUON/AliMUONDigitMaker.h>
+#include <MUON/AliMUONDigitStoreV2R.h>
+#include <MUON/mapping/AliMpCDB.h>
+#include <RAW/AliRawReader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
 #endif
 
 void muon_raw()
index 0096464..eb7235f 100644 (file)
 /// \author P. Pillot, L. Aphecetche; Subatech
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-
-#include "AliMUONClusterStoreV2.h"
-#include "AliMUONRawClusterV2.h"
-#include "AliMUONVCluster.h"
-#include "AliMUONConstants.h"
-#include "AliMUONRecoParam.h"
-#include "AliMUONCDB.h"
-
-#include "AliRunLoader.h"
-#include "AliStack.h"
-#include "AliTrackReference.h"
-
-#include "EveBase/AliEveMagField.h"
-#include "EveBase/AliEveTrack.h"
-#include "EveBase/AliEveEventManager.h"
-
+#include <TClonesArray.h>
+#include <TTree.h>
+#include <TParticle.h>
+#include <TMath.h>
+#include <TROOT.h>
 #include <TEveManager.h>
 #include <TEveUtil.h>
 #include <TEveTrack.h>
 #include <TEveVSDStructs.h>
 #include <TEveTrackPropagator.h>
 
-#include <TClonesArray.h>
-#include <TTree.h>
-#include <TParticle.h>
-#include <TMath.h>
-#include <TROOT.h>
-
+#include <MUON/AliMUONClusterStoreV2.h>
+#include <MUON/AliMUONRawClusterV2.h>
+#include <MUON/AliMUONVCluster.h>
+#include <MUON/AliMUONConstants.h>
+#include <MUON/AliMUONRecoParam.h>
+#include <MUON/AliMUONCDB.h>
+#include <STEER/STEERBase/AliStack.h>
+#include <STEER/STEERBase/AliTrackReference.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveMagField.h>
+#include <EVE/EveBase/AliEveTrack.h>
+#include <EVE/EveBase/AliEveEventManager.h>
 #endif
 
 //______________________________________________________________________________
index d7d6c0e..5bc52d5 100644 (file)
@@ -7,6 +7,20 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TObjArray.h>
+#include <TBranch.h>
+#include <TTree.h>
+#include <TString.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+
+#include <STEER/STEER/AliCluster.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EveBase/AliEveEventManager.h>
+#endif
+
 TEvePointSet* phos_clusters(TEveElement* cont=0)
 {
   AliEveEventManager::AssertGeometry();
index 95c21dd..2bbeb92 100644 (file)
@@ -6,6 +6,24 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TStyle.h>
+#include <TString.h>
+#include <TEveElement.h>
+#include <TEveFrameBox.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+#include <TEveRGBAPalette.h>
+#include <TEveTrans.h>
+
+#include <HMPID/AliHMPIDDigit.h>
+#include <HMPID/AliHMPIDv3.h>
+#include <STEER/STEER/AliCluster3D.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEvePMDModule.h>
+#endif
 
 void pmd_digits(Int_t mode = 0)
 {
index 75cbdf0..29f4f2e 100644 (file)
@@ -7,6 +7,18 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TStyle.h>
+#include <TString.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+#include <TEveTrans.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 TEvePointSet*
 pmd_hits(const char *varexp    = "fX:fY:fZ",
         const char *selection = "")
index 3729cff..4f4bc7d 100644 (file)
@@ -7,6 +7,22 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 // ---------------------------------------------------------------------- //
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TObjArray.h>
+#include <TString.h>
+#include <TStyle.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+
+#include <PMD/AliPMDRawStream.h>
+#include <RAW/AliRawReaderRoot.h>
+#include <STEER/STEER/AliCluster.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEvePMDModule.h>
+#endif
+
 void pmd_raw(Int_t mode = 0)
 {
   gStyle->SetPalette(1, 0);
@@ -89,13 +105,13 @@ void pmd_raw(Int_t mode = 0)
 
       Int_t iddl = -1;
 
-      while ((iddl = stream.DdlData(&pmdddlcont)) >=0) {
+      while ((iddl = stream.DdlData(pmdddlcont)) >=0) {
          if (iddl >= istartDDL && iddl < iendDDL){
              sddl = bsddl;
              sddl += iddl;
              TEveElementList* lddl = new TEveElementList(sddl.Data());
              //  l->SetMainColor(3);
-             gEve->AddElement(ddl, lplane);
+             gEve->AddElement(lddl, lplane);
              
              modnumber = iddl*6;
              
index 360459a..328688e 100644 (file)
 #include <TEveCompound.h>
 #include <TEveStraightLineSet.h>
 
-#include <EveBase/AliEveEventManager.h>
-
-#include <AliESDEvent.h>
-#include <AliESDVertex.h>
-
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDVertex.h>
+#include <EVE/EveBase/AliEveEventManager.h>
 #endif
 
 //==============================================================================
index 48a61dc..b3ce4cb 100644 (file)
@@ -6,25 +6,41 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TMarker.h>
+#include <TEveManager.h>
+#include <TEveCompound.h>
+#include <TEveTrack.h>
+#include <TEveTrackPropagator.h>
+#include <TEveUtil.h>
+
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDVertex.h>
+#include <STEER/ESD/AliESDtrack.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveBase/AliEveTrack.h>
+
+#include "esd_tracks.C"
+#endif
 
 TEveTrackList* primary_vertex_tracks()
 {
   TEveUtil::LoadMacro("esd_tracks.C");
   AliESDEvent   *esd = AliEveEventManager::AssertESD();
-  AliESDVertex *pv  = esd->GetPrimaryVertex();
+  const AliESDVertex *pv  = esd->GetPrimaryVertex();
 
   TEveTrackList* cont = new TEveTrackList("Tracks for Primary Vertex");
   cont->SetMainColor(7);
   TEveTrackPropagator* rnrStyle = cont->GetPropagator();
   rnrStyle->SetMagField( 0.1*esd->GetMagneticField() );
   rnrStyle->fRnrFV = kTRUE;
-  rnrStyle->fFVAtt->SetMarkerColor(2);
+  rnrStyle->fFVAtt.SetMarkerColor(2);
   gEve->AddElement(cont);
 
   for (Int_t n=0; n<pv->GetNIndices(); n++)
   {
     AliESDtrack* at = esd->GetTrack(pv->GetIndices()[n]);
-    AliEveTrack* track = esd_make_track(rnrStyle, n, at, at);
+    AliEveTrack* track = esd_make_track(at, cont);
     track->SetLineWidth(4);
     track->SetLineColor(cont->GetMainColor());
     track->SetLineStyle(7);
index e9ea141..b468619 100644 (file)
@@ -7,6 +7,14 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TParticle.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <STEER/STEERBase/AliStack.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void print_kine_from_label(Int_t label)
 {
   AliRunLoader* rl = AliEveEventManager::AssertRunLoader();
index 845f1ba..93e5f27 100644 (file)
@@ -6,6 +6,13 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TPolyMarker3D.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEveUtil.h>
+#endif
+
 
 void region_marker(Float_t a=10, Float_t b=10, Float_t c=20,
                   Float_t x=0, Float_t y=0, Float_t z=0)
index f7e5840..b246182 100644 (file)
@@ -6,12 +6,25 @@
 
 // Author: Pawel Debski 2010
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TPolyMarker3D.h>
+#include <TString.h>
+#include <TEveLine.h>
+#include <TEveManager.h>
+#include <TEveEventManager.h>
+#include <TEveElement.h>
+#include <TEveUtil.h>
+
+#include <STEER/ESD/AliESDtrack.h>
+#include <EVE/EveBase/AliEveTrack.h>
+#include <EVE/EveBase/AliEveMultiView.h>
+#endif
 
 void set_momentum_vectors()
 {
 
-   TString str1 = 0;
-   TString str2 = 0;
+   TString str1;
+   TString str2;
 
    Bool_t draw = kFALSE;
 
index 45ae32c..fa8510a 100644 (file)
@@ -7,6 +7,17 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TStyle.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <T0/AliT0digit.h>
+#include <EveBase/AliEveEventManager.h>
+#include <EveDet/AliEveITSDigitsInfo.h>
+#include <EVE/EveDet/AliEveT0Module.h>
+#endif
+
 void t0_digits()
 {
   AliRunLoader* rl = AliEveEventManager::AssertRunLoader();
index a2913f8..cc8e499 100644 (file)
@@ -7,6 +7,18 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EveBase/AliEveEventManager.h>
+#endif
+
 TEvePointSet*
 t0_hits(const char *varexp    = "T0.fX:T0.fY:T0.fZ",
        const char *selection = "")
index 1247b13..5dc24ed 100644 (file)
@@ -7,6 +7,14 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+
+#include <RAW/AliRawReader.h>
+#include <EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveT0Module.h>
+#endif
+
 void t0_raw()
 {
   AliRawReader *reader = AliEveEventManager::AssertRawReader();
index 12e7b15..75cb3d8 100644 (file)
@@ -5,22 +5,21 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-#ifdef __CINT__
-
-class TEveElement;
-class TEvePointSet;
-
-#else
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TObjArray.h>
 #include <TMath.h>
 #include <TTree.h>
+#include <TString.h>
 #include <TEveManager.h>
 #include <TEvePointSet.h>
-#include <EveBase/AliEveEventManager.h>
-
-#include <AliRunLoader.h>
-#include <AliCluster.h>
 
+#include <STEER/STEER/AliCluster.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#else
+class TEveElement;
+class TEvePointSet;
 #endif
 
 TEvePointSet* tof_clusters(TEveElement* cont=0, Float_t maxR=390)
index 1e167e1..21209cf 100644 (file)
@@ -7,6 +7,20 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <TOF/AliTOFGeometry.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
+#include <EVE/EveDet/AliEveTOFSector.h>
+#endif
 
 void tof_digits()
 {  
index 90ac7bc..2b79b70 100644 (file)
@@ -7,6 +7,20 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TStyle.h>
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <TOF/AliTOFGeometry.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
+#include <EVE/EveDet/AliEveTOFSector.h>
+#endif
+
 void tof_digits_sector(Int_t sector=0)
 {
   
@@ -23,13 +37,13 @@ void tof_digits_sector(Int_t sector=0)
 
   di->SetTree(dt);
 
-  AliTOFGeometry* g = di->GetTOFgeometry();
+  //AliTOFGeometry* g = di->GetTOFgeometry();
 
   gStyle->SetPalette(1, 0);
   gEve->DisableRedraw();
 
-  Char_t sectorName[100];
-  Char_t sectorTitle[200];
+  //Char_t sectorName[100];
+  //Char_t sectorTitle[200];
 
   TEveElementList* ll = new TEveElementList("TOF");
   ll->SetTitle("TOF detector");
index 6be8c4b..2e035ea 100644 (file)
@@ -7,11 +7,26 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TTree.h>
+#include <TStyle.h>
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <TOF/AliTOFGeometry.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
+#include <EVE/EveDet/AliEveTOFStrip.h>
+#endif
+
 void tof_digits_strips(Int_t selectedSector=-1)
 {
   TClonesArray *array = 0x0;
 
-  Int_t nDigitsInVolume[3] = {-1, -1, -1};
+ // Int_t nDigitsInVolume[3] = {-1, -1, -1};
   Int_t nStrips=19;
   TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
 
index df431f3..4fd4b28 100644 (file)
@@ -6,11 +6,22 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TString.h>
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
 
 TEvePointSet*
 tof_hits(const char *varexp    = "fX:fY:fZ",
         const char *selection = "",
-        TEveElement* cont)
+        TEveElement* cont=0)
 {
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
   rl->LoadHits("TOF");
@@ -23,7 +34,7 @@ tof_hits(const char *varexp    = "fX:fY:fZ",
   ps.Select();
 
   if( points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("tof_hits", Form("No hits match '%s'", selection));
+    Warning("tof_hits", "No hits match '%s'", selection);
     delete points;
     return 0;
   }
index 63c9f15..80aba87 100644 (file)
@@ -1,3 +1,22 @@
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TStyle.h>
+#include <TGeoManager.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+
+#include <TOF/AliTOFGeometry.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTOFDigitsInfo.h>
+#include <EVE/EveDet/AliEveTOFSector.h>
+#endif
+
 void tof_raw(Int_t newDecoder = 2)
 {
   AliRawReader *rawReader = AliEveEventManager::AssertRawReader();
index a6b8886..28c7b55 100644 (file)
@@ -6,6 +6,16 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGLayout.h>
+#include <TGFrame.h>
+#include <TEveManager.h>
+#include <TEveBrowser.h>
+
+#include <TPC/AliTPCCalibViewerGUI.h>
+#endif
+
 void tpc_calib_viewer(const char* file="CalibTree.root")
 {
    TEveBrowser* b = gEve->GetBrowser();
index 35ce041..d7729f2 100644 (file)
@@ -7,24 +7,20 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-#ifdef __CINT__
-
-class TEveElement;
-class TEvePointSet;
-
-#else
-
-#include <TEveManager.h>
+#if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TColor.h>
-#include <TEvePointSet.h>
-#include <EveBase/AliEveEventManager.h>
 #include <TTree.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
 
-#include <AliRunLoader.h>
-#include <AliCluster.h>
+#include <STEER/STEER/AliCluster.h>
+#include <STEER/STEER/AliRunLoader.h>
 #include <TPC/AliTPCClustersRow.h>
 #include <TPC/AliTPCclusterMI.h>
-
+#include <EVE/EveBase/AliEveEventManager.h>
+#else
+class TEveElement;
+class TEvePointSet;
 #endif
 
 TEvePointSet* tpc_clusters(TEveElement* cont=0, Float_t maxR=270)
index a266631..7c82f3d 100644 (file)
@@ -7,6 +7,19 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TTree.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTPCData.h>
+#include <EVE/EveDet/AliEveTPCSector2D.h>
+#include <EVE/EveDet/AliEveTPCSector3D.h>
+#endif
+
 void tpc_digits(Int_t mode=1)
 {
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
index 45ed108..ae68431 100644 (file)
@@ -7,6 +7,18 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TString.h>
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 TEvePointSet*
 tpc_hits(const char  *varexp    = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ",
         const char  *selection = "TPC2.fArray.fR>80",
@@ -27,7 +39,7 @@ tpc_hits(const char  *varexp    = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ
   ps.Select();
 
   if (points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("tpc_hits", Form("No hits match '%s'", selection));
+    Warning("tpc_hits", "No hits match '%s'", selection);
     delete points;
     return 0;
   }
@@ -40,8 +52,6 @@ tpc_hits(const char  *varexp    = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ
   points->SetMarkerSize(.5);
   points->SetMarkerColor(3);
 
-
-
   gEve->AddElement(points, cont);
   gEve->Redraw3D();
 
index f621689..934a2c3 100644 (file)
@@ -7,6 +7,16 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void tpc_hits_charge_split(const char *varexp    =
                        "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ"
                        ":log(TPC2.fArray.fCharge)",
index 97194a4..4b50b5b 100644 (file)
@@ -7,6 +7,16 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TTree.h>
+#include <TEveManager.h>
+#include <TEvePointSet.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void tpc_hits_eta_split(const char *varexp    =
                        "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ"
                        ":TPC2.fArray.Eta()",
index 9ebfe4a..495ab3b 100644 (file)
@@ -7,6 +7,23 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TTree.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+#include <TEveTreeTools.h>
+
+#include <RAW/AliRawReader.h>
+#include <RAW/AliAltroRawStreamV3.h>
+#include <TPC/AliTPCRawStreamV3.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTPCData.h>
+#include <EVE/EveDet/AliEveTPCSector2D.h>
+#include <EVE/EveDet/AliEveTPCSector3D.h>
+#endif
+
 // Macro to visualise rootified raw-data from TPC.
 //
 // Use tpc_raw(Int_t mode) in order to run it
@@ -39,6 +56,9 @@ void tpc_raw(Int_t mode = 3)
   TEveElementList* sec3d = new TEveElementList("TPC 3D");
   gEve->AddElement(sec3d);
 
+  AliEveTPCSector2D *s;
+  AliEveTPCSector3D *t;
+  
   for (Int_t i=0; i<=35; ++i) {
     if (mode & 1) {
       s = new AliEveTPCSector2D(Form("2D sector %d",i));
index c8b29f9..3f0f283 100644 (file)
@@ -1,3 +1,9 @@
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
 //
 // Select points from TEvePointSet(clusters, hits, etc.) with Alt+mouse-left
 // click action.
@@ -5,6 +11,14 @@
 // In AliEvetrackFitEditor press "Fit" button to make track fit on the
 // selected points. To fit new track, press "Reset".
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+#include <TEveSelection.h>
+
+#include <EVE/EveBase/AliEveTrackFitter.h>
+#include <EVE/EveBase/AliEveCosmicRayFitter.h>
+#endif
+
 void track_fitter(Int_t mode = 1)
 {
   gEve->GetSelection()->SetPickToSelect(1);
index 5ccf2d0..effa0e6 100644 (file)
@@ -1,3 +1,23 @@
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEvePointSet.h>
+
+#include <STEER/STEERBase/AliPID.h>
+#include <TRD/AliTRDhit.h>
+#include <TRD/AliTRDarrayADC.h>
+#include <TRD/AliTRDcluster.h>
+#include <TRD/AliTRDtrackV1.h>
+#include <TRD/AliTRDReconstructor.h>
+#include <TRD/AliTRDrecoParam.h>
+#include <TRD/AliTRDseedV1.h>
+#include <EVE/EveDet/AliEveTRDData.h>
+#endif
+
 //
 // How to access the basic TRD data structures when a 
 // pointer to an Eve opject is available. One can get a 
@@ -28,6 +48,9 @@ void analyseHits(AliEveTRDHits *hits = 0x0)
   }
 }
 
+/* Obsolete code
+ * 
+ * 
 //_______________________________________________________
 void analyseDigits(AliEveTRDDigits *digits = 0x0)
 {
@@ -53,6 +76,7 @@ void analyseDigits(AliEveTRDDigits *digits = 0x0)
     }
   data->Compress(1);
 }
+*/
 
 //_______________________________________________________
 void analyseClusters(TEvePointSet *points = 0x0)
index 1b39c3d..359f243 100644 (file)
@@ -7,18 +7,20 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-#ifdef __CINT__
-class TEvePointSet;
-class TEveElement;
-#else
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TObjArray.h>
+#include <TTree.h>
 #include <TEveManager.h>
+#include <TEveElement.h>
 #include <TEvePointSet.h>
-#include <TTree.h>
-#include <EveBase/AliEveEventManager.h>
 
-#include "AliRunLoader.h"
-#include "AliCluster.h"
-#include "TRD/AliTRDcluster.h"
+#include <STEER/STEER/AliCluster.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <TRD/AliTRDcluster.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#else
+class TEvePointSet;
+class TEveElement;
 #endif
 
 TEvePointSet* trd_clusters(TEveElement *cont = 0)
index cbab2d9..aa35c6c 100644 (file)
 // Author:
 // Alex Bercuci (A.Bercuci@gsi.de)
 // 
-#ifdef __CINT__
-class TEvePointSet;
-class TEveElement;
-#else
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
 #include <TEveManager.h>
+#include <TEveElement.h>
 #include <TEvePointSet.h>
-#include <EveBase/AliEveEventManager.h>
-#include <EveDet/AliEveTRDModuleImp.h>
 
-#include "AliRunLoader.h"
-#include "AliCluster.h"
-#include "TRD/AliTRDcluster.h"
-#include "TRD/AliTRDgeometry.h"
-#include "TRD/AliTRDdigitsManager.h"
+#include <STEER/STEER/AliCluster.h>
+#include <STEER/STEER/AliRunLoader.h>
+#include <TRD/AliTRDarrayADC.h>
+#include <TRD/AliTRDcluster.h>
+#include <TRD/AliTRDgeometry.h>
+#include <TRD/AliTRDdigitsManager.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTRDModuleImp.h>
+#else
+class TEvePointSet;
+class TEveElement;
 #endif
 
 TEveElementList* trd_digits(Int_t sector = -1, TEveElement *cont = 0)
@@ -83,6 +87,6 @@ TEveElementList* trd_digits(Int_t sector = -1, TEveElement *cont = 0)
   gEve->AddElement(list, cont);
   gEve->Redraw3D();
 
-  Info("trd_digits", Form("TRD chambers with data for current selection %d.", jdet));
+  Info("trd_digits", "TRD chambers with data for current selection %d.", jdet);
   return list;
 }
index ef88699..77fc241 100644 (file)
@@ -1,21 +1,23 @@
-#ifndef __CINT__
-#include "TEveManager.h"
-#include "TEveLine.h"
-#include "TEveStraightLineSet.h"
-#include "TClonesArray.h"
-#include "EveBase/AliEveEventManager.h"
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TParticlePDG.h>
+#include <TEveLine.h>
+#include <TEveStraightLineSet.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
 
-#include "AliRunLoader.h"
-#include "AliLoader.h"
-#include "AliDataLoader.h"
-#include "AliTreeLoader.h"
-#include "TRD/AliTRDarrayADC.h"
-#include "EveDet/AliEveTRDData.h"
-#include "TRD/AliTRDtrackletWord.h"
-#include "TRD/AliTRDtrackletMCM.h"
-#include "TRD/AliTRDtrackGTU.h"
-#include "TRD/AliTRDtrackletGTU.h"
-#include "TParticlePDG.h"
+#include <STEER/STEER/AliRunLoader.h>
+#include <STEER/STEER/AliLoader.h>
+#include <STEER/STEER/AliDataLoader.h>
+#include <STEER/STEER/AliTreeLoader.h>
+#include <TRD/AliTRDarrayADC.h>
+#include <TRD/AliTRDgeometry.h>
+#include <TRD/AliTRDtrackletWord.h>
+#include <TRD/AliTRDtrackletMCM.h>
+#include <TRD/AliTRDtrackGTU.h>
+#include <TRD/AliTRDtrackletGTU.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTRDData.h>
 #endif
 
 TEveElementList *
index e472783..3a52e51 100644 (file)
@@ -6,6 +6,17 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TString.h>
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
 
 TEvePointSet*
 trd_hits(const char *varexp    = "fX:fY:fZ",
@@ -23,7 +34,7 @@ trd_hits(const char *varexp    = "fX:fY:fZ",
   ps.Select();
 
   if (points->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) {
-    Warning("trd_hits", Form("No hits match '%s'", selection));
+    Warning("trd_hits", "No hits match '%s'", selection);
     delete points;
     return 0;
   }
index 30aaf26..5f85c6e 100644 (file)
@@ -7,6 +7,18 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TString.h>
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveElement.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void trd_hits_z_split(const char *varexp    = "fX:fY:fZ:fZ",
                      const char *selection = "")
 {
index 60c789c..7ee762f 100644 (file)
 // Author:
 // Alex Bercuci (A.Bercuci@gsi.de)
 //
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TString.h>
+#include <TSystem.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <EVE/EveDet/AliEveTRDLoader.h>
+#endif
+
 AliEveTRDLoader* trd_loader(Int_t event=0)
 {
   // init single file loader
index 5bc4f00..66c34b6 100644 (file)
@@ -1,3 +1,22 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TBranch.h>
+#include <TFile.h>
+#include <TSystem.h>
+#include <TTree.h>
+#include <TROOT.h>
+#include <TEveManager.h>
+
+#include <PWGPP/TRD/info/AliTRDtrackInfo.h>
+#include <STEER/CDB/AliCDBManager.h>
+#include <TRD/AliTRDarrayADC.h>
+#include <TRD/AliTRDReconstructor.h>
+#include <TRD/AliTRDrecoParam.h>
+#include <TRD/AliTRDtrackV1.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTRDTrackList.h>
+#include <EVE/EveDet/AliEveTRDData.h>
+#endif
+
 void trd_qaRec()
 {
   gSystem->Load("libANALYSIS.so");
index 9aff6be..b9b5110 100644 (file)
 // Alex Bercuci (A.Bercuci@gsi.de)
 // Minjug Kweon (minjung@physi.uni-heidelberg.de)
 //
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TEveManager.h>
+
+#include <EVE/EveDet/AliEveTRDLoader.h>
+#include <EVE/EveDet/AliEveTRDLoaderImp.h>
+#endif
+
+
 AliEveTRDLoader* trd_rawloader(Char_t *file)
 {
   Int_t fSuperModule = 0; // -1 for all
index c7d850b..eee4cd7 100644 (file)
@@ -1,19 +1,19 @@
-#ifdef __CINT__
-class TEveLine;
-#else
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TEveLine.h>
 #include <TEveManager.h>
-#include "TEveLine.h"
-#include "TClonesArray.h"
-#include <EveBase/AliEveEventManager.h>
+#include <TEveElement.h>
 
-#include "AliRunLoader.h"
-#include "AliLoader.h"
-#include "AliDataLoader.h"
-#include "AliTreeLoader.h"
-#include "TRD/AliTRDarrayADC.h"
-#include "EveDet/AliEveTRDData.h"
-#include "TRD/AliTRDtrackletWord.h"
-#include "TRD/AliTRDtrackletMCM.h"
+#include <STEER/STEER/AliRunLoader.h>
+#include <STEER/STEER/AliLoader.h>
+#include <STEER/STEER/AliDataLoader.h>
+#include <STEER/STEER/AliTreeLoader.h>
+#include <TRD/AliTRDarrayADC.h>
+#include <TRD/AliTRDtrackletWord.h>
+#include <TRD/AliTRDtrackletMCM.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTRDData.h>
 #endif
 
 TEveElementList *trd_tracklets()
index 713b798..62e6ad4 100644 (file)
@@ -1,14 +1,14 @@
-#ifndef __CINT__
+#if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TGLViewer.h>
 #include <TEveManager.h>
-#include <EveBase/AliEveEventManager.h>
-#include "TRD/AliTRDarrayADC.h"
-#include <EveDet/AliEveTRDTrackList.h>
 
-#include "AliESDEvent.h"
-#include "AliESDfriend.h"
-#include "TRD/AliTRDReconstructor.h"
-#include "TRD/AliTRDtrackV1.h"
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDfriend.h>
+#include <TRD/AliTRDarrayADC.h>
+#include <TRD/AliTRDReconstructor.h>
+#include <TRD/AliTRDtrackV1.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveTRDTrackList.h>
 #endif
 
 void trd_tracks(TEveElement *cont = 0)
@@ -33,7 +33,7 @@ void trd_tracks(TEveElement *cont = 0)
   for (Int_t n=0; n<esd->GetNumberOfTracks(); n++){
     AliESDtrack* esdTrack(esd->GetTrack(n));
     if(!esdTrack) continue;
-    AliESDfriendTrack *friendTrack(esdTrack->GetFriendTrack());
+    AliESDfriendTrack *friendTrack = new AliESDfriendTrack(*(esdTrack->GetFriendTrack()));
     if(!friendTrack) continue;
     //Info("trd_tracks", Form("Track[%3d] esd[%p] friend[%p]", n, (void*)esdTrack, (void*)friendTrack));
 
index 889777d..468dcaa 100644 (file)
@@ -8,25 +8,20 @@
  **************************************************************************/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
-
 #include <TGLViewer.h>
 #include <TGLCameraOverlay.h>
-
 #include <TEveManager.h>
 #include <TEveBrowser.h>
 #include <TEveViewer.h>
 #include <TEveScene.h>
 #include <TEvePointSet.h>
 
-#include <EveBase/AliEveEventManager.h>
-
-#include <AliESDEvent.h>
-#include <AliESDVertex.h>
-
-#include <AliRunLoader.h>
-#include <AliCluster.h>
+#include <STEER/STEER/AliCluster.h>
+#include <STEER/ESD/AliESDEvent.h>
+#include <STEER/ESD/AliESDVertex.h>
+#include <STEER/STEER/AliRunLoader.h>
 #include <TPC/AliTPCClustersRow.h>
-
+#include <EVE/EveBase/AliEveEventManager.h>
 #endif
 
 TEveViewer *gVPTPCView   = 0;
index 2ff7d23..441c57f 100644 (file)
@@ -7,6 +7,25 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TClonesArray.h>
+#include <TGeoManager.h>
+#include <TMath.h>
+#include <TStyle.h>
+#include <TTree.h>
+#include <TEveManager.h>
+#include <TEveElement.h>
+#include <TEvePointSet.h>
+#include <TEveQuadSet.h>
+#include <TEveTrans.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <VZERO/AliVZEROdigit.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
+
 //   fV0CHeight1  =  2.5; // height of cell 1
 //   fV0CHeight2  =  4.4; // height of cell 2
 //   fV0CHeight3  =  7.4; // height of cell 3
index 15e8280..7ed3b4d 100644 (file)
@@ -1,3 +1,8 @@
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <STEER/ESD/AliESDEvent.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
+
 void vzero_dump()
 {
   AliESDEvent* esd = AliEveEventManager::AssertESD();
index aaa0f1a..227dba6 100644 (file)
@@ -6,6 +6,16 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TString.h>
+#include <TTree.h>
+#include <TEvePointSet.h>
+#include <TEveManager.h>
+#include <TEveTreeTools.h>
+
+#include <STEER/STEER/AliRunLoader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#endif
 
 TEvePointSet*
 vzero_hits(const char *varexp    = "fX:fY:fZ",
index d7814af..95a5d9c 100644 (file)
@@ -7,9 +7,17 @@
 // Macro to visualise rootified raw-data from VZERO.
 //
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TStyle.h>
+#include <TEveManager.h>
+
+#include <RAW/AliRawReader.h>
+#include <EVE/EveBase/AliEveEventManager.h>
+#include <EVE/EveDet/AliEveVZEROModule.h>
+#else
 class AliRawReader;
-
 class AliEveVZEROModule;
+#endif
 
 void vzero_raw()
 {