From d810d0de85db24ed8bd73f51aad50e97da98c374 Mon Sep 17 00:00:00 2001 From: mtadel Date: Fri, 18 Jan 2008 19:48:23 +0000 Subject: [PATCH] Put all classes in Alieve/ sub-module out of the Alieve namespace and prefix them with AliEve instead. Modify all macros to use the new class names. --- EVE/Alieve/AliEVEHOMERManagerEditor.cxx | 65 ------ EVE/Alieve/AliEVEHOMERManagerEditor.h | 41 ---- EVE/Alieve/AliEVEHOMERSource.cxx | 22 -- EVE/Alieve/AliEVEHOMERSource.h | 33 --- EVE/Alieve/AliEVEHOMERSourceList.cxx | 25 --- EVE/Alieve/AliEVEHOMERSourceList.h | 28 --- ...EventAlieve.cxx => AliEveEventManager.cxx} | 65 +++--- .../{EventAlieve.h => AliEveEventManager.h} | 32 +-- ...OMERManager.cxx => AliEveHOMERManager.cxx} | 78 ++++---- ...EVEHOMERManager.h => AliEveHOMERManager.h} | 32 +-- EVE/Alieve/AliEveHOMERManagerEditor.cxx | 72 +++++++ EVE/Alieve/AliEveHOMERManagerEditor.h | 48 +++++ EVE/Alieve/AliEveHOMERSource.cxx | 29 +++ EVE/Alieve/AliEveHOMERSource.h | 40 ++++ EVE/Alieve/AliEveHOMERSourceList.cxx | 32 +++ EVE/Alieve/AliEveHOMERSourceList.h | 35 ++++ ...DigitsInfo.cxx => AliEveITSDigitsInfo.cxx} | 45 +++-- ...{ITSDigitsInfo.h => AliEveITSDigitsInfo.h} | 39 ++-- .../{ITSModule.cxx => AliEveITSModule.cxx} | 56 +++--- EVE/Alieve/AliEveITSModule.h | 71 +++++++ ...Stepper.cxx => AliEveITSModuleStepper.cxx} | 105 +++++----- ...duleStepper.h => AliEveITSModuleStepper.h} | 32 +-- EVE/Alieve/AliEveITSModuleStepperEditor.cxx | 63 ++++++ EVE/Alieve/AliEveITSModuleStepperEditor.h | 45 +++++ ...edModule.cxx => AliEveITSScaledModule.cxx} | 89 +++++---- ...ScaledModule.h => AliEveITSScaledModule.h} | 48 +++-- ...or.cxx => AliEveITSScaledModuleEditor.cxx} | 39 ++-- EVE/Alieve/AliEveITSScaledModuleEditor.h | 62 ++++++ .../{JetPlane.cxx => AliEveJetPlane.cxx} | 40 ++-- EVE/Alieve/{JetPlane.h => AliEveJetPlane.h} | 28 +-- ...aneEditor.cxx => AliEveJetPlaneEditor.cxx} | 87 ++++---- ...etPlaneEditor.h => AliEveJetPlaneEditor.h} | 30 +-- .../{JetPlaneGL.cxx => AliEveJetPlaneGL.cxx} | 37 ++-- EVE/Alieve/AliEveJetPlaneGL.h | 46 +++++ .../{KineTools.cxx => AliEveKineTools.cxx} | 27 ++- EVE/Alieve/AliEveKineTools.h | 45 +++++ ...{MUONChamber.cxx => AliEveMUONChamber.cxx} | 59 +++--- .../{MUONChamber.h => AliEveMUONChamber.h} | 47 +++-- ...mberData.cxx => AliEveMUONChamberData.cxx} | 36 ++-- ...NChamberData.h => AliEveMUONChamberData.h} | 23 ++- ...Editor.cxx => AliEveMUONChamberEditor.cxx} | 44 ++-- EVE/Alieve/AliEveMUONChamberEditor.h | 60 ++++++ ...NChamberGL.cxx => AliEveMUONChamberGL.cxx} | 44 ++-- EVE/Alieve/AliEveMUONChamberGL.h | 51 +++++ .../{MUONData.cxx => AliEveMUONData.cxx} | 58 +++--- .../{MUONTrack.cxx => AliEveMUONTrack.cxx} | 66 +++--- EVE/Alieve/{MUONTrack.h => AliEveMUONTrack.h} | 23 ++- .../{PMDModule.cxx => AliEvePMDModule.cxx} | 45 +++-- EVE/Alieve/{PMDModule.h => AliEvePMDModule.h} | 26 ++- ...leEditor.cxx => AliEvePMDModuleEditor.cxx} | 37 ++-- EVE/Alieve/AliEvePMDModuleEditor.h | 58 ++++++ .../{T0Module.cxx => AliEveT0Module.cxx} | 38 ++-- EVE/Alieve/{T0Module.h => AliEveT0Module.h} | 24 ++- ...DigitsInfo.cxx => AliEveTOFDigitsInfo.cxx} | 34 ++-- ...{TOFDigitsInfo.h => AliEveTOFDigitsInfo.h} | 24 ++- EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx | 64 ++++++ EVE/Alieve/AliEveTOFDigitsInfoEditor.h | 46 +++++ .../{TOFSector.cxx => AliEveTOFSector.cxx} | 52 +++-- EVE/Alieve/{TOFSector.h => AliEveTOFSector.h} | 28 ++- ...orEditor.cxx => AliEveTOFSectorEditor.cxx} | 89 +++++---- EVE/Alieve/AliEveTOFSectorEditor.h | 81 ++++++++ .../{TOFStrip.cxx => AliEveTOFStrip.cxx} | 38 ++-- EVE/Alieve/AliEveTOFStrip.h | 68 +++++++ EVE/Alieve/AliEveTOFStripEditor.cxx | 64 ++++++ EVE/Alieve/AliEveTOFStripEditor.h | 46 +++++ EVE/Alieve/{TPCData.cxx => AliEveTPCData.cxx} | 61 +++--- EVE/Alieve/{TPCData.h => AliEveTPCData.h} | 28 +-- .../{TPCLoader.cxx => AliEveTPCLoader.cxx} | 73 ++++--- EVE/Alieve/{TPCLoader.h => AliEveTPCLoader.h} | 46 +++-- ...erEditor.cxx => AliEveTPCLoaderEditor.cxx} | 89 +++++---- ...LoaderEditor.h => AliEveTPCLoaderEditor.h} | 32 +-- ...{TPCSector2D.cxx => AliEveTPCSector2D.cxx} | 61 +++--- EVE/Alieve/AliEveTPCSector2D.h | 53 +++++ ...Editor.cxx => AliEveTPCSector2DEditor.cxx} | 51 +++-- EVE/Alieve/AliEveTPCSector2DEditor.h | 54 +++++ ...Sector2DGL.cxx => AliEveTPCSector2DGL.cxx} | 99 ++++----- EVE/Alieve/AliEveTPCSector2DGL.h | 76 +++++++ ...{TPCSector3D.cxx => AliEveTPCSector3D.cxx} | 55 ++--- EVE/Alieve/AliEveTPCSector3D.h | 59 ++++++ ...Editor.cxx => AliEveTPCSector3DEditor.cxx} | 45 +++-- EVE/Alieve/AliEveTPCSector3DEditor.h | 55 +++++ ...Sector3DGL.cxx => AliEveTPCSector3DGL.cxx} | 59 +++--- EVE/Alieve/AliEveTPCSector3DGL.h | 55 +++++ ...SectorData.cxx => AliEveTPCSectorData.cxx} | 109 +++++----- ...{TPCSectorData.h => AliEveTPCSectorData.h} | 30 +-- ...PCSectorViz.cxx => AliEveTPCSectorViz.cxx} | 51 +++-- .../{TPCSectorViz.h => AliEveTPCSectorViz.h} | 63 +++--- ...ditor.cxx => AliEveTPCSectorVizEditor.cxx} | 65 +++--- EVE/Alieve/AliEveTPCSectorVizEditor.h | 72 +++++++ EVE/Alieve/{TRDData.cxx => AliEveTRDData.cxx} | 63 +++--- EVE/Alieve/AliEveTRDData.h | 117 +++++++++++ .../{TRDLoader.cxx => AliEveTRDLoader.cxx} | 112 ++++++----- EVE/Alieve/{TRDLoader.h => AliEveTRDLoader.h} | 40 ++-- ...RDLoaderImp.cxx => AliEveTRDLoaderImp.cxx} | 86 ++++---- EVE/Alieve/AliEveTRDLoaderImp.h | 91 +++++++++ ...Manager.cxx => AliEveTRDLoaderManager.cxx} | 78 ++++---- EVE/Alieve/AliEveTRDLoaderManager.h | 73 +++++++ .../{TRDModule.cxx => AliEveTRDModule.cxx} | 61 +++--- EVE/Alieve/{TRDModule.h => AliEveTRDModule.h} | 39 ++-- ...RDModuleImp.cxx => AliEveTRDModuleImp.cxx} | 123 ++++++------ .../{TRDModuleImp.h => AliEveTRDModuleImp.h} | 49 +++-- ...{TrackFitter.cxx => AliEveTrackFitter.cxx} | 46 +++-- .../{TrackFitter.h => AliEveTrackFitter.h} | 26 ++- ...Editor.cxx => AliEveTrackFitterEditor.cxx} | 47 +++-- EVE/Alieve/AliEveTrackFitterEditor.h | 52 +++++ .../{VSDCreator.cxx => AliEveVSDCreator.cxx} | 84 ++++---- .../{VSDCreator.h => AliEveVSDCreator.h} | 26 ++- EVE/Alieve/ITSModule.h | 66 ------ EVE/Alieve/ITSModuleStepperEditor.cxx | 56 ------ EVE/Alieve/ITSModuleStepperEditor.h | 41 ---- EVE/Alieve/ITSScaledModuleEditor.h | 58 ------ EVE/Alieve/JetPlaneGL.h | 42 ---- EVE/Alieve/KineTools.h | 41 ---- EVE/Alieve/LinkDef.h | 189 +++++++++--------- EVE/Alieve/MUONChamberEditor.h | 55 ----- EVE/Alieve/MUONChamberGL.h | 47 ----- EVE/Alieve/MUONData.h | 29 +-- EVE/Alieve/PMDModuleEditor.h | 54 ----- EVE/Alieve/TOFDigitsInfoEditor.cxx | 57 ------ EVE/Alieve/TOFDigitsInfoEditor.h | 42 ---- EVE/Alieve/TOFSectorEditor.h | 77 ------- EVE/Alieve/TOFStrip.h | 62 ------ EVE/Alieve/TOFStripEditor.cxx | 57 ------ EVE/Alieve/TOFStripEditor.h | 42 ---- EVE/Alieve/TPCSector2D.h | 50 ----- EVE/Alieve/TPCSector2DEditor.h | 51 ----- EVE/Alieve/TPCSector2DGL.h | 72 ------- EVE/Alieve/TPCSector3D.h | 56 ------ EVE/Alieve/TPCSector3DEditor.h | 51 ----- EVE/Alieve/TPCSector3DGL.h | 51 ----- EVE/Alieve/TPCSectorVizEditor.h | 68 ------- EVE/Alieve/TRDData.h | 111 ---------- EVE/Alieve/TRDLoaderImp.h | 84 -------- EVE/Alieve/TRDLoaderManager.h | 68 ------- EVE/Alieve/TrackFitterEditor.h | 48 ----- EVE/Alieve/alieve_main/alieve_main.cxx | 8 + EVE/alice-macros/MUON_display.C | 58 +++--- EVE/alice-macros/MUON_geom.C | 9 +- EVE/alice-macros/MUON_geomAll.C | 9 +- EVE/alice-macros/MUON_trigger_info.C | 12 +- EVE/alice-macros/NLT_test.C | 10 +- EVE/alice-macros/NLT_trackcount_init.C | 24 ++- EVE/alice-macros/acorde_hits.C | 9 +- EVE/alice-macros/clusters_from_index.C | 9 +- EVE/alice-macros/clusters_from_label.C | 9 +- EVE/alice-macros/emcal_digits.C | 10 +- EVE/alice-macros/emcal_hits.C | 9 +- EVE/alice-macros/esd_Cascade.C | 24 ++- EVE/alice-macros/esd_V0.C | 24 ++- EVE/alice-macros/esd_V0_points.C | 11 +- EVE/alice-macros/esd_spd_tracklets.C | 10 +- EVE/alice-macros/esd_tracks.C | 15 +- EVE/alice-macros/event_goto.C | 14 +- EVE/alice-macros/event_next.C | 14 +- EVE/alice-macros/event_prev.C | 14 +- EVE/alice-macros/fmd_hits.C | 9 +- EVE/alice-macros/geom_acorde.C | 7 + EVE/alice-macros/geom_all.C | 7 + EVE/alice-macros/geom_ddip.C | 7 + EVE/alice-macros/geom_emcal.C | 7 + EVE/alice-macros/geom_fmd.C | 7 + EVE/alice-macros/geom_gentle.C | 7 + EVE/alice-macros/geom_hmpid.C | 7 + EVE/alice-macros/geom_its.C | 7 + EVE/alice-macros/geom_phos.C | 7 + EVE/alice-macros/geom_pmd.C | 7 + EVE/alice-macros/geom_simple.C | 7 + EVE/alice-macros/geom_t0.C | 7 + EVE/alice-macros/geom_tpc.C | 7 + EVE/alice-macros/geom_trd_tof.C | 7 + EVE/alice-macros/geom_vzero.C | 7 + EVE/alice-macros/hits_from_label.C | 7 + EVE/alice-macros/hmpid_clusters.C | 12 +- EVE/alice-macros/init_trd.C | 12 +- EVE/alice-macros/its_clusters.C | 15 +- EVE/alice-macros/its_digits.C | 25 ++- EVE/alice-macros/its_hits.C | 9 +- EVE/alice-macros/its_hits_layer_split.C | 9 +- EVE/alice-macros/its_module_stepper.C | 14 +- EVE/alice-macros/its_raw.C | 26 ++- EVE/alice-macros/jetplane.C | 17 +- EVE/alice-macros/kine_tracks.C | 14 +- EVE/alice-macros/phos_clusters.C | 12 +- EVE/alice-macros/pmd_digits.C | 12 +- EVE/alice-macros/pmd_hits.C | 9 +- EVE/alice-macros/pmd_raw.C | 10 +- EVE/alice-macros/primary_vertex.C | 13 +- EVE/alice-macros/primary_vertex_tracks.C | 10 +- EVE/alice-macros/print_kine_from_label.C | 10 +- EVE/alice-macros/region_marker.C | 9 +- EVE/alice-macros/t0_digits.C | 13 +- EVE/alice-macros/t0_hits.C | 9 +- EVE/alice-macros/t0_raw.C | 15 +- EVE/alice-macros/tof_digits.C | 14 +- EVE/alice-macros/tof_digits_sector.C | 14 +- EVE/alice-macros/tof_digits_strips.C | 14 +- EVE/alice-macros/tof_hits.C | 9 +- EVE/alice-macros/tpc_calib_viewer.C | 8 + EVE/alice-macros/tpc_clusters.C | 15 +- EVE/alice-macros/tpc_digits.C | 45 +++-- EVE/alice-macros/tpc_hits.C | 9 +- EVE/alice-macros/tpc_hits_charge_split.C | 9 +- EVE/alice-macros/tpc_hits_eta_split.C | 9 +- EVE/alice-macros/trd_hits.C | 9 +- EVE/alice-macros/trd_hits_z_split.C | 9 +- EVE/alice-macros/vzero_digits.C | 14 +- EVE/alice-macros/vzero_hits.C | 9 +- EVE/hlt-macros/command_queue.C | 8 + EVE/hlt-macros/hlt_structs.C | 8 + EVE/hlt-macros/homer_display.C | 35 ++-- EVE/hlt-macros/rootlogon.C | 8 + EVE/macros/alieve_create_vsd.C | 10 +- EVE/macros/alieve_init.C | 17 +- EVE/macros/alieve_loadlibs.C | 7 + EVE/macros/isegv.C | 7 + EVE/macros/trackcount_init.C | 27 ++- EVE/test-macros/tpc_digi_test.C | 22 +- EVE/test-macros/tpc_gui.C | 31 +-- EVE/test-macros/tpc_gui_hack.C | 43 ++-- EVE/test-macros/tpc_raw_test.C | 20 +- EVE/test-macros/tpc_sector_raw_test.C | 32 +-- 221 files changed, 4934 insertions(+), 3689 deletions(-) delete mode 100644 EVE/Alieve/AliEVEHOMERManagerEditor.cxx delete mode 100644 EVE/Alieve/AliEVEHOMERManagerEditor.h delete mode 100644 EVE/Alieve/AliEVEHOMERSource.cxx delete mode 100644 EVE/Alieve/AliEVEHOMERSource.h delete mode 100644 EVE/Alieve/AliEVEHOMERSourceList.cxx delete mode 100644 EVE/Alieve/AliEVEHOMERSourceList.h rename EVE/Alieve/{EventAlieve.cxx => AliEveEventManager.cxx} (78%) rename EVE/Alieve/{EventAlieve.h => AliEveEventManager.h} (64%) rename EVE/Alieve/{AliEVEHOMERManager.cxx => AliEveHOMERManager.cxx} (93%) rename EVE/Alieve/{AliEVEHOMERManager.h => AliEveHOMERManager.h} (90%) create mode 100644 EVE/Alieve/AliEveHOMERManagerEditor.cxx create mode 100644 EVE/Alieve/AliEveHOMERManagerEditor.h create mode 100644 EVE/Alieve/AliEveHOMERSource.cxx create mode 100644 EVE/Alieve/AliEveHOMERSource.h create mode 100644 EVE/Alieve/AliEveHOMERSourceList.cxx create mode 100644 EVE/Alieve/AliEveHOMERSourceList.h rename EVE/Alieve/{ITSDigitsInfo.cxx => AliEveITSDigitsInfo.cxx} (88%) rename EVE/Alieve/{ITSDigitsInfo.h => AliEveITSDigitsInfo.h} (65%) rename EVE/Alieve/{ITSModule.cxx => AliEveITSModule.cxx} (84%) create mode 100644 EVE/Alieve/AliEveITSModule.h rename EVE/Alieve/{ITSModuleStepper.cxx => AliEveITSModuleStepper.cxx} (83%) rename EVE/Alieve/{ITSModuleStepper.h => AliEveITSModuleStepper.h} (75%) create mode 100644 EVE/Alieve/AliEveITSModuleStepperEditor.cxx create mode 100644 EVE/Alieve/AliEveITSModuleStepperEditor.h rename EVE/Alieve/{ITSScaledModule.cxx => AliEveITSScaledModule.cxx} (76%) rename EVE/Alieve/{ITSScaledModule.h => AliEveITSScaledModule.h} (56%) rename EVE/Alieve/{ITSScaledModuleEditor.cxx => AliEveITSScaledModuleEditor.cxx} (75%) create mode 100644 EVE/Alieve/AliEveITSScaledModuleEditor.h rename EVE/Alieve/{JetPlane.cxx => AliEveJetPlane.cxx} (54%) rename EVE/Alieve/{JetPlane.h => AliEveJetPlane.h} (79%) rename EVE/Alieve/{JetPlaneEditor.cxx => AliEveJetPlaneEditor.cxx} (70%) rename EVE/Alieve/{JetPlaneEditor.h => AliEveJetPlaneEditor.h} (62%) rename EVE/Alieve/{JetPlaneGL.cxx => AliEveJetPlaneGL.cxx} (86%) create mode 100644 EVE/Alieve/AliEveJetPlaneGL.h rename EVE/Alieve/{KineTools.cxx => AliEveKineTools.cxx} (79%) create mode 100644 EVE/Alieve/AliEveKineTools.h rename EVE/Alieve/{MUONChamber.cxx => AliEveMUONChamber.cxx} (79%) rename EVE/Alieve/{MUONChamber.h => AliEveMUONChamber.h} (59%) rename EVE/Alieve/{MUONChamberData.cxx => AliEveMUONChamberData.cxx} (84%) rename EVE/Alieve/{MUONChamberData.h => AliEveMUONChamberData.h} (69%) rename EVE/Alieve/{MUONChamberEditor.cxx => AliEveMUONChamberEditor.cxx} (72%) create mode 100644 EVE/Alieve/AliEveMUONChamberEditor.h rename EVE/Alieve/{MUONChamberGL.cxx => AliEveMUONChamberGL.cxx} (80%) create mode 100644 EVE/Alieve/AliEveMUONChamberGL.h rename EVE/Alieve/{MUONData.cxx => AliEveMUONData.cxx} (83%) rename EVE/Alieve/{MUONTrack.cxx => AliEveMUONTrack.cxx} (94%) rename EVE/Alieve/{MUONTrack.h => AliEveMUONTrack.h} (70%) rename EVE/Alieve/{PMDModule.cxx => AliEvePMDModule.cxx} (86%) rename EVE/Alieve/{PMDModule.h => AliEvePMDModule.h} (63%) rename EVE/Alieve/{PMDModuleEditor.cxx => AliEvePMDModuleEditor.cxx} (76%) create mode 100644 EVE/Alieve/AliEvePMDModuleEditor.h rename EVE/Alieve/{T0Module.cxx => AliEveT0Module.cxx} (82%) rename EVE/Alieve/{T0Module.h => AliEveT0Module.h} (51%) rename EVE/Alieve/{TOFDigitsInfo.cxx => AliEveTOFDigitsInfo.cxx} (84%) rename EVE/Alieve/{TOFDigitsInfo.h => AliEveTOFDigitsInfo.h} (51%) create mode 100644 EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx create mode 100644 EVE/Alieve/AliEveTOFDigitsInfoEditor.h rename EVE/Alieve/{TOFSector.cxx => AliEveTOFSector.cxx} (87%) rename EVE/Alieve/{TOFSector.h => AliEveTOFSector.h} (67%) rename EVE/Alieve/{TOFSectorEditor.cxx => AliEveTOFSectorEditor.cxx} (64%) create mode 100644 EVE/Alieve/AliEveTOFSectorEditor.h rename EVE/Alieve/{TOFStrip.cxx => AliEveTOFStrip.cxx} (81%) create mode 100644 EVE/Alieve/AliEveTOFStrip.h create mode 100644 EVE/Alieve/AliEveTOFStripEditor.cxx create mode 100644 EVE/Alieve/AliEveTOFStripEditor.h rename EVE/Alieve/{TPCData.cxx => AliEveTPCData.cxx} (73%) rename EVE/Alieve/{TPCData.h => AliEveTPCData.h} (59%) rename EVE/Alieve/{TPCLoader.cxx => AliEveTPCLoader.cxx} (71%) rename EVE/Alieve/{TPCLoader.h => AliEveTPCLoader.h} (51%) rename EVE/Alieve/{TPCLoaderEditor.cxx => AliEveTPCLoaderEditor.cxx} (73%) rename EVE/Alieve/{TPCLoaderEditor.h => AliEveTPCLoaderEditor.h} (50%) rename EVE/Alieve/{TPCSector2D.cxx => AliEveTPCSector2D.cxx} (64%) create mode 100644 EVE/Alieve/AliEveTPCSector2D.h rename EVE/Alieve/{TPCSector2DEditor.cxx => AliEveTPCSector2DEditor.cxx} (61%) create mode 100644 EVE/Alieve/AliEveTPCSector2DEditor.h rename EVE/Alieve/{TPCSector2DGL.cxx => AliEveTPCSector2DGL.cxx} (72%) create mode 100644 EVE/Alieve/AliEveTPCSector2DGL.h rename EVE/Alieve/{TPCSector3D.cxx => AliEveTPCSector3D.cxx} (68%) create mode 100644 EVE/Alieve/AliEveTPCSector3D.h rename EVE/Alieve/{TPCSector3DEditor.cxx => AliEveTPCSector3DEditor.cxx} (67%) create mode 100644 EVE/Alieve/AliEveTPCSector3DEditor.h rename EVE/Alieve/{TPCSector3DGL.cxx => AliEveTPCSector3DGL.cxx} (65%) create mode 100644 EVE/Alieve/AliEveTPCSector3DGL.h rename EVE/Alieve/{TPCSectorData.cxx => AliEveTPCSectorData.cxx} (77%) rename EVE/Alieve/{TPCSectorData.h => AliEveTPCSectorData.h} (87%) rename EVE/Alieve/{TPCSectorViz.cxx => AliEveTPCSectorViz.cxx} (64%) rename EVE/Alieve/{TPCSectorViz.h => AliEveTPCSectorViz.h} (54%) rename EVE/Alieve/{TPCSectorVizEditor.cxx => AliEveTPCSectorVizEditor.cxx} (69%) create mode 100644 EVE/Alieve/AliEveTPCSectorVizEditor.h rename EVE/Alieve/{TRDData.cxx => AliEveTRDData.cxx} (76%) create mode 100644 EVE/Alieve/AliEveTRDData.h rename EVE/Alieve/{TRDLoader.cxx => AliEveTRDLoader.cxx} (79%) rename EVE/Alieve/{TRDLoader.h => AliEveTRDLoader.h} (59%) rename EVE/Alieve/{TRDLoaderImp.cxx => AliEveTRDLoaderImp.cxx} (77%) create mode 100644 EVE/Alieve/AliEveTRDLoaderImp.h rename EVE/Alieve/{TRDLoaderManager.cxx => AliEveTRDLoaderManager.cxx} (70%) create mode 100644 EVE/Alieve/AliEveTRDLoaderManager.h rename EVE/Alieve/{TRDModule.cxx => AliEveTRDModule.cxx} (81%) rename EVE/Alieve/{TRDModule.h => AliEveTRDModule.h} (58%) rename EVE/Alieve/{TRDModuleImp.cxx => AliEveTRDModuleImp.cxx} (73%) rename EVE/Alieve/{TRDModuleImp.h => AliEveTRDModuleImp.h} (58%) rename EVE/Alieve/{TrackFitter.cxx => AliEveTrackFitter.cxx} (80%) rename EVE/Alieve/{TrackFitter.h => AliEveTrackFitter.h} (68%) rename EVE/Alieve/{TrackFitterEditor.cxx => AliEveTrackFitterEditor.cxx} (58%) create mode 100644 EVE/Alieve/AliEveTrackFitterEditor.h rename EVE/Alieve/{VSDCreator.cxx => AliEveVSDCreator.cxx} (90%) rename EVE/Alieve/{VSDCreator.h => AliEveVSDCreator.h} (63%) delete mode 100644 EVE/Alieve/ITSModule.h delete mode 100644 EVE/Alieve/ITSModuleStepperEditor.cxx delete mode 100644 EVE/Alieve/ITSModuleStepperEditor.h delete mode 100644 EVE/Alieve/ITSScaledModuleEditor.h delete mode 100644 EVE/Alieve/JetPlaneGL.h delete mode 100644 EVE/Alieve/KineTools.h delete mode 100644 EVE/Alieve/MUONChamberEditor.h delete mode 100644 EVE/Alieve/MUONChamberGL.h delete mode 100644 EVE/Alieve/PMDModuleEditor.h delete mode 100644 EVE/Alieve/TOFDigitsInfoEditor.cxx delete mode 100644 EVE/Alieve/TOFDigitsInfoEditor.h delete mode 100644 EVE/Alieve/TOFSectorEditor.h delete mode 100644 EVE/Alieve/TOFStrip.h delete mode 100644 EVE/Alieve/TOFStripEditor.cxx delete mode 100644 EVE/Alieve/TOFStripEditor.h delete mode 100644 EVE/Alieve/TPCSector2D.h delete mode 100644 EVE/Alieve/TPCSector2DEditor.h delete mode 100644 EVE/Alieve/TPCSector2DGL.h delete mode 100644 EVE/Alieve/TPCSector3D.h delete mode 100644 EVE/Alieve/TPCSector3DEditor.h delete mode 100644 EVE/Alieve/TPCSector3DGL.h delete mode 100644 EVE/Alieve/TPCSectorVizEditor.h delete mode 100644 EVE/Alieve/TRDData.h delete mode 100644 EVE/Alieve/TRDLoaderImp.h delete mode 100644 EVE/Alieve/TRDLoaderManager.h delete mode 100644 EVE/Alieve/TrackFitterEditor.h diff --git a/EVE/Alieve/AliEVEHOMERManagerEditor.cxx b/EVE/Alieve/AliEVEHOMERManagerEditor.cxx deleted file mode 100644 index 041a3409ac8..00000000000 --- a/EVE/Alieve/AliEVEHOMERManagerEditor.cxx +++ /dev/null @@ -1,65 +0,0 @@ -// $Header$ - -#include "AliEVEHOMERManagerEditor.h" -#include - -#include -#include - -#include -#include -#include -#include -#include -//______________________________________________________________________ -// AliEVEHOMERManagerEditor -// - -ClassImp(AliEVEHOMERManagerEditor) - -AliEVEHOMERManagerEditor::AliEVEHOMERManagerEditor(const TGWindow *p, Int_t width, Int_t height, - UInt_t options, Pixel_t back) : - TGedFrame(p, width, height, options | kVerticalFrame, back), - fM(0), - fButt(0) - // Initialize widget pointers to 0 -{ - MakeTitle("AliEVEHOMERManager"); - - // Create widgets - // fXYZZ = new TGSomeWidget(this, ...); - // AddFrame(fXYZZ, new TGLayoutHints(...)); - // fXYZZ->Connect("SignalName()", "Alieve::AliEVEHOMERManagerEditor", this, "DoXYZZ()"); - fButt = new TGTextButton(this, "Ooogadooga"); - AddFrame(fButt); //, new TGLayoutHints(...)); - fButt->Connect("Clicked()", "AliEVEHOMERManagerEditor", this, "DoButt()"); - -} - -AliEVEHOMERManagerEditor::~AliEVEHOMERManagerEditor() -{} - -/**************************************************************************/ - -void AliEVEHOMERManagerEditor::SetModel(TObject* obj) -{ - fM = dynamic_cast(obj); - - // Set values of widgets - // fXYZZ->SetValue(fM->GetXYZZ()); -} - -/**************************************************************************/ - -// Implements callback/slot methods - -// void AliEVEHOMERManagerEditor::DoXYZZ() -// { -// fM->SetXYZZ(fXYZZ->GetValue()); -// Update(); -// } - -void AliEVEHOMERManagerEditor::DoButt() -{ - fM->CreateHOMERSourcesList(); -} diff --git a/EVE/Alieve/AliEVEHOMERManagerEditor.h b/EVE/Alieve/AliEVEHOMERManagerEditor.h deleted file mode 100644 index 0e14780eb45..00000000000 --- a/EVE/Alieve/AliEVEHOMERManagerEditor.h +++ /dev/null @@ -1,41 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_AliEVEHOMERManagerEditor_H -#define ALIEVE_AliEVEHOMERManagerEditor_H - -#include - -class TGCheckButton; -class TGTextButton; -class TGNumberEntry; -class TGColorSelect; - -class AliEVEHOMERManager; - -class AliEVEHOMERManagerEditor : public TGedFrame -{ -private: - AliEVEHOMERManagerEditor(const AliEVEHOMERManagerEditor&); // Not implemented - AliEVEHOMERManagerEditor& operator=(const AliEVEHOMERManagerEditor&); // Not implemented - -protected: - AliEVEHOMERManager* fM; // fModel dynamic-casted to AliEVEHOMERManagerEditor - - // Declare widgets - // TGSomeWidget* fXYZZ; - TGTextButton *fButt; - -public: - AliEVEHOMERManagerEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~AliEVEHOMERManagerEditor(); - - virtual void SetModel(TObject* obj); - - // Declare callback/slot methods - // void DoXYZZ(); - void DoButt(); - - ClassDef(AliEVEHOMERManagerEditor, 0); // Editor for AliEVEHOMERManager -}; // endclass AliEVEHOMERManagerEditor - -#endif diff --git a/EVE/Alieve/AliEVEHOMERSource.cxx b/EVE/Alieve/AliEVEHOMERSource.cxx deleted file mode 100644 index 6730284bfdc..00000000000 --- a/EVE/Alieve/AliEVEHOMERSource.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// $Header$ - -#include "AliEVEHOMERSource.h" - -//______________________________________________________________________ -// AliEVEHOMERSource -// - -ClassImp(AliEVEHOMERSource) - -AliEVEHOMERSource::AliEVEHOMERSource(const Text_t* n, const Text_t* t) : - TEveElement(), - TNamed(n, t), - fSource(0) -{} - -AliEVEHOMERSource::AliEVEHOMERSource(AliHLTHOMERSourceDesc* src, const Text_t* n, const Text_t* t) : - TEveElement(), - TNamed(n, t), - fSource(src) -{} - diff --git a/EVE/Alieve/AliEVEHOMERSource.h b/EVE/Alieve/AliEVEHOMERSource.h deleted file mode 100644 index 7c155a3f3f6..00000000000 --- a/EVE/Alieve/AliEVEHOMERSource.h +++ /dev/null @@ -1,33 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_AliEVEHOMERSource_H -#define ALIEVE_AliEVEHOMERSource_H - -#include - -#include - -class AliHLTHOMERSourceDesc; - -class AliEVEHOMERSource : public TEveElement, - public TNamed -{ -private: - AliEVEHOMERSource(const AliEVEHOMERSource&); // Not implemented - AliEVEHOMERSource& operator=(const AliEVEHOMERSource&); // Not implemented - -protected: - AliHLTHOMERSourceDesc *fSource; - -public: - AliEVEHOMERSource(const Text_t* n="HOMER Source", const Text_t* t=""); - AliEVEHOMERSource(AliHLTHOMERSourceDesc* src, const Text_t* n="HOMER Source", const Text_t* t=""); - virtual ~AliEVEHOMERSource() {} - - AliHLTHOMERSourceDesc* GetSource() const { return fSource; } - void SetSource(AliHLTHOMERSourceDesc* src) { fSource = src; } - - ClassDef(AliEVEHOMERSource, 1); -}; // endclass AliEVEHOMERSource - -#endif diff --git a/EVE/Alieve/AliEVEHOMERSourceList.cxx b/EVE/Alieve/AliEVEHOMERSourceList.cxx deleted file mode 100644 index 4086a217887..00000000000 --- a/EVE/Alieve/AliEVEHOMERSourceList.cxx +++ /dev/null @@ -1,25 +0,0 @@ -// $Header$ - -#include "AliEVEHOMERSourceList.h" - -//______________________________________________________________________ -// AliEVEHOMERSourceList -// - -ClassImp(AliEVEHOMERSourceList) - -AliEVEHOMERSourceList::AliEVEHOMERSourceList(const Text_t* n, const Text_t* t) : - TEveElementList(n, t) -{ - -} - -void AliEVEHOMERSourceList::SelectAll() -{ - EnableListElements(kTRUE, kTRUE); -} - -void AliEVEHOMERSourceList::DeselectAll() -{ - DisableListElements (kFALSE, kFALSE); -} diff --git a/EVE/Alieve/AliEVEHOMERSourceList.h b/EVE/Alieve/AliEVEHOMERSourceList.h deleted file mode 100644 index 94e96e85663..00000000000 --- a/EVE/Alieve/AliEVEHOMERSourceList.h +++ /dev/null @@ -1,28 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_AliEVEHOMERSourceList_H -#define ALIEVE_AliEVEHOMERSourceList_H - -#include - -#include - -class AliEVEHOMERSourceList : public TEveElementList -{ -private: - AliEVEHOMERSourceList(const AliEVEHOMERSourceList&); // Not implemented - AliEVEHOMERSourceList& operator=(const AliEVEHOMERSourceList&); // Not implemented - -protected: - -public: - AliEVEHOMERSourceList(const Text_t* n="HOMER Source List", const Text_t* t=""); - virtual ~AliEVEHOMERSourceList() {} - - void SelectAll(); // *MENU* - void DeselectAll(); // *MENU* - - ClassDef(AliEVEHOMERSourceList, 1); -}; // endclass AliEVEHOMERSourceList - -#endif diff --git a/EVE/Alieve/EventAlieve.cxx b/EVE/Alieve/AliEveEventManager.cxx similarity index 78% rename from EVE/Alieve/EventAlieve.cxx rename to EVE/Alieve/AliEveEventManager.cxx index 13dbfbdd22d..81a194a6675 100644 --- a/EVE/Alieve/EventAlieve.cxx +++ b/EVE/Alieve/AliEveEventManager.cxx @@ -1,6 +1,13 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "EventAlieve.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveEventManager.h" #include #include @@ -19,10 +26,10 @@ #include #include -using namespace Alieve; + //______________________________________________________________________ -// Event +// AliEveEventManager // // Provide interface for loading and navigating standard AliRoot data // (AliRunLoader) and ESDs. @@ -31,19 +38,19 @@ using namespace Alieve; // by each sub-detector. // -ClassImp(Event) +ClassImp(AliEveEventManager) -Event* Alieve::gEvent = 0; +AliEveEventManager* gEvent = 0; -Bool_t Alieve::Event::fgAssertRunLoader = kFALSE; -Bool_t Alieve::Event::fgAssertESDTree = kFALSE; +Bool_t AliEveEventManager::fgAssertRunLoader = kFALSE; +Bool_t AliEveEventManager::fgAssertESDTree = kFALSE; -TString Alieve::Event::fgCdbUri("local://$ALICE_ROOT"); +TString AliEveEventManager::fgCdbUri("local://$ALICE_ROOT"); -AliMagF* Alieve::Event::fgMagField = 0; +AliMagF* AliEveEventManager::fgMagField = 0; -Event::Event() : +AliEveEventManager::AliEveEventManager() : TEveEventManager(), fPath (), fEventId (0), @@ -52,8 +59,8 @@ Event::Event() : fESDfriend (0), fESDfriendExists(kFALSE) {} -Event::Event(TString path, Int_t ev) : - TEveEventManager("AliEVE Event"), +AliEveEventManager::AliEveEventManager(TString path, Int_t ev) : + TEveEventManager("AliEVE AliEveEventManager"), fPath (path), fEventId(-1), fRunLoader (0), @@ -66,9 +73,9 @@ Event::Event(TString path, Int_t ev) : /**************************************************************************/ -void Event::Open() +void AliEveEventManager::Open() { - static const TEveException eH("Event::Open "); + static const TEveException eH("AliEveEventManager::Open "); gSystem->ExpandPathName(fPath); if (fPath[0] != '/') @@ -176,13 +183,13 @@ void Event::Open() cdb->SetRun(runNo); } - SetName(Form("Event %d", fEventId)); + SetName(Form("AliEveEventManager %d", fEventId)); SetTitle(fPath); } -void Event::GotoEvent(Int_t event) +void AliEveEventManager::GotoEvent(Int_t event) { - static const TEveException eH("Event::GotoEvent "); + static const TEveException eH("AliEveEventManager::GotoEvent "); Int_t maxEvent = 0; if (fRunLoader) @@ -204,7 +211,7 @@ void Event::GotoEvent(Int_t event) // additinal parents. DestroyElements(); fEventId = event; - SetName(Form("Event %d", fEventId)); + SetName(Form("AliEveEventManager %d", fEventId)); UpdateItems(); if (fRunLoader) { @@ -223,7 +230,7 @@ void Event::GotoEvent(Int_t event) AfterNewEventLoaded(); } -void Event::Close() +void AliEveEventManager::Close() { if (fESDTree) { delete fESD; fESD = 0; @@ -240,9 +247,9 @@ void Event::Close() // Static convenience functions. -AliRunLoader* Event::AssertRunLoader() +AliRunLoader* AliEveEventManager::AssertRunLoader() { - static const TEveException eH("Event::AssertRunLoader "); + static const TEveException eH("AliEveEventManager::AssertRunLoader "); if (gEvent == 0) throw(eH + "ALICE event not ready."); @@ -251,9 +258,9 @@ AliRunLoader* Event::AssertRunLoader() return gEvent->fRunLoader; } -AliESDEvent* Event::AssertESD() +AliESDEvent* AliEveEventManager::AssertESD() { - static const TEveException eH("Event::AssertESD "); + static const TEveException eH("AliEveEventManager::AssertESD "); if (gEvent == 0) throw(eH + "ALICE event not ready."); @@ -262,9 +269,9 @@ AliESDEvent* Event::AssertESD() return gEvent->fESD; } -AliESDfriend* Event::AssertESDfriend() +AliESDfriend* AliEveEventManager::AssertESDfriend() { - static const TEveException eH("Event::AssertESDfriend "); + static const TEveException eH("AliEveEventManager::AssertESDfriend "); if (gEvent == 0) throw(eH + "ALICE event not ready."); @@ -273,7 +280,7 @@ AliESDfriend* Event::AssertESDfriend() return gEvent->fESDfriend; } -AliMagF* Event::AssertMagField() +AliMagF* AliEveEventManager::AssertMagField() { if (fgMagField == 0) { @@ -285,9 +292,9 @@ AliMagF* Event::AssertMagField() return fgMagField; } -TGeoManager* Event::AssertGeometry() +TGeoManager* AliEveEventManager::AssertGeometry() { - static const TEveException eH("Event::AssertGeometry "); + static const TEveException eH("AliEveEventManager::AssertGeometry "); if (AliGeomManager::GetGeometry() == 0) { diff --git a/EVE/Alieve/EventAlieve.h b/EVE/Alieve/AliEveEventManager.h similarity index 64% rename from EVE/Alieve/EventAlieve.h rename to EVE/Alieve/AliEveEventManager.h index 3fdc6b0cd2f..2df06891a76 100644 --- a/EVE/Alieve/EventAlieve.h +++ b/EVE/Alieve/AliEveEventManager.h @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#ifndef ALIEVE_Event_H -#define ALIEVE_Event_H +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_EventAlieve_H +#define ALIEVE_EventAlieve_H #include @@ -15,13 +22,12 @@ class TFile; class TTree; class TGeoManager; -namespace Alieve { -class Event : public TEveEventManager +class AliEveEventManager : public TEveEventManager { private: - Event(const Event&); // Not implemented - Event& operator=(const Event&); // Not implemented + AliEveEventManager(const AliEveEventManager&); // Not implemented + AliEveEventManager& operator=(const AliEveEventManager&); // Not implemented protected: TString fPath; @@ -46,8 +52,8 @@ public: static void SetAssertElements(Bool_t assertRunloader, Bool_t assertEsd) { fgAssertRunLoader = assertRunloader; fgAssertESDTree = assertEsd; } - Event(); - Event(TString path, Int_t ev=0); + AliEveEventManager(); + AliEveEventManager(TString path, Int_t ev=0); virtual void Open(); virtual void GotoEvent(Int_t event); @@ -71,11 +77,9 @@ public: static TGeoManager* AssertGeometry(); - ClassDef(Event, 1); -}; // endclass Event - -extern Event* gEvent; + ClassDef(AliEveEventManager, 1); +}; // endclass AliEveEventManager -} +extern AliEveEventManager* gEvent; #endif diff --git a/EVE/Alieve/AliEVEHOMERManager.cxx b/EVE/Alieve/AliEveHOMERManager.cxx similarity index 93% rename from EVE/Alieve/AliEVEHOMERManager.cxx rename to EVE/Alieve/AliEveHOMERManager.cxx index a2097a54b10..fb1c5bdc7db 100644 --- a/EVE/Alieve/AliEVEHOMERManager.cxx +++ b/EVE/Alieve/AliEveHOMERManager.cxx @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * * @@ -13,7 +21,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/** @file AliEVEHOMERManager.cxx +/** @file AliEveHOMERManager.cxx @author Jochen Thaeder @date @brief Manger for HOMER in offline @@ -23,7 +31,7 @@ using namespace std; #endif -#include "AliEVEHOMERManager.h" +#include "AliEveHOMERManager.h" #define use_aliroot #define use_root @@ -41,7 +49,7 @@ #include "AliHLTHOMERSourceDesc.h" #include "AliHLTHOMERBlockDesc.h" -#include "AliEVEHOMERSource.h" +#include "AliEveHOMERSource.h" #include "AliLog.h" @@ -61,7 +69,7 @@ #include "AliTPCPreprocessorOnline.h" #include "AliTPCCalROC.h" // ------------ -ClassImp(AliEVEHOMERManager) +ClassImp(AliEveHOMERManager) /* * --------------------------------------------------------------------------------- @@ -70,8 +78,8 @@ ClassImp(AliEVEHOMERManager) */ //################################################################################## -AliEVEHOMERManager::AliEVEHOMERManager( TString xmlFile ) : - TEveElementList("AliEVEHOMERManager"), +AliEveHOMERManager::AliEveHOMERManager( TString xmlFile ) : + TEveElementList("AliEveHOMERManager"), fLibManager(new AliHLTHOMERLibManager), fXMLFile(xmlFile), @@ -94,7 +102,7 @@ AliEVEHOMERManager::AliEVEHOMERManager( TString xmlFile ) : } //################################################################################## -AliEVEHOMERManager::AliEVEHOMERManager( const AliEVEHOMERManager& m) : +AliEveHOMERManager::AliEveHOMERManager( const AliEveHOMERManager& m) : TEveElementList(m.GetName(), m.GetTitle()) { // see header file for class documentation @@ -103,7 +111,7 @@ AliEVEHOMERManager::AliEVEHOMERManager( const AliEVEHOMERManager& m) : } //################################################################################## -AliEVEHOMERManager& AliEVEHOMERManager::operator=( const AliEVEHOMERManager& ) { +AliEveHOMERManager& AliEveHOMERManager::operator=( const AliEveHOMERManager& ) { // see header file for class documentation AliError( Form( "assignment constructor to be tested." ) ); @@ -111,7 +119,7 @@ AliEVEHOMERManager& AliEVEHOMERManager::operator=( const AliEVEHOMERManager& ) { } //################################################################################## -AliEVEHOMERManager::~AliEVEHOMERManager() { +AliEveHOMERManager::~AliEveHOMERManager() { // see header file for class documentation if ( fLibManager ) { @@ -146,7 +154,7 @@ AliEVEHOMERManager::~AliEVEHOMERManager() { */ //################################################################################## -Int_t AliEVEHOMERManager::CreateHOMERSourcesList() { +Int_t AliEveHOMERManager::CreateHOMERSourcesList() { // see header file for class documentation // -- Initialize XML parser @@ -221,7 +229,7 @@ Int_t AliEVEHOMERManager::CreateHOMERSourcesList() { TIter next(fSourceList); AliHLTHOMERSourceDesc* src = 0; while ((src = (AliHLTHOMERSourceDesc*) next())) { - AliEVEHOMERSource* re = new AliEVEHOMERSource + AliEveHOMERSource* re = new AliEveHOMERSource (src, Form("%s-%s-%s %s", src->GetDetector().Data(), src->GetSubDetector().Data(), src->GetSubSubDetector().Data(), src->GetDataType().Data()), @@ -240,7 +248,7 @@ Int_t AliEVEHOMERManager::CreateHOMERSourcesList() { } //################################################################################## -void AliEVEHOMERManager::SetSourceState( AliHLTHOMERSourceDesc * source, Bool_t state ) { +void AliEveHOMERManager::SetSourceState( AliHLTHOMERSourceDesc * source, Bool_t state ) { // see header file for class documentation if ( source->IsSelected() != state ) { @@ -252,7 +260,7 @@ void AliEVEHOMERManager::SetSourceState( AliHLTHOMERSourceDesc * source, Bool_t } //################################################################################## -Int_t AliEVEHOMERManager::GetTDSAttributes( TXMLNode * xmlNode ) { +Int_t AliEveHOMERManager::GetTDSAttributes( TXMLNode * xmlNode ) { // see header file for class documentation Int_t iResult = 0; @@ -326,7 +334,7 @@ Int_t AliEVEHOMERManager::GetTDSAttributes( TXMLNode * xmlNode ) { } //################################################################################## -Int_t AliEVEHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TString xmlPort, TString &hostname, Int_t &port ) { +Int_t AliEveHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TString xmlPort, TString &hostname, Int_t &port ) { // see header file for class documentation Int_t iResult = 1; @@ -421,7 +429,7 @@ Int_t AliEVEHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TStr } //################################################################################## -Int_t AliEVEHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOMERSourceDesc *source ) { +Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOMERSourceDesc *source ) { // see header file for class documentation Int_t iResult = 0; @@ -545,7 +553,7 @@ Int_t AliEVEHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM */ //################################################################################## -Int_t AliEVEHOMERManager::ConnectHOMER(){ +Int_t AliEveHOMERManager::ConnectHOMER(){ // see header file for class documentation Int_t iResult = 0; @@ -620,7 +628,7 @@ Int_t AliEVEHOMERManager::ConnectHOMER(){ } //################################################################################## -void AliEVEHOMERManager::DisconnectHOMER(){ +void AliEveHOMERManager::DisconnectHOMER(){ // see header file for class documentation if ( ! IsConnected() ) @@ -639,7 +647,7 @@ void AliEVEHOMERManager::DisconnectHOMER(){ } //################################################################################## -Int_t AliEVEHOMERManager::ReconnectHOMER(){ +Int_t AliEveHOMERManager::ReconnectHOMER(){ // see header file for class documentation Int_t iResult = 0; @@ -657,7 +665,7 @@ Int_t AliEVEHOMERManager::ReconnectHOMER(){ //################################################################################## -void AliEVEHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort_t *sourcePorts, UInt_t &sourceCount ){ +void AliEveHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort_t *sourcePorts, UInt_t &sourceCount ){ // see header file for class documentation AliHLTHOMERSourceDesc * source= NULL; @@ -695,12 +703,12 @@ void AliEVEHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort /* * --------------------------------------------------------------------------------- - * Event Handling + * AliEveEventManager Handling * --------------------------------------------------------------------------------- */ //################################################################################## -Int_t AliEVEHOMERManager::NextEvent(){ +Int_t AliEveHOMERManager::NextEvent(){ // see header file for class documentation Int_t iResult = 0; @@ -749,7 +757,7 @@ Int_t AliEVEHOMERManager::NextEvent(){ fEventID = (ULong64_t) fReader->GetEventID(); fCurrentBlk = 0; - AliInfo( Form("Event 0x%016LX (%Lu) with %lu blocks", fEventID, fEventID, fNBlks) ); + AliInfo( Form("AliEveEventManager 0x%016LX (%Lu) with %lu blocks", fEventID, fEventID, fNBlks) ); #if 1 @@ -776,7 +784,7 @@ Int_t AliEVEHOMERManager::NextEvent(){ } //################################################################################## -Int_t AliEVEHOMERManager::CreateBlockList() { +Int_t AliEveHOMERManager::CreateBlockList() { // see header file for class documentation Int_t iResult = 0; @@ -818,7 +826,7 @@ Int_t AliEVEHOMERManager::CreateBlockList() { */ //################################################################################## -void* AliEVEHOMERManager::GetBlk( Int_t ndx ) { +void* AliEveHOMERManager::GetBlk( Int_t ndx ) { // see header file for class documentation void* data = NULL; @@ -835,7 +843,7 @@ void* AliEVEHOMERManager::GetBlk( Int_t ndx ) { } //################################################################################## -ULong_t AliEVEHOMERManager::GetBlkSize( Int_t ndx ) { +ULong_t AliEveHOMERManager::GetBlkSize( Int_t ndx ) { // see header file for class documentation ULong_t length = 0; @@ -852,7 +860,7 @@ ULong_t AliEVEHOMERManager::GetBlkSize( Int_t ndx ) { } //################################################################################## -TString AliEVEHOMERManager::GetBlkOrigin( Int_t ndx ) { +TString AliEveHOMERManager::GetBlkOrigin( Int_t ndx ) { // see header file for class documentation TString origin = ""; @@ -886,7 +894,7 @@ TString AliEVEHOMERManager::GetBlkOrigin( Int_t ndx ) { } //################################################################################## -TString AliEVEHOMERManager:: GetBlkType( Int_t ndx ) { +TString AliEveHOMERManager:: GetBlkType( Int_t ndx ) { // see header file for class documentation TString type = ""; @@ -921,7 +929,7 @@ TString AliEVEHOMERManager:: GetBlkType( Int_t ndx ) { //################################################################################## -ULong_t AliEVEHOMERManager:: GetBlkSpecification( Int_t ndx ) { +ULong_t AliEveHOMERManager:: GetBlkSpecification( Int_t ndx ) { // see header file for class documentation ULong_t spec = 0; @@ -945,7 +953,7 @@ ULong_t AliEVEHOMERManager:: GetBlkSpecification( Int_t ndx ) { } //################################################################################## -Bool_t AliEVEHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) { +Bool_t AliEveHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) { // see header file for class documentation Bool_t requested = kFALSE; @@ -993,7 +1001,7 @@ Bool_t AliEVEHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) { } //################################################################################## -void AliEVEHOMERManager::TestSelect() { +void AliEveHOMERManager::TestSelect() { // see header file for class documentation for (Int_t ii =0; ii < fSourceList->GetEntries() ; ii++ ) { @@ -1003,7 +1011,7 @@ void AliEVEHOMERManager::TestSelect() { } //################################################################################## -void AliEVEHOMERManager::TestSelectClass( TString objectName ) { +void AliEveHOMERManager::TestSelectClass( TString objectName ) { // see header file for class documentation TList* srcList = GetSourceList(); @@ -1019,7 +1027,7 @@ void AliEVEHOMERManager::TestSelectClass( TString objectName ) { } //################################################################################## -void AliEVEHOMERManager::SelectRawTPC() { +void AliEveHOMERManager::SelectRawTPC() { // see header file for class documentation TList* srcList = GetSourceList(); @@ -1036,7 +1044,7 @@ void AliEVEHOMERManager::SelectRawTPC() { } //################################################################################## -void AliEVEHOMERManager::SelectClusterTPC() { +void AliEveHOMERManager::SelectClusterTPC() { // see header file for class documentation TList* srcList = GetSourceList(); @@ -1053,7 +1061,7 @@ void AliEVEHOMERManager::SelectClusterTPC() { } //################################################################################## -void AliEVEHOMERManager::SelectESDTPC() { +void AliEveHOMERManager::SelectESDTPC() { // see header file for class documentation TList* srcList = GetSourceList(); @@ -1069,7 +1077,7 @@ void AliEVEHOMERManager::SelectESDTPC() { } } //################################################################################## -void AliEVEHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { +void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { // see header file for class documentation if ( fTPCPre != NULL ) diff --git a/EVE/Alieve/AliEVEHOMERManager.h b/EVE/Alieve/AliEveHOMERManager.h similarity index 90% rename from EVE/Alieve/AliEVEHOMERManager.h rename to EVE/Alieve/AliEveHOMERManager.h index 7351f66d9a1..d0667a7d8a7 100644 --- a/EVE/Alieve/AliEVEHOMERManager.h +++ b/EVE/Alieve/AliEveHOMERManager.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ //-*- Mode: C++ -*- #ifndef ALIEVEHOMERMANGER_H #define ALIEVEHOMERMANGER_H @@ -5,7 +13,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/** @file AliEVEHOMERManager.h +/** @file AliEveHOMERManager.h @author Jochen Thaeder @date @brief Manager for HOMER in offline @@ -28,15 +36,15 @@ class AliHLTHOMERLibManager; /** - * @class AliEVEHOMERManager + * @class AliEveHOMERManager * - * This class is the main class of the AliEVEHOMERManager + * This class is the main class of the AliEveHOMERManager * ... more to come * * @ingroup alihlt_homer */ -class AliEVEHOMERManager : public TEveElementList +class AliEveHOMERManager : public TEveElementList { public: @@ -50,13 +58,13 @@ public: * @param argc Number of command line arguments. * @param argv Array of command line arguments. */ - AliEVEHOMERManager(TString xmlFile="" ); + AliEveHOMERManager(TString xmlFile="" ); /** not a valid copy constructor, defined according to effective C++ style */ - AliEVEHOMERManager( const AliEVEHOMERManager& ); + AliEveHOMERManager( const AliEveHOMERManager& ); /** not a valid assignment op, but defined according to effective C++ style */ - AliEVEHOMERManager& operator=( const AliEVEHOMERManager& ); + AliEveHOMERManager& operator=( const AliEveHOMERManager& ); /** destructor */ - virtual ~AliEVEHOMERManager(); + virtual ~AliEveHOMERManager(); /* * --------------------------------------------------------------------------------- @@ -99,11 +107,11 @@ public: /* * --------------------------------------------------------------------------------- - * Event Handling - public + * AliEveEventManager Handling - public * --------------------------------------------------------------------------------- */ - /** Loads the next Event, after being connected + /** Loads the next AliEveEventManager, after being connected * @return 0 on sucess, "HOMER" errors on error */ Int_t NextEvent(); @@ -188,7 +196,7 @@ private: Bool_t IsConnected() { return fConnected; } /* --------------------------------------------------------------------------------- - * Eve AliEVEHOMERManager::foo(nt Handling - private + * Eve AliEveHOMERManager::foo(nt Handling - private * --------------------------------------------------------------------------------- */ @@ -340,7 +348,7 @@ private: AliTPCPreprocessorOnline* fTPCPre; - ClassDef( AliEVEHOMERManager, 0 ) + ClassDef( AliEveHOMERManager, 0 ) }; #endif diff --git a/EVE/Alieve/AliEveHOMERManagerEditor.cxx b/EVE/Alieve/AliEveHOMERManagerEditor.cxx new file mode 100644 index 00000000000..d8f0081b77c --- /dev/null +++ b/EVE/Alieve/AliEveHOMERManagerEditor.cxx @@ -0,0 +1,72 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveHOMERManagerEditor.h" +#include + +#include +#include + +#include +#include +#include +#include +#include +//______________________________________________________________________ +// AliEveHOMERManagerEditor +// + +ClassImp(AliEveHOMERManagerEditor) + +AliEveHOMERManagerEditor::AliEveHOMERManagerEditor(const TGWindow *p, Int_t width, Int_t height, + UInt_t options, Pixel_t back) : + TGedFrame(p, width, height, options | kVerticalFrame, back), + fM(0), + fButt(0) + // Initialize widget pointers to 0 +{ + MakeTitle("AliEveHOMERManager"); + + // Create widgets + // fXYZZ = new TGSomeWidget(this, ...); + // AddFrame(fXYZZ, new TGLayoutHints(...)); + // fXYZZ->Connect("SignalName()", "AliEveHOMERManagerEditor", this, "DoXYZZ()"); + fButt = new TGTextButton(this, "Ooogadooga"); + AddFrame(fButt); //, new TGLayoutHints(...)); + fButt->Connect("Clicked()", "AliEveHOMERManagerEditor", this, "DoButt()"); + +} + +AliEveHOMERManagerEditor::~AliEveHOMERManagerEditor() +{} + +/**************************************************************************/ + +void AliEveHOMERManagerEditor::SetModel(TObject* obj) +{ + fM = dynamic_cast(obj); + + // Set values of widgets + // fXYZZ->SetValue(fM->GetXYZZ()); +} + +/**************************************************************************/ + +// Implements callback/slot methods + +// void AliEveHOMERManagerEditor::DoXYZZ() +// { +// fM->SetXYZZ(fXYZZ->GetValue()); +// Update(); +// } + +void AliEveHOMERManagerEditor::DoButt() +{ + fM->CreateHOMERSourcesList(); +} diff --git a/EVE/Alieve/AliEveHOMERManagerEditor.h b/EVE/Alieve/AliEveHOMERManagerEditor.h new file mode 100644 index 00000000000..fc79f94059f --- /dev/null +++ b/EVE/Alieve/AliEveHOMERManagerEditor.h @@ -0,0 +1,48 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_AliEVEHOMERManagerEditor_H +#define ALIEVE_AliEVEHOMERManagerEditor_H + +#include + +class TGCheckButton; +class TGTextButton; +class TGNumberEntry; +class TGColorSelect; + +class AliEveHOMERManager; + +class AliEveHOMERManagerEditor : public TGedFrame +{ +private: + AliEveHOMERManagerEditor(const AliEveHOMERManagerEditor&); // Not implemented + AliEveHOMERManagerEditor& operator=(const AliEveHOMERManagerEditor&); // Not implemented + +protected: + AliEveHOMERManager* fM; // fModel dynamic-casted to AliEveHOMERManagerEditor + + // Declare widgets + // TGSomeWidget* fXYZZ; + TGTextButton *fButt; + +public: + AliEveHOMERManagerEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveHOMERManagerEditor(); + + virtual void SetModel(TObject* obj); + + // Declare callback/slot methods + // void DoXYZZ(); + void DoButt(); + + ClassDef(AliEveHOMERManagerEditor, 0); // Editor for AliEveHOMERManager +}; // endclass AliEveHOMERManagerEditor + +#endif diff --git a/EVE/Alieve/AliEveHOMERSource.cxx b/EVE/Alieve/AliEveHOMERSource.cxx new file mode 100644 index 00000000000..9f89d55435a --- /dev/null +++ b/EVE/Alieve/AliEveHOMERSource.cxx @@ -0,0 +1,29 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveHOMERSource.h" + +//______________________________________________________________________ +// AliEveHOMERSource +// + +ClassImp(AliEveHOMERSource) + +AliEveHOMERSource::AliEveHOMERSource(const Text_t* n, const Text_t* t) : + TEveElement(), + TNamed(n, t), + fSource(0) +{} + +AliEveHOMERSource::AliEveHOMERSource(AliHLTHOMERSourceDesc* src, const Text_t* n, const Text_t* t) : + TEveElement(), + TNamed(n, t), + fSource(src) +{} + diff --git a/EVE/Alieve/AliEveHOMERSource.h b/EVE/Alieve/AliEveHOMERSource.h new file mode 100644 index 00000000000..2952701bbae --- /dev/null +++ b/EVE/Alieve/AliEveHOMERSource.h @@ -0,0 +1,40 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_AliEVEHOMERSource_H +#define ALIEVE_AliEVEHOMERSource_H + +#include + +#include + +class AliHLTHOMERSourceDesc; + +class AliEveHOMERSource : public TEveElement, + public TNamed +{ +private: + AliEveHOMERSource(const AliEveHOMERSource&); // Not implemented + AliEveHOMERSource& operator=(const AliEveHOMERSource&); // Not implemented + +protected: + AliHLTHOMERSourceDesc *fSource; + +public: + AliEveHOMERSource(const Text_t* n="HOMER Source", const Text_t* t=""); + AliEveHOMERSource(AliHLTHOMERSourceDesc* src, const Text_t* n="HOMER Source", const Text_t* t=""); + virtual ~AliEveHOMERSource() {} + + AliHLTHOMERSourceDesc* GetSource() const { return fSource; } + void SetSource(AliHLTHOMERSourceDesc* src) { fSource = src; } + + ClassDef(AliEveHOMERSource, 1); +}; // endclass AliEveHOMERSource + +#endif diff --git a/EVE/Alieve/AliEveHOMERSourceList.cxx b/EVE/Alieve/AliEveHOMERSourceList.cxx new file mode 100644 index 00000000000..0bfbef1591a --- /dev/null +++ b/EVE/Alieve/AliEveHOMERSourceList.cxx @@ -0,0 +1,32 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveHOMERSourceList.h" + +//______________________________________________________________________ +// AliEveHOMERSourceList +// + +ClassImp(AliEveHOMERSourceList) + +AliEveHOMERSourceList::AliEveHOMERSourceList(const Text_t* n, const Text_t* t) : + TEveElementList(n, t) +{ + +} + +void AliEveHOMERSourceList::SelectAll() +{ + EnableListElements(kTRUE, kTRUE); +} + +void AliEveHOMERSourceList::DeselectAll() +{ + DisableListElements (kFALSE, kFALSE); +} diff --git a/EVE/Alieve/AliEveHOMERSourceList.h b/EVE/Alieve/AliEveHOMERSourceList.h new file mode 100644 index 00000000000..070d69684c3 --- /dev/null +++ b/EVE/Alieve/AliEveHOMERSourceList.h @@ -0,0 +1,35 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_AliEVEHOMERSourceList_H +#define ALIEVE_AliEVEHOMERSourceList_H + +#include + +#include + +class AliEveHOMERSourceList : public TEveElementList +{ +private: + AliEveHOMERSourceList(const AliEveHOMERSourceList&); // Not implemented + AliEveHOMERSourceList& operator=(const AliEveHOMERSourceList&); // Not implemented + +protected: + +public: + AliEveHOMERSourceList(const Text_t* n="HOMER Source List", const Text_t* t=""); + virtual ~AliEveHOMERSourceList() {} + + void SelectAll(); // *MENU* + void DeselectAll(); // *MENU* + + ClassDef(AliEveHOMERSourceList, 1); +}; // endclass AliEveHOMERSourceList + +#endif diff --git a/EVE/Alieve/ITSDigitsInfo.cxx b/EVE/Alieve/AliEveITSDigitsInfo.cxx similarity index 88% rename from EVE/Alieve/ITSDigitsInfo.cxx rename to EVE/Alieve/AliEveITSDigitsInfo.cxx index 418d6968e21..bb40466d21f 100644 --- a/EVE/Alieve/ITSDigitsInfo.cxx +++ b/EVE/Alieve/AliEveITSDigitsInfo.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ //__________________________________________________________________________ -// ITSDigitsInfo +// AliEveITSDigitsInfo // // #include @@ -10,7 +17,7 @@ #include #include -#include "ITSDigitsInfo.h" +#include "AliEveITSDigitsInfo.h" #include #include #include @@ -19,13 +26,13 @@ #include #include #include -using namespace Alieve; + using namespace std; -ClassImp(ITSModuleSelection) +ClassImp(AliEveITSModuleSelection) -ITSModuleSelection::ITSModuleSelection(): +AliEveITSModuleSelection::AliEveITSModuleSelection(): fType(-1), fLayer(-1), fMinPhi(-TMath::Pi()), @@ -35,11 +42,11 @@ ITSModuleSelection::ITSModuleSelection(): {} -ClassImp(ITSDigitsInfo) +ClassImp(AliEveITSDigitsInfo) /**************************************************************************/ -ITSDigitsInfo::ITSDigitsInfo() : +AliEveITSDigitsInfo::AliEveITSDigitsInfo() : TObject(), TEveRefCnt(), fSPDmap(), fSDDmap(), fSSDmap(), @@ -50,9 +57,9 @@ ITSDigitsInfo::ITSDigitsInfo() : InitInternals(); } -void ITSDigitsInfo::InitInternals() +void AliEveITSDigitsInfo::InitInternals() { - static const TEveException eH("ITSDigitsInfo::InitInternals "); + static const TEveException eH("AliEveITSDigitsInfo::InitInternals "); fGeom = new AliITSgeom(); fGeom->ReadNewFile("$REVESYS/alice-data/ITSgeometry.det"); @@ -110,7 +117,7 @@ void ITSDigitsInfo::InitInternals() /**************************************************************************/ -ITSDigitsInfo:: ~ITSDigitsInfo() +AliEveITSDigitsInfo:: ~AliEveITSDigitsInfo() { map::iterator j; for(j = fSPDmap.begin(); j != fSPDmap.end(); ++j) @@ -127,7 +134,7 @@ ITSDigitsInfo:: ~ITSDigitsInfo() /**************************************************************************/ -void ITSDigitsInfo::SetTree(TTree* tree) +void AliEveITSDigitsInfo::SetTree(TTree* tree) { // Set digit-tree to be used for digit retrieval. Data is loaded on // demand. @@ -135,7 +142,7 @@ void ITSDigitsInfo::SetTree(TTree* tree) fTree = tree; } -void ITSDigitsInfo::ReadRaw(AliRawReader* raw, Int_t mode) +void AliEveITSDigitsInfo::ReadRaw(AliRawReader* raw, Int_t mode) { // Read raw-data into internal structures. AliITSdigit is used to // store raw-adata for all sub-detectors. @@ -223,7 +230,7 @@ void ITSDigitsInfo::ReadRaw(AliRawReader* raw, Int_t mode) /**************************************************************************/ -void ITSDigitsInfo::SetITSSegmentation() +void AliEveITSDigitsInfo::SetITSSegmentation() { // SPD fSegSPD = new AliITSsegmentationSPD(fGeom); @@ -257,14 +264,14 @@ void ITSDigitsInfo::SetITSSegmentation() fSegSSD = new AliITSsegmentationSSD(fGeom); } -void ITSDigitsInfo::GetSPDLocalZ(Int_t j, Float_t& z) +void AliEveITSDigitsInfo::GetSPDLocalZ(Int_t j, Float_t& z) { z = fSPDZCoord[j]; } /**************************************************************************/ -TClonesArray* ITSDigitsInfo::GetDigits(Int_t mod, Int_t subdet) +TClonesArray* AliEveITSDigitsInfo::GetDigits(Int_t mod, Int_t subdet) { switch(subdet) { case 0: { @@ -329,7 +336,7 @@ TClonesArray* ITSDigitsInfo::GetDigits(Int_t mod, Int_t subdet) } /**************************************************************************/ -void ITSDigitsInfo::GetModuleIDs(ITSModuleSelection* sel, std::vector& ids) +void AliEveITSDigitsInfo::GetModuleIDs(AliEveITSModuleSelection* sel, std::vector& ids) { // loop SPD Int_t idx0 = 0, idx1 = 0; @@ -378,7 +385,7 @@ void ITSDigitsInfo::GetModuleIDs(ITSModuleSelection* sel, std::vector& i /**************************************************************************/ -void ITSDigitsInfo::Print(Option_t* ) const +void AliEveITSDigitsInfo::Print(Option_t* ) const { printf("*********************************************************\n"); printf("SPD module dimension (%f,%f) \n",fSegSPD->Dx()*0.0001, fSegSPD->Dz()*0.0001); @@ -408,7 +415,7 @@ void ITSDigitsInfo::Print(Option_t* ) const /* printf("num cells %d,%d scaled %d,%d \n",fSegSPD->Npz(),fSegSPD->Npx(),Nz,Nx); - printf("%d digits in ITSModule %d\n",ne, module); + printf("%d digits in AliEveITSModule %d\n",ne, module); Float_t zn = i*(3.48*2)/Nz - 3.48 ; Float_t xo = -fSegSPD->Dx()*0.00005 + fSegSPD->Dpx(0)*od->GetCoord2()*0.0001; Float_t xn = -fSegSPD->Dx()*0.00005 + j*0.0001*fSegSPD->Dx()/Nx; diff --git a/EVE/Alieve/ITSDigitsInfo.h b/EVE/Alieve/AliEveITSDigitsInfo.h similarity index 65% rename from EVE/Alieve/ITSDigitsInfo.h rename to EVE/Alieve/AliEveITSDigitsInfo.h index ee309575292..5b8daa744c2 100644 --- a/EVE/Alieve/ITSDigitsInfo.h +++ b/EVE/Alieve/AliEveITSDigitsInfo.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_ITSDigitsInfo_H #define ALIEVE_ITSDigitsInfo_H @@ -20,11 +27,10 @@ class AliRawReader; -namespace Alieve { /**************************************************************************/ -// ITSModuleSelection +// AliEveITSModuleSelection /**************************************************************************/ -class ITSModuleSelection +class AliEveITSModuleSelection { public: Int_t fType; @@ -34,19 +40,19 @@ public: Float_t fMinTheta; Float_t fMaxTheta; - ITSModuleSelection(); - virtual ~ITSModuleSelection() {} + AliEveITSModuleSelection(); + virtual ~AliEveITSModuleSelection() {} - ClassDef(ITSModuleSelection, 1); + ClassDef(AliEveITSModuleSelection, 1); }; /**************************************************************************/ -// ITSDigitsInfo +// AliEveITSDigitsInfo /**************************************************************************/ -class ITSDigitsInfo : public TObject, public TEveRefCnt +class AliEveITSDigitsInfo : public TObject, public TEveRefCnt { - ITSDigitsInfo(const ITSDigitsInfo&); // Not implemented - ITSDigitsInfo& operator=(const ITSDigitsInfo&); // Not implemented + AliEveITSDigitsInfo(const AliEveITSDigitsInfo&); // Not implemented + AliEveITSDigitsInfo& operator=(const AliEveITSDigitsInfo&); // Not implemented private: Float_t fSPDZCoord[192]; @@ -85,8 +91,8 @@ public: Int_t fSDDScaleZ[5]; Int_t fSSDScale [5]; - ITSDigitsInfo(); - virtual ~ITSDigitsInfo(); + AliEveITSDigitsInfo(); + virtual ~AliEveITSDigitsInfo(); void SetTree(TTree* tree); void ReadRaw(AliRawReader* raw, Int_t mode); @@ -95,12 +101,11 @@ public: void GetSPDLocalZ(Int_t j, Float_t& z); - void GetModuleIDs(ITSModuleSelection* sel, std::vector& ids); + void GetModuleIDs(AliEveITSModuleSelection* sel, std::vector& ids); virtual void Print(Option_t* opt="") const; - ClassDef(ITSDigitsInfo, 1); -}; // endclass ITSDigitsInfo + ClassDef(AliEveITSDigitsInfo, 1); +}; // endclass AliEveITSDigitsInfo -} #endif diff --git a/EVE/Alieve/ITSModule.cxx b/EVE/Alieve/AliEveITSModule.cxx similarity index 84% rename from EVE/Alieve/ITSModule.cxx rename to EVE/Alieve/AliEveITSModule.cxx index a3367a078f0..65dd4262726 100644 --- a/EVE/Alieve/ITSModule.cxx +++ b/EVE/Alieve/AliEveITSModule.cxx @@ -1,33 +1,41 @@ -#include "ITSModule.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveITSModule.h" #include #include #include #include -using namespace Alieve; -Bool_t ITSModule::fgStaticInitDone = kFALSE; -TEveFrameBox* ITSModule::fgSPDFrameBox = 0; -TEveFrameBox* ITSModule::fgSDDFrameBox = 0; -TEveFrameBox* ITSModule::fgSSDFrameBox = 0; +Bool_t AliEveITSModule::fgStaticInitDone = kFALSE; + +TEveFrameBox* AliEveITSModule::fgSPDFrameBox = 0; +TEveFrameBox* AliEveITSModule::fgSDDFrameBox = 0; +TEveFrameBox* AliEveITSModule::fgSSDFrameBox = 0; -TEveRGBAPalette* ITSModule::fgSPDPalette = 0; -TEveRGBAPalette* ITSModule::fgSDDPalette = 0; -TEveRGBAPalette* ITSModule::fgSSDPalette = 0; +TEveRGBAPalette* AliEveITSModule::fgSPDPalette = 0; +TEveRGBAPalette* AliEveITSModule::fgSDDPalette = 0; +TEveRGBAPalette* AliEveITSModule::fgSSDPalette = 0; //__________________________________________________________________________ -// ITSModule +// AliEveITSModule // // -ClassImp(ITSModule) +ClassImp(AliEveITSModule) /**************************************************************************/ -ITSModule::ITSModule(const Text_t* n, const Text_t* t) : +AliEveITSModule::AliEveITSModule(const Text_t* n, const Text_t* t) : TEveQuadSet(n, t), fInfo(0), fID(-1), fDetID(-1), @@ -35,7 +43,7 @@ ITSModule::ITSModule(const Text_t* n, const Text_t* t) : fDx(0), fDz(0), fDy(0) {} -ITSModule::ITSModule(Int_t gid, ITSDigitsInfo* info) : +AliEveITSModule::AliEveITSModule(Int_t gid, AliEveITSDigitsInfo* info) : TEveQuadSet(Form("ITS module %d", gid)), fInfo (0), fID(-1), fDetID(-1), @@ -46,14 +54,14 @@ ITSModule::ITSModule(Int_t gid, ITSDigitsInfo* info) : SetID(gid); } -ITSModule::~ITSModule() +AliEveITSModule::~AliEveITSModule() { if(fInfo) fInfo->DecRefCount(); } /**************************************************************************/ -void ITSModule::InitStatics(ITSDigitsInfo* info) +void AliEveITSModule::InitStatics(AliEveITSDigitsInfo* info) { if (fgStaticInitDone) return; fgStaticInitDone = kTRUE; @@ -103,7 +111,7 @@ void ITSModule::InitStatics(ITSDigitsInfo* info) /**************************************************************************/ -void ITSModule::SetDigitsInfo(ITSDigitsInfo* info) +void AliEveITSModule::SetDigitsInfo(AliEveITSDigitsInfo* info) { if (fInfo == info) return; if (fInfo) fInfo->DecRefCount(); @@ -113,12 +121,12 @@ void ITSModule::SetDigitsInfo(ITSDigitsInfo* info) /**************************************************************************/ -void ITSModule::SetID(Int_t gid, Bool_t trans) +void AliEveITSModule::SetID(Int_t gid, Bool_t trans) { - static const TEveException eH("ITSModule::SetID "); + static const TEveException eH("AliEveITSModule::SetID "); if(fInfo == 0) - throw(eH + "ITSDigitsInfo not set."); + throw(eH + "AliEveITSDigitsInfo not set."); if (gid < fInfo->fGeom->GetStartSPD() || gid > fInfo->fGeom->GetLastSSD()) throw(eH + Form("%d is not valid. ID range from %d to %d", gid, @@ -240,7 +248,7 @@ void ITSModule::SetID(Int_t gid, Bool_t trans) SetTrans(); } -void ITSModule::LoadQuads() +void AliEveITSModule::LoadQuads() { // Here we still use 'z' for the name of axial coordinates. // The transforamtion matrix aplied rotates y -> z. @@ -343,7 +351,7 @@ void ITSModule::LoadQuads() /**************************************************************************/ -void ITSModule::SetTrans() +void AliEveITSModule::SetTrans() { // Set transformation matrix based on module id (use geometry to // retrieve this information). @@ -366,14 +374,14 @@ void ITSModule::SetTrans() /**************************************************************************/ -void ITSModule::DigitSelected(Int_t idx) +void AliEveITSModule::DigitSelected(Int_t idx) { // Override control-click from TEveQuadSet DigitBase_t* qb = GetDigit(idx); TObject* obj = qb->fId.GetObject(); AliITSdigit* d = dynamic_cast(obj); - printf("ITSModule::QuadSelected "); Print(); + printf("AliEveITSModule::QuadSelected "); Print(); printf(" idx=%d, value=%d, obj=0x%lx, digit=0x%lx\n", idx, qb->fValue, (ULong_t)obj, (ULong_t)d); if (d) @@ -384,7 +392,7 @@ void ITSModule::DigitSelected(Int_t idx) /**************************************************************************/ -void ITSModule::Print(Option_t* ) const +void AliEveITSModule::Print(Option_t* ) const { printf("ID %d, layer %d, ladder %d, det %d \n", fID, fLayer, fLadder, fDetID); } diff --git a/EVE/Alieve/AliEveITSModule.h b/EVE/Alieve/AliEveITSModule.h new file mode 100644 index 00000000000..d8f329fc989 --- /dev/null +++ b/EVE/Alieve/AliEveITSModule.h @@ -0,0 +1,71 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#ifndef ALIEVE_ITSModule_H +#define ALIEVE_ITSModule_H + +#include + +#include + + +class AliEveITSModule : public TEveQuadSet +{ + AliEveITSModule(const AliEveITSModule&); // Not implemented + AliEveITSModule& operator=(const AliEveITSModule&); // Not implemented + +protected: + AliEveITSDigitsInfo* fInfo; + + Int_t fID; // Module id + Int_t fDetID; // Detector id (0~SPD, 1~SDD, 2~SSD) + + Int_t fLayer; + Int_t fLadder; + Int_t fDet; + + Float_t fDx; + Float_t fDz; + Float_t fDy; + + static Bool_t fgStaticInitDone; + +public: + AliEveITSModule(const Text_t* n="AliEveITSModule", const Text_t* t=0); + AliEveITSModule(Int_t gid, AliEveITSDigitsInfo* info); + virtual ~AliEveITSModule(); + + static void InitStatics(AliEveITSDigitsInfo* info); + + AliEveITSDigitsInfo* GetDigitsInfo() const { return fInfo; } + void SetDigitsInfo(AliEveITSDigitsInfo* info); + + Int_t GetSubDetID() const { return fDetID; } + + Int_t GetID() const { return fID; } + void SetID(Int_t gid, Bool_t tran=kTRUE); + + virtual void LoadQuads(); + void SetTrans(); + + virtual void DigitSelected(Int_t idx); + + virtual void Print(Option_t* opt="") const; + + static TEveFrameBox* fgSPDFrameBox; + static TEveFrameBox* fgSDDFrameBox; + static TEveFrameBox* fgSSDFrameBox; + + static TEveRGBAPalette* fgSPDPalette; + static TEveRGBAPalette* fgSDDPalette; + static TEveRGBAPalette* fgSSDPalette; + + ClassDef(AliEveITSModule, 1); +}; + +#endif diff --git a/EVE/Alieve/ITSModuleStepper.cxx b/EVE/Alieve/AliEveITSModuleStepper.cxx similarity index 83% rename from EVE/Alieve/ITSModuleStepper.cxx rename to EVE/Alieve/AliEveITSModuleStepper.cxx index 0a7f1ebd853..d7df850e8e4 100644 --- a/EVE/Alieve/ITSModuleStepper.cxx +++ b/EVE/Alieve/AliEveITSModuleStepper.cxx @@ -1,8 +1,15 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "ITSModuleStepper.h" -#include "ITSDigitsInfo.h" -#include "ITSScaledModule.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveITSModuleStepper.h" +#include "AliEveITSDigitsInfo.h" +#include "AliEveITSScaledModule.h" #include #include @@ -23,16 +30,16 @@ // #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// ITSModuleStepper +// AliEveITSModuleStepper // -ClassImp(ITSModuleStepper) +ClassImp(AliEveITSModuleStepper) -ITSModuleStepper::ITSModuleStepper(ITSDigitsInfo* di) : - TEveElementList("ITS 2DStore", "ITSModuleStepper", kTRUE), +AliEveITSModuleStepper::AliEveITSModuleStepper(AliEveITSDigitsInfo* di) : + TEveElementList("ITS 2DStore", "AliEveITSModuleStepper", kTRUE), fPosition(0), @@ -63,7 +70,7 @@ ITSModuleStepper::ITSModuleStepper(ITSDigitsInfo* di) : fFontCol(8) { // override member from base TEveElementList - fChildClass = ITSScaledModule::Class(); + fChildClass = AliEveITSScaledModule::Class(); SetMainColorPtr(&fWCol); @@ -72,7 +79,7 @@ ITSModuleStepper::ITSModuleStepper(ITSDigitsInfo* di) : fStepper = new TEveGridStepper(); fStepper->SetNs(5, 4); - fScaleInfo = new DigitScaleInfo(); + fScaleInfo = new AliEveDigitScaleInfo(); fScaleInfo->IncRefCount(); fAxis = new TGLAxis(); @@ -88,7 +95,7 @@ ITSModuleStepper::ITSModuleStepper(ITSDigitsInfo* di) : gEve->GetGLViewer()->AddOverlayElement(this); } -ITSModuleStepper::~ITSModuleStepper() +AliEveITSModuleStepper::~AliEveITSModuleStepper() { gEve->GetGLViewer()->RemoveOverlayElement(this); @@ -103,7 +110,7 @@ ITSModuleStepper::~ITSModuleStepper() /**************************************************************************/ -void ITSModuleStepper::Capacity() +void AliEveITSModuleStepper::Capacity() { Int_t N = fStepper->GetNx()*fStepper->GetNy(); if (N != GetNChildren()) @@ -111,14 +118,14 @@ void ITSModuleStepper::Capacity() DestroyElements(); for (Int_t m=0; mGetModuleIDs(&sel, fIDs); //in reder menu define a space between left and right pager @@ -173,10 +180,10 @@ void ITSModuleStepper::DisplayDet(Int_t det, Int_t layer) /**************************************************************************/ -void ITSModuleStepper::DisplayTheta(Float_t min, Float_t max) +void AliEveITSModuleStepper::DisplayTheta(Float_t min, Float_t max) { fIDs.clear(); - ITSModuleSelection sel = ITSModuleSelection(); + AliEveITSModuleSelection sel = AliEveITSModuleSelection(); sel.fMaxTheta = max; sel.fMinTheta=min; fDigitsInfo->GetModuleIDs(&sel, fIDs); Start(); @@ -184,7 +191,7 @@ void ITSModuleStepper::DisplayTheta(Float_t min, Float_t max) /**************************************************************************/ -Int_t ITSModuleStepper::GetCurrentPage() +Int_t AliEveITSModuleStepper::GetCurrentPage() { Int_t idx = fPosition +1; Int_t n = idx/Nxy(); @@ -194,7 +201,7 @@ Int_t ITSModuleStepper::GetCurrentPage() /**************************************************************************/ -Int_t ITSModuleStepper::GetPages() +Int_t AliEveITSModuleStepper::GetPages() { Int_t n = fIDs.size()/Nxy(); if(fIDs.size() % Nxy()) n++; @@ -203,9 +210,9 @@ Int_t ITSModuleStepper::GetPages() /**************************************************************************/ -void ITSModuleStepper::Apply() +void AliEveITSModuleStepper::Apply() { - // printf("ITSModuleStepper::Apply fPosition %d \n", fPosition); + // printf("AliEveITSModuleStepper::Apply fPosition %d \n", fPosition); gEve->DisableRedraw(); Capacity(); @@ -214,7 +221,7 @@ void ITSModuleStepper::Apply() { if(idx < fIDs.size()) { - ITSScaledModule* mod = dynamic_cast(*childit); + AliEveITSScaledModule* mod = dynamic_cast(*childit); mod->SetID(fIDs[idx], kFALSE); TEveTrans& tr = mod->RefHMTrans(); tr.UnitTrans(); @@ -268,7 +275,7 @@ void ITSModuleStepper::Apply() /**************************************************************************/ -void ITSModuleStepper::Render(TGLRnrCtx& rnrCtx) +void AliEveITSModuleStepper::Render(TGLRnrCtx& rnrCtx) { // render everyting in relative coordinates glMatrixMode(GL_PROJECTION); @@ -317,7 +324,7 @@ void ITSModuleStepper::Render(TGLRnrCtx& rnrCtx) /**************************************************************************/ //______________________________________________________________________ -Float_t ITSModuleStepper::TextLength(const char* txt) +Float_t AliEveITSModuleStepper::TextLength(const char* txt) { Float_t llx, lly, llz, urx, ury, urz; fText->BBox(txt, llx, lly, llz, urx, ury, urz); @@ -325,7 +332,7 @@ Float_t ITSModuleStepper::TextLength(const char* txt) } //______________________________________________________________________ -void ITSModuleStepper::RenderString(TString string, Int_t id) +void AliEveITSModuleStepper::RenderString(TString string, Int_t id) { Float_t txtY = fWHeight*0.5; Float_t txtl = TextLength(string.Data()); @@ -361,7 +368,7 @@ void ITSModuleStepper::RenderString(TString string, Int_t id) } //______________________________________________________________________ -void ITSModuleStepper::RenderFrame(Float_t dx, Float_t dy, Int_t id) +void AliEveITSModuleStepper::RenderFrame(Float_t dx, Float_t dy, Int_t id) { if(fRnrFrame == kFALSE)return; @@ -369,9 +376,9 @@ void ITSModuleStepper::RenderFrame(Float_t dx, Float_t dy, Int_t id) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); UChar_t color[4]; if (fWActive == id) - TEveUtil::ColorFromIdx(fWActiveCol, color); + TEveUtil::TEveUtil::ColorFromIdx(fWActiveCol, color); else - TEveUtil:: ColorFromIdx(fWCol, color); + TEveUtil:: TEveUtil::ColorFromIdx(fWCol, color); glColor4ubv(color); glBegin(GL_QUADS); @@ -382,15 +389,15 @@ void ITSModuleStepper::RenderFrame(Float_t dx, Float_t dy, Int_t id) } //______________________________________________________________________ -void ITSModuleStepper::RenderSymbol(Float_t dx, Float_t dy, Int_t id) +void AliEveITSModuleStepper::RenderSymbol(Float_t dx, Float_t dy, Int_t id) { glLoadName(id); UChar_t color[4]; if (fWActive == id) - TEveUtil::ColorFromIdx(fWActiveCol, color); + TEveUtil::TEveUtil::ColorFromIdx(fWActiveCol, color); else - TEveUtil::ColorFromIdx(fWCol, color); + TEveUtil::TEveUtil::ColorFromIdx(fWCol, color); glColor4ubv(color); Float_t xs = dx/4, ys = dy/4; @@ -453,12 +460,12 @@ void ITSModuleStepper::RenderSymbol(Float_t dx, Float_t dy, Int_t id) } //______________________________________________________________________ -void ITSModuleStepper::RenderPalette(Float_t dx, Float_t x, Float_t y) +void AliEveITSModuleStepper::RenderPalette(Float_t dx, Float_t x, Float_t y) { glPushMatrix(); glLoadIdentity(); glTranslatef(1 -x- dx, -1+y*4, 0); - ITSModule* qs = dynamic_cast(*BeginChildren()); + AliEveITSModule* qs = dynamic_cast(*BeginChildren()); TEveRGBAPalette* p = qs->GetPalette(); glBegin(GL_QUAD_STRIP); glColor4ubv(p->ColorFromValue(p->GetMinVal())); @@ -493,7 +500,7 @@ void ITSModuleStepper::RenderPalette(Float_t dx, Float_t x, Float_t y) } //______________________________________________________________________ -void ITSModuleStepper::RenderMenu() +void AliEveITSModuleStepper::RenderMenu() { Float_t ww = 2*fWWidth; Float_t wh = 2*fWHeight; @@ -543,9 +550,9 @@ void ITSModuleStepper::RenderMenu() // scale info glPushMatrix(); - ITSDigitsInfo* di = fDigitsInfo; + AliEveITSDigitsInfo* di = fDigitsInfo; Int_t scale = fScaleInfo->GetScale() - 1; - ITSScaledModule* sm = dynamic_cast(*BeginChildren()); + AliEveITSScaledModule* sm = dynamic_cast(*BeginChildren()); Int_t cnx = 0, cnz = 0; switch(sm->GetSubDetID()) { @@ -588,7 +595,7 @@ void ITSModuleStepper::RenderMenu() } //______________________________________________________________________ -void ITSModuleStepper::RenderCellIDs() +void AliEveITSModuleStepper::RenderCellIDs() { fText->SetTextSize(fStepper->GetDy()*0.1); fText->SetTextColor(fFontCol); @@ -599,7 +606,7 @@ void ITSModuleStepper::RenderCellIDs() { if(idx < fIDs.size()) { - ITSScaledModule* mod = dynamic_cast(*childit); + AliEveITSScaledModule* mod = dynamic_cast(*childit); TEveTrans& tr = mod->RefHMTrans(); TString name = Form("%d",mod->GetID()); tr.GetPos(x,y,z); @@ -621,7 +628,7 @@ void ITSModuleStepper::RenderCellIDs() /**************************************************************************/ //______________________________________________________________________ -Bool_t ITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, +Bool_t AliEveITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, TGLOvlSelectRecord & rec, Event_t * event) { @@ -662,7 +669,7 @@ Bool_t ITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, break; case 5: { - DigitScaleInfo* si = fScaleInfo; + AliEveDigitScaleInfo* si = fScaleInfo; if(si->GetScale() < 5) { si->ScaleChanged(si->GetScale() + 1); @@ -672,7 +679,7 @@ Bool_t ITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, } case 6: { - DigitScaleInfo* si = fScaleInfo; + AliEveDigitScaleInfo* si = fScaleInfo; if(si->GetScale() > 1) { si->ScaleChanged(si->GetScale() - 1); @@ -706,13 +713,13 @@ Bool_t ITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, } //______________________________________________________________________ -Bool_t ITSModuleStepper::MouseEnter(TGLOvlSelectRecord& /*rec*/) +Bool_t AliEveITSModuleStepper::MouseEnter(TGLOvlSelectRecord& /*rec*/) { return kTRUE; } //______________________________________________________________________ -void ITSModuleStepper::MouseLeave() +void AliEveITSModuleStepper::MouseLeave() { // Mouse has left the element. diff --git a/EVE/Alieve/ITSModuleStepper.h b/EVE/Alieve/AliEveITSModuleStepper.h similarity index 75% rename from EVE/Alieve/ITSModuleStepper.h rename to EVE/Alieve/AliEveITSModuleStepper.h index babfc34edb6..1e25954dca4 100644 --- a/EVE/Alieve/ITSModuleStepper.h +++ b/EVE/Alieve/AliEveITSModuleStepper.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_ITSModuleStepper_H #define ALIEVE_ITSModuleStepper_H @@ -14,12 +21,11 @@ class TGLText; class TGLAxis; -namespace Alieve { -class ITSDigitsInfo; -class DigitScaleInfo; +class AliEveITSDigitsInfo; +class AliEveDigitScaleInfo; -class ITSModuleStepper : public TEveElementList, +class AliEveITSModuleStepper : public TEveElementList, public TGLOverlayElement { friend class ITSModuleStepperGL; @@ -32,12 +38,12 @@ private: vpInt_t fIDs; UInt_t fPosition; // position of top corner ITS module in vector fIDs - ITSModuleStepper(const ITSModuleStepper&); // Not implemented - ITSModuleStepper& operator=(const ITSModuleStepper&); // Not implemented + AliEveITSModuleStepper(const AliEveITSModuleStepper&); // Not implemented + AliEveITSModuleStepper& operator=(const AliEveITSModuleStepper&); // Not implemented protected: - ITSDigitsInfo* fDigitsInfo; - DigitScaleInfo* fScaleInfo; + AliEveITSDigitsInfo* fDigitsInfo; + AliEveDigitScaleInfo* fScaleInfo; Int_t fSubDet; TEveGridStepper* fStepper; @@ -80,8 +86,8 @@ protected: void SetFirst(Int_t first); public: - ITSModuleStepper(ITSDigitsInfo* di); - virtual ~ITSModuleStepper(); + AliEveITSModuleStepper(AliEveITSDigitsInfo* di); + virtual ~AliEveITSModuleStepper(); // external functions void DisplayDet(Int_t det, Int_t layer = -1); @@ -113,9 +119,7 @@ public: TGLText* GetFont() { return fText; } void SetGLText(TGLText* t) { fText = t; } - ClassDef(ITSModuleStepper, 0); + ClassDef(AliEveITSModuleStepper, 0); }; -} // Alieve namespace - #endif diff --git a/EVE/Alieve/AliEveITSModuleStepperEditor.cxx b/EVE/Alieve/AliEveITSModuleStepperEditor.cxx new file mode 100644 index 00000000000..dfea9ba441a --- /dev/null +++ b/EVE/Alieve/AliEveITSModuleStepperEditor.cxx @@ -0,0 +1,63 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveITSModuleStepperEditor.h" +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + + +//______________________________________________________________________ +// AliEveITSModuleStepperEditor +// + +ClassImp(AliEveITSModuleStepperEditor) + +AliEveITSModuleStepperEditor::AliEveITSModuleStepperEditor(const TGWindow *p, Int_t width, Int_t height, + UInt_t options, Pixel_t back) : + TGedFrame(p, width, height, options | kVerticalFrame, back), + + fM(0), + fStepper(0) +{ + MakeTitle("AliEveITSModuleStepper"); + + fStepper = new TEveGridStepperSubEditor(this); + fStepper->Connect("Changed()", "AliEveITSModuleStepperEditor", this, "UpdateStore()"); + AddFrame(fStepper, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 2, 0, 0, 0)); +} + +AliEveITSModuleStepperEditor::~AliEveITSModuleStepperEditor() +{} + +/**************************************************************************/ + +void AliEveITSModuleStepperEditor::SetModel(TObject* obj) +{ + fM = dynamic_cast(obj); + fStepper->SetModel(fM->GetStepper()); +} + +/**************************************************************************/ + +void AliEveITSModuleStepperEditor::UpdateStore() +{ + fM->Apply(); + Update(); + gEve->Redraw3D(kTRUE); +} diff --git a/EVE/Alieve/AliEveITSModuleStepperEditor.h b/EVE/Alieve/AliEveITSModuleStepperEditor.h new file mode 100644 index 00000000000..3a119e27a68 --- /dev/null +++ b/EVE/Alieve/AliEveITSModuleStepperEditor.h @@ -0,0 +1,45 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_ITSModuleStepperEditor_H +#define ALIEVE_ITSModuleStepperEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; + +class TEveGridStepperSubEditor; + + +class AliEveITSModuleStepper; + +class AliEveITSModuleStepperEditor : public TGedFrame +{ +private: + AliEveITSModuleStepperEditor(const AliEveITSModuleStepperEditor&); // Not implemented + AliEveITSModuleStepperEditor& operator=(const AliEveITSModuleStepperEditor&); // Not implemented + +protected: + AliEveITSModuleStepper* fM; // fModel dynamic-casted to AliEveITSModuleStepperEditor + + TEveGridStepperSubEditor* fStepper; + +public: + AliEveITSModuleStepperEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveITSModuleStepperEditor(); + + virtual void SetModel(TObject* obj); + + void UpdateStore(); + ClassDef(AliEveITSModuleStepperEditor, 0); // Editor for AliEveITSModuleStepper +}; // endclass AliEveITSModuleStepperEditor + +#endif diff --git a/EVE/Alieve/ITSScaledModule.cxx b/EVE/Alieve/AliEveITSScaledModule.cxx similarity index 76% rename from EVE/Alieve/ITSScaledModule.cxx rename to EVE/Alieve/AliEveITSScaledModule.cxx index 5fc538931d4..4757a860d85 100644 --- a/EVE/Alieve/ITSScaledModule.cxx +++ b/EVE/Alieve/AliEveITSScaledModule.cxx @@ -1,48 +1,55 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "ITSScaledModule.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveITSScaledModule.h" #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// DigitScaleInfo +// AliEveDigitScaleInfo // -ClassImp(DigitScaleInfo) +ClassImp(AliEveDigitScaleInfo) -DigitScaleInfo::DigitScaleInfo(): +AliEveDigitScaleInfo::AliEveDigitScaleInfo(): fScale(1), fStatType (ST_Average), fSyncPalette(kFALSE) { } -void DigitScaleInfo::ScaleChanged(Int_t s) +void AliEveDigitScaleInfo::ScaleChanged(Int_t s) { fScale = s; - ITSScaledModule* sm; + AliEveITSScaledModule* sm; std::list::iterator i = fBackRefs.begin(); while (i != fBackRefs.end()) { - sm = dynamic_cast(*i); + sm = dynamic_cast(*i); if(sm) sm->LoadQuads(); ++i; } } -void DigitScaleInfo::StatTypeChanged(Int_t t) +void AliEveDigitScaleInfo::StatTypeChanged(Int_t t) { fStatType = t; fSyncPalette = kTRUE; - ITSScaledModule* sm; + AliEveITSScaledModule* sm; std::list::iterator i = fBackRefs.begin(); while (i != fBackRefs.end()) { - sm = dynamic_cast(*i); + sm = dynamic_cast(*i); if(sm) sm->SetQuadValues(); ++i; } @@ -73,13 +80,13 @@ void ScaledDigit::Dump() const } //______________________________________________________________________ -// ITSScaledModule +// AliEveITSScaledModule // -ClassImp(ITSScaledModule) +ClassImp(AliEveITSScaledModule) -ITSScaledModule::ITSScaledModule(Int_t gid, ITSDigitsInfo* info, DigitScaleInfo* si): - ITSModule("ITSScaledModule", "ITSScaledModule"), +AliEveITSScaledModule::AliEveITSScaledModule(Int_t gid, AliEveITSDigitsInfo* info, AliEveDigitScaleInfo* si): + AliEveITSModule("AliEveITSScaledModule", "AliEveITSScaledModule"), fNx(-1), fNz(-1), fNCx(-1), @@ -93,14 +100,14 @@ ITSScaledModule::ITSScaledModule(Int_t gid, ITSDigitsInfo* info, DigitScaleInfo* fScaleInfo->IncRefCount(this); } -ITSScaledModule::~ITSScaledModule() +AliEveITSScaledModule::~AliEveITSScaledModule() { fScaleInfo->DecRefCount(this); } /**************************************************************************/ -void ITSScaledModule::LoadQuads() +void AliEveITSScaledModule::LoadQuads() { // Here we still use 'z' for the name of axial coordinates. // The transforamtion matrix aplied rotates y -> z. @@ -300,7 +307,7 @@ void ITSScaledModule::LoadQuads() /**************************************************************************/ -void ITSScaledModule::SetQuadValues() +void AliEveITSScaledModule::SetQuadValues() { if(fScaleInfo->GetSyncPalette()) SyncPalette(); @@ -313,13 +320,13 @@ void ITSScaledModule::SetQuadValues() { using namespace TMath; - case DigitScaleInfo::ST_Occup: + case AliEveDigitScaleInfo::ST_Occup: v = Nint((100.0*sd->N) / (fNCx*fNCz)); break; - case DigitScaleInfo::ST_Average: + case AliEveDigitScaleInfo::ST_Average: v = Nint((Double_t) sd->sum / sd->N); break; - case DigitScaleInfo::ST_Rms: + case AliEveDigitScaleInfo::ST_Rms: v = Nint(Sqrt(sd->sqr_sum) / sd->N); break; } @@ -330,37 +337,37 @@ void ITSScaledModule::SetQuadValues() /**************************************************************************/ -void ITSScaledModule::SyncPalette() +void AliEveITSScaledModule::SyncPalette() { - // printf("ITSScaledModule::SyncPalette()\n"); - if(fScaleInfo->GetStatType() == DigitScaleInfo::ST_Occup) + // printf("AliEveITSScaledModule::SyncPalette()\n"); + if(fScaleInfo->GetStatType() == AliEveDigitScaleInfo::ST_Occup) { // SPD - ITSModule::fgSPDPalette->SetLimits(0, 100); - ITSModule::fgSPDPalette->SetMinMax(0, 100); + AliEveITSModule::fgSPDPalette->SetLimits(0, 100); + AliEveITSModule::fgSPDPalette->SetMinMax(0, 100); // SDD - ITSModule::fgSDDPalette->SetLimits(0, 100); - ITSModule::fgSDDPalette->SetMinMax(0, 100); + AliEveITSModule::fgSDDPalette->SetLimits(0, 100); + AliEveITSModule::fgSDDPalette->SetMinMax(0, 100); // SSD - ITSModule::fgSSDPalette->SetLimits(0, 100); - ITSModule::fgSDDPalette->SetMinMax(0, 100); + AliEveITSModule::fgSSDPalette->SetLimits(0, 100); + AliEveITSModule::fgSDDPalette->SetMinMax(0, 100); } else { - Alieve::ITSDigitsInfo& DI = *fInfo; + AliEveITSDigitsInfo& DI = *fInfo; // SPD - ITSModule::fgSPDPalette->SetLimits(0, DI.fSPDHighLim); - ITSModule::fgSPDPalette->SetMinMax(DI.fSPDMinVal, DI.fSPDMaxVal); + AliEveITSModule::fgSPDPalette->SetLimits(0, DI.fSPDHighLim); + AliEveITSModule::fgSPDPalette->SetMinMax(DI.fSPDMinVal, DI.fSPDMaxVal); // SDD - ITSModule::fgSDDPalette->SetLimits(0, DI.fSDDHighLim); - ITSModule::fgSDDPalette->SetMinMax(DI.fSDDMinVal, DI.fSDDMaxVal); + AliEveITSModule::fgSDDPalette->SetLimits(0, DI.fSDDHighLim); + AliEveITSModule::fgSDDPalette->SetMinMax(DI.fSDDMinVal, DI.fSDDMaxVal); // SSD - ITSModule::fgSSDPalette->SetLimits(0, DI.fSSDHighLim); - ITSModule::fgSSDPalette->SetMinMax(DI.fSSDMinVal, DI.fSSDMaxVal); + AliEveITSModule::fgSSDPalette->SetLimits(0, DI.fSSDHighLim); + AliEveITSModule::fgSSDPalette->SetMinMax(DI.fSSDMinVal, DI.fSSDMaxVal); } fScaleInfo->SetSyncPalette(kFALSE); @@ -368,7 +375,7 @@ void ITSScaledModule::SyncPalette() /**************************************************************************/ -void ITSScaledModule::GetScaleData(Int_t& cnx, Int_t& cnz, Int_t& total) +void AliEveITSScaledModule::GetScaleData(Int_t& cnx, Int_t& cnz, Int_t& total) { cnx =fNx; cnz =fNz; @@ -377,10 +384,10 @@ void ITSScaledModule::GetScaleData(Int_t& cnx, Int_t& cnz, Int_t& total) /**************************************************************************/ -void ITSScaledModule::DigitSelected(Int_t idx) +void AliEveITSScaledModule::DigitSelected(Int_t idx) { // Override control-click from TEveQuadSet - printf("ITSScaledModule::DigitSelected "); Print(); + printf("AliEveITSScaledModule::DigitSelected "); Print(); DigitBase_t* qb = GetDigit(idx); TObject* obj = qb->fId.GetObject(); diff --git a/EVE/Alieve/ITSScaledModule.h b/EVE/Alieve/AliEveITSScaledModule.h similarity index 56% rename from EVE/Alieve/ITSScaledModule.h rename to EVE/Alieve/AliEveITSScaledModule.h index ec5e986b821..23740cc6e54 100644 --- a/EVE/Alieve/ITSScaledModule.h +++ b/EVE/Alieve/AliEveITSScaledModule.h @@ -1,28 +1,34 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_ITSScaledModule_H #define ALIEVE_ITSScaledModule_H #include -#include +#include #include -namespace Alieve { /**************************************************************************/ -// DigitScaleInfo +// AliEveDigitScaleInfo /**************************************************************************/ -class DigitScaleInfo : public TQObject, public TEveRefBackPtr +class AliEveDigitScaleInfo : public TQObject, public TEveRefBackPtr { public: enum StatType_e { ST_Occup, ST_Average, ST_Rms }; // Bool_t fAutoUpdatePalette; private: - DigitScaleInfo(const DigitScaleInfo&); // Not implemented - DigitScaleInfo& operator=(const DigitScaleInfo&); // Not implemented + AliEveDigitScaleInfo(const AliEveDigitScaleInfo&); // Not implemented + AliEveDigitScaleInfo& operator=(const AliEveDigitScaleInfo&); // Not implemented protected: Int_t fScale; @@ -31,8 +37,8 @@ protected: Bool_t fSyncPalette; public: - DigitScaleInfo(); - virtual ~DigitScaleInfo(){} + AliEveDigitScaleInfo(); + virtual ~AliEveDigitScaleInfo(){} Int_t GetScale() { return fScale; } void ScaleChanged(Int_t s); @@ -43,7 +49,7 @@ public: Bool_t GetSyncPalette(){return fSyncPalette;} void SetSyncPalette(Bool_t x){fSyncPalette = x;} - ClassDef(DigitScaleInfo, 1); + ClassDef(AliEveDigitScaleInfo, 1); }; /**************************************************************************/ @@ -66,17 +72,17 @@ public: }; /**************************************************************************/ -// ITSScaledModule +// AliEveITSScaledModule /**************************************************************************/ -class ITSScaledModule : public ITSModule +class AliEveITSScaledModule : public AliEveITSModule { friend class ITSSDSubEditor; private: map fDigitsMap; - ITSScaledModule(const ITSScaledModule&); // Not implemented - ITSScaledModule& operator=(const ITSScaledModule&); // Not implemented + AliEveITSScaledModule(const AliEveITSScaledModule&); // Not implemented + AliEveITSScaledModule& operator=(const AliEveITSScaledModule&); // Not implemented protected: Int_t fNx; // per module @@ -85,11 +91,11 @@ protected: Int_t fNCx; // per cell Int_t fNCz; - DigitScaleInfo* fScaleInfo; + AliEveDigitScaleInfo* fScaleInfo; public: - ITSScaledModule(Int_t gid, ITSDigitsInfo* info, DigitScaleInfo* si ); - virtual ~ITSScaledModule(); + AliEveITSScaledModule(Int_t gid, AliEveITSDigitsInfo* info, AliEveDigitScaleInfo* si ); + virtual ~AliEveITSScaledModule(); virtual void DigitSelected(Int_t idx); @@ -99,11 +105,9 @@ public: void SyncPalette(); void GetScaleData(Int_t& cnx, Int_t& cnz, Int_t& total); - DigitScaleInfo* GetScaleInfo(){ return fScaleInfo; } - - ClassDef(ITSScaledModule, 1); -}; // endclass ITSScaledModule + AliEveDigitScaleInfo* GetScaleInfo(){ return fScaleInfo; } -} + ClassDef(AliEveITSScaledModule, 1); +}; // endclass AliEveITSScaledModule #endif diff --git a/EVE/Alieve/ITSScaledModuleEditor.cxx b/EVE/Alieve/AliEveITSScaledModuleEditor.cxx similarity index 75% rename from EVE/Alieve/ITSScaledModuleEditor.cxx rename to EVE/Alieve/AliEveITSScaledModuleEditor.cxx index 59f4507483d..5797e5dd473 100644 --- a/EVE/Alieve/ITSScaledModuleEditor.cxx +++ b/EVE/Alieve/AliEveITSScaledModuleEditor.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "ITSScaledModuleEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveITSScaledModuleEditor.h" +#include #include #include @@ -16,15 +23,15 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// ITSScaledModuleEditor +// AliEveITSScaledModuleEditor // -ClassImp(ITSScaledModuleEditor) +ClassImp(AliEveITSScaledModuleEditor) - ITSScaledModuleEditor::ITSScaledModuleEditor(const TGWindow *p, Int_t width, Int_t height, + AliEveITSScaledModuleEditor::AliEveITSScaledModuleEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), @@ -37,7 +44,7 @@ ClassImp(ITSScaledModuleEditor) fInfoLabel0(0), fInfoLabel1(0) { - MakeTitle("ITSScaledModule"); + MakeTitle("AliEveITSScaledModule"); // Create widgets { TGHorizontalFrame* f = new TGHorizontalFrame(this); @@ -49,7 +56,7 @@ ClassImp(ITSScaledModuleEditor) fScale->GetNumberEntry()->SetToolTipText("Set cell size."); f->AddFrame(fScale, new TGLayoutHints(kLHintsLeft, 1, 7, 1, 1)); fScale->Associate(f); - fScale->Connect("ValueSet(Long_t)", "Alieve::ITSScaledModuleEditor", this, "DoScale()"); + fScale->Connect("ValueSet(Long_t)", "AliEveITSScaledModuleEditor", this, "DoScale()"); TGLabel* lab = new TGLabel(f, "Statistic:"); f->AddFrame(lab, new TGLayoutHints(kLHintsLeft|kLHintsBottom, 1, 2, 1, 2)); @@ -60,7 +67,7 @@ ClassImp(ITSScaledModuleEditor) TGListBox* lb = fStatistic->GetListBox(); lb->Resize(lb->GetWidth(), 3*16); fStatistic->Resize(74, 20); - fStatistic->Connect("Selected(Int_t)", "Alieve::ITSScaledModuleEditor", this, "DoStatType(Int_t)"); + fStatistic->Connect("Selected(Int_t)", "AliEveITSScaledModuleEditor", this, "DoStatType(Int_t)"); f->AddFrame(fStatistic, new TGLayoutHints(kLHintsLeft, 1, 2, 1, 1)); AddFrame(f, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); } @@ -69,11 +76,11 @@ ClassImp(ITSScaledModuleEditor) } /*************************************************************************/ -ITSScaledModuleEditor::~ITSScaledModuleEditor() +AliEveITSScaledModuleEditor::~AliEveITSScaledModuleEditor() {} /*************************************************************************/ -void ITSScaledModuleEditor::CreateInfoFrame() +void AliEveITSScaledModuleEditor::CreateInfoFrame() { fInfoFrame = CreateEditorTabSubFrame("Info"); TGCompositeFrame *title1 = new TGCompositeFrame(fInfoFrame, 145, 10, @@ -104,9 +111,9 @@ void ITSScaledModuleEditor::CreateInfoFrame() /**************************************************************************/ -void ITSScaledModuleEditor::SetModel(TObject* obj) +void AliEveITSScaledModuleEditor::SetModel(TObject* obj) { - fModule = dynamic_cast(obj); + fModule = dynamic_cast(obj); // widgets fScale->SetIntNumber(fModule->GetScaleInfo()->GetScale()); @@ -122,7 +129,7 @@ void ITSScaledModuleEditor::SetModel(TObject* obj) /**************************************************************************/ -void ITSScaledModuleEditor::DoScale() +void AliEveITSScaledModuleEditor::DoScale() { fModule->GetScaleInfo()->ScaleChanged(fScale->GetIntNumber()); @@ -135,7 +142,7 @@ void ITSScaledModuleEditor::DoScale() /**************************************************************************/ -void ITSScaledModuleEditor::DoStatType(Int_t v) +void AliEveITSScaledModuleEditor::DoStatType(Int_t v) { fModule->GetScaleInfo()->StatTypeChanged(v); Update(); diff --git a/EVE/Alieve/AliEveITSScaledModuleEditor.h b/EVE/Alieve/AliEveITSScaledModuleEditor.h new file mode 100644 index 00000000000..969c5d8c1ed --- /dev/null +++ b/EVE/Alieve/AliEveITSScaledModuleEditor.h @@ -0,0 +1,62 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_ITSScaledModuleEditor_H +#define ALIEVE_ITSScaledModuleEditor_H + +#include +#include + +class TGNumberEntry; +class TGColorSelect; +class TGComboBox; + +class TEveGValuator; +class TEveGDoubleValuator; +class TEveRGBAPalette; + + +class AliEveDigitScaleInfo; +class AliEveITSScaledModule; +class AliITSsegmentation; + +/**************************************************************************/ + +class AliEveITSScaledModuleEditor : public TGedFrame +{ +private: + AliEveITSScaledModuleEditor(const AliEveITSScaledModuleEditor&); // Not implemented + AliEveITSScaledModuleEditor& operator=(const AliEveITSScaledModuleEditor&); // Not implemented + + void CreateInfoFrame(); + +protected: + TGVerticalFrame* fInfoFrame; + + AliEveITSScaledModule* fModule; // fModel dynamic-casted to AliEveITSScaledModuleEditor + + TGNumberEntry* fScale; + TGComboBox* fStatistic; + + TGLabel* fInfoLabel0; + TGLabel* fInfoLabel1; + +public: + AliEveITSScaledModuleEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveITSScaledModuleEditor(); + + virtual void SetModel(TObject* obj); + + void DoScale(); + void DoStatType(Int_t t); + + ClassDef(AliEveITSScaledModuleEditor, 0); // Editor for AliEveITSScaledModule +}; // endclass AliEveITSScaledModuleEditor + +#endif diff --git a/EVE/Alieve/JetPlane.cxx b/EVE/Alieve/AliEveJetPlane.cxx similarity index 54% rename from EVE/Alieve/JetPlane.cxx rename to EVE/Alieve/AliEveJetPlane.cxx index a0a6adcf7db..4089b713b81 100644 --- a/EVE/Alieve/JetPlane.cxx +++ b/EVE/Alieve/AliEveJetPlane.cxx @@ -1,30 +1,36 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "JetPlane.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveJetPlane.h" #include #include #include #include #include -using namespace Alieve; //______________________________________________________________________ -// JetPlane +// AliEveJetPlane // -Bool_t JetPlane::fgOneMomentumXYZ = kFALSE; -Bool_t JetPlane::fgOneMomentumPhiTheta = kFALSE; -Bool_t JetPlane::fgOneEta = kFALSE; -Bool_t JetPlane::fgOneE = kFALSE; -Bool_t JetPlane::fgOneChgMass = kFALSE; +Bool_t AliEveJetPlane::fgOneMomentumXYZ = kFALSE; +Bool_t AliEveJetPlane::fgOneMomentumPhiTheta = kFALSE; +Bool_t AliEveJetPlane::fgOneEta = kFALSE; +Bool_t AliEveJetPlane::fgOneE = kFALSE; +Bool_t AliEveJetPlane::fgOneChgMass = kFALSE; -ClassImp(JetPlane) +ClassImp(AliEveJetPlane) -JetPlane::JetPlane(Int_t iev) : - TEveElementList(Form("JetPlane %i",iev), Form("%i",iev)), +AliEveJetPlane::AliEveJetPlane(Int_t iev) : + TEveElementList(Form("AliEveJetPlane %i",iev), Form("%i",iev)), fMinEta (-1.5 ), fMaxEta ( 1.5 ), @@ -55,14 +61,14 @@ JetPlane::JetPlane(Int_t iev) : /**************************************************************************/ -void JetPlane::AddJet(AliAODJet jet) +void AliEveJetPlane::AddJet(AliAODJet jet) { fJets.push_back(jet); } /**************************************************************************/ -void JetPlane::AddTrack(AliAODTrack track) +void AliEveJetPlane::AddTrack(AliAODTrack track) { fTracks.push_back(track); } @@ -70,14 +76,14 @@ void JetPlane::AddTrack(AliAODTrack track) /**************************************************************************/ -void JetPlane::ComputeBBox() +void AliEveJetPlane::ComputeBBox() { BBoxInit(); BBoxCheckPoint(-350, -350, -20); BBoxCheckPoint( 350, 350, 20); } -void JetPlane::Paint(Option_t* /*option*/) +void AliEveJetPlane::Paint(Option_t* /*option*/) { TBuffer3D buff(TBuffer3DTypes::kGeneric); @@ -90,7 +96,7 @@ void JetPlane::Paint(Option_t* /*option*/) Int_t reqSections = gPad->GetViewer3D()->AddObject(buff); if (reqSections == TBuffer3D::kNone) { - // printf("JetPlane::Paint viewer was happy with Core buff3d.\n"); + // printf("AliEveJetPlane::Paint viewer was happy with Core buff3d.\n"); return; } } diff --git a/EVE/Alieve/JetPlane.h b/EVE/Alieve/AliEveJetPlane.h similarity index 79% rename from EVE/Alieve/JetPlane.h rename to EVE/Alieve/AliEveJetPlane.h index 5b631403652..fab6ffa638d 100644 --- a/EVE/Alieve/JetPlane.h +++ b/EVE/Alieve/AliEveJetPlane.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_JetPlane_H #define ALIEVE_JetPlane_H @@ -15,17 +22,16 @@ #include -namespace Alieve { -class JetPlane : public TEveElementList, +class AliEveJetPlane : public TEveElementList, public TAtt3D, public TAttBBox { - friend class JetPlaneGL; + friend class AliEveJetPlaneGL; private: - JetPlane(const JetPlane&); // Not implemented - JetPlane& operator=(const JetPlane&); // Not implemented + AliEveJetPlane(const AliEveJetPlane&); // Not implemented + AliEveJetPlane& operator=(const AliEveJetPlane&); // Not implemented protected: Float_t fMinEta; @@ -64,8 +70,8 @@ protected: static Bool_t fgOneChgMass; public: - JetPlane(Int_t iev); - virtual ~JetPlane() {} + AliEveJetPlane(Int_t iev); + virtual ~AliEveJetPlane() {} void AddJet(AliAODJet jet); void AddTrack(AliAODTrack track); @@ -118,9 +124,7 @@ public: void SetTransMatrix(Double_t* carr) { fHMTrans.SetFrom(carr); } void SetTransMatrix(const TGeoMatrix& mat) { fHMTrans.SetFrom(mat); } - ClassDef(JetPlane, 1); -}; // endclass JetPlane - -} + ClassDef(AliEveJetPlane, 1); +}; // endclass AliEveJetPlane #endif diff --git a/EVE/Alieve/JetPlaneEditor.cxx b/EVE/Alieve/AliEveJetPlaneEditor.cxx similarity index 70% rename from EVE/Alieve/JetPlaneEditor.cxx rename to EVE/Alieve/AliEveJetPlaneEditor.cxx index 53b44160fa0..59e64cea94c 100644 --- a/EVE/Alieve/JetPlaneEditor.cxx +++ b/EVE/Alieve/AliEveJetPlaneEditor.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "JetPlaneEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveJetPlaneEditor.h" +#include #include #include @@ -14,17 +21,17 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// JetPlaneEditor +// AliEveJetPlaneEditor // -Alieve::JetPlaneEditor::StaticDataWindow* JetPlaneEditor::fgStaticWindow = 0; +AliEveJetPlaneEditor::StaticDataWindow* AliEveJetPlaneEditor::fgStaticWindow = 0; -ClassImp(JetPlaneEditor) +ClassImp(AliEveJetPlaneEditor) -JetPlaneEditor::JetPlaneEditor(const TGWindow *p, Int_t width, Int_t height, +AliEveJetPlaneEditor::AliEveJetPlaneEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), fM(0), @@ -37,21 +44,21 @@ JetPlaneEditor::JetPlaneEditor(const TGWindow *p, Int_t width, Int_t height, fInformationSetup(0) // Initialize widget pointers to 0 { - MakeTitle("JetPlane"); + MakeTitle("AliEveJetPlane"); Int_t labelW = 67; // Create widgets // fXYZZ = new TGSomeWidget(this, ...); // AddFrame(fXYZZ, new TGLayoutHints(...)); - // fXYZZ->Connect("SignalName()", "Alieve::JetPlaneEditor", this, "DoXYZZ()"); + // fXYZZ->Connect("SignalName()", "AliEveJetPlaneEditor", this, "DoXYZZ()"); fRnrJets = new TGCheckButton(this, "Rnr Jets"); AddFrame(fRnrJets, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); - fRnrJets->Connect("Clicked()", "Alieve::JetPlaneEditor", this, "DoRnrJets()"); + fRnrJets->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoRnrJets()"); fRnrTracks = new TGCheckButton(this, "Rnr Tracks"); AddFrame(fRnrTracks, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); - fRnrTracks->Connect("Clicked()", "Alieve::JetPlaneEditor", this, "DoRnrTracks()"); + fRnrTracks->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoRnrTracks()"); fEnergyScale = new TEveGValuator(this, "Length scale:", 110, 0); fEnergyScale->SetLabelWidth(labelW); @@ -59,7 +66,7 @@ JetPlaneEditor::JetPlaneEditor(const TGWindow *p, Int_t width, Int_t height, fEnergyScale->Build(); fEnergyScale->SetLimits(1, 500, 500, TGNumberFormat::kNESRealOne); fEnergyScale->SetToolTip("Energy mapped to length of arrow."); - fEnergyScale->Connect("ValueSet(Double_t)", "Alieve::JetPlaneEditor", this, "DoEnergyScale()"); + fEnergyScale->Connect("ValueSet(Double_t)", "AliEveJetPlaneEditor", this, "DoEnergyScale()"); AddFrame(fEnergyScale, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); fEnergyColorScale = new TEveGValuator(this, "Color scale:", 110, 0); @@ -68,29 +75,29 @@ JetPlaneEditor::JetPlaneEditor(const TGWindow *p, Int_t width, Int_t height, fEnergyColorScale->Build(); fEnergyColorScale->SetLimits(-2, 2, 100, TGNumberFormat::kNESRealOne); fEnergyColorScale->SetToolTip("Energy mapped to highest palette color."); - fEnergyColorScale->Connect("ValueSet(Double_t)", "Alieve::JetPlaneEditor", this, "DoEnergyColorScale()"); + fEnergyColorScale->Connect("ValueSet(Double_t)", "AliEveJetPlaneEditor", this, "DoEnergyColorScale()"); AddFrame(fEnergyColorScale, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); fOneSelection = new TGRadioButton(this, "&One TEveTrack/Jet"); fTwoSelection = new TGRadioButton(this, "&Two TEveTrack/Jet"); AddFrame(fOneSelection, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); AddFrame(fTwoSelection, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); - fOneSelection->Connect("Clicked()", "Alieve::JetPlaneEditor", this, "DoOneSelection()"); - fTwoSelection->Connect("Clicked()", "Alieve::JetPlaneEditor", this, "DoTwoSelection()"); + fOneSelection->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoOneSelection()"); + fTwoSelection->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoTwoSelection()"); // fInformationSetup = new TGTextButton(this, "TEveTrack/Jet Print"); // AddFrame(fInformationSetup, new TGLayoutHints(kLHintsTop | kLHintsLeft, 2, 0, 2, 2)); - // fInformationSetup->Connect("Clicked()", "Alieve::JetPlaneEditor", this, "DoStaticDataWindow()"); + // fInformationSetup->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoStaticDataWindow()"); } -JetPlaneEditor::~JetPlaneEditor() +AliEveJetPlaneEditor::~AliEveJetPlaneEditor() {} /**************************************************************************/ -void JetPlaneEditor::SetModel(TObject* obj) +void AliEveJetPlaneEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); // Set values of widgets // fXYZZ->SetValue(fM->GetXYZZ()); @@ -106,37 +113,37 @@ void JetPlaneEditor::SetModel(TObject* obj) // Implements callback/slot methods -// void JetPlaneEditor::DoXYZZ() +// void AliEveJetPlaneEditor::DoXYZZ() // { // fM->SetXYZZ(fXYZZ->GetValue()); // Update(); // } -void JetPlaneEditor::DoRnrJets() +void AliEveJetPlaneEditor::DoRnrJets() { fM->SetRnrJets(fRnrJets->IsOn()); Update(); } -void JetPlaneEditor::DoRnrTracks() +void AliEveJetPlaneEditor::DoRnrTracks() { fM->SetRnrTracks(fRnrTracks->IsOn()); Update(); } -void JetPlaneEditor::DoEnergyColorScale() +void AliEveJetPlaneEditor::DoEnergyColorScale() { fM->SetEnergyColorScale(fEnergyColorScale->GetValue()); Update(); } -void JetPlaneEditor::DoEnergyScale() +void AliEveJetPlaneEditor::DoEnergyScale() { fM->SetEnergyScale(fEnergyScale->GetValue()); Update(); } -void JetPlaneEditor::DoOneSelection() +void AliEveJetPlaneEditor::DoOneSelection() { fTwoSelection->SetState(kButtonUp); fM->SetOneSelection(fOneSelection->IsOn()); @@ -144,7 +151,7 @@ void JetPlaneEditor::DoOneSelection() Update(); } -void JetPlaneEditor::DoTwoSelection() +void AliEveJetPlaneEditor::DoTwoSelection() { fOneSelection->SetState(kButtonUp); fM->SetOneSelection(fOneSelection->IsOn()); @@ -152,7 +159,7 @@ void JetPlaneEditor::DoTwoSelection() Update(); } -void JetPlaneEditor::DoStaticDataWindow() +void AliEveJetPlaneEditor::DoStaticDataWindow() { printf("\n Soon available ... \n"); if (fgStaticWindow == 0) @@ -168,9 +175,9 @@ void JetPlaneEditor::DoStaticDataWindow() /**************************************************************************/ -ClassImp(JetPlaneEditor::StaticDataWindow) +ClassImp(AliEveJetPlaneEditor::StaticDataWindow) -JetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, const TGWindow *main, +AliEveJetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, const TGWindow *main, UInt_t w, UInt_t h, UInt_t options) : TGTransientFrame(p, main, w, h, options), fFrame1(0), @@ -186,7 +193,7 @@ JetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, const TGWi // Create a dialog window. A dialog window pops up with respect to its // "main" window. - Connect("CloseWindow()", "JetPlaneEditor::StaticDataWindow", this, "DoClose()"); + Connect("CloseWindow()", "AliEveJetPlaneEditor::StaticDataWindow", this, "DoClose()"); DontCallClose(); // to avoid double deletions. // use hierarchical cleaning @@ -195,9 +202,9 @@ JetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, const TGWi fFrame1 = new TGHorizontalFrame(this, 60, 20, kFixedWidth); fOkButton = new TGTextButton(fFrame1, "&Ok", 1); - fOkButton->Connect("Clicked()", "JetPlaneEditor::StaticDataWindow", this, "DoOK()"); + fOkButton->Connect("Clicked()", "AliEveJetPlaneEditor::StaticDataWindow", this, "DoOK()"); fCancelButton = new TGTextButton(fFrame1, "&Cancel", 2); - fCancelButton->Connect("Clicked()", "JetPlaneEditor::StaticDataWindow", this, "DoCancel()"); + fCancelButton->Connect("Clicked()", "AliEveJetPlaneEditor::StaticDataWindow", this, "DoCancel()"); fL1 = new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX,2, 2, 2, 2); fL2 = new TGLayoutHints(kLHintsBottom | kLHintsRight, 2, 2, 5, 1); @@ -211,7 +218,7 @@ JetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, const TGWi // Tabs for one and two track information fTab = new TGTab(this, 300, 300); - fTab->Connect("Selected(Int_t)", "JetPlaneEditor::StaticDataWindow", this, "DoTab(Int_t)"); + fTab->Connect("Selected(Int_t)", "AliEveJetPlaneEditor::StaticDataWindow", this, "DoTab(Int_t)"); fL3 = new TGLayoutHints(kLHintsTop | kLHintsLeft, 5, 5, 5, 5); @@ -254,29 +261,29 @@ JetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, const TGWi SetWindowName("TEveTrack/Jet Common Setup"); } -JetPlaneEditor::StaticDataWindow::~StaticDataWindow() +AliEveJetPlaneEditor::StaticDataWindow::~StaticDataWindow() { DeleteWindow(); } -void JetPlaneEditor::StaticDataWindow::DoClose() +void AliEveJetPlaneEditor::StaticDataWindow::DoClose() { UnmapWindow(); } -void JetPlaneEditor::StaticDataWindow::DoOK() +void AliEveJetPlaneEditor::StaticDataWindow::DoOK() { - // Read data from widgets, copy to static members of JetPlane + // Read data from widgets, copy to static members of AliEveJetPlane SendCloseMessage(); } -void JetPlaneEditor::StaticDataWindow::DoCancel() +void AliEveJetPlaneEditor::StaticDataWindow::DoCancel() { SendCloseMessage(); } -void JetPlaneEditor::StaticDataWindow::DoTab(Int_t /*id*/) +void AliEveJetPlaneEditor::StaticDataWindow::DoTab(Int_t /*id*/) { // printf("Tab item %d activated\n", id); } diff --git a/EVE/Alieve/JetPlaneEditor.h b/EVE/Alieve/AliEveJetPlaneEditor.h similarity index 62% rename from EVE/Alieve/JetPlaneEditor.h rename to EVE/Alieve/AliEveJetPlaneEditor.h index ac5d2f50e47..c722a04fd87 100644 --- a/EVE/Alieve/JetPlaneEditor.h +++ b/EVE/Alieve/AliEveJetPlaneEditor.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_JetPlaneEditor_H #define ALIEVE_JetPlaneEditor_H @@ -13,20 +20,19 @@ class TGColorSelect; class TEveGValuator; -namespace Alieve { // class TEveGValuator; -class JetPlane; +class AliEveJetPlane; -class JetPlaneEditor : public TGedFrame +class AliEveJetPlaneEditor : public TGedFrame { private: - JetPlaneEditor(const JetPlaneEditor&); // Not implemented - JetPlaneEditor& operator=(const JetPlaneEditor&); // Not implemented + AliEveJetPlaneEditor(const AliEveJetPlaneEditor&); // Not implemented + AliEveJetPlaneEditor& operator=(const AliEveJetPlaneEditor&); // Not implemented protected: - JetPlane *fM; // fModel dynamic-casted to JetPlaneEditor + AliEveJetPlane *fM; // fModel dynamic-casted to AliEveJetPlaneEditor // Declare widgets // TGSomeWidget* fXYZZ; @@ -38,9 +44,9 @@ protected: TGButton *fInformationSetup; public: - JetPlaneEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, + AliEveJetPlaneEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~JetPlaneEditor(); + virtual ~AliEveJetPlaneEditor(); virtual void SetModel(TObject* obj); @@ -83,9 +89,7 @@ public: protected: static StaticDataWindow* fgStaticWindow; - ClassDef(JetPlaneEditor, 1); // Editor for JetPlane -}; // endclass JetPlaneEditor - -} + ClassDef(AliEveJetPlaneEditor, 1); // Editor for AliEveJetPlane +}; // endclass AliEveJetPlaneEditor #endif diff --git a/EVE/Alieve/JetPlaneGL.cxx b/EVE/Alieve/AliEveJetPlaneGL.cxx similarity index 86% rename from EVE/Alieve/JetPlaneGL.cxx rename to EVE/Alieve/AliEveJetPlaneGL.cxx index b229ce6f0ee..96d36ef4c2e 100644 --- a/EVE/Alieve/JetPlaneGL.cxx +++ b/EVE/Alieve/AliEveJetPlaneGL.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "JetPlaneGL.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveJetPlaneGL.h" +#include #include #include @@ -13,42 +20,42 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// JetPlaneGL +// AliEveJetPlaneGL // -ClassImp(JetPlaneGL) +ClassImp(AliEveJetPlaneGL) -JetPlaneGL::JetPlaneGL() : TGLObject(), fM(0) +AliEveJetPlaneGL::AliEveJetPlaneGL() : TGLObject(), fM(0) { fDLCache = kFALSE; // Disable display list -- axis pain. } -JetPlaneGL::~JetPlaneGL() +AliEveJetPlaneGL::~AliEveJetPlaneGL() {} /**************************************************************************/ -Bool_t JetPlaneGL::SetModel(TObject* obj, const Option_t* /*opt*/) +Bool_t AliEveJetPlaneGL::SetModel(TObject* obj, const Option_t* /*opt*/) { - if(SetModelCheckClass(obj, Alieve::JetPlane::Class())) { - fM = dynamic_cast(obj); + if(SetModelCheckClass(obj, AliEveJetPlane::Class())) { + fM = dynamic_cast(obj); return kTRUE; } return kFALSE; } -void JetPlaneGL::SetBBox() +void AliEveJetPlaneGL::SetBBox() { // !! This ok if master sub-classed from TAttBBox - SetAxisAlignedBBox(((JetPlane*)fExternalObj)->AssertBBox()); + SetAxisAlignedBBox(((AliEveJetPlane*)fExternalObj)->AssertBBox()); } /**************************************************************************/ -void JetPlaneGL::DirectDraw(TGLRnrCtx & /*rnrCtx*/) const +void AliEveJetPlaneGL::DirectDraw(TGLRnrCtx & /*rnrCtx*/) const { Float_t minEta = (fM->fMinEta)*(fM->fEtaScale); @@ -239,7 +246,7 @@ void JetPlaneGL::DirectDraw(TGLRnrCtx & /*rnrCtx*/) const /**************************************************************************/ -void JetPlaneGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord & rec) +void AliEveJetPlaneGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord & rec) { // printf("beep %u\n", rec.GetN()); // rec.Print(); diff --git a/EVE/Alieve/AliEveJetPlaneGL.h b/EVE/Alieve/AliEveJetPlaneGL.h new file mode 100644 index 00000000000..d14013750d4 --- /dev/null +++ b/EVE/Alieve/AliEveJetPlaneGL.h @@ -0,0 +1,46 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_JetPlaneGL_H +#define ALIEVE_JetPlaneGL_H + +#include + +class TGLViewer; +class TGLScene; + + +class AliEveJetPlane; + +class AliEveJetPlaneGL : public TGLObject +{ +private: + AliEveJetPlaneGL(const AliEveJetPlaneGL&); // Not implemented + AliEveJetPlaneGL& operator=(const AliEveJetPlaneGL&); // Not implemented + +protected: + AliEveJetPlane* fM; // fModel dynamic-casted to AliEveJetPlaneGL + + virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; + +public: + AliEveJetPlaneGL(); + virtual ~AliEveJetPlaneGL(); + + virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); + virtual void SetBBox(); + + // To support two-level selection + virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } + virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec); + + ClassDef(AliEveJetPlaneGL, 0); +}; // endclass AliEveJetPlaneGL + +#endif diff --git a/EVE/Alieve/KineTools.cxx b/EVE/Alieve/AliEveKineTools.cxx similarity index 79% rename from EVE/Alieve/KineTools.cxx rename to EVE/Alieve/AliEveKineTools.cxx index e8771176bb4..275114dbb17 100644 --- a/EVE/Alieve/KineTools.cxx +++ b/EVE/Alieve/AliEveKineTools.cxx @@ -1,6 +1,13 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "KineTools.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveKineTools.h" #include #include @@ -17,19 +24,19 @@ #include //______________________________________________________________________ -// KineTools +// AliEveKineTools // -using namespace Alieve; + using namespace std; -ClassImp(KineTools) +ClassImp(AliEveKineTools) -KineTools::KineTools() +AliEveKineTools::AliEveKineTools() {} /**************************************************************************/ -void KineTools::SetDaughterPathMarks(TEveElement* cont, AliStack* stack, Bool_t recurse) +void AliEveKineTools::SetDaughterPathMarks(TEveElement* cont, AliStack* stack, Bool_t recurse) { // Import daughters birth points. @@ -81,11 +88,11 @@ void slurp_tracks(map& tracks, TEveElement* cont, Bool_t recu } -void KineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_t recurse) +void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_t recurse) { // set decay and reference points - static const TEveException eH("KineTools::ImportPathMarks"); + static const TEveException eH("AliEveKineTools::ImportPathMarks"); // Fill map map tracks; @@ -138,7 +145,7 @@ void KineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_t recu } // end loop through top branches } -void KineTools::SortPathMarks(TEveElement* cont, Bool_t recurse) +void AliEveKineTools::SortPathMarks(TEveElement* cont, Bool_t recurse) { // Sort path-marks for all tracks by time. diff --git a/EVE/Alieve/AliEveKineTools.h b/EVE/Alieve/AliEveKineTools.h new file mode 100644 index 00000000000..e6cc217320b --- /dev/null +++ b/EVE/Alieve/AliEveKineTools.h @@ -0,0 +1,45 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +// Tools for import of kinematics. +// Preliminary/minimal solution. + +#ifndef ALIEVE_KineTools_H +#define ALIEVE_KineTools_H + +#include +#include + +class TTree; +class AliStack; + +class TEveTrackList; + + +class AliEveKineTools +{ +private: + AliEveKineTools(const AliEveKineTools&); // Not implemented + AliEveKineTools& operator=(const AliEveKineTools&); // Not implemented + +protected: + // data from TreeK +public: + AliEveKineTools(); + virtual ~AliEveKineTools(){} + + // data from TreeTR + void SetDaughterPathMarks(TEveElement* cont, AliStack* stack, Bool_t recurse=kFALSE); + void SetTrackReferences (TEveElement* cont, TTree* treeTR=0, Bool_t recurse=kFALSE); + void SortPathMarks (TEveElement* cont, Bool_t recurse=kFALSE); + + ClassDef(AliEveKineTools, 1); +}; // endclass AliEveKineTools + +#endif diff --git a/EVE/Alieve/MUONChamber.cxx b/EVE/Alieve/AliEveMUONChamber.cxx similarity index 79% rename from EVE/Alieve/MUONChamber.cxx rename to EVE/Alieve/AliEveMUONChamber.cxx index af8db6b3773..0632a8a53bf 100644 --- a/EVE/Alieve/MUONChamber.cxx +++ b/EVE/Alieve/AliEveMUONChamber.cxx @@ -1,7 +1,15 @@ -#include "MUONChamber.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveMUONChamber.h" + +#include +#include #include #include @@ -12,16 +20,15 @@ #include #include -using namespace Alieve; //______________________________________________________________________ -// MUONChamber +// AliEveMUONChamber // -ClassImp(MUONChamber) +ClassImp(AliEveMUONChamber) //______________________________________________________________________ -MUONChamber::MUONChamber(Int_t id, const Text_t* n, const Text_t* t) : +AliEveMUONChamber::AliEveMUONChamber(Int_t id, const Text_t* n, const Text_t* t) : TEveElement(fFrameColor), TNamed(n,t), fMUONData(0), @@ -54,7 +61,7 @@ fHitSize(5) } //______________________________________________________________________ -MUONChamber::~MUONChamber() +AliEveMUONChamber::~AliEveMUONChamber() { // // destructor @@ -65,7 +72,7 @@ MUONChamber::~MUONChamber() } //______________________________________________________________________ -void MUONChamber::ComputeBBox() +void AliEveMUONChamber::ComputeBBox() { // // bounding box @@ -96,7 +103,7 @@ void MUONChamber::ComputeBBox() } //______________________________________________________________________ -void MUONChamber::Paint(Option_t*) +void AliEveMUONChamber::Paint(Option_t*) { // // draw... @@ -115,17 +122,17 @@ void MUONChamber::Paint(Option_t*) buffer.SetSectionsValid(TBuffer3D::kCore); Int_t reqSections = gPad->GetViewer3D()->AddObject(buffer); if (reqSections == TBuffer3D::kNone) { - //printf("MUONChamber::Paint viewer was happy with Core buff3d.\n"); + //printf("AliEveMUONChamber::Paint viewer was happy with Core buff3d.\n"); return; } - printf("MUONChamber::Paint only GL supported.\n"); + printf("AliEveMUONChamber::Paint only GL supported.\n"); return; } //______________________________________________________________________ -void MUONChamber::SetThreshold(Short_t t) +void AliEveMUONChamber::SetThreshold(Short_t t) { // // digits amplitude threshold @@ -138,7 +145,7 @@ void MUONChamber::SetThreshold(Short_t t) } //______________________________________________________________________ -void MUONChamber::SetMaxVal(Int_t mv) +void AliEveMUONChamber::SetMaxVal(Int_t mv) { // // digits amplitude maximum value @@ -151,7 +158,7 @@ void MUONChamber::SetMaxVal(Int_t mv) } //______________________________________________________________________ -void MUONChamber::SetClusterSize(Int_t size) +void AliEveMUONChamber::SetClusterSize(Int_t size) { // // cluster point size @@ -163,7 +170,7 @@ void MUONChamber::SetClusterSize(Int_t size) } //______________________________________________________________________ -void MUONChamber::SetHitSize(Int_t size) +void AliEveMUONChamber::SetHitSize(Int_t size) { // // hit point size @@ -175,7 +182,7 @@ void MUONChamber::SetHitSize(Int_t size) } //______________________________________________________________________ -void MUONChamber::SetupColor(Int_t val, UChar_t* pixel) const +void AliEveMUONChamber::SetupColor(Int_t val, UChar_t* pixel) const { // // RGBA color for amplitude "val" @@ -185,12 +192,12 @@ void MUONChamber::SetupColor(Int_t val, UChar_t* pixel) const Int_t nCol = gStyle->GetNumberOfColors(); Int_t cBin = (Int_t) TMath::Nint(nCol*(val - fThreshold)/div); - TEveUtil::ColorFromIdx(gStyle->GetColorPalette(TMath::Min(nCol - 1, cBin)), pixel); + TEveUtil::TEveUtil::ColorFromIdx(gStyle->GetColorPalette(TMath::Min(nCol - 1, cBin)), pixel); } //______________________________________________________________________ -Int_t MUONChamber::ColorIndex(Int_t val) const +Int_t AliEveMUONChamber::ColorIndex(Int_t val) const { // // index color @@ -208,7 +215,7 @@ Int_t MUONChamber::ColorIndex(Int_t val) const } //______________________________________________________________________ -void MUONChamber::SetupColorArray() const +void AliEveMUONChamber::SetupColorArray() const { // // build array of colors @@ -225,7 +232,7 @@ void MUONChamber::SetupColorArray() const } //______________________________________________________________________ -void MUONChamber::ClearColorArray() +void AliEveMUONChamber::ClearColorArray() { // // delete array of colors @@ -238,7 +245,7 @@ void MUONChamber::ClearColorArray() } //______________________________________________________________________ -void MUONChamber::SetDataSource(MUONData* data) +void AliEveMUONChamber::SetDataSource(AliEveMUONData* data) { if (data == fMUONData) return; @@ -250,7 +257,7 @@ void MUONChamber::SetDataSource(MUONData* data) } //______________________________________________________________________ -MUONChamberData* MUONChamber::GetChamberData() const +AliEveMUONChamberData* AliEveMUONChamber::GetChamberData() const { return fMUONData ? fMUONData->GetChamberData(fChamberID) : 0; @@ -258,7 +265,7 @@ MUONChamberData* MUONChamber::GetChamberData() const } //______________________________________________________________________ -void MUONChamber::UpdateQuads() +void AliEveMUONChamber::UpdateQuads() { fQuadSet1.Reset(TEveQuadSet::kQT_RectangleXY, kTRUE, 32); @@ -266,7 +273,7 @@ void MUONChamber::UpdateQuads() fPointSet1.Reset(); fPointSet2.Reset(); - MUONChamberData* data = GetChamberData(); + AliEveMUONChamberData* data = GetChamberData(); Float_t *buffer; Float_t x0, y0, z, w, h, clsq; @@ -351,7 +358,7 @@ void MUONChamber::UpdateQuads() } //______________________________________________________________________ -void MUONChamber::SetChamberID(Int_t id) +void AliEveMUONChamber::SetChamberID(Int_t id) { if (id < 0) id = 0; diff --git a/EVE/Alieve/MUONChamber.h b/EVE/Alieve/AliEveMUONChamber.h similarity index 59% rename from EVE/Alieve/MUONChamber.h rename to EVE/Alieve/AliEveMUONChamber.h index 355597993d3..7493d937a3c 100644 --- a/EVE/Alieve/MUONChamber.h +++ b/EVE/Alieve/AliEveMUONChamber.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_MUONChamber_H #define ALIEVE_MUONChamber_H @@ -9,31 +17,30 @@ #include #include -namespace Alieve { -class MUONData; -class MUONChamberData; -class MUONChamberEditor; -class MUONChamberGL; +class AliEveMUONData; +class AliEveMUONChamberData; +class AliEveMUONChamberEditor; +class AliEveMUONChamberGL; -class MUONChamber : public TEveElement, +class AliEveMUONChamber : public TEveElement, public TNamed, public TAtt3D, public TAttBBox { - friend class MUONChamberGL; - friend class MUONChamberEditor; + friend class AliEveMUONChamberGL; + friend class AliEveMUONChamberEditor; - MUONChamber(const MUONChamber&); // Not implemented - MUONChamber& operator=(const MUONChamber&); // Not implemented + AliEveMUONChamber(const AliEveMUONChamber&); // Not implemented + AliEveMUONChamber& operator=(const AliEveMUONChamber&); // Not implemented protected: void UpdateQuads(); - MUONData* fMUONData; // data for the current event + AliEveMUONData* fMUONData; // data for the current event Color_t fFrameColor; // main coloring UInt_t fRTS; //! Rendering Time Stamp Int_t fChamberID; // number of the chamber, 0 to 13 @@ -57,42 +64,40 @@ class MUONChamber : public TEveElement, public: - MUONChamber(Int_t id, const Text_t* n = "MUONChamber", const Text_t* t = 0); - virtual ~MUONChamber(); + AliEveMUONChamber(Int_t id, const Text_t* n = "AliEveMUONChamber", const Text_t* t = 0); + virtual ~AliEveMUONChamber(); virtual void ComputeBBox(); virtual void Paint(Option_t* option = ""); virtual UInt_t IncRTS() { return ++fRTS; }; virtual Bool_t CanEditMainColor() { return kTRUE; } - void SetDataSource(MUONData *data); + void SetDataSource(AliEveMUONData *data); void SetChamberID(Int_t id); void SetFrameColor(Color_t col) { fFrameColor = col; IncRTS(); }; - MUONData* GetData() const { return fMUONData; }; - MUONChamberData* GetChamberData() const; + AliEveMUONData* GetData() const { return fMUONData; }; + AliEveMUONChamberData* GetChamberData() const; Int_t GetID() const { return fChamberID; }; void SetThreshold(Short_t t); void SetMaxVal(Int_t mv); void SetClusterSize(Int_t size); void SetHitSize(Int_t size); - ClassDef(MUONChamber,1); // Visualisation of the MUON chambers + ClassDef(AliEveMUONChamber,1); // Visualisation of the MUON chambers }; -inline UChar_t* MUONChamber::ColorFromArray(Int_t val) const +inline UChar_t* AliEveMUONChamber::ColorFromArray(Int_t val) const { if(val < fThreshold) val = fThreshold; if(val > fMaxVal) val = fMaxVal; return fColorArray + 4 * (val - fThreshold); } -inline void MUONChamber::ColorFromArray(Int_t val, UChar_t* pix) const +inline void AliEveMUONChamber::ColorFromArray(Int_t val, UChar_t* pix) const { UChar_t* c = ColorFromArray(val); pix[0] = c[0]; pix[1] = c[1]; pix[2] = c[2]; pix[3] = c[3]; } -} - #endif diff --git a/EVE/Alieve/MUONChamberData.cxx b/EVE/Alieve/AliEveMUONChamberData.cxx similarity index 84% rename from EVE/Alieve/MUONChamberData.cxx rename to EVE/Alieve/AliEveMUONChamberData.cxx index 551236f50d6..1f3145559d5 100644 --- a/EVE/Alieve/MUONChamberData.cxx +++ b/EVE/Alieve/AliEveMUONChamberData.cxx @@ -1,4 +1,12 @@ -#include "MUONChamberData.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveMUONChamberData.h" #include #include @@ -14,27 +22,27 @@ #include -#include "Alieve/EventAlieve.h" +#include "Alieve/AliEveEventManager.h" /////////////////////////////////////////////////////////////////////////////// /// -/// MUONChamberData: geometry and digits +/// AliEveMUONChamberData: geometry and digits /// /////////////////////////////////////////////////////////////////////////////// -using namespace Alieve; -ClassImp(MUONChamberData) -AliMUONGeometryTransformer* MUONChamberData::fgTransformer = 0; +ClassImp(AliEveMUONChamberData) + +AliMUONGeometryTransformer* AliEveMUONChamberData::fgTransformer = 0; //______________________________________________________________________ -MUONChamberData::MUONChamberData(Int_t chamber) +AliEveMUONChamberData::AliEveMUONChamberData(Int_t chamber) { // // constructor // - Event *event = Alieve::gEvent; + AliEveEventManager *event = gEvent; TString dataPath = TString(event->GetTitle()); dataPath.Append("/geometry.root"); @@ -75,7 +83,7 @@ MUONChamberData::MUONChamberData(Int_t chamber) } //______________________________________________________________________ -MUONChamberData::~MUONChamberData() +AliEveMUONChamberData::~AliEveMUONChamberData() { // // destructor @@ -84,7 +92,7 @@ MUONChamberData::~MUONChamberData() } //______________________________________________________________________ -void MUONChamberData::DropData() +void AliEveMUONChamberData::DropData() { // // release the chamber data @@ -99,7 +107,7 @@ void MUONChamberData::DropData() } //______________________________________________________________________ -void MUONChamberData::Init(Int_t chamber) +void AliEveMUONChamberData::Init(Int_t chamber) { // // initialize the drawing coordinates of the chamber @@ -214,7 +222,7 @@ void MUONChamberData::Init(Int_t chamber) } //______________________________________________________________________ -void MUONChamberData::RegisterDigit(Int_t detElemId, Int_t cathode, Int_t ix, Int_t iy, Int_t charge) +void AliEveMUONChamberData::RegisterDigit(Int_t detElemId, Int_t cathode, Int_t ix, Int_t iy, Int_t charge) { // // add a digit to this chamber @@ -261,7 +269,7 @@ void MUONChamberData::RegisterDigit(Int_t detElemId, Int_t cathode, Int_t ix, In } //______________________________________________________________________ -void MUONChamberData::RegisterCluster(Int_t /*detElemId*/, Int_t cathode, Float_t clsX, Float_t clsY, Float_t clsZ, Float_t charge) +void AliEveMUONChamberData::RegisterCluster(Int_t /*detElemId*/, Int_t cathode, Float_t clsX, Float_t clsY, Float_t clsZ, Float_t charge) { // // add a reconstructed point (cluster) to this chamber @@ -282,7 +290,7 @@ void MUONChamberData::RegisterCluster(Int_t /*detElemId*/, Int_t cathode, Float_ } //______________________________________________________________________ -void MUONChamberData::RegisterHit(Int_t /*detElemId*/, Float_t hitX, Float_t hitY, Float_t hitZ) +void AliEveMUONChamberData::RegisterHit(Int_t /*detElemId*/, Float_t hitX, Float_t hitY, Float_t hitZ) { // // add a simulation hit to this chamber diff --git a/EVE/Alieve/MUONChamberData.h b/EVE/Alieve/AliEveMUONChamberData.h similarity index 69% rename from EVE/Alieve/MUONChamberData.h rename to EVE/Alieve/AliEveMUONChamberData.h index 4ddfcc6f76b..befd3397469 100644 --- a/EVE/Alieve/MUONChamberData.h +++ b/EVE/Alieve/AliEveMUONChamberData.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_MUONChamberData_H #define ALIEVE_MUONChamberData_H @@ -7,13 +15,12 @@ class AliMUONGeometryTransformer; -namespace Alieve { -class MUONChamberData : public TObject +class AliEveMUONChamberData : public TObject { - MUONChamberData(const MUONChamberData&); // Not implemented - MUONChamberData& operator=(const MUONChamberData&); // Not implemented + AliEveMUONChamberData(const AliEveMUONChamberData&); // Not implemented + AliEveMUONChamberData& operator=(const AliEveMUONChamberData&); // Not implemented private: @@ -34,8 +41,8 @@ protected: public: - MUONChamberData(Int_t chamber); - virtual ~MUONChamberData(); + AliEveMUONChamberData(Int_t chamber); + virtual ~AliEveMUONChamberData(); void DropData(); @@ -58,10 +65,8 @@ public: Float_t* GetChamberBox() { return &fChamberBox[0]; }; - ClassDef(MUONChamberData,1); // class with data for one chamber + ClassDef(AliEveMUONChamberData,1); // class with data for one chamber }; -} - #endif diff --git a/EVE/Alieve/MUONChamberEditor.cxx b/EVE/Alieve/AliEveMUONChamberEditor.cxx similarity index 72% rename from EVE/Alieve/MUONChamberEditor.cxx rename to EVE/Alieve/AliEveMUONChamberEditor.cxx index 4e93f808f2e..535399e0a0f 100644 --- a/EVE/Alieve/MUONChamberEditor.cxx +++ b/EVE/Alieve/AliEveMUONChamberEditor.cxx @@ -1,6 +1,14 @@ -#include "MUONChamberEditor.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveMUONChamberEditor.h" + +#include #include @@ -13,16 +21,16 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// MUONChamberEditor +// AliEveMUONChamberEditor // -ClassImp(MUONChamberEditor) +ClassImp(AliEveMUONChamberEditor) //______________________________________________________________________ -MUONChamberEditor::MUONChamberEditor(const TGWindow *p, +AliEveMUONChamberEditor::AliEveMUONChamberEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), @@ -35,7 +43,7 @@ MUONChamberEditor::MUONChamberEditor(const TGWindow *p, // constructor // - MakeTitle("MUONChamber"); + MakeTitle("AliEveMUONChamber"); Int_t labelW = 60; @@ -46,7 +54,7 @@ MUONChamberEditor::MUONChamberEditor(const TGWindow *p, fThreshold->GetSlider()->SetWidth(120); fThreshold->SetLimits(0,4096); fThreshold->Connect("ValueSet(Double_t)", - "Alieve::MUONChamberEditor", this, "DoThreshold()"); + "AliEveMUONChamberEditor", this, "DoThreshold()"); AddFrame(fThreshold, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fMaxVal = new TEveGValuator(this,"ADC max", 200, 0); @@ -56,7 +64,7 @@ MUONChamberEditor::MUONChamberEditor(const TGWindow *p, fMaxVal->GetSlider()->SetWidth(120); fMaxVal->SetLimits(0, 4096); fMaxVal->Connect("ValueSet(Double_t)", - "Alieve::MUONChamberEditor", this, "DoMaxVal()"); + "AliEveMUONChamberEditor", this, "DoMaxVal()"); AddFrame(fMaxVal, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fClusterSize = new TEveGValuator(this,"Cls size", 200, 0); @@ -67,7 +75,7 @@ MUONChamberEditor::MUONChamberEditor(const TGWindow *p, fClusterSize->SetLimits(0, 24); fClusterSize->SetToolTip("Size of displayed clusters"); fClusterSize->Connect("ValueSet(Double_t)", - "Alieve::MUONChamberEditor", this, "DoClusterSize()"); + "AliEveMUONChamberEditor", this, "DoClusterSize()"); AddFrame(fClusterSize, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fHitSize = new TEveGValuator(this,"TEveHit size", 200, 0); @@ -78,13 +86,13 @@ MUONChamberEditor::MUONChamberEditor(const TGWindow *p, fHitSize->SetLimits(0, 24); fHitSize->SetToolTip("Size of displayed clusters"); fHitSize->Connect("ValueSet(Double_t)", - "Alieve::MUONChamberEditor", this, "DoHitSize()"); + "AliEveMUONChamberEditor", this, "DoHitSize()"); AddFrame(fHitSize, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); } //______________________________________________________________________ -MUONChamberEditor::~MUONChamberEditor() +AliEveMUONChamberEditor::~AliEveMUONChamberEditor() { // // destructor @@ -93,13 +101,13 @@ MUONChamberEditor::~MUONChamberEditor() } //______________________________________________________________________ -void MUONChamberEditor::SetModel(TObject* obj) +void AliEveMUONChamberEditor::SetModel(TObject* obj) { // // ... // - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fThreshold->SetValue(fM->fThreshold); fMaxVal->SetValue(fM->fMaxVal); @@ -109,7 +117,7 @@ void MUONChamberEditor::SetModel(TObject* obj) } //______________________________________________________________________ -void MUONChamberEditor::DoThreshold() +void AliEveMUONChamberEditor::DoThreshold() { // // set digit minimum amplitude @@ -122,7 +130,7 @@ void MUONChamberEditor::DoThreshold() } //______________________________________________________________________ -void MUONChamberEditor::DoMaxVal() +void AliEveMUONChamberEditor::DoMaxVal() { // // set digit maximum amplitude @@ -135,7 +143,7 @@ void MUONChamberEditor::DoMaxVal() } //______________________________________________________________________ -void MUONChamberEditor::DoClusterSize() +void AliEveMUONChamberEditor::DoClusterSize() { // // set the cluster point size @@ -148,7 +156,7 @@ void MUONChamberEditor::DoClusterSize() } //______________________________________________________________________ -void MUONChamberEditor::DoHitSize() +void AliEveMUONChamberEditor::DoHitSize() { // // set the hit point size diff --git a/EVE/Alieve/AliEveMUONChamberEditor.h b/EVE/Alieve/AliEveMUONChamberEditor.h new file mode 100644 index 00000000000..0e2618749b3 --- /dev/null +++ b/EVE/Alieve/AliEveMUONChamberEditor.h @@ -0,0 +1,60 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#ifndef ALIEVE_MUONChamberEditor_H +#define ALIEVE_MUONChamberEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; +class TGDoubleHSlider; +class TGHSlider; + +class TEveGValuator; + + +class AliEveMUONChamber; + +class AliEveMUONChamberEditor : public TGedFrame +{ + + AliEveMUONChamberEditor(const AliEveMUONChamberEditor&); // Not implemented + AliEveMUONChamberEditor& operator=(const AliEveMUONChamberEditor&); // Not implemented + + protected: + + AliEveMUONChamber* fM; // fModel dynamic-casted to AliEveMUONChamberEditor + + TEveGValuator *fThreshold; // digit ADC min + TEveGValuator *fMaxVal; // digit ADC max + TEveGValuator *fClusterSize; // cluster point size + TEveGValuator *fHitSize; // hit point size + + public: + + AliEveMUONChamberEditor(const TGWindow* p = 0, + Int_t width = 170, Int_t height = 30, + UInt_t options = kChildFrame, + Pixel_t back = GetDefaultFrameBackground()); + + virtual ~AliEveMUONChamberEditor(); + + virtual void SetModel(TObject* obj); + + void DoThreshold(); + void DoMaxVal(); + void DoClusterSize(); + void DoHitSize(); + + ClassDef(AliEveMUONChamberEditor, 0); // Editor for AliEveMUONChamber + +}; + +#endif diff --git a/EVE/Alieve/MUONChamberGL.cxx b/EVE/Alieve/AliEveMUONChamberGL.cxx similarity index 80% rename from EVE/Alieve/MUONChamberGL.cxx rename to EVE/Alieve/AliEveMUONChamberGL.cxx index e7ff592f860..56f306a92e0 100644 --- a/EVE/Alieve/MUONChamberGL.cxx +++ b/EVE/Alieve/AliEveMUONChamberGL.cxx @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * * @@ -19,24 +27,24 @@ #include -#include "MUONChamberGL.h" +#include "AliEveMUONChamberGL.h" -#include -#include +#include +#include #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// MUONChamberGL +// AliEveMUONChamberGL // -ClassImp(MUONChamberGL) +ClassImp(AliEveMUONChamberGL) //______________________________________________________________________ -MUONChamberGL::MUONChamberGL() : +AliEveMUONChamberGL::AliEveMUONChamberGL() : TGLObject(), fChamber(0), fRTS(0) @@ -48,7 +56,7 @@ MUONChamberGL::MUONChamberGL() : } //______________________________________________________________________ -MUONChamberGL::~MUONChamberGL() +AliEveMUONChamberGL::~AliEveMUONChamberGL() { // // destructor @@ -57,15 +65,15 @@ MUONChamberGL::~MUONChamberGL() } //______________________________________________________________________ -Bool_t MUONChamberGL::SetModel(TObject* obj, const Option_t* /*opt*/) +Bool_t AliEveMUONChamberGL::SetModel(TObject* obj, const Option_t* /*opt*/) { // // ... // - if(SetModelCheckClass(obj, Alieve::MUONChamber::Class())) { + if(SetModelCheckClass(obj, AliEveMUONChamber::Class())) { - fChamber = (MUONChamber*) fExternalObj; + fChamber = (AliEveMUONChamber*) fExternalObj; fQS1.SetModel(&fChamber->fQuadSet1); fQS2.SetModel(&fChamber->fQuadSet2); return kTRUE; @@ -77,18 +85,18 @@ Bool_t MUONChamberGL::SetModel(TObject* obj, const Option_t* /*opt*/) } //______________________________________________________________________ -void MUONChamberGL::SetBBox() +void AliEveMUONChamberGL::SetBBox() { // // ... // - SetAxisAlignedBBox(((MUONChamber*)fExternalObj)->AssertBBox()); + SetAxisAlignedBBox(((AliEveMUONChamber*)fExternalObj)->AssertBBox()); } //______________________________________________________________________ -void MUONChamberGL::DirectDraw(TGLRnrCtx& rnrCtx) const +void AliEveMUONChamberGL::DirectDraw(TGLRnrCtx& rnrCtx) const { // // Actual GL drawing. @@ -118,7 +126,7 @@ void MUONChamberGL::DirectDraw(TGLRnrCtx& rnrCtx) const } //______________________________________________________________________ -void MUONChamberGL::DrawQuads(TGLRnrCtx& rnrCtx) const +void AliEveMUONChamberGL::DrawQuads(TGLRnrCtx& rnrCtx) const { // // draw the digits as GL_QUADS @@ -148,7 +156,7 @@ void MUONChamberGL::DrawQuads(TGLRnrCtx& rnrCtx) const } //______________________________________________________________________ -void MUONChamberGL::DrawPoints() const +void AliEveMUONChamberGL::DrawPoints() const { // // draw the clusters as GL_QUADS @@ -208,13 +216,13 @@ void MUONChamberGL::DrawPoints() const } //______________________________________________________________________ -void MUONChamberGL::DrawChamberFrame() const +void AliEveMUONChamberGL::DrawChamberFrame() const { // // draw the chamber frame as GL_LINE_LOOP // - MUONChamberData* chamberData = fChamber->GetChamberData(); + AliEveMUONChamberData* chamberData = fChamber->GetChamberData(); Int_t nDetElem = chamberData->GetNDetElem(); Float_t *frameCoord; Float_t xOrig, yOrig, xRad, yRad, x, y, z; diff --git a/EVE/Alieve/AliEveMUONChamberGL.h b/EVE/Alieve/AliEveMUONChamberGL.h new file mode 100644 index 00000000000..689844ad4a4 --- /dev/null +++ b/EVE/Alieve/AliEveMUONChamberGL.h @@ -0,0 +1,51 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#ifndef ALIEVE_MUONChamberGL_H +#define ALIEVE_MUONChamberGL_H + +#include +#include + +class TEveQuadSetGL; + + +class AliEveMUONChamber; + +class AliEveMUONChamberGL : public TGLObject +{ + + AliEveMUONChamberGL(const AliEveMUONChamberGL&); // Not implemented + AliEveMUONChamberGL& operator=(const AliEveMUONChamberGL&); // Not implemented + + protected: + + virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; + void DrawChamberFrame() const; + void DrawQuads(TGLRnrCtx& rnrCtx) const; + void DrawPoints() const; + + AliEveMUONChamber* fChamber; // fModel dynamic-casted to AliEveMUONChamberGL + TEveQuadSetGL fQS1; + TEveQuadSetGL fQS2; + + mutable UInt_t fRTS; // render time stamp + + public: + + AliEveMUONChamberGL(); + virtual ~AliEveMUONChamberGL(); + + virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); + virtual void SetBBox(); + + ClassDef(AliEveMUONChamberGL,1); // the GL drawing class of one chamber + +}; + +#endif diff --git a/EVE/Alieve/MUONData.cxx b/EVE/Alieve/AliEveMUONData.cxx similarity index 83% rename from EVE/Alieve/MUONData.cxx rename to EVE/Alieve/AliEveMUONData.cxx index e0c6f9edc18..97da557205e 100644 --- a/EVE/Alieve/MUONData.cxx +++ b/EVE/Alieve/AliEveMUONData.cxx @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // // Sources: // @@ -8,10 +16,10 @@ // LoadRawTrigger = MUONRawStreamTrigger.C // -#include "MUONData.h" +#include "AliEveMUONData.h" -#include -#include +#include +#include #include #include @@ -31,18 +39,18 @@ #include "TString.h" #include "TClonesArray.h" #include "TList.h" -using namespace Alieve; + //______________________________________________________________________ -// MUONData +// AliEveMUONData // -ClassImp(MUONData) +ClassImp(AliEveMUONData) -AliRawReader* MUONData::fgRawReader = 0; +AliRawReader* AliEveMUONData::fgRawReader = 0; //______________________________________________________________________ -MUONData::MUONData() : +AliEveMUONData::AliEveMUONData() : fChambers(14), fNTrackList(0) { @@ -59,7 +67,7 @@ MUONData::MUONData() : } //______________________________________________________________________ -MUONData::~MUONData() +AliEveMUONData::~AliEveMUONData() { // // Destructor @@ -70,7 +78,7 @@ MUONData::~MUONData() } //______________________________________________________________________ -void MUONData::Reset() +void AliEveMUONData::Reset() { // // Reset data @@ -86,7 +94,7 @@ void MUONData::Reset() } //______________________________________________________________________ -MUONData::MUONData(const MUONData &mdata) : +AliEveMUONData::AliEveMUONData(const AliEveMUONData &mdata) : TObject(mdata), TEveRefCnt(), fChambers(14), @@ -99,7 +107,7 @@ MUONData::MUONData(const MUONData &mdata) : } //______________________________________________________________________ -MUONData& MUONData::operator=(const MUONData &mdata) +AliEveMUONData& AliEveMUONData::operator=(const AliEveMUONData &mdata) { // // Assignment operator @@ -114,19 +122,19 @@ MUONData& MUONData::operator=(const MUONData &mdata) } //______________________________________________________________________ -void MUONData::CreateChamber(Int_t chamber) +void AliEveMUONData::CreateChamber(Int_t chamber) { // // create data for the chamber with id=chamber (0 to 13) // if (fChambers[chamber] == 0) - fChambers[chamber] = new MUONChamberData(chamber); + fChambers[chamber] = new AliEveMUONChamberData(chamber); } //______________________________________________________________________ -void MUONData::CreateAllChambers() +void AliEveMUONData::CreateAllChambers() { // // create all 14 chambers data @@ -138,7 +146,7 @@ void MUONData::CreateAllChambers() } //______________________________________________________________________ -void MUONData::DropAllChambers() +void AliEveMUONData::DropAllChambers() { // // release data from all chambers @@ -154,7 +162,7 @@ void MUONData::DropAllChambers() } //______________________________________________________________________ -void MUONData::DeleteAllChambers() +void AliEveMUONData::DeleteAllChambers() { // // delete all chambers data @@ -170,7 +178,7 @@ void MUONData::DeleteAllChambers() } //______________________________________________________________________ -void MUONData::RegisterTrack(Int_t track) +void AliEveMUONData::RegisterTrack(Int_t track) { // // register (in a list) a track with hits in the chambers @@ -196,7 +204,7 @@ void MUONData::RegisterTrack(Int_t track) } //______________________________________________________________________ -void MUONData::LoadRecPoints(TTree* tree) +void AliEveMUONData::LoadRecPoints(TTree* tree) { // // load reconstructed points from the TreeR @@ -240,7 +248,7 @@ void MUONData::LoadRecPoints(TTree* tree) } //______________________________________________________________________ -void MUONData::LoadHits(TTree* tree) +void AliEveMUONData::LoadHits(TTree* tree) { // // load simulation hits from the TreeH @@ -278,7 +286,7 @@ void MUONData::LoadHits(TTree* tree) } //______________________________________________________________________ -void MUONData::LoadDigits(TTree* tree) +void AliEveMUONData::LoadDigits(TTree* tree) { // // load digits from the TreeD @@ -316,7 +324,7 @@ void MUONData::LoadDigits(TTree* tree) } //______________________________________________________________________ -void MUONData::LoadRaw(TString fileName) +void AliEveMUONData::LoadRaw(TString fileName) { // // load raw data from fileName; tracker and trigger data @@ -339,7 +347,7 @@ void MUONData::LoadRaw(TString fileName) Int_t iEvent = 0; while (fgRawReader->NextEvent()) { - if (iEvent != Alieve::gEvent->GetEventId()) + if (iEvent != gEvent->GetEventId()) { iEvent++; continue; @@ -379,7 +387,7 @@ void MUONData::LoadRaw(TString fileName) } //______________________________________________________________________ -Int_t MUONData::GetTrack(Int_t index) +Int_t AliEveMUONData::GetTrack(Int_t index) { // // return track stack number for "index"-th track with hits in the chambers @@ -394,7 +402,7 @@ Int_t MUONData::GetTrack(Int_t index) } //______________________________________________________________________ -MUONChamberData* MUONData::GetChamberData(Int_t chamber) +AliEveMUONChamberData* AliEveMUONData::GetChamberData(Int_t chamber) { // // return chamber data diff --git a/EVE/Alieve/MUONTrack.cxx b/EVE/Alieve/AliEveMUONTrack.cxx similarity index 94% rename from EVE/Alieve/MUONTrack.cxx rename to EVE/Alieve/AliEveMUONTrack.cxx index 3260fb8a297..e5331ee63dc 100644 --- a/EVE/Alieve/MUONTrack.cxx +++ b/EVE/Alieve/AliEveMUONTrack.cxx @@ -1,6 +1,14 @@ -#include "MUONTrack.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveMUONTrack.h" + +#include #include #include @@ -26,18 +34,18 @@ #include #include -using namespace Alieve; + //______________________________________________________________________ -// MUONTrack +// AliEveMUONTrack // Produce TEveUtil:TEveTrack from AliMUONTrack with dipole field model -ClassImp(MUONTrack) +ClassImp(AliEveMUONTrack) -AliMagF* MUONTrack::fFieldMap = 0; +AliMagF* AliEveMUONTrack::fFieldMap = 0; //______________________________________________________________________ -MUONTrack::MUONTrack(TEveRecTrack* t, TEveTrackPropagator* rs) : +AliEveMUONTrack::AliEveMUONTrack(TEveRecTrack* t, TEveTrackPropagator* rs) : TEveTrack(t,rs), fTrack(0), fPart(0), @@ -52,12 +60,12 @@ MUONTrack::MUONTrack(TEveRecTrack* t, TEveTrackPropagator* rs) : // constructor // - fFieldMap = Alieve::Event::AssertMagField(); + fFieldMap = AliEveEventManager::AssertMagField(); } //______________________________________________________________________ -MUONTrack::~MUONTrack() +AliEveMUONTrack::~AliEveMUONTrack() { // // destructor @@ -69,7 +77,7 @@ MUONTrack::~MUONTrack() } //______________________________________________________________________ -void MUONTrack::PrintMCTrackInfo() +void AliEveMUONTrack::PrintMCTrackInfo() { // // information about the MC particle @@ -120,7 +128,7 @@ void MUONTrack::PrintMCTrackInfo() } //______________________________________________________________________ -void MUONTrack::PrintMUONTrackInfo() +void AliEveMUONTrack::PrintMUONTrackInfo() { // // information about the reconstructed/reference track; at hits and at vertex @@ -266,7 +274,7 @@ void MUONTrack::PrintMUONTrackInfo() } //______________________________________________________________________ -void MUONTrack::PrintMUONTriggerTrackInfo() +void AliEveMUONTrack::PrintMUONTriggerTrackInfo() { // // information about the trigger track @@ -277,7 +285,7 @@ void MUONTrack::PrintMUONTriggerTrackInfo() } //______________________________________________________________________ -void MUONTrack::PrintESDTrackInfo() +void AliEveMUONTrack::PrintESDTrackInfo() { // // information about the reconstructed ESD track at vertex @@ -335,7 +343,7 @@ void MUONTrack::PrintESDTrackInfo() setw(8) << setprecision(4) << mtp->P() << " GeV/c" << endl; - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); Double_t spdVertexX = 0; Double_t spdVertexY = 0; @@ -383,7 +391,7 @@ void MUONTrack::PrintESDTrackInfo() } //______________________________________________________________________ -void MUONTrack::MUONTrackInfo() +void AliEveMUONTrack::MUONTrackInfo() { // // MENU function @@ -413,14 +421,14 @@ void MUONTrack::MUONTrackInfo() } //______________________________________________________________________ -void MUONTrack::MUONTriggerInfo() +void AliEveMUONTrack::MUONTriggerInfo() { // // MENU function // if (fIsMUONTrack) { - TEveUtil::LoadMacro("MUON_trigger_info.C"); + TEveUtil::TEveUtil::LoadMacro("MUON_trigger_info.C"); gROOT->ProcessLine(Form("MUON_trigger_info(%d);", fLabel)); } if (fIsRefTrack) { @@ -431,7 +439,7 @@ void MUONTrack::MUONTriggerInfo() } if (fIsESDTrack) { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); ULong64_t triggerMask = esd->GetTriggerMask(); cout << endl; @@ -455,7 +463,7 @@ void MUONTrack::MUONTriggerInfo() } //______________________________________________________________________ -void MUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) +void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) { // // builds the track with dipole field @@ -492,9 +500,9 @@ void MUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) if (fIsMUONTrack) { if (mtrack->GetMatchTrigger()) { - sprintf(form,"MUONTrack %2d (MT)", fLabel); + sprintf(form,"AliEveMUONTrack %2d (MT)", fLabel); } else { - sprintf(form,"MUONTrack %2d ", fLabel); + sprintf(form,"AliEveMUONTrack %2d ", fLabel); } SetName(form); SetLineStyle(1); @@ -736,7 +744,7 @@ void MUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) } //______________________________________________________________________ -void MUONTrack::MakeMUONTriggerTrack(AliMUONTriggerTrack *mtrack) +void AliEveMUONTrack::MakeMUONTriggerTrack(AliMUONTriggerTrack *mtrack) { // // builds the trigger track from one point and direction @@ -766,7 +774,7 @@ void MUONTrack::MakeMUONTriggerTrack(AliMUONTriggerTrack *mtrack) } //______________________________________________________________________ -void MUONTrack::MakeESDTrack(AliESDMuonTrack *mtrack) +void AliEveMUONTrack::MakeESDTrack(AliESDMuonTrack *mtrack) { // // builds the track with dipole field starting from the TParticle @@ -825,7 +833,7 @@ void MUONTrack::MakeESDTrack(AliESDMuonTrack *mtrack) } //______________________________________________________________________ -void MUONTrack::MakeMCTrack(TParticle *part) +void AliEveMUONTrack::MakeMCTrack(TParticle *part) { // // builds the track with dipole field starting from the TParticle @@ -880,7 +888,7 @@ void MUONTrack::MakeMCTrack(TParticle *part) } //______________________________________________________________________ -void MUONTrack::MakeRefTrack(AliMUONTrack *mtrack) +void AliEveMUONTrack::MakeRefTrack(AliMUONTrack *mtrack) { // // builds the track with dipole field starting from the TParticle @@ -899,7 +907,7 @@ void MUONTrack::MakeRefTrack(AliMUONTrack *mtrack) } //______________________________________________________________________ -void MUONTrack::Propagate(Float_t *xr, Float_t *yr, Float_t *zr, Int_t i1, Int_t i2) +void AliEveMUONTrack::Propagate(Float_t *xr, Float_t *yr, Float_t *zr, Int_t i1, Int_t i2) { // // propagate in magnetic field between hits of indices i1 and i2 @@ -952,7 +960,7 @@ void MUONTrack::Propagate(Float_t *xr, Float_t *yr, Float_t *zr, Int_t i1, Int_t } //______________________________________________________________________ -void MUONTrack::GetField(Double_t *position, Double_t *field) +void AliEveMUONTrack::GetField(Double_t *position, Double_t *field) { // // returns field components at position, for a give field map @@ -983,7 +991,7 @@ void MUONTrack::GetField(Double_t *position, Double_t *field) } //______________________________________________________________________ -void MUONTrack::OneStepRungekutta(Double_t charge, Double_t step, +void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, Double_t* vect, Double_t* vout) { /// ****************************************************************** @@ -1228,7 +1236,7 @@ void MUONTrack::OneStepRungekutta(Double_t charge, Double_t step, } //______________________________________________________________________ -Int_t MUONTrack::ColorIndex(Float_t val) +Int_t AliEveMUONTrack::ColorIndex(Float_t val) { // // returns color index in the palette for a give value diff --git a/EVE/Alieve/MUONTrack.h b/EVE/Alieve/AliEveMUONTrack.h similarity index 70% rename from EVE/Alieve/MUONTrack.h rename to EVE/Alieve/AliEveMUONTrack.h index 5c2059a09bd..c882d140643 100644 --- a/EVE/Alieve/MUONTrack.h +++ b/EVE/Alieve/AliEveMUONTrack.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_MUONTrack_H #define ALIEVE_MUONTrack_H @@ -14,18 +22,17 @@ class TParticle; class TEveTrackPropagator; class TEveRecTrack; -namespace Alieve { -class MUONTrack: public TEveTrack +class AliEveMUONTrack: public TEveTrack { - MUONTrack(const MUONTrack&); // Not implemented - MUONTrack& operator=(const MUONTrack&); // Not implemented + AliEveMUONTrack(const AliEveMUONTrack&); // Not implemented + AliEveMUONTrack& operator=(const AliEveMUONTrack&); // Not implemented public: - MUONTrack(TEveRecTrack* t, TEveTrackPropagator* rs); - virtual ~MUONTrack(); + AliEveMUONTrack(TEveRecTrack* t, TEveTrackPropagator* rs); + virtual ~AliEveMUONTrack(); virtual void MakeTrack(Bool_t /*recurse*/=kFALSE) {} @@ -67,11 +74,9 @@ class MUONTrack: public TEveTrack static AliMagF *fFieldMap; // pointer to the magnetic field map - ClassDef(MUONTrack, 1); // Produce TEveUtil:TEveTrack from AliMUONTrack + ClassDef(AliEveMUONTrack, 1); // Produce TEveUtil:TEveTrack from AliMUONTrack }; -} - #endif diff --git a/EVE/Alieve/PMDModule.cxx b/EVE/Alieve/AliEvePMDModule.cxx similarity index 86% rename from EVE/Alieve/PMDModule.cxx rename to EVE/Alieve/AliEvePMDModule.cxx index 6ad70eda33e..0f7c8523bf5 100644 --- a/EVE/Alieve/PMDModule.cxx +++ b/EVE/Alieve/AliEvePMDModule.cxx @@ -1,30 +1,37 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "PMDModule.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEvePMDModule.h" #include "AliPMDdigit.h" #include "AliPMDddldata.h" #include -using namespace Alieve; -const Float_t PMDModule::fgkRad = 0.25; -const Float_t PMDModule::fgkSqRoot3 = 1.732050808; -const Float_t PMDModule::fgkZpos = 0.; -Int_t PMDModule::fPreTotPads = 0; -Int_t PMDModule::fCpvTotPads = 0; -Int_t PMDModule::fPreTotAdc = 0; -Int_t PMDModule::fCpvTotAdc = 0; + +const Float_t AliEvePMDModule::fgkRad = 0.25; +const Float_t AliEvePMDModule::fgkSqRoot3 = 1.732050808; +const Float_t AliEvePMDModule::fgkZpos = 0.; +Int_t AliEvePMDModule::fPreTotPads = 0; +Int_t AliEvePMDModule::fCpvTotPads = 0; +Int_t AliEvePMDModule::fPreTotAdc = 0; +Int_t AliEvePMDModule::fCpvTotAdc = 0; //______________________________________________________________________ -// PMDModule +// AliEvePMDModule // -ClassImp(PMDModule) +ClassImp(AliEvePMDModule) -PMDModule::PMDModule(): +AliEvePMDModule::AliEvePMDModule(): fH1(0), fX(0.), fY(0.), @@ -35,7 +42,7 @@ PMDModule::PMDModule(): } // -------------------------------------------------------------------- // -void PMDModule::DisplayInit(Int_t ism) +void AliEvePMDModule::DisplayInit(Int_t ism) { TString smodule = "Module"; smodule+= ism; @@ -62,7 +69,7 @@ void PMDModule::DisplayInit(Int_t ism) // -------------------------------------------------------------------- // -void PMDModule::DisplayDigitsData(Int_t ism, TTree *pmdt) +void AliEvePMDModule::DisplayDigitsData(Int_t ism, TTree *pmdt) { DisplayInit(ism); @@ -138,7 +145,7 @@ void PMDModule::DisplayDigitsData(Int_t ism, TTree *pmdt) // -------------------------------------------------------------------- // -void PMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) +void AliEvePMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) { DisplayInit(ism); @@ -208,7 +215,7 @@ void PMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) // -------------------------------------------------------------------- // -void PMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, +void AliEvePMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, Float_t &xpos, Float_t &ypos) { // This routine finds the cell eta,phi for the new PMD rectangular @@ -299,7 +306,7 @@ void PMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, // -------------------------------------------------------------------- // -void PMDModule::GenerateBox(Int_t ism, Float_t &xism, Float_t &yism, +void AliEvePMDModule::GenerateBox(Int_t ism, Float_t &xism, Float_t &yism, Float_t &dxism, Float_t &dyism) { const Float_t kDia = 0.50; @@ -370,7 +377,7 @@ void PMDModule::GenerateBox(Int_t ism, Float_t &xism, Float_t &yism, // -------------------------------------------------------------------- // -void PMDModule::SetPosition(Float_t x, Float_t y, Float_t z) +void AliEvePMDModule::SetPosition(Float_t x, Float_t y, Float_t z) { fX = x; fY = y; diff --git a/EVE/Alieve/PMDModule.h b/EVE/Alieve/AliEvePMDModule.h similarity index 63% rename from EVE/Alieve/PMDModule.h rename to EVE/Alieve/AliEvePMDModule.h index 27030b64966..06ce2bac9cc 100644 --- a/EVE/Alieve/PMDModule.h +++ b/EVE/Alieve/AliEvePMDModule.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_PMDModule_H #define ALIEVE_PMDModule_H @@ -11,13 +18,12 @@ #include #include -namespace Alieve { -class PMDModule : public TEveQuadSet +class AliEvePMDModule : public TEveQuadSet { private: - PMDModule(const PMDModule&); // Not implemented - PMDModule& operator=(const PMDModule&); // Not implemented + AliEvePMDModule(const AliEvePMDModule&); // Not implemented + AliEvePMDModule& operator=(const AliEvePMDModule&); // Not implemented void RectGeomCellPos(Int_t ism, Int_t irow, Int_t icol, Float_t &xpos, Float_t &ypos); @@ -41,8 +47,8 @@ protected: public: - PMDModule(); - virtual ~PMDModule() { delete fH1; } + AliEvePMDModule(); + virtual ~AliEvePMDModule() { delete fH1; } Int_t GetPRETotPads() const { return fPreTotPads; } Int_t GetCPVTotPads() const { return fCpvTotPads; } @@ -57,9 +63,7 @@ public: void DisplayRawData(Int_t ism, TObjArray *ddlcont); void SetPosition(Float_t x, Float_t y, Float_t z); - ClassDef(PMDModule, 1); -}; // endclass PMDModule - -} + ClassDef(AliEvePMDModule, 1); +}; // endclass AliEvePMDModule #endif diff --git a/EVE/Alieve/PMDModuleEditor.cxx b/EVE/Alieve/AliEvePMDModuleEditor.cxx similarity index 76% rename from EVE/Alieve/PMDModuleEditor.cxx rename to EVE/Alieve/AliEvePMDModuleEditor.cxx index c270be14345..6336b51003d 100644 --- a/EVE/Alieve/PMDModuleEditor.cxx +++ b/EVE/Alieve/AliEvePMDModuleEditor.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "PMDModuleEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEvePMDModuleEditor.h" +#include #include #include @@ -20,15 +27,15 @@ #include -using namespace Alieve; + //______________________________________________________________________ -// PMDModuleEditor +// AliEvePMDModuleEditor // -ClassImp(PMDModuleEditor) +ClassImp(AliEvePMDModuleEditor) -PMDModuleEditor::PMDModuleEditor(const TGWindow *p, Int_t width, Int_t height, +AliEvePMDModuleEditor::AliEvePMDModuleEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), fM(0), @@ -41,12 +48,12 @@ PMDModuleEditor::PMDModuleEditor(const TGWindow *p, Int_t width, Int_t height, fInfoLabel5(0) // Initialize widget pointers to 0 { - MakeTitle("PMDModule"); + MakeTitle("AliEvePMDModule"); CreateInfoFrame(); } -void PMDModuleEditor::CreateInfoFrame() +void AliEvePMDModuleEditor::CreateInfoFrame() { fInfoFrame = CreateEditorTabSubFrame("Info"); @@ -56,7 +63,7 @@ void PMDModuleEditor::CreateInfoFrame() kFixedWidth | kOwnBackground); - title1->AddFrame(new TGLabel(title1, "PMDModule Info"), + title1->AddFrame(new TGLabel(title1, "AliEvePMDModule Info"), new TGLayoutHints(kLHintsLeft, 1, 1, 0, 0)); title1->AddFrame(new TGHorizontal3DLine(title1), new TGLayoutHints(kLHintsExpandX, 5, 5, 7, 7)); @@ -107,20 +114,20 @@ void PMDModuleEditor::CreateInfoFrame() b = new TGTextButton(f, "Show"); f->AddFrame(b, new TGLayoutHints(kLHintsLeft|kLHintsExpandX, 1, 1, 0, 0)); - b->Connect("Clicked()", "Alieve::PMDModuleEditor", this, "DisplayHistos()"); + b->Connect("Clicked()", "AliEvePMDModuleEditor", this, "DisplayHistos()"); fInfoFrame->AddFrame(f, new TGLayoutHints(kLHintsLeft, 0, 0, 0, 0)); } } -PMDModuleEditor::~PMDModuleEditor() +AliEvePMDModuleEditor::~AliEvePMDModuleEditor() {} /**************************************************************************/ -void PMDModuleEditor::SetModel(TObject* obj) +void AliEvePMDModuleEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); // Set values of widgets @@ -132,7 +139,7 @@ void PMDModuleEditor::SetModel(TObject* obj) fInfoLabel5->SetText(Form("Tot ADC for CPV : %d", fM->GetCPVTotAdc())); } -void PMDModuleEditor::DisplayHistos() +void AliEvePMDModuleEditor::DisplayHistos() { fM->GetHisto()->Draw(); gPad->Modified(); diff --git a/EVE/Alieve/AliEvePMDModuleEditor.h b/EVE/Alieve/AliEvePMDModuleEditor.h new file mode 100644 index 00000000000..6c4ae432013 --- /dev/null +++ b/EVE/Alieve/AliEvePMDModuleEditor.h @@ -0,0 +1,58 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_PMDModuleEditor_H +#define ALIEVE_PMDModuleEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; + + +class AliEvePMDModule; + +class AliEvePMDModuleEditor : public TGedFrame +{ +private: + AliEvePMDModuleEditor(const AliEvePMDModuleEditor&); // Not implemented + AliEvePMDModuleEditor& operator=(const AliEvePMDModuleEditor&); // Not implemented + + void CreateInfoFrame(); + +protected: + AliEvePMDModule* fM; // fModel dynamic-casted to AliEvePMDModuleEditor + + TGVerticalFrame* fInfoFrame; + + TGLabel* fInfoLabel0; + TGLabel* fInfoLabel1; + TGLabel* fInfoLabel2; + TGLabel* fInfoLabel3; + TGLabel* fInfoLabel4; + TGLabel* fInfoLabel5; + +public: + AliEvePMDModuleEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEvePMDModuleEditor(); + + virtual void SetModel(TObject* obj); + void DisplayHistos(); + // void PrintADC(); + + + + // Declare callback/slot methods + // void DoXYZZ(); + + ClassDef(AliEvePMDModuleEditor, 0); // Editor for AliEvePMDModule +}; // endclass AliEvePMDModuleEditor + +#endif diff --git a/EVE/Alieve/T0Module.cxx b/EVE/Alieve/AliEveT0Module.cxx similarity index 82% rename from EVE/Alieve/T0Module.cxx rename to EVE/Alieve/AliEveT0Module.cxx index c2589823cee..0d07551e3d3 100644 --- a/EVE/Alieve/T0Module.cxx +++ b/EVE/Alieve/AliEveT0Module.cxx @@ -1,11 +1,19 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ ////////////////////////////////////////////////////////////////////////// // // // The main AliEVE drawing module for the T0 detector // // // ////////////////////////////////////////////////////////////////////////// -#include "EventAlieve.h" -#include "T0Module.h" +#include "AliEveEventManager.h" +#include "AliEveT0Module.h" #include #include #include @@ -19,13 +27,13 @@ #include "AliT0RawReader.h" #include #include -using namespace Alieve; -ClassImp(T0Module) + +ClassImp(AliEveT0Module) /**************************************************************************/ -T0Module::T0Module(const Text_t* n, Int_t sigType, AliT0digit *digits, AliT0RawReader *start) +AliEveT0Module::AliEveT0Module(const Text_t* n, Int_t sigType, AliT0digit *digits, AliT0RawReader *start) : TEveQuadSet(n), fSigType(sigType), fDigits(digits), fStart(start) { // @@ -35,12 +43,12 @@ T0Module::T0Module(const Text_t* n, Int_t sigType, AliT0digit *digits, AliT0RawR } /**************************************************************************/ -T0Module::~T0Module() +AliEveT0Module::~AliEveT0Module() { } -void T0Module::LoadRaw(TString fileName, Int_t ievt) +void AliEveT0Module::LoadRaw(TString fileName, Int_t ievt) { AliT0digit *digits = 0; AliRawReader *reader = new AliRawReaderRoot(fileName,ievt); @@ -52,9 +60,9 @@ void T0Module::LoadRaw(TString fileName, Int_t ievt) // cout<SetLimits(1, 3000); // Set proper raw time range. - TEveQuadSet* raw_a = new T0Module("T0_RAW_A", 2,digits, start); raw_a->SetPalette(rawPalette); + TEveQuadSet* raw_a = new AliEveT0Module("T0_RAW_A", 2,digits, start); raw_a->SetPalette(rawPalette); raw_a->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); - TEveQuadSet* raw_c = new T0Module("T0_RAW_C", 3,digits, start); raw_c->SetPalette(rawPalette); + TEveQuadSet* raw_c = new AliEveT0Module("T0_RAW_C", 3,digits, start); raw_c->SetPalette(rawPalette); raw_c->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); Float_t angle = 2 * TMath::Pi() / 12; start->Next(); @@ -91,7 +99,7 @@ void T0Module::LoadRaw(TString fileName, Int_t ievt) } /**************************************************************************/ -void T0Module::MakeModules(AliT0digit *digits) +void AliEveT0Module::MakeModules(AliT0digit *digits) { TRandom r(0); TArrayI ADC(24); @@ -109,10 +117,10 @@ void T0Module::MakeModules(AliT0digit *digits) TEveRGBAPalette* tdcPalette = new TEveRGBAPalette(0, 9999); tdcPalette->SetLimits(1, 9999); // Set proper TDC range. - TEveQuadSet* qa = new T0Module("T0A_ADC", 0, digits); qa->SetPalette(adcPalette); - TEveQuadSet* qc = new T0Module("T0C_ADC", 0, digits); qc->SetPalette(adcPalette); - TEveQuadSet* qat = new T0Module("T0A_TDC", 1, digits); qat->SetPalette(tdcPalette); - TEveQuadSet* qct = new T0Module("T0C_TDC", 1, digits); qct->SetPalette(tdcPalette); + TEveQuadSet* qa = new AliEveT0Module("T0A_ADC", 0, digits); qa->SetPalette(adcPalette); + TEveQuadSet* qc = new AliEveT0Module("T0C_ADC", 0, digits); qc->SetPalette(adcPalette); + TEveQuadSet* qat = new AliEveT0Module("T0A_TDC", 1, digits); qat->SetPalette(tdcPalette); + TEveQuadSet* qct = new AliEveT0Module("T0C_TDC", 1, digits); qct->SetPalette(tdcPalette); Float_t angle = 2 * TMath::Pi() / 12; @@ -169,7 +177,7 @@ void T0Module::MakeModules(AliT0digit *digits) /**************************************************************************/ -void T0Module::DigitSelected(Int_t idx) +void AliEveT0Module::DigitSelected(Int_t idx) { // Override control-click from TEveQuadSet diff --git a/EVE/Alieve/T0Module.h b/EVE/Alieve/AliEveT0Module.h similarity index 51% rename from EVE/Alieve/T0Module.h rename to EVE/Alieve/AliEveT0Module.h index 7ae20ccc7b1..998dcb3d87e 100644 --- a/EVE/Alieve/T0Module.h +++ b/EVE/Alieve/AliEveT0Module.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_T0Module_H #define ALIEVE_T0Module_H @@ -12,18 +20,17 @@ #include #include -namespace Alieve { -class T0Module : public TEveQuadSet +class AliEveT0Module : public TEveQuadSet { - T0Module(const T0Module&); - T0Module& operator=(const T0Module&); + AliEveT0Module(const AliEveT0Module&); + AliEveT0Module& operator=(const AliEveT0Module&); public: - T0Module(const Text_t* n="T0Module", Int_t sigType=0, AliT0digit *digits=0,AliT0RawReader *start=0); - virtual ~T0Module(); + AliEveT0Module(const Text_t* n="AliEveT0Module", Int_t sigType=0, AliT0digit *digits=0,AliT0RawReader *start=0); + virtual ~AliEveT0Module(); virtual void DigitSelected(Int_t idx); @@ -36,11 +43,11 @@ protected: AliT0digit *fDigits; AliT0RawReader *fStart; - ClassDef(T0Module,1); + ClassDef(AliEveT0Module,1); }; /* - class T0ModuleTDC : public T0Module + class T0ModuleTDC : public AliEveT0Module { public: // constructor @@ -49,5 +56,4 @@ protected: }; */ -} #endif diff --git a/EVE/Alieve/TOFDigitsInfo.cxx b/EVE/Alieve/AliEveTOFDigitsInfo.cxx similarity index 84% rename from EVE/Alieve/TOFDigitsInfo.cxx rename to EVE/Alieve/AliEveTOFDigitsInfo.cxx index 7ee65b62b1d..3ffecc478f2 100644 --- a/EVE/Alieve/TOFDigitsInfo.cxx +++ b/EVE/Alieve/AliEveTOFDigitsInfo.cxx @@ -1,21 +1,29 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // -// TOFDigitsInfo +// AliEveTOFDigitsInfo // #include -#include "TOFDigitsInfo.h" +#include "AliEveTOFDigitsInfo.h" #include #include //#include -using namespace Alieve; + using namespace std; //_________________________________________________________ -ClassImp(TOFDigitsInfo) +ClassImp(AliEveTOFDigitsInfo) - TOFDigitsInfo::TOFDigitsInfo(): + AliEveTOFDigitsInfo::AliEveTOFDigitsInfo(): TObject(), TEveRefCnt(), fTree (0), @@ -25,7 +33,7 @@ ClassImp(TOFDigitsInfo) {} /* ******************************************************* */ -TOFDigitsInfo:: ~TOFDigitsInfo() +AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() { delete fGeom; @@ -36,9 +44,9 @@ TOFDigitsInfo:: ~TOFDigitsInfo() } /* ******************************************************* */ -void TOFDigitsInfo::SetTree(TTree* tree) +void AliEveTOFDigitsInfo::SetTree(TTree* tree) { - static const TEveException eH("TOFDigitsInfo::SetTree "); + static const TEveException eH("AliEveTOFDigitsInfo::SetTree "); if(fGeom == 0) { fGeom = new AliTOFGeometry(); @@ -52,7 +60,7 @@ void TOFDigitsInfo::SetTree(TTree* tree) } /* ******************************************************* */ -void TOFDigitsInfo::LoadDigits() +void AliEveTOFDigitsInfo::LoadDigits() { TClonesArray *digitsTOF = 0x0; @@ -84,7 +92,7 @@ void TOFDigitsInfo::LoadDigits() /* ******************************************************* */ -void TOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, +void AliEveTOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, Int_t nStrip, Int_t nPadZ, Int_t nPadX, Int_t indexDigit[3]) { @@ -96,7 +104,7 @@ void TOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, } /* ******************************************************* */ -TClonesArray* TOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, +TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, Int_t nStrip) { @@ -157,7 +165,7 @@ TClonesArray* TOFDigitsInfo::GetDigits(Int_t nSector, Int_t nPlate, } /* ******************************************************* */ -TClonesArray* TOFDigitsInfo::GetDigits(Int_t nSector) +TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) { Int_t newCounter = 0; @@ -230,7 +238,7 @@ TClonesArray* TOFDigitsInfo::GetDigits(Int_t nSector) } /* ******************************************************* */ -void TOFDigitsInfo::GetDigits() +void AliEveTOFDigitsInfo::GetDigits() { for (Int_t iSector=0; iSectorNSectors(); iSector++) { diff --git a/EVE/Alieve/TOFDigitsInfo.h b/EVE/Alieve/AliEveTOFDigitsInfo.h similarity index 51% rename from EVE/Alieve/TOFDigitsInfo.h rename to EVE/Alieve/AliEveTOFDigitsInfo.h index 5fc64252d39..2d32be59cd2 100644 --- a/EVE/Alieve/TOFDigitsInfo.h +++ b/EVE/Alieve/AliEveTOFDigitsInfo.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TOFDigitsInfo_H #define ALIEVE_TOFDigitsInfo_H @@ -13,12 +21,11 @@ #include #include -namespace Alieve { -class TOFDigitsInfo : public TObject, public TEveRefCnt +class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt { - TOFDigitsInfo(const TOFDigitsInfo&); // Not implemented - TOFDigitsInfo& operator=(const TOFDigitsInfo&); // Not implemented + AliEveTOFDigitsInfo(const AliEveTOFDigitsInfo&); // Not implemented + AliEveTOFDigitsInfo& operator=(const AliEveTOFDigitsInfo&); // Not implemented private: @@ -32,8 +39,8 @@ class TOFDigitsInfo : public TObject, public TEveRefCnt AliTOFGeometry* fGeom; AliTOFDigitMap* fTOFdigitMap; - TOFDigitsInfo(); - virtual ~TOFDigitsInfo(); + AliEveTOFDigitsInfo(); + virtual ~AliEveTOFDigitsInfo(); void SetTree(TTree* tree); void LoadDigits(); @@ -46,8 +53,7 @@ class TOFDigitsInfo : public TObject, public TEveRefCnt TClonesArray* GetDigits(Int_t nSector); void GetDigits(); - ClassDef(TOFDigitsInfo, 1); - }; // endclass TOFDigitsInfo + ClassDef(AliEveTOFDigitsInfo, 1); + }; // endclass AliEveTOFDigitsInfo -} #endif diff --git a/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx b/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx new file mode 100644 index 00000000000..042190bb67d --- /dev/null +++ b/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx @@ -0,0 +1,64 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTOFDigitsInfoEditor.h" +#include + +#include +#include + +#include +#include +#include +#include +#include + + +//______________________________________________________________________ +// AliEveTOFDigitsInfoEditor +// + +ClassImp(AliEveTOFDigitsInfoEditor) + +AliEveTOFDigitsInfoEditor::AliEveTOFDigitsInfoEditor(const TGWindow *p, Int_t width, Int_t height, + UInt_t options, Pixel_t back) : + TGedFrame(p, width, height, options | kVerticalFrame, back), + fM(0) + // Initialize widget pointers to 0 +{ + MakeTitle("AliEveTOFDigitsInfo"); + + // Create widgets + // fXYZZ = new TGSomeWidget(this, ...); + // AddFrame(fXYZZ, new TGLayoutHints(...)); + // fXYZZ->Connect("SignalName()", "AliEveTOFDigitsInfoEditor", this, "DoXYZZ()"); +} + +AliEveTOFDigitsInfoEditor::~AliEveTOFDigitsInfoEditor() +{} + +/**************************************************************************/ + +void AliEveTOFDigitsInfoEditor::SetModel(TObject* obj) +{ + fM = dynamic_cast(obj); + + // Set values of widgets + // fXYZZ->SetValue(fM->GetXYZZ()); +} + +/**************************************************************************/ + +// Implements callback/slot methods + +// void AliEveTOFDigitsInfoEditor::DoXYZZ() +// { +// fM->SetXYZZ(fXYZZ->GetValue()); +// Update(); +// } diff --git a/EVE/Alieve/AliEveTOFDigitsInfoEditor.h b/EVE/Alieve/AliEveTOFDigitsInfoEditor.h new file mode 100644 index 00000000000..d4e79fc7b77 --- /dev/null +++ b/EVE/Alieve/AliEveTOFDigitsInfoEditor.h @@ -0,0 +1,46 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TOFDigitsInfoEditor_H +#define ALIEVE_TOFDigitsInfoEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; + + +class AliEveTOFDigitsInfo; + +class AliEveTOFDigitsInfoEditor : public TGedFrame +{ +private: + AliEveTOFDigitsInfoEditor(const AliEveTOFDigitsInfoEditor&); // Not implemented + AliEveTOFDigitsInfoEditor& operator=(const AliEveTOFDigitsInfoEditor&); // Not implemented + +protected: + AliEveTOFDigitsInfo* fM; // fModel dynamic-casted to AliEveTOFDigitsInfoEditor + + // Declare widgets + // TGSomeWidget* fXYZZ; + +public: + AliEveTOFDigitsInfoEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveTOFDigitsInfoEditor(); + + virtual void SetModel(TObject* obj); + + // Declare callback/slot methods + // void DoXYZZ(); + + ClassDef(AliEveTOFDigitsInfoEditor, 0); // Editor for AliEveTOFDigitsInfo +}; // endclass AliEveTOFDigitsInfoEditor + +#endif diff --git a/EVE/Alieve/TOFSector.cxx b/EVE/Alieve/AliEveTOFSector.cxx similarity index 87% rename from EVE/Alieve/TOFSector.cxx rename to EVE/Alieve/AliEveTOFSector.cxx index f5e0ca302eb..8d847118a96 100644 --- a/EVE/Alieve/TOFSector.cxx +++ b/EVE/Alieve/AliEveTOFSector.cxx @@ -1,4 +1,12 @@ -#include "TOFSector.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTOFSector.h" #include @@ -6,19 +14,19 @@ #include #include -using namespace Alieve; + using namespace std; -Bool_t TOFSector::fgStaticInitDone = kFALSE; -TEveFrameBox* TOFSector::fgTOFsectorFrameBox = 0; -TEveRGBAPalette* TOFSector::fgTOFsectorPalette = 0; +Bool_t AliEveTOFSector::fgStaticInitDone = kFALSE; +TEveFrameBox* AliEveTOFSector::fgTOFsectorFrameBox = 0; +TEveRGBAPalette* AliEveTOFSector::fgTOFsectorPalette = 0; //_______________________________________________________ -ClassImp(TOFSector) +ClassImp(AliEveTOFSector) /* ************************************************************************ */ -TOFSector::TOFSector(const Text_t* n, const Text_t* t) : +AliEveTOFSector::AliEveTOFSector(const Text_t* n, const Text_t* t) : TEveQuadSet(n, t), fTOFgeometry(new AliTOFGeometry()), fTOFarray(0x0), @@ -44,7 +52,7 @@ TOFSector::TOFSector(const Text_t* n, const Text_t* t) : } /* ************************************************************************ */ -TOFSector::TOFSector(TGeoManager *localGeoManager, +AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector) : TEveQuadSet(Form("Sector%i",nSector)), @@ -74,7 +82,7 @@ TOFSector::TOFSector(TGeoManager *localGeoManager, } /* ************************************************************************ */ -TOFSector::TOFSector(TGeoManager *localGeoManager, +AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TClonesArray *tofArray) : @@ -99,7 +107,7 @@ TOFSector::TOFSector(TGeoManager *localGeoManager, } /* ************************************************************************ */ -TOFSector::TOFSector(TGeoManager *localGeoManager, +AliEveTOFSector::AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TTree *tofTree) : @@ -124,7 +132,7 @@ TOFSector::TOFSector(TGeoManager *localGeoManager, } /* ************************************************************************ */ -TOFSector::~TOFSector() +AliEveTOFSector::~AliEveTOFSector() { /* fGeoManager = 0x0; @@ -139,7 +147,7 @@ TOFSector::~TOFSector() /* ************************************************************************ */ /* -void TOFSector::SetDigitsInfo(TOFDigitsInfo* info) +void AliEveTOFSector::SetDigitsInfo(AliEveTOFDigitsInfo* info) { if(fInfo) fInfo->DecRefCount(); fInfo = info; @@ -148,7 +156,7 @@ void TOFSector::SetDigitsInfo(TOFDigitsInfo* info) } */ /* ************************************************************************ */ -void TOFSector::InitStatics() +void AliEveTOFSector::InitStatics() { if (fgStaticInitDone) return; @@ -168,7 +176,7 @@ void TOFSector::InitStatics() } /* ************************************************************************ */ -void TOFSector::InitModule() +void AliEveTOFSector::InitModule() { fDx = fTOFgeometry->XPad()*fTOFgeometry->NpadX(); @@ -189,7 +197,7 @@ void TOFSector::InitModule() } /* ************************************************************************ */ -void TOFSector::LoadQuads() +void AliEveTOFSector::LoadQuads() { Reset(kQT_FreeQuad, kFALSE, 32); @@ -297,7 +305,7 @@ void TOFSector::LoadQuads() } /* ************************************************************ */ -void TOFSector::SetTrans() +void AliEveTOFSector::SetTrans() { fHMTrans.UnitTrans(); @@ -323,7 +331,7 @@ void TOFSector::SetTrans() //----------------------------------------------------- -void TOFSector::SetSectorID(Int_t id) +void AliEveTOFSector::SetSectorID(Int_t id) { fSectorID = id; fSector = id; @@ -335,7 +343,7 @@ void TOFSector::SetSectorID(Int_t id) //----------------------------------------------------- -void TOFSector::SetPlate(Int_t nPlate, Bool_t r) +void AliEveTOFSector::SetPlate(Int_t nPlate, Bool_t r) { fPlateFlag[nPlate] = r; @@ -345,7 +353,7 @@ void TOFSector::SetPlate(Int_t nPlate, Bool_t r) /**************************************************************************/ -void TOFSector::SetThreshold(Short_t t) +void AliEveTOFSector::SetThreshold(Short_t t) { fThreshold = TMath::Min(t, (Short_t)(fMaxVal - 1)); // ClearColorArray(); @@ -353,7 +361,7 @@ void TOFSector::SetThreshold(Short_t t) /**************************************************************************/ -void TOFSector::SetMaxVal(Int_t mv) +void AliEveTOFSector::SetMaxVal(Int_t mv) { fMaxVal = TMath::Max(mv, (Int_t)(fThreshold + 1)); //ClearColorArray(); @@ -361,14 +369,14 @@ void TOFSector::SetMaxVal(Int_t mv) /**************************************************************************/ -void TOFSector::DigitSelected(Int_t idx) +void AliEveTOFSector::DigitSelected(Int_t idx) { // Override control-click from TEveQuadSet DigitBase_t* qb = GetDigit(idx); TObject* obj = qb->fId.GetObject(); AliTOFdigit* digs = dynamic_cast(obj); - // printf("TOFSector::QuadSelected "); Print(); + // printf("AliEveTOFSector::QuadSelected "); Print(); printf(" idx = %5i, value = %5d, obj = 0x%lx, digit = 0x%lx ", idx, qb->fValue, (ULong_t)obj, (ULong_t)digs); if (digs) diff --git a/EVE/Alieve/TOFSector.h b/EVE/Alieve/AliEveTOFSector.h similarity index 67% rename from EVE/Alieve/TOFSector.h rename to EVE/Alieve/AliEveTOFSector.h index 7d19a8dd66c..9210edd0a6c 100644 --- a/EVE/Alieve/TOFSector.h +++ b/EVE/Alieve/AliEveTOFSector.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TOFSector_H #define ALIEVE_TOFSector_H @@ -13,13 +21,12 @@ #include -namespace Alieve { - class TOFSector : public TEveQuadSet + class AliEveTOFSector : public TEveQuadSet { - TOFSector(const TOFSector&); // Not implemented - TOFSector& operator=(const TOFSector&); // Not implemented + AliEveTOFSector(const AliEveTOFSector&); // Not implemented + AliEveTOFSector& operator=(const AliEveTOFSector&); // Not implemented //Int_t fSectorID; private: @@ -66,14 +73,14 @@ namespace Alieve { virtual void InitModule(); virtual void SetTrans(); - TOFSector(const Text_t* n="TOFSector", const Text_t* t=0); - TOFSector(TGeoManager *localGeoManager, Int_t nSector); + AliEveTOFSector(const Text_t* n="AliEveTOFSector", const Text_t* t=0); + AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector); - TOFSector(TGeoManager *localGeoManager, Int_t nSector, + AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TClonesArray *tofArray); - TOFSector(TGeoManager *localGeoManager, + AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TTree *tofTree); - virtual ~TOFSector(); + virtual ~AliEveTOFSector(); static Bool_t fgStaticInitDone; static void InitStatics(); @@ -95,7 +102,6 @@ namespace Alieve { static TEveFrameBox *fgTOFsectorFrameBox; static TEveRGBAPalette *fgTOFsectorPalette; - ClassDef(TOFSector, 1); + ClassDef(AliEveTOFSector, 1); }; -} #endif diff --git a/EVE/Alieve/TOFSectorEditor.cxx b/EVE/Alieve/AliEveTOFSectorEditor.cxx similarity index 64% rename from EVE/Alieve/TOFSectorEditor.cxx rename to EVE/Alieve/AliEveTOFSectorEditor.cxx index 9a129346e61..2ced8639d6f 100644 --- a/EVE/Alieve/TOFSectorEditor.cxx +++ b/EVE/Alieve/AliEveTOFSectorEditor.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TOFSectorEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTOFSectorEditor.h" +#include #include #include @@ -13,15 +20,15 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TOFSectorEditor +// AliEveTOFSectorEditor // -ClassImp(TOFSectorEditor) +ClassImp(AliEveTOFSectorEditor) - TOFSectorEditor::TOFSectorEditor(const TGWindow *p, Int_t width, Int_t height, + AliEveTOFSectorEditor::AliEveTOFSectorEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), fM(0) , @@ -35,18 +42,18 @@ ClassImp(TOFSectorEditor) /* fHMTrans = new TEveTransSubEditor(this); - fHMTrans->Connect("UseTrans()", "Alieve::TPCSectorVizEditor", this, "Update()"); - fHMTrans->Connect("TransChanged()", "Alieve::TPCSectorVizEditor", this, "Update()"); + fHMTrans->Connect("UseTrans()", "AliEveTPCSectorVizEditor", this, "Update()"); + fHMTrans->Connect("TransChanged()", "AliEveTPCSectorVizEditor", this, "Update()"); AddFrame(fHMTrans, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 2, 0, 0, 0)); - MakeTitle("TPCSectorViz");*/ + MakeTitle("AliEveTPCSectorViz");*/ { fPlate = new TGCheckButton*[5]; for (Int_t ii=0; ii<5; ii++) fPlate[ii] = new TGCheckButton; //fPriority = 40; - MakeTitle("TOFSector"); + MakeTitle("AliEveTOFSector"); fSectorID = new TEveGValuator(this, "SectorID", 110, 0); fSectorID->SetLabelWidth(60); @@ -56,49 +63,49 @@ ClassImp(TOFSectorEditor) fSectorID->SetLimits(0, 17); fSectorID->SetToolTip("The 18 Tof Sector's"); fSectorID->Connect("ValueSet(Double_t)", - "Alieve::TOFSectorEditor", this, "DoSectorID()"); + "AliEveTOFSectorEditor", this, "DoSectorID()"); // Reuse sectorID for auto-transformation button fAutoTrans = new TGCheckButton(fSectorID, "AutoTrans"); fAutoTrans->SetToolTipText("Automatically set transformation to true position"); fSectorID->AddFrame(fAutoTrans, new TGLayoutHints(kLHintsLeft, 12, 0, 1, 0)); - fAutoTrans->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoAutoTrans()"); + fAutoTrans->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoAutoTrans()"); AddFrame(fSectorID, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); // Create widgets // fXYZZ = new TGSomeWidget(this, ...); // AddFrame(fXYZZ, new TGLayoutHints(...)); - // fXYZZ->Connect("SignalName()", "Alieve::TOFSectorEditor", this, "DoXYZZ()"); { + // fXYZZ->Connect("SignalName()", "AliEveTOFSectorEditor", this, "DoXYZZ()"); { TGHorizontalFrame* f = new TGHorizontalFrame(this); Int_t nPlate = 0; fPlate0 = new TGCheckButton(f, "Plate0"); f->AddFrame(fPlate0, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fPlate0->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate0()"); - //fPlate0->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate(Int_t)"); + fPlate0->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate0()"); + //fPlate0->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate(Int_t)"); nPlate = 1; fPlate1 = new TGCheckButton(f, "Plate 1"); f->AddFrame(fPlate1, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fPlate1->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate1()"); - //fPlate1->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate(Int_t)"); + fPlate1->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate1()"); + //fPlate1->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate(Int_t)"); nPlate = 2; fPlate2 = new TGCheckButton(f, "Plate 2"); f->AddFrame(fPlate2, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fPlate2->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate2()"); - //fPlate2->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate(Int_t)"); + fPlate2->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate2()"); + //fPlate2->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate(Int_t)"); nPlate = 3; fPlate3 = new TGCheckButton(f, "Plate 3"); f->AddFrame(fPlate3, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fPlate3->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate3()"); - //fPlate3->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate(Int_t)"); + fPlate3->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate3()"); + //fPlate3->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate(Int_t)"); nPlate = 4; fPlate4 = new TGCheckButton(f, "Plate 4"); f->AddFrame(fPlate4, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fPlate4->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate4()"); - //fPlate4->Connect("Toggled(Bool_t)","Alieve::TOFSectorEditor", this, "DoPlate(Int_t)"); + fPlate4->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate4()"); + //fPlate4->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoPlate(Int_t)"); fPlate[0] = fPlate0; @@ -116,7 +123,7 @@ ClassImp(TOFSectorEditor) fThreshold->GetSlider()->SetWidth(120); fThreshold->SetLimits(0,250); fThreshold->Connect("ValueSet(Double_t)", - "Alieve::TOFSectorEditor", this, "DoThreshold()"); + "AliEveTOFSectorEditor", this, "DoThreshold()"); AddFrame(fThreshold, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fMaxVal = new TEveGValuator(this,"MaxVal", 200, 0); @@ -126,7 +133,7 @@ ClassImp(TOFSectorEditor) fMaxVal->GetSlider()->SetWidth(60); fMaxVal->SetLimits(0, 500); fMaxVal->Connect("ValueSet(Double_t)", - "Alieve::TOFSectorEditor", this, "DoMaxVal()"); + "AliEveTOFSectorEditor", this, "DoMaxVal()"); AddFrame(fMaxVal, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); } @@ -134,14 +141,14 @@ ClassImp(TOFSectorEditor) -TOFSectorEditor::~TOFSectorEditor() +AliEveTOFSectorEditor::~AliEveTOFSectorEditor() {} /**************************************************************************/ -void TOFSectorEditor::SetModel(TObject* obj) +void AliEveTOFSectorEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fSectorID->SetValue(fM->GetSectorID()); fAutoTrans->SetState(fM->GetAutoTrans() ? kButtonDown : kButtonUp); @@ -157,13 +164,13 @@ void TOFSectorEditor::SetModel(TObject* obj) } /**************************************************************************/ -void TOFSectorEditor::DoSectorID() +void AliEveTOFSectorEditor::DoSectorID() { fM->SetSectorID((Int_t) fSectorID->GetValue()); Update(); } -void TOFSectorEditor::DoAutoTrans() +void AliEveTOFSectorEditor::DoAutoTrans() { fM->SetAutoTrans(fAutoTrans->IsOn()); Update(); @@ -171,50 +178,50 @@ void TOFSectorEditor::DoAutoTrans() /**************************************************************************/ -void TOFSectorEditor::DoPlate(Int_t nPlate) +void AliEveTOFSectorEditor::DoPlate(Int_t nPlate) { fM->SetPlate(nPlate, fPlate[nPlate]->IsOn()); Update(); } -void TOFSectorEditor::DoPlate0() +void AliEveTOFSectorEditor::DoPlate0() { fM->SetPlate(0, fPlate0->IsOn()); Update(); } -void TOFSectorEditor::DoPlate1() +void AliEveTOFSectorEditor::DoPlate1() { fM->SetPlate(1, fPlate1->IsOn()); Update(); } -void TOFSectorEditor::DoPlate2() +void AliEveTOFSectorEditor::DoPlate2() { fM->SetPlate(2, fPlate2->IsOn()); Update(); } -void TOFSectorEditor::DoPlate3() +void AliEveTOFSectorEditor::DoPlate3() { fM->SetPlate(3, fPlate3->IsOn()); Update(); } -void TOFSectorEditor::DoPlate4() +void AliEveTOFSectorEditor::DoPlate4() { fM->SetPlate(4, fPlate4->IsOn()); Update(); } -void TOFSectorEditor::DoThreshold() +void AliEveTOFSectorEditor::DoThreshold() { fM->SetThreshold((Short_t) fThreshold->GetValue()); fThreshold->SetValue(fM->GetThreshold()); Update(); } -void TOFSectorEditor::DoMaxVal() +void AliEveTOFSectorEditor::DoMaxVal() { fM->SetMaxVal((Int_t) fMaxVal->GetValue()); fMaxVal->SetValue(fM->GetMaxVal()); @@ -223,7 +230,7 @@ void TOFSectorEditor::DoMaxVal() /**************************************************************************/ /* -void TOFSectorEditor::DoTime() +void AliEveTOFSectorEditor::DoTime() { fM->SetMinTime((Int_t) fTime->GetMin()); fM->SetMaxTime((Int_t) fTime->GetMax()); @@ -251,7 +258,7 @@ void TOFSectorEditor::DoTime() // Implements callback/slot methods -// void TOFSectorEditor::DoXYZZ() +// void AliEveTOFSectorEditor::DoXYZZ() // { // fM->SetXYZZ(fXYZZ->GetValue()); // Update(); diff --git a/EVE/Alieve/AliEveTOFSectorEditor.h b/EVE/Alieve/AliEveTOFSectorEditor.h new file mode 100644 index 00000000000..bb883ce046d --- /dev/null +++ b/EVE/Alieve/AliEveTOFSectorEditor.h @@ -0,0 +1,81 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TOFSectorEditor_H +#define ALIEVE_TOFSectorEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; +class TGDoubleHSlider; + +class TGHSlider; + +class TEveGValuator; +class TEveGDoubleValuator; +class TEveTransSubEditor; + + + class AliEveTOFSector; + + class AliEveTOFSectorEditor : public TGedFrame + { + //private: + AliEveTOFSectorEditor(const AliEveTOFSectorEditor&); // Not implemented + AliEveTOFSectorEditor& operator=(const AliEveTOFSectorEditor&); // Not implemented + + protected: + AliEveTOFSector* fM; // fModel dynamic-casted to AliEveTOFSectorEditor + + TEveGValuator* fSectorID; + + TGCheckButton* fAutoTrans; + + TGCheckButton** fPlate; + + TGCheckButton* fPlate0; + TGCheckButton* fPlate1; + TGCheckButton* fPlate2; + TGCheckButton* fPlate3; + TGCheckButton* fPlate4; + + TEveGValuator* fThreshold; + TEveGValuator* fMaxVal; + + + // Declare widgets + // TGSomeWidget* fXYZZ; + + public: + AliEveTOFSectorEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveTOFSectorEditor(); + + virtual void SetModel(TObject* obj); + void DoSectorID(); + void DoAutoTrans(); + void DoPlate0(); + void DoPlate1(); + void DoPlate2(); + void DoPlate3(); + void DoPlate4(); + + void DoPlate(Int_t nPlate); + void DoThreshold(); + void DoMaxVal(); + + + // Declare callback/slot methods + // void DoXYZZ(); + + ClassDef(AliEveTOFSectorEditor, 0); // Editor for AliEveTOFSector + }; // endclass AliEveTOFSectorEditor + +#endif diff --git a/EVE/Alieve/TOFStrip.cxx b/EVE/Alieve/AliEveTOFStrip.cxx similarity index 81% rename from EVE/Alieve/TOFStrip.cxx rename to EVE/Alieve/AliEveTOFStrip.cxx index 7ea48956445..51e64269d39 100644 --- a/EVE/Alieve/TOFStrip.cxx +++ b/EVE/Alieve/AliEveTOFStrip.cxx @@ -1,4 +1,12 @@ -#include "TOFStrip.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTOFStrip.h" #include @@ -6,19 +14,19 @@ #include #include -using namespace Alieve; + using namespace std; -Bool_t TOFStrip::fgStaticInitDone = kFALSE; -TEveFrameBox* TOFStrip::fgTOFstripFrameBox = 0; -TEveRGBAPalette* TOFStrip::fgTOFstripPalette = 0; +Bool_t AliEveTOFStrip::fgStaticInitDone = kFALSE; +TEveFrameBox* AliEveTOFStrip::fgTOFstripFrameBox = 0; +TEveRGBAPalette* AliEveTOFStrip::fgTOFstripPalette = 0; //_______________________________________________________ -ClassImp(TOFStrip) +ClassImp(AliEveTOFStrip) /* ************************************************************************ */ -TOFStrip::TOFStrip(const Text_t* n, const Text_t* t) : +AliEveTOFStrip::AliEveTOFStrip(const Text_t* n, const Text_t* t) : TEveQuadSet(n, t), fTOFgeometry(new AliTOFGeometry()), fTOFarray(0), @@ -32,7 +40,7 @@ TOFStrip::TOFStrip(const Text_t* n, const Text_t* t) : } /* ************************************************************************ */ -TOFStrip::TOFStrip(TGeoManager *localGeoManager, +AliEveTOFStrip::AliEveTOFStrip(TGeoManager *localGeoManager, Int_t nSector, Int_t nPlate, Int_t nStrip) : TEveQuadSet(Form("Strip%i",nStrip)), @@ -50,7 +58,7 @@ TOFStrip::TOFStrip(TGeoManager *localGeoManager, } /* ************************************************************************ */ -TOFStrip::TOFStrip(TGeoManager *localGeoManager, +AliEveTOFStrip::AliEveTOFStrip(TGeoManager *localGeoManager, Int_t nSector, Int_t nPlate, Int_t nStrip, TClonesArray *tofArray) : @@ -67,7 +75,7 @@ TOFStrip::TOFStrip(TGeoManager *localGeoManager, } /* ************************************************************************ */ -TOFStrip::~TOFStrip() +AliEveTOFStrip::~AliEveTOFStrip() { fGeoManager = 0x0; @@ -80,7 +88,7 @@ TOFStrip::~TOFStrip() /* ************************************************************************ */ /* -void TOFStrip::SetDigitsInfo(TOFDigitsInfo* info) +void AliEveTOFStrip::SetDigitsInfo(AliEveTOFDigitsInfo* info) { if(fInfo) fInfo->DecRefCount(); fInfo = info; @@ -89,7 +97,7 @@ void TOFStrip::SetDigitsInfo(TOFDigitsInfo* info) } */ /* ************************************************************************ */ -void TOFStrip::InitStatics() +void AliEveTOFStrip::InitStatics() { if (fgStaticInitDone) return; @@ -107,7 +115,7 @@ void TOFStrip::InitStatics() } /* ************************************************************************ */ -void TOFStrip::InitModule() +void AliEveTOFStrip::InitModule() { fDx = fTOFgeometry->XPad()*fTOFgeometry->NpadX(); @@ -127,7 +135,7 @@ void TOFStrip::InitModule() } /* ************************************************************************ */ -void TOFStrip::LoadQuads() +void AliEveTOFStrip::LoadQuads() { //Int_t n_col = gStyle->GetNumberOfColors(); @@ -177,7 +185,7 @@ void TOFStrip::LoadQuads() } /* ************************************************************ */ -void TOFStrip::SetTrans() +void AliEveTOFStrip::SetTrans() { fHMTrans.UnitTrans(); diff --git a/EVE/Alieve/AliEveTOFStrip.h b/EVE/Alieve/AliEveTOFStrip.h new file mode 100644 index 00000000000..5a288a7df89 --- /dev/null +++ b/EVE/Alieve/AliEveTOFStrip.h @@ -0,0 +1,68 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#ifndef ALIEVE_TOFStrip_H +#define ALIEVE_TOFStrip_H + +#include +#include + +#include +#include + +#include +#include + +#include + + +class AliEveTOFStrip : public TEveQuadSet +{ + AliEveTOFStrip(const AliEveTOFStrip&); // Not implemented + AliEveTOFStrip& operator=(const AliEveTOFStrip&); // Not implemented + +private: + void LoadQuads(); + +protected: + virtual void InitModule(); + virtual void SetTrans(); + + AliTOFGeometry* fTOFgeometry; + + TClonesArray *fTOFarray; + + Int_t fSector; + Int_t fPlate; + Int_t fStrip; + + Float_t fDx; + Float_t fDz; + + TGeoManager *fGeoManager; + +public: + AliEveTOFStrip(const Text_t* n="AliEveTOFStrip", const Text_t* t=0); + AliEveTOFStrip(TGeoManager *localGeoManager, + Int_t nSector, Int_t nPlate, Int_t nStrip); + + AliEveTOFStrip(TGeoManager *localGeoManager, + Int_t nSector, Int_t nPlate, Int_t nStrip, + TClonesArray *tofArray); + virtual ~AliEveTOFStrip(); + + static Bool_t fgStaticInitDone; + static void InitStatics(); + + static TEveFrameBox* fgTOFstripFrameBox; + + static TEveRGBAPalette* fgTOFstripPalette; + + ClassDef(AliEveTOFStrip, 1); +}; +#endif diff --git a/EVE/Alieve/AliEveTOFStripEditor.cxx b/EVE/Alieve/AliEveTOFStripEditor.cxx new file mode 100644 index 00000000000..79a487e6de6 --- /dev/null +++ b/EVE/Alieve/AliEveTOFStripEditor.cxx @@ -0,0 +1,64 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTOFStripEditor.h" +#include + +#include +#include + +#include +#include +#include +#include +#include + + +//______________________________________________________________________ +// AliEveTOFStripEditor +// + +ClassImp(AliEveTOFStripEditor) + +AliEveTOFStripEditor::AliEveTOFStripEditor(const TGWindow *p, Int_t width, Int_t height, + UInt_t options, Pixel_t back) : + TGedFrame(p, width, height, options | kVerticalFrame, back), + fM(0) + // Initialize widget pointers to 0 +{ + MakeTitle("AliEveTOFStrip"); + + // Create widgets + // fXYZZ = new TGSomeWidget(this, ...); + // AddFrame(fXYZZ, new TGLayoutHints(...)); + // fXYZZ->Connect("SignalName()", "AliEveTOFStripEditor", this, "DoXYZZ()"); +} + +AliEveTOFStripEditor::~AliEveTOFStripEditor() +{} + +/**************************************************************************/ + +void AliEveTOFStripEditor::SetModel(TObject* obj) +{ + fM = dynamic_cast(obj); + + // Set values of widgets + // fXYZZ->SetValue(fM->GetXYZZ()); +} + +/**************************************************************************/ + +// Implements callback/slot methods + +// void AliEveTOFStripEditor::DoXYZZ() +// { +// fM->SetXYZZ(fXYZZ->GetValue()); +// Update(); +// } diff --git a/EVE/Alieve/AliEveTOFStripEditor.h b/EVE/Alieve/AliEveTOFStripEditor.h new file mode 100644 index 00000000000..cba3efd7d44 --- /dev/null +++ b/EVE/Alieve/AliEveTOFStripEditor.h @@ -0,0 +1,46 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TOFStripEditor_H +#define ALIEVE_TOFStripEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; + + +class AliEveTOFStrip; + +class AliEveTOFStripEditor : public TGedFrame +{ +private: + AliEveTOFStripEditor(const AliEveTOFStripEditor&); // Not implemented + AliEveTOFStripEditor& operator=(const AliEveTOFStripEditor&); // Not implemented + +protected: + AliEveTOFStrip* fM; // fModel dynamic-casted to AliEveTOFStripEditor + + // Declare widgets + // TGSomeWidget* fXYZZ; + +public: + AliEveTOFStripEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveTOFStripEditor(); + + virtual void SetModel(TObject* obj); + + // Declare callback/slot methods + // void DoXYZZ(); + + ClassDef(AliEveTOFStripEditor, 0); // Editor for AliEveTOFStrip +}; // endclass AliEveTOFStripEditor + +#endif diff --git a/EVE/Alieve/TPCData.cxx b/EVE/Alieve/AliEveTPCData.cxx similarity index 73% rename from EVE/Alieve/TPCData.cxx rename to EVE/Alieve/AliEveTPCData.cxx index 63e7b01e94f..c5c7d86579e 100644 --- a/EVE/Alieve/TPCData.cxx +++ b/EVE/Alieve/AliEveTPCData.cxx @@ -1,22 +1,29 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCData.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ -#include +#include "AliEveTPCData.h" + +#include #include #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCData +// AliEveTPCData // // A central manager for TPC data of an event. Can read digits (from // a tree: LoadDigits()) and raw-data (via AliRawReader: LoadRaw()). // -// The sector data is stored in 36 TPCSectorData objects. +// The sector data is stored in 36 AliEveTPCSectorData objects. // Sectors 0 - 17: +z side, 18 - 35: -z side. // No separation of inner/outer segments, use row numbers for addressing. // @@ -28,35 +35,35 @@ using namespace Alieve; // You might still want to set load threshold (default iz zero). // -ClassImp(TPCData) +ClassImp(AliEveTPCData) -TPCData::TPCData() : +AliEveTPCData::AliEveTPCData() : fSectors(36), fSectorBlockSize(65536), fLoadThreshold(0), fLoadPedestal(0), fAutoPedestal(kFALSE) { - TPCSectorData::InitStatics(); + AliEveTPCSectorData::InitStatics(); } -TPCData::~TPCData() +AliEveTPCData::~AliEveTPCData() { DeleteAllSectors(); } /**************************************************************************/ -void TPCData::CreateSector(Int_t sector) +void AliEveTPCData::CreateSector(Int_t sector) { if(fSectors[sector] == 0) - fSectors[sector] = new TPCSectorData(sector, fSectorBlockSize); + fSectors[sector] = new AliEveTPCSectorData(sector, fSectorBlockSize); } -void TPCData::CreateAllSectors() +void AliEveTPCData::CreateAllSectors() { for(Int_t s=0; s<36; ++s) CreateSector(s); } -void TPCData::DropAllSectors() +void AliEveTPCData::DropAllSectors() { for(Int_t s=0; s<36; ++s) { if(fSectors[s] != 0) @@ -64,7 +71,7 @@ void TPCData::DropAllSectors() } } -void TPCData::DeleteAllSectors() +void AliEveTPCData::DeleteAllSectors() { for(Int_t s=0; s<36; ++s) { delete fSectors[s]; @@ -74,7 +81,7 @@ void TPCData::DeleteAllSectors() /**************************************************************************/ -TPCSectorData* TPCData::GetSectorData(Int_t sector, Bool_t spawnSectors) +AliEveTPCSectorData* AliEveTPCData::GetSectorData(Int_t sector, Bool_t spawnSectors) { if(sector < 0 || sector > 35) return 0; if(fSectors[sector] == 0 && spawnSectors) @@ -84,7 +91,7 @@ TPCSectorData* TPCData::GetSectorData(Int_t sector, Bool_t spawnSectors) /**************************************************************************/ -void TPCData::LoadDigits(TTree* tree, Bool_t spawnSectors) +void AliEveTPCData::LoadDigits(TTree* tree, Bool_t spawnSectors) { // Load data from TTree of AliSimDigits. // If spawnSectors is false only sectors that have been created previously @@ -97,15 +104,15 @@ void TPCData::LoadDigits(TTree* tree, Bool_t spawnSectors) Int_t sector, row, pad, curPad; Short_t time, signal; Bool_t inFill = kFALSE; - TPCSectorData* secData = 0; + AliEveTPCSectorData* secData = 0; Int_t numEnt = (Int_t) tree->GetEntries(); for (Int_t ent=0; entGetEntry(ent); - Alieve::TPCSectorData::GetParam().AdjustSectorRow(digit.GetID(), sector, row); + AliEveTPCSectorData::GetParam().AdjustSectorRow(digit.GetID(), sector, row); if(sector >= 36) { sector -= 36; - row += TPCSectorData::GetInnSeg().GetNRows(); + row += AliEveTPCSectorData::GetInnSeg().GetNRows(); } secData = GetSectorData(sector, spawnSectors); if(secData == 0) @@ -142,21 +149,21 @@ void TPCData::LoadDigits(TTree* tree, Bool_t spawnSectors) } } -void TPCData::LoadRaw(AliTPCRawStream& input, Bool_t spawnSectors, Bool_t warn) +void AliEveTPCData::LoadRaw(AliTPCRawStream& input, Bool_t spawnSectors, Bool_t warn) { // Load data from AliTPCRawStream. // If spawnSectors is false only sectors that have been created previously // via CreateSector() are loaded. // If spawnSectors is true sectors are created if data for them is encountered. - static const TEveException eH("TPCData::LoadRaw "); + static const TEveException eH("AliEveTPCData::LoadRaw "); Int_t sector = -1, row = -1, pad = -1, rowOffset = 0; Short_t time, signal; Bool_t inFill = kFALSE; Short_t lastTime = 9999; Bool_t lastTimeWarn = kFALSE; - TPCSectorData* secData = 0; + AliEveTPCSectorData* secData = 0; Short_t threshold = fLoadThreshold; @@ -169,7 +176,7 @@ void TPCData::LoadRaw(AliTPCRawStream& input, Bool_t spawnSectors, Bool_t warn) sector = input.GetSector(); if(sector >= 36) { sector -= 36; - rowOffset = TPCSectorData::GetInnSeg().GetNRows(); + rowOffset = AliEveTPCSectorData::GetInnSeg().GetNRows(); } else { rowOffset = 0; } @@ -186,15 +193,15 @@ void TPCData::LoadRaw(AliTPCRawStream& input, Bool_t spawnSectors, Bool_t warn) row = input.GetRow() + rowOffset; pad = input.GetPad(); - if(pad >= TPCSectorData::GetNPadsInRow(row)) { + if(pad >= AliEveTPCSectorData::GetNPadsInRow(row)) { if(warn) { Warning(eH.Data(), "pad out of range (row=%d, pad=%d, maxpad=%d).", - row, pad, TPCSectorData::GetNPadsInRow(row)); + row, pad, AliEveTPCSectorData::GetNPadsInRow(row)); } continue; } - TPCSectorData::PadRowHack* prh = secData->GetPadRowHack(row, pad); + AliEveTPCSectorData::PadRowHack* prh = secData->GetPadRowHack(row, pad); if(prh != 0) { threshold = prh->fThrExt + Short_t(prh->fThrFac*fLoadThreshold); } else { diff --git a/EVE/Alieve/TPCData.h b/EVE/Alieve/AliEveTPCData.h similarity index 59% rename from EVE/Alieve/TPCData.h rename to EVE/Alieve/AliEveTPCData.h index 04005d0b22a..81603da81ef 100644 --- a/EVE/Alieve/TPCData.h +++ b/EVE/Alieve/AliEveTPCData.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TPCData_H #define ALIEVE_TPCData_H @@ -13,29 +20,28 @@ class TTree; class AliTPCRawStream; class AliTPCRawStreamOld; -namespace Alieve { -class TPCSectorData; +class AliEveTPCSectorData; -class TPCData : public TObject, public TEveRefCnt +class AliEveTPCData : public TObject, public TEveRefCnt { protected: - std::vector fSectors; + std::vector fSectors; Int_t fSectorBlockSize; Short_t fLoadThreshold; Short_t fLoadPedestal; Bool_t fAutoPedestal; public: - TPCData(); - virtual ~TPCData(); + AliEveTPCData(); + virtual ~AliEveTPCData(); void CreateSector(Int_t sector); void CreateAllSectors(); void DropAllSectors(); void DeleteAllSectors(); - TPCSectorData* GetSectorData(Int_t sector, Bool_t spawnSectors=kFALSE); + AliEveTPCSectorData* GetSectorData(Int_t sector, Bool_t spawnSectors=kFALSE); Int_t GetSectorBlockSize() const { return fSectorBlockSize; } void SetSectorBlockSize(Int_t bs) { fSectorBlockSize = bs; } @@ -52,9 +58,7 @@ public: void LoadDigits(TTree* tree, Bool_t spawnSectors=kTRUE); void LoadRaw(AliTPCRawStream& input, Bool_t spawnSectors=kTRUE, Bool_t warn=kFALSE); - ClassDef(TPCData, 1); // Manages TPC data for an event. -}; // endclass TPCData - -} + ClassDef(AliEveTPCData, 1); // Manages TPC data for an event. +}; // endclass AliEveTPCData #endif diff --git a/EVE/Alieve/TPCLoader.cxx b/EVE/Alieve/AliEveTPCLoader.cxx similarity index 71% rename from EVE/Alieve/TPCLoader.cxx rename to EVE/Alieve/AliEveTPCLoader.cxx index 0792816f9fa..5ee7549eff9 100644 --- a/EVE/Alieve/TPCLoader.cxx +++ b/EVE/Alieve/AliEveTPCLoader.cxx @@ -1,9 +1,16 @@ -// $Header$ - -#include "TPCLoader.h" -#include "TPCData.h" -#include -#include +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCLoader.h" +#include "AliEveTPCData.h" +#include +#include #include #include @@ -11,15 +18,15 @@ #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCLoader +// AliEveTPCLoader // -ClassImp(TPCLoader) +ClassImp(AliEveTPCLoader) -TPCLoader::TPCLoader(const Text_t* n, const Text_t* t) : +AliEveTPCLoader::AliEveTPCLoader(const Text_t* n, const Text_t* t) : TEveElementList(n, t), fFile(), @@ -36,10 +43,10 @@ TPCLoader::TPCLoader(const Text_t* n, const Text_t* t) : fSetInitSectorParams(kFALSE), fInitMinTime(0), fInitMaxTime(460), fInitThreshold(5), fInitMaxVal(128) { - fData = new TPCData; + fData = new AliEveTPCData; } -TPCLoader::~TPCLoader() +AliEveTPCLoader::~AliEveTPCLoader() { delete fReader; delete fData; @@ -47,7 +54,7 @@ TPCLoader::~TPCLoader() /**************************************************************************/ -void TPCLoader::RemoveElementLocal(TEveElement* el) +void AliEveTPCLoader::RemoveElementLocal(TEveElement* el) { for(Int_t i=0; i<36; ++i) { if(fSec2Ds[i] == el) fSec2Ds[i] = 0; @@ -55,7 +62,7 @@ void TPCLoader::RemoveElementLocal(TEveElement* el) } } -void TPCLoader::RemoveElementsLocal() +void AliEveTPCLoader::RemoveElementsLocal() { for(Int_t i=0; i<36; ++i) { fSec2Ds[i] = 0; @@ -65,7 +72,7 @@ void TPCLoader::RemoveElementsLocal() /**************************************************************************/ -void TPCLoader::SetData(TPCData* d) +void AliEveTPCLoader::SetData(AliEveTPCData* d) { delete fData; fData = d; @@ -73,9 +80,9 @@ void TPCLoader::SetData(TPCData* d) /**************************************************************************/ -void TPCLoader::OpenFile() +void AliEveTPCLoader::OpenFile() { - static const TEveException eH("TPCLoader::OpenFile "); + static const TEveException eH("AliEveTPCLoader::OpenFile "); if(gSystem->AccessPathName(fFile, kReadPermission)) throw(eH + "can not read '" + fFile + "'."); @@ -96,9 +103,9 @@ void TPCLoader::OpenFile() UpdateSectors(kTRUE); } -void TPCLoader::LoadEvent() +void AliEveTPCLoader::LoadEvent() { - static const TEveException eH("TPCLoader::LoadEvent "); + static const TEveException eH("AliEveTPCLoader::LoadEvent "); if(fReader == 0) throw(eH + "data file not opened."); @@ -113,9 +120,9 @@ void TPCLoader::LoadEvent() fData->LoadRaw(input, kTRUE, kTRUE); } -void TPCLoader::NextEvent(Bool_t rewindOnEnd) +void AliEveTPCLoader::NextEvent(Bool_t rewindOnEnd) { - static const TEveException eH("TPCLoader::NextEvent "); + static const TEveException eH("AliEveTPCLoader::NextEvent "); if(fReader == 0) throw(eH + "data file not opened."); @@ -136,9 +143,9 @@ void TPCLoader::NextEvent(Bool_t rewindOnEnd) } } -void TPCLoader::GotoEvent(Int_t event) +void AliEveTPCLoader::GotoEvent(Int_t event) { - static const TEveException eH("TPCLoader::GotoEvent "); + static const TEveException eH("AliEveTPCLoader::GotoEvent "); if(fReader == 0) throw(eH + "data file not opened."); @@ -160,7 +167,7 @@ void TPCLoader::GotoEvent(Int_t event) UpdateSectors(); } -void* TPCLoader::LoopEvent(TPCLoader* loader) +void* AliEveTPCLoader::LoopEvent(AliEveTPCLoader* loader) { loader->NextEvent(); loader->LoadEvent(); @@ -172,12 +179,12 @@ void* TPCLoader::LoopEvent(TPCLoader* loader) /**************************************************************************/ -void TPCLoader::UpdateSectors(Bool_t dropNonPresent) +void AliEveTPCLoader::UpdateSectors(Bool_t dropNonPresent) { gEve->DisableRedraw(); for(Int_t i=0; i<=35; ++i) { - TPCSectorData* sd = fData->GetSectorData(i); + AliEveTPCSectorData* sd = fData->GetSectorData(i); // 2D sectors if(fSec2Ds[i] != 0) @@ -193,7 +200,7 @@ void TPCLoader::UpdateSectors(Bool_t dropNonPresent) else { if(sd != 0) { - TPCSector2D* s = new TPCSector2D(Form("Sector2D %d", i)); + AliEveTPCSector2D* s = new AliEveTPCSector2D(Form("Sector2D %d", i)); fSec2Ds[i] = s; s->SetSectorID(i); s->SetDataSource(fData); @@ -231,19 +238,19 @@ void TPCLoader::UpdateSectors(Bool_t dropNonPresent) gEve->EnableRedraw(); } -void TPCLoader::ReloadSectors() +void AliEveTPCLoader::ReloadSectors() { LoadEvent(); UpdateSectors(); } -void TPCLoader::CreateSectors3D() +void AliEveTPCLoader::CreateSectors3D() { gEve->DisableRedraw(); for(Int_t i=0; i<=35; ++i) { - TPCSectorData* sd = fData->GetSectorData(i); + AliEveTPCSectorData* sd = fData->GetSectorData(i); if(sd != 0 && fSec3Ds[i] == 0) { - TPCSector3D* s = new TPCSector3D(Form("Sector3D %d", i)); + AliEveTPCSector3D* s = new AliEveTPCSector3D(Form("Sector3D %d", i)); fSec3Ds[i] = s; s->SetSectorID(i); s->SetDataSource(fData); @@ -262,7 +269,7 @@ void TPCLoader::CreateSectors3D() gEve->EnableRedraw(); } -void TPCLoader::DeleteSectors3D() +void AliEveTPCLoader::DeleteSectors3D() { gEve->DisableRedraw(); for(Int_t i=0; i<=35; ++i) { @@ -278,7 +285,7 @@ void TPCLoader::DeleteSectors3D() /**************************************************************************/ -void TPCLoader::SetInitParams(Int_t mint, Int_t maxt, Int_t thr, Int_t maxval) +void AliEveTPCLoader::SetInitParams(Int_t mint, Int_t maxt, Int_t thr, Int_t maxval) { fSetInitSectorParams = kTRUE; fInitMinTime = mint; diff --git a/EVE/Alieve/TPCLoader.h b/EVE/Alieve/AliEveTPCLoader.h similarity index 51% rename from EVE/Alieve/TPCLoader.h rename to EVE/Alieve/AliEveTPCLoader.h index f9996fa6ea2..d0e94848ae6 100644 --- a/EVE/Alieve/TPCLoader.h +++ b/EVE/Alieve/AliEveTPCLoader.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TPCLoader_H #define ALIEVE_TPCLoader_H @@ -8,18 +15,17 @@ class AliRawReaderRoot; -namespace Alieve { -class TPCData; -class TPCSector2D; -class TPCSector3D; +class AliEveTPCData; +class AliEveTPCSector2D; +class AliEveTPCSector3D; -class TPCLoader : public TEveElementList +class AliEveTPCLoader : public TEveElementList { - friend class TPCLoaderEditor; + friend class AliEveTPCLoaderEditor; - TPCLoader(const TPCLoader&); // Not implemented - TPCLoader& operator=(const TPCLoader&); // Not implemented + AliEveTPCLoader(const AliEveTPCLoader&); // Not implemented + AliEveTPCLoader& operator=(const AliEveTPCLoader&); // Not implemented protected: TString fFile; @@ -28,10 +34,10 @@ protected: TString fTPCEquipementMap; AliRawReaderRoot* fReader; - TPCData* fData; + AliEveTPCData* fData; - std::vector fSec2Ds; - std::vector fSec3Ds; + std::vector fSec2Ds; + std::vector fSec3Ds; Bool_t fSetInitSectorParams; Int_t fInitMinTime; @@ -40,8 +46,8 @@ protected: Int_t fInitMaxVal; public: - TPCLoader(const Text_t* n="TPCLoader", const Text_t* t=0); - virtual ~TPCLoader(); + AliEveTPCLoader(const Text_t* n="AliEveTPCLoader", const Text_t* t=0); + virtual ~AliEveTPCLoader(); virtual void RemoveElementLocal(TEveElement* el); virtual void RemoveElementsLocal(); @@ -53,14 +59,14 @@ public: void SetTPCEquipementMap(const Text_t* em) { fTPCEquipementMap = em; } AliRawReaderRoot* GetReader() const { return fReader; } void SetReader(AliRawReaderRoot* reader) { fReader = reader; } - TPCData* GetData() const { return fData; } - void SetData(TPCData* d); + AliEveTPCData* GetData() const { return fData; } + void SetData(AliEveTPCData* d); void OpenFile(); void LoadEvent(); void NextEvent(Bool_t rewindOnEnd=kTRUE); void GotoEvent(Int_t event); - static void* LoopEvent(TPCLoader* loader); + static void* LoopEvent(AliEveTPCLoader* loader); void UpdateSectors(Bool_t dropNonPresent=kFALSE); void ReloadSectors(); @@ -69,9 +75,7 @@ public: void SetInitParams(Int_t mint, Int_t maxt, Int_t thr, Int_t maxval=128); - ClassDef(TPCLoader, 1); -}; // endclass TPCLoader - -} + ClassDef(AliEveTPCLoader, 1); +}; // endclass AliEveTPCLoader #endif diff --git a/EVE/Alieve/TPCLoaderEditor.cxx b/EVE/Alieve/AliEveTPCLoaderEditor.cxx similarity index 73% rename from EVE/Alieve/TPCLoaderEditor.cxx rename to EVE/Alieve/AliEveTPCLoaderEditor.cxx index 6bb7dd99c18..7091a0a4e66 100644 --- a/EVE/Alieve/TPCLoaderEditor.cxx +++ b/EVE/Alieve/AliEveTPCLoaderEditor.cxx @@ -1,8 +1,15 @@ -// $Header$ - -#include "TPCLoaderEditor.h" -#include -#include +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCLoaderEditor.h" +#include +#include #include #include @@ -16,15 +23,15 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCLoaderEditor +// AliEveTPCLoaderEditor // -ClassImp(TPCLoaderEditor) +ClassImp(AliEveTPCLoaderEditor) - TPCLoaderEditor::TPCLoaderEditor(const TGWindow *p, + AliEveTPCLoaderEditor::AliEveTPCLoaderEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), @@ -46,7 +53,7 @@ ClassImp(TPCLoaderEditor) fCreateSectors3D (0), fDeleteSectors3D (0) { - MakeTitle("TPCLoader"); + MakeTitle("AliEveTPCLoader"); Int_t labelW; @@ -63,17 +70,17 @@ ClassImp(TPCLoaderEditor) fFile->SetWidth(140); f->AddFrame(fFile); fFile->Connect("DoubleClicked()", - "Alieve::TPCLoaderEditor", this, "FileSelect()"); + "AliEveTPCLoaderEditor", this, "FileSelect()"); fFile->Connect("TextChanged(const char *)", - "Alieve::TPCLoaderEditor", this, "FileChanged()"); + "AliEveTPCLoaderEditor", this, "FileChanged()"); fOpenFile = new TGTextButton(f, "Open"); f->AddFrame(fOpenFile); fOpenFile->Connect("Clicked()", - "Alieve::TPCLoaderEditor", this, "DoOpen()"); + "AliEveTPCLoaderEditor", this, "DoOpen()"); AddFrame(f); } - fEvent = new TEveGValuator(this, "Event:", 110, 0); + fEvent = new TEveGValuator(this, "AliEveEventManager:", 110, 0); fEvent->SetShowSlider(kFALSE); fEvent->SetLabelWidth(labelW); fEvent->SetNELength(6); @@ -81,17 +88,17 @@ ClassImp(TPCLoaderEditor) fEvent->SetLimits(0, 1000); fEvent->SetToolTip("Current event number"); fEvent->Connect("ValueSet(Double_t)", - "Alieve::TPCLoaderEditor", this, "DoEvent()"); - // Reuse Event for DoubleSR button + "AliEveTPCLoaderEditor", this, "DoEvent()"); + // Reuse AliEveEventManager for DoubleSR button fDoubleSR = new TGCheckButton(fEvent, "Double SR"); fDoubleSR->SetToolTipText("Double sampling rate"); fEvent->AddFrame(fDoubleSR, new TGLayoutHints(kLHintsLeft, 12, 0, 2, 0)); fDoubleSR->Connect("Toggled(Bool_t)", - "Alieve::TPCLoaderEditor", this, "DoDoubleSR()"); + "AliEveTPCLoaderEditor", this, "DoDoubleSR()"); AddFrame(fEvent); - // TPCData load settings + // AliEveTPCData load settings labelW = 90; @@ -104,7 +111,7 @@ ClassImp(TPCLoaderEditor) fDataLoadThreshold->SetToolTip("Minimum signal that will be stored (pedestal subtracted first)."); fDataLoadThreshold->Connect ("ValueSet(Double_t)", - "Alieve::TPCLoaderEditor", this, "DoDataLoadThreshold()"); + "AliEveTPCLoaderEditor", this, "DoDataLoadThreshold()"); AddFrame(fDataLoadThreshold, new TGLayoutHints(kLHintsLeft, 0, 0, 6, 0)); fDataLoadPedestal = new TEveGValuator(this, "Load pedestal:", 110, 0); @@ -116,13 +123,13 @@ ClassImp(TPCLoaderEditor) fDataLoadPedestal->SetToolTip("Pedestal that will be subtracted during data loading."); fDataLoadPedestal->Connect ("ValueSet(Double_t)", - "Alieve::TPCLoaderEditor", this, "DoDataLoadPedestal()"); + "AliEveTPCLoaderEditor", this, "DoDataLoadPedestal()"); // Reuse DataLoadPedestal for DataAutoPedestal check button fDataAutoPedestal = new TGCheckButton(fDataLoadPedestal, "Automatic"); fDataAutoPedestal->SetToolTipText("Determine per-pad pedestal during data loading."); fDataAutoPedestal->Connect ("Toggled(Bool_t)", - "Alieve::TPCLoaderEditor", this, "DoDataAutoPedestal()"); + "AliEveTPCLoaderEditor", this, "DoDataAutoPedestal()"); fDataLoadPedestal->AddFrame(fDataAutoPedestal, new TGLayoutHints(kLHintsLeft, 12, 0, 2, 0)); AddFrame(fDataLoadPedestal); @@ -133,11 +140,11 @@ ClassImp(TPCLoaderEditor) fUpdateSectors = new TGTextButton(f, "Update Sectors"); f->AddFrame(fUpdateSectors, new TGLayoutHints(kLHintsExpandX, 0,4,0,0)); fUpdateSectors->Connect("Clicked()", - "Alieve::TPCLoaderEditor", this, "DoUpdateSectors()"); + "AliEveTPCLoaderEditor", this, "DoUpdateSectors()"); fReloadSectors = new TGTextButton(f, "Reload Sectors"); f->AddFrame(fReloadSectors, new TGLayoutHints(kLHintsExpandX, 4,0,0,0)); fReloadSectors->Connect("Clicked()", - "Alieve::TPCLoaderEditor", this, "DoReloadSectors()"); + "AliEveTPCLoaderEditor", this, "DoReloadSectors()"); AddFrame(f, new TGLayoutHints(kLHintsExpandX, 8,8,8,0)); } { @@ -145,23 +152,23 @@ ClassImp(TPCLoaderEditor) fCreateSectors3D = new TGTextButton(f, "Create 3D"); f->AddFrame(fCreateSectors3D, new TGLayoutHints(kLHintsExpandX, 0,4,0,0)); fCreateSectors3D->Connect("Clicked()", - "Alieve::TPCLoaderEditor", this, "DoCreateSectors3D()"); + "AliEveTPCLoaderEditor", this, "DoCreateSectors3D()"); fDeleteSectors3D = new TGTextButton(f, "Delete 3D"); f->AddFrame(fDeleteSectors3D, new TGLayoutHints(kLHintsExpandX, 4,0,0,0)); fDeleteSectors3D->Connect("Clicked()", - "Alieve::TPCLoaderEditor", this, "DoDeleteSectors3D()"); + "AliEveTPCLoaderEditor", this, "DoDeleteSectors3D()"); AddFrame(f, new TGLayoutHints(kLHintsExpandX, 8,8,8,0)); } } -TPCLoaderEditor::~TPCLoaderEditor() +AliEveTPCLoaderEditor::~AliEveTPCLoaderEditor() {} /**************************************************************************/ -void TPCLoaderEditor::SetModel(TObject* obj) +void AliEveTPCLoaderEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); // !!!! order changed, need TGTextEntry::SetText NO BLOODY EMIT. fFile->SetText(fM->fFile); @@ -169,7 +176,7 @@ void TPCLoaderEditor::SetModel(TObject* obj) fEvent->SetEnabled(fM->fEvent >= 0); fDoubleSR->SetState(fM->fDoubleSR ? kButtonDown : kButtonUp); - TPCData* tpcd = fM->GetData(); + AliEveTPCData* tpcd = fM->GetData(); Bool_t tpcp = (tpcd != 0); fDataLoadThreshold->SetEnabled(tpcp); fDataLoadPedestal ->SetEnabled(tpcp && ! tpcd->GetAutoPedestal()); @@ -192,7 +199,7 @@ const char *tpcfiletypes[] = { }; } -void TPCLoaderEditor::FileSelect() +void AliEveTPCLoaderEditor::FileSelect() { TGFileInfo fi; fi.fIniDir = StrDup(gSystem->DirName (fM->fFile)); @@ -206,12 +213,12 @@ void TPCLoaderEditor::FileSelect() fFile->SetText(fi.fFilename); } -void TPCLoaderEditor::FileChanged() +void AliEveTPCLoaderEditor::FileChanged() { fM->fFile = fFile->GetText(); } -void TPCLoaderEditor::DoOpen() +void AliEveTPCLoaderEditor::DoOpen() { fM->OpenFile(); SetModel(fM); @@ -219,13 +226,13 @@ void TPCLoaderEditor::DoOpen() /**************************************************************************/ -void TPCLoaderEditor::DoEvent() +void AliEveTPCLoaderEditor::DoEvent() { fM->GotoEvent((Int_t) fEvent->GetValue()); SetModel(fM); } -void TPCLoaderEditor::DoDoubleSR() +void AliEveTPCLoaderEditor::DoDoubleSR() { fM->SetDoubleSR(fDoubleSR->IsOn()); Update(); @@ -233,19 +240,19 @@ void TPCLoaderEditor::DoDoubleSR() /**************************************************************************/ -void TPCLoaderEditor::DoDataLoadThreshold() +void AliEveTPCLoaderEditor::DoDataLoadThreshold() { if (fM->GetData() == 0) return; fM->GetData()->SetLoadThreshold((Short_t) fDataLoadThreshold->GetValue()); } -void TPCLoaderEditor::DoDataLoadPedestal() +void AliEveTPCLoaderEditor::DoDataLoadPedestal() { if (fM->GetData() == 0) return; fM->GetData()->SetLoadPedestal((Short_t) fDataLoadPedestal->GetValue()); } -void TPCLoaderEditor::DoDataAutoPedestal() +void AliEveTPCLoaderEditor::DoDataAutoPedestal() { if (fM->GetData() == 0) return; fM->GetData()->SetAutoPedestal(fDataAutoPedestal->IsOn()); @@ -254,23 +261,23 @@ void TPCLoaderEditor::DoDataAutoPedestal() /**************************************************************************/ -void TPCLoaderEditor::DoUpdateSectors() +void AliEveTPCLoaderEditor::DoUpdateSectors() { fM->UpdateSectors(); } -void TPCLoaderEditor::DoReloadSectors() +void AliEveTPCLoaderEditor::DoReloadSectors() { fM->ReloadSectors(); } -void TPCLoaderEditor::DoCreateSectors3D() +void AliEveTPCLoaderEditor::DoCreateSectors3D() { fM->CreateSectors3D(); } -void TPCLoaderEditor::DoDeleteSectors3D() +void AliEveTPCLoaderEditor::DoDeleteSectors3D() { fM->DeleteSectors3D(); } diff --git a/EVE/Alieve/TPCLoaderEditor.h b/EVE/Alieve/AliEveTPCLoaderEditor.h similarity index 50% rename from EVE/Alieve/TPCLoaderEditor.h rename to EVE/Alieve/AliEveTPCLoaderEditor.h index 47e6259c430..c4369cb98c8 100644 --- a/EVE/Alieve/TPCLoaderEditor.h +++ b/EVE/Alieve/AliEveTPCLoaderEditor.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TPCLoaderEditor_H #define ALIEVE_TPCLoaderEditor_H @@ -13,17 +20,16 @@ class TGTextEntry; class TEveGValuator; -namespace Alieve { -class TPCLoader; +class AliEveTPCLoader; -class TPCLoaderEditor : public TGedFrame +class AliEveTPCLoaderEditor : public TGedFrame { - TPCLoaderEditor(const TPCLoaderEditor&); // Not implemented - TPCLoaderEditor& operator=(const TPCLoaderEditor&); // Not implemented + AliEveTPCLoaderEditor(const AliEveTPCLoaderEditor&); // Not implemented + AliEveTPCLoaderEditor& operator=(const AliEveTPCLoaderEditor&); // Not implemented protected: - TPCLoader* fM; // fModel dynamic-casted to TPCLoaderEditor + AliEveTPCLoader* fM; // fModel dynamic-casted to AliEveTPCLoaderEditor TGTextEntry* fFile; TGTextButton* fOpenFile; @@ -31,7 +37,7 @@ protected: TEveGValuator* fEvent; TGCheckButton* fDoubleSR; - // TPCData loading settings + // AliEveTPCData loading settings TEveGValuator* fDataLoadThreshold; TEveGValuator* fDataLoadPedestal; TGCheckButton* fDataAutoPedestal; @@ -42,9 +48,9 @@ protected: TGTextButton* fDeleteSectors3D; public: - TPCLoaderEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, + AliEveTPCLoaderEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - ~TPCLoaderEditor(); + ~AliEveTPCLoaderEditor(); virtual void SetModel(TObject* obj); @@ -64,9 +70,7 @@ public: void DoCreateSectors3D(); void DoDeleteSectors3D(); - ClassDef(TPCLoaderEditor, 0); // Editor for TPCLoader -}; // endclass TPCLoaderEditor - -} + ClassDef(AliEveTPCLoaderEditor, 0); // Editor for AliEveTPCLoader +}; // endclass AliEveTPCLoaderEditor #endif diff --git a/EVE/Alieve/TPCSector2D.cxx b/EVE/Alieve/AliEveTPCSector2D.cxx similarity index 64% rename from EVE/Alieve/TPCSector2D.cxx rename to EVE/Alieve/AliEveTPCSector2D.cxx index 3ffbf928693..62205858328 100644 --- a/EVE/Alieve/TPCSector2D.cxx +++ b/EVE/Alieve/AliEveTPCSector2D.cxx @@ -1,10 +1,17 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSector2D.h" -#include "TPCSector3D.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ -#include -#include +#include "AliEveTPCSector2D.h" +#include "AliEveTPCSector3D.h" + +#include +#include #include @@ -18,11 +25,11 @@ #include #include #include -using namespace Alieve; + using namespace std; //______________________________________________________________________ -// TPCSector2D +// AliEveTPCSector2D // // Displays TPC raw-data in 2D. // @@ -34,12 +41,12 @@ using namespace std; // updates take the same time) // -ClassImp(TPCSector2D) +ClassImp(AliEveTPCSector2D) /**************************************************************************/ -TPCSector2D::TPCSector2D(const Text_t* n, const Text_t* t) : - TPCSectorViz(n,t), +AliEveTPCSector2D::AliEveTPCSector2D(const Text_t* n, const Text_t* t) : + AliEveTPCSectorViz(n,t), fShowMax (kTRUE), fAverage (kFALSE), @@ -49,14 +56,14 @@ TPCSector2D::TPCSector2D(const Text_t* n, const Text_t* t) : fPickMode (1) {} -TPCSector2D::~TPCSector2D() +AliEveTPCSector2D::~AliEveTPCSector2D() {} /**************************************************************************/ -void TPCSector2D::MakeSector3D() +void AliEveTPCSector2D::MakeSector3D() { - TPCSector3D* s = new TPCSector3D; + AliEveTPCSector3D* s = new AliEveTPCSector3D; s->SetDataSource(fTPCData); s->SetSectorID(fSectorID); s->SetAutoTrans(fAutoTrans); @@ -66,10 +73,10 @@ void TPCSector2D::MakeSector3D() /**************************************************************************/ -void TPCSector2D::ComputeBBox() +void AliEveTPCSector2D::ComputeBBox() { - const TPCSectorData::SegmentInfo& iSeg = TPCSectorData::GetInnSeg(); - const TPCSectorData::SegmentInfo& o2Seg = TPCSectorData::GetOut2Seg(); + const AliEveTPCSectorData::SegmentInfo& iSeg = AliEveTPCSectorData::GetInnSeg(); + const AliEveTPCSectorData::SegmentInfo& o2Seg = AliEveTPCSectorData::GetOut2Seg(); BBoxInit(); Float_t w = o2Seg.GetNMaxPads()*o2Seg.GetPadWidth()/2; @@ -83,25 +90,25 @@ void TPCSector2D::ComputeBBox() /**************************************************************************/ -void TPCSector2D::PadSelected(Int_t row, Int_t pad) +void AliEveTPCSector2D::PadSelected(Int_t row, Int_t pad) { // Called when ctrl-mouse-left-click registered over a pad. // EVE -> Std convention Int_t sseg = fSectorID, srow = row; - if (row >= TPCSectorData::GetInnSeg().GetNRows()) { + if (row >= AliEveTPCSectorData::GetInnSeg().GetNRows()) { sseg += 36; - srow -= TPCSectorData::GetInnSeg().GetNRows(); + srow -= AliEveTPCSectorData::GetInnSeg().GetNRows(); } switch (fPickMode) { case 0: { - printf("TPCSector2DGL::ProcessSelection segment=%d, row=%d, pad=%d\n", + printf("AliEveTPCSector2DGL::ProcessSelection segment=%d, row=%d, pad=%d\n", sseg, srow, pad); break; } case 1: { - TPCSectorData* sectorData = GetSectorData(); + AliEveTPCSectorData* sectorData = GetSectorData(); if (sectorData == 0) return; Int_t mint = fMinTime; Int_t maxt = fMaxTime; @@ -110,7 +117,7 @@ void TPCSector2D::PadSelected(Int_t row, Int_t pad) maxt - mint +1 , mint, maxt); h->SetXTitle("Time"); h->SetYTitle("ADC"); - TPCSectorData::PadIterator i = sectorData->MakePadIterator(row, pad); + AliEveTPCSectorData::PadIterator i = sectorData->MakePadIterator(row, pad); while (i.Next()) h->Fill(i.Time(), i.Signal()); h->Draw(); @@ -119,11 +126,11 @@ void TPCSector2D::PadSelected(Int_t row, Int_t pad) break; } case 2: { - TPCSectorData* sectorData = GetSectorData(); + AliEveTPCSectorData* sectorData = GetSectorData(); if (sectorData == 0) return; Int_t mint = fMinTime; Int_t maxt = fMaxTime; - Int_t npad = TPCSectorData::GetNPadsInRow(row); + Int_t npad = AliEveTPCSectorData::GetNPadsInRow(row); TH2S* h = new TH2S(Form("Seg%d_Row%d", sseg, srow), Form("Segment %d, Row %d", sseg, srow), maxt - mint +1 , mint, maxt, @@ -131,7 +138,7 @@ void TPCSector2D::PadSelected(Int_t row, Int_t pad) h->SetXTitle("Time"); h->SetYTitle("TEvePad"); h->SetZTitle("ADC"); - TPCSectorData::RowIterator i = sectorData->MakeRowIterator(row); + AliEveTPCSectorData::RowIterator i = sectorData->MakeRowIterator(row); while (i.NextPad()) while (i.Next()) h->Fill(i.Time(), i.TEvePad(), i.Signal()); @@ -145,7 +152,7 @@ void TPCSector2D::PadSelected(Int_t row, Int_t pad) /**************************************************************************/ -void TPCSector2D::Paint(Option_t* ) +void AliEveTPCSector2D::Paint(Option_t* ) { if(fRnrSelf == kFALSE) return; @@ -164,5 +171,5 @@ void TPCSector2D::Paint(Option_t* ) return; } - Error("TPCSector2D::Paint", "only direct OpenGL rendering supported."); + Error("AliEveTPCSector2D::Paint", "only direct OpenGL rendering supported."); } diff --git a/EVE/Alieve/AliEveTPCSector2D.h b/EVE/Alieve/AliEveTPCSector2D.h new file mode 100644 index 00000000000..9ac6d5902c1 --- /dev/null +++ b/EVE/Alieve/AliEveTPCSector2D.h @@ -0,0 +1,53 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSector2D_H +#define ALIEVE_TPCSector2D_H + +#include "AliEveTPCSectorViz.h" + + +class AliEveTPCSector2DEditor; +class AliEveTPCSector2DGL; + +class AliEveTPCSector2D : public AliEveTPCSectorViz +{ + friend class AliEveTPCSector2DGL; + friend class AliEveTPCSector2DEditor; + +protected: + Bool_t fShowMax; + Bool_t fAverage; + + Bool_t fUseTexture; + Bool_t fPickEmpty; + Int_t fPickMode; // 0-print, 1-1dhisto of pad, 2-2dhisto of padrow + +public: + AliEveTPCSector2D(const Text_t* n="AliEveTPCSector2D", const Text_t* t=0); + virtual ~AliEveTPCSector2D(); + + void SetShowMax(Bool_t sm) { fShowMax = sm; IncRTS(); } + void SetAverage(Bool_t avg) { fAverage = avg; IncRTS(); } + + Int_t GetPickMode() const { return fPickMode; } + void SetPickMode(Int_t mode) { fPickMode = mode; } + + void MakeSector3D(); // *MENU* + + virtual void ComputeBBox(); + + virtual void PadSelected(Int_t row, Int_t pad); + + virtual void Paint(Option_t* option=""); + + ClassDef(AliEveTPCSector2D, 1); // Visualization of TPC raw-data in 2D +}; // endclass AliEveTPCSector2D + +#endif diff --git a/EVE/Alieve/TPCSector2DEditor.cxx b/EVE/Alieve/AliEveTPCSector2DEditor.cxx similarity index 61% rename from EVE/Alieve/TPCSector2DEditor.cxx rename to EVE/Alieve/AliEveTPCSector2DEditor.cxx index f044e9e64da..dcea77dd8dd 100644 --- a/EVE/Alieve/TPCSector2DEditor.cxx +++ b/EVE/Alieve/AliEveTPCSector2DEditor.cxx @@ -1,46 +1,53 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSector2DEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCSector2DEditor.h" +#include #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCSector2DEditor +// AliEveTPCSector2DEditor // -ClassImp(TPCSector2DEditor) +ClassImp(AliEveTPCSector2DEditor) -TPCSector2DEditor::TPCSector2DEditor(const TGWindow *p, +AliEveTPCSector2DEditor::AliEveTPCSector2DEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), fM(0), fShowMax(0), fAverage(0), fUseTexture(0), fPickEmpty(0), fPickMode(0) { - MakeTitle("TPCSector2D"); + MakeTitle("AliEveTPCSector2D"); { TGHorizontalFrame* f = new TGHorizontalFrame(this); fShowMax = new TGCheckButton(f, "ShowMax"); f->AddFrame(fShowMax, new TGLayoutHints(kLHintsLeft, 3, 16, 1, 0)); - fShowMax->Connect("Toggled(Bool_t)","Alieve::TPCSector2DEditor", this, "DoShowMax()"); + fShowMax->Connect("Toggled(Bool_t)","AliEveTPCSector2DEditor", this, "DoShowMax()"); fAverage = new TGCheckButton(f, "Average"); f->AddFrame(fAverage, new TGLayoutHints(kLHintsLeft, 3, 1, 1, 0)); - fAverage->Connect("Toggled(Bool_t)","Alieve::TPCSector2DEditor", this, "DoAverage()"); + fAverage->Connect("Toggled(Bool_t)","AliEveTPCSector2DEditor", this, "DoAverage()"); AddFrame(f); } { TGHorizontalFrame* f = new TGHorizontalFrame(this); fUseTexture = new TGCheckButton(f, "UseTexture"); f->AddFrame(fUseTexture, new TGLayoutHints(kLHintsTop, 3, 9, 1, 0)); - fUseTexture->Connect("Toggled(Bool_t)","Alieve::TPCSector2DEditor", this, "DoUseTexture()"); + fUseTexture->Connect("Toggled(Bool_t)","AliEveTPCSector2DEditor", this, "DoUseTexture()"); fPickEmpty = new TGCheckButton(f, "PickEmpty"); f->AddFrame(fPickEmpty, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fPickEmpty->Connect("Toggled(Bool_t)","Alieve::TPCSector2DEditor", this, "DoPickEmpty()"); + fPickEmpty->Connect("Toggled(Bool_t)","AliEveTPCSector2DEditor", this, "DoPickEmpty()"); AddFrame(f); } { @@ -54,20 +61,20 @@ TPCSector2DEditor::TPCSector2DEditor(const TGWindow *p, TGListBox* lb = fPickMode->GetListBox(); lb->Resize(lb->GetWidth(), 3*18); fPickMode->Resize(80, 20); - fPickMode->Connect("Selected(Int_t)", "Alieve::TPCSector2DEditor", this, "DoPickMode(Int_t)"); + fPickMode->Connect("Selected(Int_t)", "AliEveTPCSector2DEditor", this, "DoPickMode(Int_t)"); f->AddFrame(fPickMode, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); AddFrame(f); } } -TPCSector2DEditor::~TPCSector2DEditor() +AliEveTPCSector2DEditor::~AliEveTPCSector2DEditor() {} /**************************************************************************/ -void TPCSector2DEditor::SetModel(TObject* obj) +void AliEveTPCSector2DEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fShowMax->SetState(fM->fShowMax ? kButtonDown : kButtonUp); SetupAverage(); @@ -79,20 +86,20 @@ void TPCSector2DEditor::SetModel(TObject* obj) /**************************************************************************/ -void TPCSector2DEditor::DoShowMax() +void AliEveTPCSector2DEditor::DoShowMax() { fM->SetShowMax(fShowMax->IsOn()); SetupAverage(); Update(); } -void TPCSector2DEditor::DoAverage() +void AliEveTPCSector2DEditor::DoAverage() { fM->SetAverage(fAverage->IsOn()); Update(); } -void TPCSector2DEditor::SetupAverage() +void AliEveTPCSector2DEditor::SetupAverage() { if(fM->fShowMax) { fAverage->SetEnabled(kFALSE); @@ -104,19 +111,19 @@ void TPCSector2DEditor::SetupAverage() /**************************************************************************/ -void TPCSector2DEditor::DoUseTexture() +void AliEveTPCSector2DEditor::DoUseTexture() { fM->fUseTexture = fUseTexture->IsOn(); Update(); } -void TPCSector2DEditor::DoPickEmpty() +void AliEveTPCSector2DEditor::DoPickEmpty() { fM->fPickEmpty = fPickEmpty->IsOn(); // Update(); } -void TPCSector2DEditor::DoPickMode(Int_t mode) +void AliEveTPCSector2DEditor::DoPickMode(Int_t mode) { fM->fPickMode = mode; // Update(); diff --git a/EVE/Alieve/AliEveTPCSector2DEditor.h b/EVE/Alieve/AliEveTPCSector2DEditor.h new file mode 100644 index 00000000000..f3251aff63c --- /dev/null +++ b/EVE/Alieve/AliEveTPCSector2DEditor.h @@ -0,0 +1,54 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSector2DEditor_H +#define ALIEVE_TPCSector2DEditor_H + +#include + +class TGCheckButton; +class TGComboBox; + + +class AliEveTPCSector2D; + +class AliEveTPCSector2DEditor : public TGedFrame +{ + AliEveTPCSector2DEditor(const AliEveTPCSector2DEditor&); // Not implemented + AliEveTPCSector2DEditor& operator=(const AliEveTPCSector2DEditor&); // Not implemented + +protected: + AliEveTPCSector2D* fM; // fModel dynamic-casted to AliEveTPCSector2DEditor + + TGCheckButton* fShowMax; + TGCheckButton* fAverage; + + TGCheckButton* fUseTexture; + TGCheckButton* fPickEmpty; + TGComboBox* fPickMode; + +public: + AliEveTPCSector2DEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, + UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + ~AliEveTPCSector2DEditor(); + + virtual void SetModel(TObject* obj); + + void DoShowMax(); + void DoAverage(); + void SetupAverage(); + + void DoUseTexture(); + void DoPickEmpty(); + void DoPickMode(Int_t mode); + + ClassDef(AliEveTPCSector2DEditor, 0); // Editor for AliEveTPCSector2D +}; // endclass AliEveTPCSector2DEditor + +#endif diff --git a/EVE/Alieve/TPCSector2DGL.cxx b/EVE/Alieve/AliEveTPCSector2DGL.cxx similarity index 72% rename from EVE/Alieve/TPCSector2DGL.cxx rename to EVE/Alieve/AliEveTPCSector2DGL.cxx index 9e12a65c1a4..b475b127684 100644 --- a/EVE/Alieve/TPCSector2DGL.cxx +++ b/EVE/Alieve/AliEveTPCSector2DGL.cxx @@ -1,30 +1,37 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSector2DGL.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ -#include +#include "AliEveTPCSector2DGL.h" + +#include #include #include #include -using namespace Alieve; + using namespace std; //______________________________________________________________________ -// TPCSector2DGL +// AliEveTPCSector2DGL // -ClassImp(TPCSector2DGL) +ClassImp(AliEveTPCSector2DGL) // This can be optimized to non-pow-2 values once everybody has GL 1.4. -const Int_t TPCSector2DGL::fgkTextureWidth = 256; -const Int_t TPCSector2DGL::fgkTextureHeight = 128; -const Int_t TPCSector2DGL::fgkTextureByteSize = 4*256*128; +const Int_t AliEveTPCSector2DGL::fgkTextureWidth = 256; +const Int_t AliEveTPCSector2DGL::fgkTextureHeight = 128; +const Int_t AliEveTPCSector2DGL::fgkTextureByteSize = 4*256*128; /**************************************************************************/ -TPCSector2DGL::TPCSector2DGL() : +AliEveTPCSector2DGL::AliEveTPCSector2DGL() : TGLObject(), fSector (0), @@ -35,7 +42,7 @@ TPCSector2DGL::TPCSector2DGL() : fRTS (0) {} -TPCSector2DGL::~TPCSector2DGL() +AliEveTPCSector2DGL::~AliEveTPCSector2DGL() { if(fImage) delete fImage; if(fTexture) glDeleteTextures(1, &fTexture); @@ -43,40 +50,40 @@ TPCSector2DGL::~TPCSector2DGL() /**************************************************************************/ -Bool_t TPCSector2DGL::SetModel(TObject* obj, const Option_t* /*opt*/) +Bool_t AliEveTPCSector2DGL::SetModel(TObject* obj, const Option_t* /*opt*/) { - if(SetModelCheckClass(obj, Alieve::TPCSector2D::Class())) { - fSector = (TPCSector2D*) fExternalObj; + if(SetModelCheckClass(obj, AliEveTPCSector2D::Class())) { + fSector = (AliEveTPCSector2D*) fExternalObj; return kTRUE; } return kFALSE; } -void TPCSector2DGL::SetBBox() +void AliEveTPCSector2DGL::SetBBox() { - SetAxisAlignedBBox(((TPCSector2D*)fExternalObj)->AssertBBox()); + SetAxisAlignedBBox(((AliEveTPCSector2D*)fExternalObj)->AssertBBox()); } /**************************************************************************/ -void TPCSector2DGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, +void AliEveTPCSector2DGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord & rec) { if (rec.GetN() != 3) return; Int_t row = rec.GetItem(1); Int_t pad = rec.GetItem(2); - if (row < 0 || row >= TPCSectorData::GetNAllRows()) return; - if (pad < 0 || pad >= TPCSectorData::GetNPadsInRow(row)) return; + if (row < 0 || row >= AliEveTPCSectorData::GetNAllRows()) return; + if (pad < 0 || pad >= AliEveTPCSectorData::GetNPadsInRow(row)) return; fSector->PadSelected(row, pad); } /**************************************************************************/ -void TPCSector2DGL::DirectDraw(TGLRnrCtx& rnrCtx) const +void AliEveTPCSector2DGL::DirectDraw(TGLRnrCtx& rnrCtx) const { // Actual GL drawing. - // printf("TPCSector2DGL::DirectDraw \n"); + // printf("AliEveTPCSector2DGL::DirectDraw \n"); fSectorData = fSector->GetSectorData(); @@ -96,9 +103,9 @@ void TPCSector2DGL::DirectDraw(TGLRnrCtx& rnrCtx) const // Display digits if(fSectorData != 0) { - const TPCSectorData::SegmentInfo& iSeg = TPCSectorData::GetInnSeg(); - const TPCSectorData::SegmentInfo& o1Seg = TPCSectorData::GetOut1Seg(); - const TPCSectorData::SegmentInfo& o2Seg = TPCSectorData::GetOut2Seg(); + const AliEveTPCSectorData::SegmentInfo& iSeg = AliEveTPCSectorData::GetInnSeg(); + const AliEveTPCSectorData::SegmentInfo& o1Seg = AliEveTPCSectorData::GetOut1Seg(); + const AliEveTPCSectorData::SegmentInfo& o2Seg = AliEveTPCSectorData::GetOut2Seg(); if(rnrCtx.SecSelection()) { @@ -144,7 +151,7 @@ void TPCSector2DGL::DirectDraw(TGLRnrCtx& rnrCtx) const // Data import /**************************************************************************/ -void TPCSector2DGL::LoadPadrow(TPCSectorData::RowIterator& iter, +void AliEveTPCSector2DGL::LoadPadrow(AliEveTPCSectorData::RowIterator& iter, Int_t row, Int_t col_off) const { Int_t padVal; @@ -189,7 +196,7 @@ void TPCSector2DGL::LoadPadrow(TPCSectorData::RowIterator& iter, /**************************************************************************/ -void TPCSector2DGL::CreateTexture() const +void AliEveTPCSector2DGL::CreateTexture() const { if (fImage == 0 ) { fImage = new UChar_t[fgkTextureByteSize]; @@ -200,9 +207,9 @@ void TPCSector2DGL::CreateTexture() const Int_t rowOff[3], colOff[3]; Bool_t isOn[3]; rowOff[0] = 0; - rowOff[1] = rowOff[2] = -TPCSectorData::GetSeg(1).GetFirstRow(); + rowOff[1] = rowOff[2] = -AliEveTPCSectorData::GetSeg(1).GetFirstRow(); colOff[0] = colOff[2] = 0; - colOff[1] = TPCSectorData::GetSeg(0).GetNMaxPads(); + colOff[1] = AliEveTPCSectorData::GetSeg(0).GetNMaxPads(); isOn[0] = fSector->fRnrInn; isOn[1] = fSector->fRnrOut1; isOn[2] = fSector->fRnrOut2; @@ -213,10 +220,10 @@ void TPCSector2DGL::CreateTexture() const for (Int_t sId = 0; sId <= 2; ++sId) { if(isOn[sId] == kFALSE) continue; - const TPCSectorData::SegmentInfo& sInfo = TPCSectorData::GetSeg(sId); + const AliEveTPCSectorData::SegmentInfo& sInfo = AliEveTPCSectorData::GetSeg(sId); for (Int_t row=sInfo.GetFirstRow(); row<=sInfo.GetLastRow(); ++row) { - TPCSectorData::RowIterator i = fSectorData->MakeRowIterator(row); - Int_t offset = (sInfo.GetNMaxPads() - TPCSectorData::GetNPadsInRow(row))/2; + AliEveTPCSectorData::RowIterator i = fSectorData->MakeRowIterator(row); + Int_t offset = (sInfo.GetNMaxPads() - AliEveTPCSectorData::GetNPadsInRow(row))/2; LoadPadrow(i, row + rowOff[sId], offset + colOff[sId]); } } @@ -236,7 +243,7 @@ void TPCSector2DGL::CreateTexture() const // Data display /**************************************************************************/ -void TPCSector2DGL::DisplayTexture(const TPCSectorData::SegmentInfo& seg, +void AliEveTPCSector2DGL::DisplayTexture(const AliEveTPCSectorData::SegmentInfo& seg, Int_t startCol, Int_t startRow) const { Float_t w = seg.GetNMaxPads()*seg.GetPadWidth()/2; @@ -258,7 +265,7 @@ void TPCSector2DGL::DisplayTexture(const TPCSectorData::SegmentInfo& seg, /**************************************************************************/ -void TPCSector2DGL::DisplayQuads(const TPCSectorData::SegmentInfo& seg, +void AliEveTPCSector2DGL::DisplayQuads(const AliEveTPCSectorData::SegmentInfo& seg, Int_t startCol, Int_t startRow) const { Float_t y_d, y_u; @@ -272,7 +279,7 @@ void TPCSector2DGL::DisplayQuads(const TPCSectorData::SegmentInfo& seg, y_u = y_d + padH; x_off = -seg.GetNMaxPads()*padW/2; Int_t tpcRow = row + seg.GetFirstRow(); - Int_t deltaPad = (seg.GetNMaxPads() - TPCSectorData::GetNPadsInRow(tpcRow))/2; + Int_t deltaPad = (seg.GetNMaxPads() - AliEveTPCSectorData::GetNPadsInRow(tpcRow))/2; Int_t maxPad = seg.GetNMaxPads() - deltaPad; UChar_t *pix = GetRowCol(row + startRow, startCol + deltaPad); for (Int_t pad=deltaPad; padfFrameColor, col); + TEveUtil::TEveUtil::ColorFromIdx(fSector->fFrameColor, col); glColor4ubv(col); if(fSector->fRnrInn) { glBegin(GL_POLYGON); - TraceStepsUp (TPCSectorData::GetInnSeg()); - TraceStepsDown(TPCSectorData::GetInnSeg()); + TraceStepsUp (AliEveTPCSectorData::GetInnSeg()); + TraceStepsDown(AliEveTPCSectorData::GetInnSeg()); glEnd(); } if(fSector->fRnrOut1) { glBegin(GL_POLYGON); - TraceStepsUp (TPCSectorData::GetOut1Seg()); - TraceStepsDown(TPCSectorData::GetOut1Seg()); + TraceStepsUp (AliEveTPCSectorData::GetOut1Seg()); + TraceStepsDown(AliEveTPCSectorData::GetOut1Seg()); glEnd(); } if(fSector->fRnrOut2) { glBegin(GL_POLYGON); - TraceStepsUp (TPCSectorData::GetOut2Seg()); - TraceStepsDown(TPCSectorData::GetOut2Seg()); + TraceStepsUp (AliEveTPCSectorData::GetOut2Seg()); + TraceStepsDown(AliEveTPCSectorData::GetOut2Seg()); glEnd(); } } diff --git a/EVE/Alieve/AliEveTPCSector2DGL.h b/EVE/Alieve/AliEveTPCSector2DGL.h new file mode 100644 index 00000000000..5d65bd7a36d --- /dev/null +++ b/EVE/Alieve/AliEveTPCSector2DGL.h @@ -0,0 +1,76 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSector2DGL_H +#define ALIEVE_TPCSector2DGL_H + +#include + +#include +#include + +class TGLViewer; +class TGLScene; + + +class AliEveTPCSector2DGL : public TGLObject +{ + AliEveTPCSector2DGL(const AliEveTPCSector2DGL&); // Not implemented + AliEveTPCSector2DGL& operator=(const AliEveTPCSector2DGL&); // Not implemented + +protected: + virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; + + void LoadPadrow(AliEveTPCSectorData::RowIterator& iter, Int_t row, Int_t off) const; + void CreateTexture() const; + + void DisplayTexture(const AliEveTPCSectorData::SegmentInfo& seg, + Int_t startCol, Int_t startRow) const; + void DisplayQuads(const AliEveTPCSectorData::SegmentInfo& seg, + Int_t startCol, Int_t startRow) const; + void DisplayNamedQuads(const AliEveTPCSectorData::SegmentInfo& seg, + Int_t startCol, Int_t startRow) const; + void DisplayFrame() const; + + UChar_t* GetRowCol(Int_t row, Int_t col) const; + + AliEveTPCSector2D* fSector; + mutable AliEveTPCSectorData* fSectorData; + + mutable UChar_t* fImage; + mutable UInt_t fTexture; + mutable UInt_t fRTS; + +public: + AliEveTPCSector2DGL(); + virtual ~AliEveTPCSector2DGL(); + + virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); + virtual void SetBBox(); + virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } + + virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec); + + static void TraceStepsUp (const AliEveTPCSectorData::SegmentInfo& s); + static void TraceStepsDown(const AliEveTPCSectorData::SegmentInfo& s); + + static const Int_t fgkTextureWidth; + static const Int_t fgkTextureHeight; + static const Int_t fgkTextureByteSize; + +}; // endclass TPCSector2D_GL_Rnr + + +inline UChar_t* AliEveTPCSector2DGL::GetRowCol(Int_t row, Int_t col) const +{ + return fImage + 4*(row*fgkTextureWidth + col); +} + + +#endif diff --git a/EVE/Alieve/TPCSector3D.cxx b/EVE/Alieve/AliEveTPCSector3D.cxx similarity index 68% rename from EVE/Alieve/TPCSector3D.cxx rename to EVE/Alieve/AliEveTPCSector3D.cxx index 4401e52429c..2a6f6bf0604 100644 --- a/EVE/Alieve/TPCSector3D.cxx +++ b/EVE/Alieve/AliEveTPCSector3D.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSector3D.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCSector3D.h" +#include #include #include @@ -10,16 +17,16 @@ #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCSector3D +// AliEveTPCSector3D // -ClassImp(TPCSector3D) +ClassImp(AliEveTPCSector3D) -TPCSector3D::TPCSector3D(const Text_t* n, const Text_t* t) : - TPCSectorViz(n, t), +AliEveTPCSector3D::AliEveTPCSector3D(const Text_t* n, const Text_t* t) : + AliEveTPCSectorViz(n, t), fBoxSet (n, t), fPointSetArray(n, t), @@ -36,12 +43,12 @@ TPCSector3D::TPCSector3D(const Text_t* n, const Text_t* t) : ComputeBBox(); } -TPCSector3D::~TPCSector3D() +AliEveTPCSector3D::~AliEveTPCSector3D() {} /**************************************************************************/ -void TPCSector3D::SetRnrFrame(Bool_t rf) +void AliEveTPCSector3D::SetRnrFrame(Bool_t rf) { if(fRnrFrame != rf) { fRnrFrame = rf; @@ -51,10 +58,10 @@ void TPCSector3D::SetRnrFrame(Bool_t rf) /**************************************************************************/ -void TPCSector3D::ComputeBBox() +void AliEveTPCSector3D::ComputeBBox() { - const TPCSectorData::SegmentInfo& iSeg = TPCSectorData::GetInnSeg(); - const TPCSectorData::SegmentInfo& o2Seg = TPCSectorData::GetOut2Seg(); + const AliEveTPCSectorData::SegmentInfo& iSeg = AliEveTPCSectorData::GetInnSeg(); + const AliEveTPCSectorData::SegmentInfo& o2Seg = AliEveTPCSectorData::GetOut2Seg(); BBoxInit(); @@ -64,13 +71,13 @@ void TPCSector3D::ComputeBBox() fBBox[2] = iSeg.GetRLow(); fBBox[3] = o2Seg.GetRLow() + o2Seg.GetNRows()*o2Seg.GetPadHeight(); fBBox[4] = 0; - fBBox[5] = TPCSectorData::GetZLength(); + fBBox[5] = AliEveTPCSectorData::GetZLength(); Float_t* b = fBoxSet.AssertBBox(); for(Int_t i=0; i<6; ++i) { b[i] = fBBox[i]; } } -void TPCSector3D::Paint(Option_t* /*option*/) +void AliEveTPCSector3D::Paint(Option_t* /*option*/) { if(fRnrSelf == kFALSE) return; @@ -89,13 +96,13 @@ void TPCSector3D::Paint(Option_t* /*option*/) return; } - Error("TPCSector3D::Paint", "only direct OpenGL rendering supported."); + Error("AliEveTPCSector3D::Paint", "only direct OpenGL rendering supported."); return; } /**************************************************************************/ -void TPCSector3D::LoadPadrow(TPCSectorData::RowIterator& iter, +void AliEveTPCSector3D::LoadPadrow(AliEveTPCSectorData::RowIterator& iter, Float_t xs, Float_t ys, Float_t pw, Float_t ph) { Short_t pad, time, val; @@ -129,16 +136,16 @@ void TPCSector3D::LoadPadrow(TPCSectorData::RowIterator& iter, } } -void TPCSector3D::UpdateBoxes() +void AliEveTPCSector3D::UpdateBoxes() { // Populate parent class TEveBoxSet with digit information. - // printf("TPCSector3D update boxes\n"); + // printf("AliEveTPCSector3D update boxes\n"); fBoxSet.Reset(TEveBoxSet::kBT_AABox, kTRUE, 16384); fPointSetArray.RemoveElements(); - TPCSectorData* data = GetSectorData(); + AliEveTPCSectorData* data = GetSectorData(); if (data != 0) { Bool_t isOn[3]; isOn[0] = fRnrInn; @@ -152,11 +159,11 @@ void TPCSector3D::UpdateBoxes() for (Int_t sId = 0; sId <= 2; ++sId) { if(isOn[sId] == kFALSE) continue; - const TPCSectorData::SegmentInfo& sInfo = TPCSectorData::GetSeg(sId); + const AliEveTPCSectorData::SegmentInfo& sInfo = AliEveTPCSectorData::GetSeg(sId); Float_t sy = sInfo.GetRLow(); for (Int_t row=sInfo.GetFirstRow(); row<=sInfo.GetLastRow(); ++row) { - TPCSectorData::RowIterator i = data->MakeRowIterator(row); - Float_t sx = -0.5*TPCSectorData::GetNPadsInRow(row)*sInfo.GetPadWidth(); + AliEveTPCSectorData::RowIterator i = data->MakeRowIterator(row); + Float_t sx = -0.5*AliEveTPCSectorData::GetNPadsInRow(row)*sInfo.GetPadWidth(); LoadPadrow(i, sx, sy, sInfo.GetPadWidth(), sInfo.GetPadHeight()); sy += sInfo.GetPadHeight(); } @@ -168,7 +175,7 @@ void TPCSector3D::UpdateBoxes() } } -void TPCSector3D::SetupPointSetArray() +void AliEveTPCSector3D::SetupPointSetArray() { Int_t nBins = (Int_t) TMath::Nint(fPointFrac*gStyle->GetNumberOfColors()); if(nBins > 0) { diff --git a/EVE/Alieve/AliEveTPCSector3D.h b/EVE/Alieve/AliEveTPCSector3D.h new file mode 100644 index 00000000000..84c1743e8ad --- /dev/null +++ b/EVE/Alieve/AliEveTPCSector3D.h @@ -0,0 +1,59 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSector3D_H +#define ALIEVE_TPCSector3D_H + +#include +#include + +#include +#include + + +class AliEveTPCSector3D : public AliEveTPCSectorViz +{ + friend class AliEveTPCSector3DEditor; + friend class AliEveTPCSector3DGL; + +protected: + void LoadPadrow(AliEveTPCSectorData::RowIterator& iter, + Float_t sx, Float_t sy, Float_t pw, Float_t ph); + void UpdateBoxes(); + void SetupPointSetArray(); + + TEveBoxSet fBoxSet; + TEvePointSetArray fPointSetArray; + Float_t fPointFrac; + Float_t fPointSize; + Bool_t fPointSetOn; + Int_t fPointSetMaxVal; + + Float_t fDriftVel; + Float_t fZStep; + +public: + AliEveTPCSector3D(const Text_t* n="AliEveTPCSector3D", const Text_t* t=0); + virtual ~AliEveTPCSector3D(); + + void SetPointFrac(Float_t f) { fPointFrac = f; IncRTS(); } + void SetPointSize(Float_t s) { fPointSize = s; } + + void SetDriftVel(Float_t v) { fDriftVel = v; IncRTS(); } + void SetZStep(Float_t step) { fZStep = step; IncRTS(); } + + virtual void SetRnrFrame(Bool_t rf); + + virtual void ComputeBBox(); + virtual void Paint(Option_t* option=""); + + ClassDef(AliEveTPCSector3D, 1); +}; // endclass AliEveTPCSector3D + +#endif diff --git a/EVE/Alieve/TPCSector3DEditor.cxx b/EVE/Alieve/AliEveTPCSector3DEditor.cxx similarity index 67% rename from EVE/Alieve/TPCSector3DEditor.cxx rename to EVE/Alieve/AliEveTPCSector3DEditor.cxx index 2f4979a18e7..587486df8b8 100644 --- a/EVE/Alieve/TPCSector3DEditor.cxx +++ b/EVE/Alieve/AliEveTPCSector3DEditor.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSector3DEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCSector3DEditor.h" +#include #include @@ -14,29 +21,29 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCSector3DEditor +// AliEveTPCSector3DEditor // -ClassImp(TPCSector3DEditor) +ClassImp(AliEveTPCSector3DEditor) -TPCSector3DEditor::TPCSector3DEditor(const TGWindow *p, +AliEveTPCSector3DEditor::AliEveTPCSector3DEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), fM(0), fRnrFrame(0), fDriftVel(0), fPointFrac(0), fPointSize(0) { - MakeTitle("TPCSector3D"); + MakeTitle("AliEveTPCSector3D"); Int_t labelW = 60; fRnrFrame = new TGCheckButton(this, "ShowFrame"); AddFrame(fRnrFrame, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); fRnrFrame->Connect - ("Toggled(Bool_t)","Alieve::TPCSector3DEditor", this, "DoRnrFrame()"); + ("Toggled(Bool_t)","AliEveTPCSector3DEditor", this, "DoRnrFrame()"); fDriftVel = new TEveGValuator(this, "Vdrift fac", 110, 0); fDriftVel->SetLabelWidth(labelW); @@ -46,7 +53,7 @@ TPCSector3DEditor::TPCSector3DEditor(const TGWindow *p, fDriftVel->SetLimits(0.1, 10, 1, TGNumberFormat::kNESRealThree); fDriftVel->SetToolTip("Drift velocity factor"); fDriftVel->Connect("ValueSet(Double_t)", - "Alieve::TPCSector3DEditor", this, "DoDriftVel()"); + "AliEveTPCSector3DEditor", this, "DoDriftVel()"); AddFrame(fDriftVel, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fPointFrac = new TEveGValuator(this,"Point frac", 200, 0); @@ -57,7 +64,7 @@ TPCSector3DEditor::TPCSector3DEditor(const TGWindow *p, fPointFrac->SetLimits(0.0, 1.0, 101); fPointFrac->SetToolTip("Fraction of signal range displayed as points"); fPointFrac->Connect("ValueSet(Double_t)", - "Alieve::TPCSector3DEditor", this, "DoPointFrac()"); + "AliEveTPCSector3DEditor", this, "DoPointFrac()"); AddFrame(fPointFrac, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fPointSize = new TEveGValuator(this,"Point size", 200, 0); @@ -69,18 +76,18 @@ TPCSector3DEditor::TPCSector3DEditor(const TGWindow *p, fPointSize->SetLimits(0.1, 32.0, 1, TGNumberFormat::kNESRealOne); fPointSize->SetToolTip("Size of displayed points"); fPointSize->Connect("ValueSet(Double_t)", - "Alieve::TPCSector3DEditor", this, "DoPointSize()"); + "AliEveTPCSector3DEditor", this, "DoPointSize()"); AddFrame(fPointSize, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); } -TPCSector3DEditor::~TPCSector3DEditor() +AliEveTPCSector3DEditor::~AliEveTPCSector3DEditor() {} /**************************************************************************/ -void TPCSector3DEditor::SetModel(TObject* obj) +void AliEveTPCSector3DEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fRnrFrame->SetState(fM->fRnrFrame ? kButtonDown : kButtonUp); fDriftVel->SetValue(fM->fDriftVel); @@ -91,25 +98,25 @@ void TPCSector3DEditor::SetModel(TObject* obj) /**************************************************************************/ -void TPCSector3DEditor::DoRnrFrame() +void AliEveTPCSector3DEditor::DoRnrFrame() { fM->SetRnrFrame(fRnrFrame->IsOn()); Update(); } -void TPCSector3DEditor::DoDriftVel() +void AliEveTPCSector3DEditor::DoDriftVel() { fM->SetDriftVel(fDriftVel->GetValue()); Update(); } -void TPCSector3DEditor::DoPointFrac() +void AliEveTPCSector3DEditor::DoPointFrac() { fM->SetPointFrac(fPointFrac->GetValue()); Update(); } -void TPCSector3DEditor::DoPointSize() +void AliEveTPCSector3DEditor::DoPointSize() { fM->SetPointSize(fPointSize->GetValue()); Update(); diff --git a/EVE/Alieve/AliEveTPCSector3DEditor.h b/EVE/Alieve/AliEveTPCSector3DEditor.h new file mode 100644 index 00000000000..9445505b8d1 --- /dev/null +++ b/EVE/Alieve/AliEveTPCSector3DEditor.h @@ -0,0 +1,55 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSector3DEditor_H +#define ALIEVE_TPCSector3DEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; + +class TEveGValuator; +class TEveGDoubleValuator; + + +class AliEveTPCSector3D; + +class AliEveTPCSector3DEditor : public TGedFrame +{ + AliEveTPCSector3DEditor(const AliEveTPCSector3DEditor&); // Not implemented + AliEveTPCSector3DEditor& operator=(const AliEveTPCSector3DEditor&); // Not implemented + +protected: + AliEveTPCSector3D* fM; // fModel dynamic-casted to AliEveTPCSector3DEditor + + TGCheckButton* fRnrFrame; + TEveGValuator* fDriftVel; + + TEveGValuator* fPointFrac; + TEveGValuator* fPointSize; + +public: + AliEveTPCSector3DEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, + UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveTPCSector3DEditor(); + + virtual void SetModel(TObject* obj); + + void DoRnrFrame(); + void DoDriftVel(); + + void DoPointFrac(); + void DoPointSize(); + + ClassDef(AliEveTPCSector3DEditor, 0); // Editor for AliEveTPCSector3D +}; // endclass AliEveTPCSector3DEditor + +#endif diff --git a/EVE/Alieve/TPCSector3DGL.cxx b/EVE/Alieve/AliEveTPCSector3DGL.cxx similarity index 65% rename from EVE/Alieve/TPCSector3DGL.cxx rename to EVE/Alieve/AliEveTPCSector3DGL.cxx index bd010ed65cd..5b93761b5d5 100644 --- a/EVE/Alieve/TPCSector3DGL.cxx +++ b/EVE/Alieve/AliEveTPCSector3DGL.cxx @@ -1,22 +1,29 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSector3DGL.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCSector3DGL.h" +#include #include #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCSector3DGL +// AliEveTPCSector3DGL // -ClassImp(TPCSector3DGL) +ClassImp(AliEveTPCSector3DGL) -TPCSector3DGL::TPCSector3DGL() : +AliEveTPCSector3DGL::AliEveTPCSector3DGL() : TGLObject(), fSector(0), fBoxRnr(0), fRTS(0) @@ -24,7 +31,7 @@ TPCSector3DGL::TPCSector3DGL() : // fDLCache = false; // Disable display list. } -TPCSector3DGL::~TPCSector3DGL() +AliEveTPCSector3DGL::~AliEveTPCSector3DGL() { delete fBoxRnr; } @@ -32,7 +39,7 @@ TPCSector3DGL::~TPCSector3DGL() /**************************************************************************/ //______________________________________________________________________________ -Short_t TPCSector3DGL::QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) const +Short_t AliEveTPCSector3DGL::QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) const { // Factor in scene/viewer LOD and quantize. @@ -46,10 +53,10 @@ Short_t TPCSector3DGL::QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) cons /**************************************************************************/ -Bool_t TPCSector3DGL::SetModel(TObject* obj, const Option_t* /*opt*/) +Bool_t AliEveTPCSector3DGL::SetModel(TObject* obj, const Option_t* /*opt*/) { - if(SetModelCheckClass(obj, Alieve::TPCSector3D::Class())) { - fSector = (TPCSector3D*) fExternalObj; + if(SetModelCheckClass(obj, AliEveTPCSector3D::Class())) { + fSector = (AliEveTPCSector3D*) fExternalObj; if(fBoxRnr == 0) { fBoxRnr = new TEveBoxSetGL; fBoxRnr->SetModel(&fSector->fBoxSet); @@ -59,16 +66,16 @@ Bool_t TPCSector3DGL::SetModel(TObject* obj, const Option_t* /*opt*/) return kFALSE; } -void TPCSector3DGL::SetBBox() +void AliEveTPCSector3DGL::SetBBox() { - SetAxisAlignedBBox(((TPCSector3D*)fExternalObj)->AssertBBox()); + SetAxisAlignedBBox(((AliEveTPCSector3D*)fExternalObj)->AssertBBox()); } /**************************************************************************/ -void TPCSector3DGL::DirectDraw(TGLRnrCtx & rnrCtx) const +void AliEveTPCSector3DGL::DirectDraw(TGLRnrCtx & rnrCtx) const { - // printf("TPCSector3DGL::DirectDraw Style %d, LOD %d\n", rnrCtx.Style(), rnrCtx.LOD()); + // printf("AliEveTPCSector3DGL::DirectDraw Style %d, LOD %d\n", rnrCtx.Style(), rnrCtx.LOD()); if(fRTS < fSector->fRTS) { fSector->UpdateBoxes(); @@ -104,7 +111,7 @@ void TPCSector3DGL::DirectDraw(TGLRnrCtx & rnrCtx) const TEvePointSet* ps = psa.GetBin(b); if(ps->Size() > 0) { - TEveUtil::ColorFromIdx(ps->GetMarkerColor(), col); + TEveUtil::TEveUtil::ColorFromIdx(ps->GetMarkerColor(), col); glColor4ubv(col); if (rnrCtx.SecSelection()) glLoadName(b + 1); @@ -118,30 +125,30 @@ void TPCSector3DGL::DirectDraw(TGLRnrCtx & rnrCtx) const if(fSector->fRnrFrame && ! rnrCtx.SecSelection()) { - TEveUtil::ColorFromIdx(fSector->fFrameColor, col); + TEveUtil::TEveUtil::ColorFromIdx(fSector->fFrameColor, col); glColor4ubv(col); if(fSector->fRnrInn) - DrawSegmentFrame(TPCSectorData::GetInnSeg(), 0, 2); + DrawSegmentFrame(AliEveTPCSectorData::GetInnSeg(), 0, 2); if(fSector->fRnrOut1) - DrawSegmentFrame(TPCSectorData::GetOut1Seg(), 2, 1); + DrawSegmentFrame(AliEveTPCSectorData::GetOut1Seg(), 2, 1); if(fSector->fRnrOut2) - DrawSegmentFrame(TPCSectorData::GetOut2Seg(), 2, 2); + DrawSegmentFrame(AliEveTPCSectorData::GetOut2Seg(), 2, 2); } glPopAttrib(); } -void TPCSector3DGL::DrawSegmentFrame(const TPCSectorData::SegmentInfo& s, +void AliEveTPCSector3DGL::DrawSegmentFrame(const AliEveTPCSectorData::SegmentInfo& s, Int_t botExtraPads, Int_t topExtraPads) const { Float_t xl, xh, yl, yh, zl, zh; - xl = 0.5*s.GetPadWidth()*(TPCSectorData::GetNPadsInRow(s.GetFirstRow()) + botExtraPads); - xh = 0.5*s.GetPadWidth()*(TPCSectorData::GetNPadsInRow(s.GetLastRow()) + topExtraPads); + xl = 0.5*s.GetPadWidth()*(AliEveTPCSectorData::GetNPadsInRow(s.GetFirstRow()) + botExtraPads); + xh = 0.5*s.GetPadWidth()*(AliEveTPCSectorData::GetNPadsInRow(s.GetLastRow()) + topExtraPads); yl = s.GetRLow(); yh = yl + s.GetNRows()*s.GetPadHeight(); zl = 0; - zh = TPCSectorData::GetZLength(); + zh = AliEveTPCSectorData::GetZLength(); glBegin(GL_LINE_LOOP); glVertex3f( xl, yl, zl); glVertex3f( xh, yh, zl); @@ -163,7 +170,7 @@ void TPCSector3DGL::DrawSegmentFrame(const TPCSectorData::SegmentInfo& s, /**************************************************************************/ //______________________________________________________________________________ -void TPCSector3DGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord & rec) +void AliEveTPCSector3DGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord & rec) { // Processes secondary selection from TGLViewer. // Calls TPointSet3D::PointSelected(Int_t) with index of selected diff --git a/EVE/Alieve/AliEveTPCSector3DGL.h b/EVE/Alieve/AliEveTPCSector3DGL.h new file mode 100644 index 00000000000..51db92d58cb --- /dev/null +++ b/EVE/Alieve/AliEveTPCSector3DGL.h @@ -0,0 +1,55 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSector3DGL_H +#define ALIEVE_TPCSector3DGL_H + +#include + +#include + +class TEveBoxSetGL; + + +class AliEveTPCSector3D; + +class AliEveTPCSector3DGL : public TGLObject +{ + AliEveTPCSector3DGL(const AliEveTPCSector3DGL&); // Not implemented + AliEveTPCSector3DGL& operator=(const AliEveTPCSector3DGL&); // Not implemented + +protected: + AliEveTPCSector3D* fSector; // fModel dynamic-casted to AliEveTPCSector3DGL + TEveBoxSetGL* fBoxRnr; + + mutable UInt_t fRTS; + + virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; + +public: + AliEveTPCSector3DGL(); + virtual ~AliEveTPCSector3DGL(); + + virtual Bool_t ShouldDLCache(const TGLRnrCtx&) const { return kFALSE; } + virtual ELODAxes SupportedLODAxes() const { return kLODAxesAll; } + virtual Short_t QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) const; + + virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); + virtual void SetBBox(); + + void DrawSegmentFrame(const AliEveTPCSectorData::SegmentInfo& s, + Int_t botExtraPads=0, Int_t topExtraPads=0) const; + + virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } + virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec); + + ClassDef(AliEveTPCSector3DGL, 0); +}; // endclass AliEveTPCSector3DGL + +#endif diff --git a/EVE/Alieve/TPCSectorData.cxx b/EVE/Alieve/AliEveTPCSectorData.cxx similarity index 77% rename from EVE/Alieve/TPCSectorData.cxx rename to EVE/Alieve/AliEveTPCSectorData.cxx index 45ccbe22983..c360c0af09d 100644 --- a/EVE/Alieve/TPCSectorData.cxx +++ b/EVE/Alieve/AliEveTPCSectorData.cxx @@ -1,12 +1,19 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSectorData.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCSectorData.h" #include #include //______________________________________________________________________ -// TPCSectorData +// AliEveTPCSectorData // // Stores data from a fiven TPC sector. // @@ -16,28 +23,28 @@ // // A lot of TPC-sector information is stored as static data. // -// For accessing data, see for example TPCSector2DGL::CreateTexture() +// For accessing data, see for example AliEveTPCSector2DGL::CreateTexture() // and LoadPadrow(). // -using namespace Alieve; -ClassImp(TPCSectorData) -AliTPCParam* TPCSectorData::fgParam = 0; -Float_t TPCSectorData::fgZLength = 0; -Int_t TPCSectorData::fgNAllRows = 0; -Int_t TPCSectorData::fgNAllPads = 0; -Int_t* TPCSectorData::fgRowBegs = 0; +ClassImp(AliEveTPCSectorData) + +AliTPCParam* AliEveTPCSectorData::fgParam = 0; +Float_t AliEveTPCSectorData::fgZLength = 0; +Int_t AliEveTPCSectorData::fgNAllRows = 0; +Int_t AliEveTPCSectorData::fgNAllPads = 0; +Int_t* AliEveTPCSectorData::fgRowBegs = 0; -TPCSectorData::SegmentInfo TPCSectorData::fgInnSeg; -TPCSectorData::SegmentInfo TPCSectorData::fgOut1Seg; -TPCSectorData::SegmentInfo TPCSectorData::fgOut2Seg; +AliEveTPCSectorData::SegmentInfo AliEveTPCSectorData::fgInnSeg; +AliEveTPCSectorData::SegmentInfo AliEveTPCSectorData::fgOut1Seg; +AliEveTPCSectorData::SegmentInfo AliEveTPCSectorData::fgOut2Seg; -TPCSectorData::SegmentInfo* TPCSectorData::fgSegInfoPtrs[3] = {0}; +AliEveTPCSectorData::SegmentInfo* AliEveTPCSectorData::fgSegInfoPtrs[3] = {0}; /**************************************************************************/ -void TPCSectorData::InitStatics() +void AliEveTPCSectorData::InitStatics() { if(fgParam != 0) return; @@ -123,13 +130,13 @@ void TPCSectorData::InitStatics() fgOut2Seg.fNYSteps = k; } -Int_t TPCSectorData::GetNPadsInRow(Int_t row) +Int_t AliEveTPCSectorData::GetNPadsInRow(Int_t row) { if(row < 0 || row >= fgNAllRows) return 0; return fgRowBegs[row + 1] - fgRowBegs[row]; } -const TPCSectorData::SegmentInfo& TPCSectorData::GetSeg(Int_t seg) +const AliEveTPCSectorData::SegmentInfo& AliEveTPCSectorData::GetSeg(Int_t seg) { static const SegmentInfo null; @@ -143,7 +150,7 @@ const TPCSectorData::SegmentInfo& TPCSectorData::GetSeg(Int_t seg) // True member functions start here. /**************************************************************************/ -void TPCSectorData::NewBlock() +void AliEveTPCSectorData::NewBlock() { fBlocks.push_back(new Short_t[fBlockSize]); fBlockPos = 0; @@ -151,7 +158,7 @@ void TPCSectorData::NewBlock() /**************************************************************************/ -TPCSectorData::TPCSectorData(Int_t sector, Int_t bsize) : +AliEveTPCSectorData::AliEveTPCSectorData(Int_t sector, Int_t bsize) : fSectorID(sector), fNPadsFilled(0), fPads(), fBlockSize(bsize), fBlockPos(0), fBlocks(), fCurrentRow(0), fCurrentPad(0), fCurrentPos(0), fCurrentStep(0), @@ -165,14 +172,14 @@ TPCSectorData::TPCSectorData(Int_t sector, Int_t bsize) : } -TPCSectorData::~TPCSectorData() +AliEveTPCSectorData::~AliEveTPCSectorData() { for(std::vector::iterator b=fBlocks.begin(); b!=fBlocks.end(); ++b) delete [] *b; DeletePadRowHack(); } -void TPCSectorData::DropData() +void AliEveTPCSectorData::DropData() { fPads.assign(fgNAllPads, PadData()); for(std::vector::iterator b=fBlocks.begin(); b!=fBlocks.end(); ++b) @@ -183,15 +190,15 @@ void TPCSectorData::DropData() /**************************************************************************/ -void TPCSectorData::Print(Option_t* /*opt*/) const +void AliEveTPCSectorData::Print(Option_t* /*opt*/) const { - printf("TPCSectorData sector=%d, NPadsFilled=%d, NBlocks=%d, BlockPos=%d\n", + printf("AliEveTPCSectorData sector=%d, NPadsFilled=%d, NBlocks=%d, BlockPos=%d\n", fSectorID, fNPadsFilled, fBlocks.size(), fBlockPos); } /**************************************************************************/ -void TPCSectorData::BeginPad(Int_t row, Int_t pad, Bool_t reverseTime) +void AliEveTPCSectorData::BeginPad(Int_t row, Int_t pad, Bool_t reverseTime) { fCurrentRow = row; fCurrentPad = pad; @@ -207,7 +214,7 @@ void TPCSectorData::BeginPad(Int_t row, Int_t pad, Bool_t reverseTime) // fPadBuffer, fCurrentPos, fCurrentStep); } -void TPCSectorData::EndPad(Bool_t autoPedestal, Short_t threshold) +void AliEveTPCSectorData::EndPad(Bool_t autoPedestal, Short_t threshold) { Short_t *beg, *end; if(fCurrentStep > 0) { @@ -299,7 +306,7 @@ void TPCSectorData::EndPad(Bool_t autoPedestal, Short_t threshold) /**************************************************************************/ -const TPCSectorData::PadData& TPCSectorData::GetPadData(Int_t padAddr) +const AliEveTPCSectorData::PadData& AliEveTPCSectorData::GetPadData(Int_t padAddr) { static const PadData null; @@ -307,7 +314,7 @@ const TPCSectorData::PadData& TPCSectorData::GetPadData(Int_t padAddr) return fPads[padAddr]; } -const TPCSectorData::PadData& TPCSectorData::GetPadData(Int_t row, Int_t pad) +const AliEveTPCSectorData::PadData& AliEveTPCSectorData::GetPadData(Int_t row, Int_t pad) { static const PadData null; @@ -316,17 +323,17 @@ const TPCSectorData::PadData& TPCSectorData::GetPadData(Int_t row, Int_t pad) return GetPadData(fgRowBegs[row] + pad); } -TPCSectorData::PadIterator TPCSectorData::MakePadIterator(Int_t padAddr, Short_t thr) +AliEveTPCSectorData::PadIterator AliEveTPCSectorData::MakePadIterator(Int_t padAddr, Short_t thr) { return PadIterator(GetPadData(padAddr), thr); } -TPCSectorData::PadIterator TPCSectorData::MakePadIterator(Int_t row, Int_t pad, Short_t thr) +AliEveTPCSectorData::PadIterator AliEveTPCSectorData::MakePadIterator(Int_t row, Int_t pad, Short_t thr) { return PadIterator(GetPadData(row, pad), thr); } -TPCSectorData::RowIterator TPCSectorData::MakeRowIterator(Int_t row, Short_t thr) +AliEveTPCSectorData::RowIterator AliEveTPCSectorData::MakeRowIterator(Int_t row, Short_t thr) { Short_t npads = GetNPadsInRow(row); if(npads > 0) @@ -336,10 +343,10 @@ TPCSectorData::RowIterator TPCSectorData::MakeRowIterator(Int_t row, Short_t thr } /**************************************************************************/ -// TPCSectorData::PadData +// AliEveTPCSectorData::PadData /**************************************************************************/ -void TPCSectorData::PadData::Print(Option_t* /*opt*/) +void AliEveTPCSectorData::PadData::Print(Option_t* /*opt*/) { printf("addr=%p, len=%hd>\n", (void*)fData, fLength); for(Int_t i=0; i= fEnd) return kFALSE; if(fNChunk > 0) { @@ -372,7 +379,7 @@ Bool_t TPCSectorData::PadIterator::Next() return (fSignal > fThreshold) ? kTRUE : Next(); } -void TPCSectorData::PadIterator::Reset() +void AliEveTPCSectorData::PadIterator::Reset() { // Return to the beginning of the pad-data. Must call Next() to get to // the first stored signal. @@ -383,7 +390,7 @@ void TPCSectorData::PadIterator::Reset() fNChunk = 0; } -void TPCSectorData::PadIterator::Reset(const PadData& pd) +void AliEveTPCSectorData::PadIterator::Reset(const PadData& pd) { // Reinitialize to new pad-data. Must call Next() to get to the // first stored signal. @@ -394,17 +401,17 @@ void TPCSectorData::PadIterator::Reset(const PadData& pd) Reset(); } -void TPCSectorData::PadIterator::Test() +void AliEveTPCSectorData::PadIterator::Test() { while(Next()) printf(" %3d %d\n", fTime, fSignal); } /**************************************************************************/ -// TPCSectorData::RowIterator +// AliEveTPCSectorData::RowIterator /**************************************************************************/ -Bool_t TPCSectorData::RowIterator::NextPad() +Bool_t AliEveTPCSectorData::RowIterator::NextPad() { ++fPad; if(fPad >= fNPads) return kFALSE; @@ -412,7 +419,7 @@ Bool_t TPCSectorData::RowIterator::NextPad() return kTRUE; } -void TPCSectorData::RowIterator::ResetRow() +void AliEveTPCSectorData::RowIterator::ResetRow() { // Return to the beginning of the row. Must call NextPad() to get to // the zeroth pad. @@ -420,7 +427,7 @@ void TPCSectorData::RowIterator::ResetRow() fPad = -1; } -void TPCSectorData::RowIterator::ResetRow(const PadData* first, Short_t npads) +void AliEveTPCSectorData::RowIterator::ResetRow(const PadData* first, Short_t npads) { // Reinitialize to another pad-data array. Must call NextPad() to // get to the zeroth pad. @@ -430,7 +437,7 @@ void TPCSectorData::RowIterator::ResetRow(const PadData* first, Short_t npads) fPad = -1; } -void TPCSectorData::RowIterator::Test() +void AliEveTPCSectorData::RowIterator::Test() { while(NextPad()) { printf("TEvePad %d\n", fPad); @@ -439,12 +446,12 @@ void TPCSectorData::RowIterator::Test() } /**************************************************************************/ -// TPCSectorData::SegmentInfo +// AliEveTPCSectorData::SegmentInfo /**************************************************************************/ -ClassImp(TPCSectorData::SegmentInfo) +ClassImp(AliEveTPCSectorData::SegmentInfo) -TPCSectorData::SegmentInfo::SegmentInfo() : +AliEveTPCSectorData::SegmentInfo::SegmentInfo() : TObject(), fPadWidth(0), fPadHeight(0), @@ -456,10 +463,10 @@ TPCSectorData::SegmentInfo::SegmentInfo() : } /**************************************************************************/ -// TPCSectorData::PadRowHack +// AliEveTPCSectorData::PadRowHack /**************************************************************************/ -TPCSectorData::PadRowHack* TPCSectorData::GetPadRowHack(Int_t r, Int_t p) +AliEveTPCSectorData::PadRowHack* AliEveTPCSectorData::GetPadRowHack(Int_t r, Int_t p) { if(fPadRowHackSet == 0) return 0; std::set* hs = static_cast*>(fPadRowHackSet); @@ -467,7 +474,7 @@ TPCSectorData::PadRowHack* TPCSectorData::GetPadRowHack(Int_t r, Int_t p) return (i == hs->end()) ? 0 : const_cast(&*i); } -void TPCSectorData::AddPadRowHack(Int_t r, Int_t p, Int_t te, Float_t tf) +void AliEveTPCSectorData::AddPadRowHack(Int_t r, Int_t p, Int_t te, Float_t tf) { if(fPadRowHackSet == 0) fPadRowHackSet = new std::set; @@ -481,7 +488,7 @@ void TPCSectorData::AddPadRowHack(Int_t r, Int_t p, Int_t te, Float_t tf) } } -void TPCSectorData::RemovePadRowHack(Int_t r, Int_t p) +void AliEveTPCSectorData::RemovePadRowHack(Int_t r, Int_t p) { if(fPadRowHackSet == 0) return; std::set*hs = static_cast*>(fPadRowHackSet); @@ -489,7 +496,7 @@ void TPCSectorData::RemovePadRowHack(Int_t r, Int_t p) if(i != hs->end()) hs->erase(i); } -void TPCSectorData::DeletePadRowHack() +void AliEveTPCSectorData::DeletePadRowHack() { if(fPadRowHackSet != 0) { std::set*hs = static_cast*>(fPadRowHackSet); diff --git a/EVE/Alieve/TPCSectorData.h b/EVE/Alieve/AliEveTPCSectorData.h similarity index 87% rename from EVE/Alieve/TPCSectorData.h rename to EVE/Alieve/AliEveTPCSectorData.h index e3f93939845..8e164c6e3b6 100644 --- a/EVE/Alieve/TPCSectorData.h +++ b/EVE/Alieve/AliEveTPCSectorData.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TPCSectorData_H #define ALIEVE_TPCSectorData_H @@ -11,12 +18,11 @@ class AliTPCParam; -namespace Alieve { -class TPCSectorData : public TObject +class AliEveTPCSectorData : public TObject { - TPCSectorData(const TPCSectorData&); // Not implemented - TPCSectorData& operator=(const TPCSectorData&); // Not implemented + AliEveTPCSectorData(const AliEveTPCSectorData&); // Not implemented + AliEveTPCSectorData& operator=(const AliEveTPCSectorData&); // Not implemented public: @@ -113,7 +119,7 @@ public: class SegmentInfo : public TObject { - friend class TPCSectorData; + friend class AliEveTPCSectorData; private: Float_t fPadWidth; @@ -174,8 +180,8 @@ protected: Int_t PadIndex(Int_t row, Int_t pad) { return fgRowBegs[row] + pad; } public: - TPCSectorData(Int_t sector, Int_t bsize=65536); - virtual ~TPCSectorData(); + AliEveTPCSectorData(Int_t sector, Int_t bsize=65536); + virtual ~AliEveTPCSectorData(); void DropData(); @@ -237,17 +243,15 @@ protected: void* fPadRowHackSet; - ClassDef(TPCSectorData, 0); -}; // endclass TPCSectorData + ClassDef(AliEveTPCSectorData, 0); +}; // endclass AliEveTPCSectorData -inline void TPCSectorData::RegisterData(Short_t time, Short_t signal) +inline void AliEveTPCSectorData::RegisterData(Short_t time, Short_t signal) { fPadBuffer[fCurrentPos] = time; fPadBuffer[fCurrentPos+1] = signal; fCurrentPos += fCurrentStep; } -} - #endif diff --git a/EVE/Alieve/TPCSectorViz.cxx b/EVE/Alieve/AliEveTPCSectorViz.cxx similarity index 64% rename from EVE/Alieve/TPCSectorViz.cxx rename to EVE/Alieve/AliEveTPCSectorViz.cxx index 70b6d12a1ec..42eee317f42 100644 --- a/EVE/Alieve/TPCSectorViz.cxx +++ b/EVE/Alieve/AliEveTPCSectorViz.cxx @@ -1,26 +1,33 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSectorViz.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ -#include -#include +#include "AliEveTPCSectorViz.h" + +#include +#include #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCSectorViz +// AliEveTPCSectorViz // // Base class for TPC raw-data visualization. -// See TPCSector2D and TPCSector3D for concrete implementations. +// See AliEveTPCSector2D and AliEveTPCSector3D for concrete implementations. -ClassImp(TPCSectorViz) +ClassImp(AliEveTPCSectorViz) /**************************************************************************/ -TPCSectorViz::TPCSectorViz(const Text_t* n, const Text_t* t) : +AliEveTPCSectorViz::AliEveTPCSectorViz(const Text_t* n, const Text_t* t) : TEveElement(fFrameColor), TNamed(n, t), @@ -44,13 +51,13 @@ TPCSectorViz::TPCSectorViz(const Text_t* n, const Text_t* t) : fColorArray (0) {} -TPCSectorViz::~TPCSectorViz() +AliEveTPCSectorViz::~AliEveTPCSectorViz() { if(fTPCData) fTPCData->DecRefCount(); delete [] fColorArray; } -void TPCSectorViz::CopyVizParams(const TPCSectorViz& v) +void AliEveTPCSectorViz::CopyVizParams(const AliEveTPCSectorViz& v) { fMinTime = v.fMinTime; fMaxTime = v.fMaxTime; @@ -64,7 +71,7 @@ void TPCSectorViz::CopyVizParams(const TPCSectorViz& v) /**************************************************************************/ -void TPCSectorViz::SetDataSource(TPCData* data) +void AliEveTPCSectorViz::SetDataSource(AliEveTPCData* data) { if(data == fTPCData) return; if(fTPCData) fTPCData->DecRefCount(); @@ -73,7 +80,7 @@ void TPCSectorViz::SetDataSource(TPCData* data) IncRTS(); } -void TPCSectorViz::SetSectorID(Int_t id) +void AliEveTPCSectorViz::SetSectorID(Int_t id) { if(id < 0) id = 0; if(id > 35) id = 35; @@ -83,21 +90,21 @@ void TPCSectorViz::SetSectorID(Int_t id) IncRTS(); } -TPCSectorData* TPCSectorViz::GetSectorData() const +AliEveTPCSectorData* AliEveTPCSectorViz::GetSectorData() const { return fTPCData ? fTPCData->GetSectorData(fSectorID) : 0; } /**************************************************************************/ -void TPCSectorViz::SetThreshold(Short_t t) +void AliEveTPCSectorViz::SetThreshold(Short_t t) { fThreshold = TMath::Min(t, (Short_t)(fMaxVal - 1)); ClearColorArray(); IncRTS(); } -void TPCSectorViz::SetMaxVal(Int_t mv) +void AliEveTPCSectorViz::SetMaxVal(Int_t mv) { fMaxVal = TMath::Max(mv, (Int_t)(fThreshold + 1)); ClearColorArray(); @@ -106,7 +113,7 @@ void TPCSectorViz::SetMaxVal(Int_t mv) /**************************************************************************/ -void TPCSectorViz::SetAutoTrans(Bool_t trans) +void AliEveTPCSectorViz::SetAutoTrans(Bool_t trans) { fAutoTrans = trans; if(fAutoTrans) { @@ -115,7 +122,7 @@ void TPCSectorViz::SetAutoTrans(Bool_t trans) using namespace TMath; Float_t c = Cos((fSectorID + 0.5)*20*Pi()/180 - PiOver2()); Float_t s = Sin((fSectorID + 0.5)*20*Pi()/180 - PiOver2()); - Float_t z = TPCSectorData::GetZLength(); + Float_t z = AliEveTPCSectorData::GetZLength(); Float_t d = -1; if(fSectorID >= 18) { z = -z; @@ -135,17 +142,17 @@ void TPCSectorViz::SetAutoTrans(Bool_t trans) /**************************************************************************/ -void TPCSectorViz::SetupColor(Int_t val, UChar_t* pixel) const +void AliEveTPCSectorViz::SetupColor(Int_t val, UChar_t* pixel) const { using namespace TMath; Float_t div = Max(1, fMaxVal - fThreshold); Int_t nCol = gStyle->GetNumberOfColors(); Int_t cBin = (Int_t) Nint(nCol*(val - fThreshold)/div); - TEveUtil::ColorFromIdx(gStyle->GetColorPalette(Min(nCol - 1, cBin)), pixel); + TEveUtil::TEveUtil::ColorFromIdx(gStyle->GetColorPalette(Min(nCol - 1, cBin)), pixel); } -void TPCSectorViz::ClearColorArray() +void AliEveTPCSectorViz::ClearColorArray() { if(fColorArray) { delete [] fColorArray; @@ -153,7 +160,7 @@ void TPCSectorViz::ClearColorArray() } } -void TPCSectorViz::SetupColorArray() const +void AliEveTPCSectorViz::SetupColorArray() const { if(fColorArray) return; diff --git a/EVE/Alieve/TPCSectorViz.h b/EVE/Alieve/AliEveTPCSectorViz.h similarity index 54% rename from EVE/Alieve/TPCSectorViz.h rename to EVE/Alieve/AliEveTPCSectorViz.h index 35a28538073..102aa5dd5fc 100644 --- a/EVE/Alieve/TPCSectorViz.h +++ b/EVE/Alieve/AliEveTPCSectorViz.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TPCSectorViz_H #define ALIEVE_TPCSectorViz_H @@ -11,32 +18,30 @@ #include -namespace Alieve { - -class TPCData; class TPCSectorData; +class AliEveTPCData; class AliEveTPCSectorData; -class TPCSectorVizEditor; -class TPCSector2D; class TPCSector2DEditor; class TPCSector2DGL; -class TPCSector3D; class TPCSector3DEditor; class TPCSector3DGL; +class AliEveTPCSectorVizEditor; +class AliEveTPCSector2D; class AliEveTPCSector2DEditor; class AliEveTPCSector2DGL; +class AliEveTPCSector3D; class AliEveTPCSector3DEditor; class AliEveTPCSector3DGL; -class TPCSectorViz : public TEveElement, +class AliEveTPCSectorViz : public TEveElement, public TNamed, public TAtt3D, public TAttBBox { - friend class TPCSectorVizEditor; - friend class TPCSector2D; - friend class TPCSector2DEditor; - friend class TPCSector2DGL; - friend class TPCSector3D; - friend class TPCSector3DEditor; - friend class TPCSector3DGL; + friend class AliEveTPCSectorVizEditor; + friend class AliEveTPCSector2D; + friend class AliEveTPCSector2DEditor; + friend class AliEveTPCSector2DGL; + friend class AliEveTPCSector3D; + friend class AliEveTPCSector3DEditor; + friend class AliEveTPCSector3DGL; - TPCSectorViz(const TPCSectorViz&); // Not implemented - TPCSectorViz& operator=(const TPCSectorViz&); // Not implemented + AliEveTPCSectorViz(const AliEveTPCSectorViz&); // Not implemented + AliEveTPCSectorViz& operator=(const AliEveTPCSectorViz&); // Not implemented protected: - TPCData* fTPCData; + AliEveTPCData* fTPCData; Int_t fSectorID; Int_t fMinTime; @@ -63,20 +68,20 @@ protected: void ColorFromArray(Int_t val, UChar_t* pix) const; public: - TPCSectorViz(const Text_t* n="TPCSectorViz", const Text_t* t=0); - virtual ~TPCSectorViz(); + AliEveTPCSectorViz(const Text_t* n="AliEveTPCSectorViz", const Text_t* t=0); + virtual ~AliEveTPCSectorViz(); - virtual void CopyVizParams(const TPCSectorViz& v); + virtual void CopyVizParams(const AliEveTPCSectorViz& v); virtual UInt_t IncRTS() { return ++fRTS; } virtual Bool_t CanEditMainColor() { return kTRUE; } - void SetDataSource(TPCData* data); + void SetDataSource(AliEveTPCData* data); void SetSectorID(Int_t id); - TPCData* GetData() const { return fTPCData; } + AliEveTPCData* GetData() const { return fTPCData; } Int_t GetSectorID() const { return fSectorID; } - TPCSectorData* GetSectorData() const; + AliEveTPCSectorData* GetSectorData() const; Int_t GetMinTime() const { return fMinTime; } Int_t GetMaxTime() const { return fMaxTime; } @@ -96,23 +101,21 @@ public: TEveTrans& RefHMTrans() { return fHMTrans; } void SetUseTrans(Bool_t t) { fHMTrans.SetUseTrans(t); } - ClassDef(TPCSectorViz, 1); // Base-class for TPC raw-data visualization -}; // endclass TPCSectorViz + ClassDef(AliEveTPCSectorViz, 1); // Base-class for TPC raw-data visualization +}; // endclass AliEveTPCSectorViz -inline UChar_t* TPCSectorViz::ColorFromArray(Int_t val) const +inline UChar_t* AliEveTPCSectorViz::ColorFromArray(Int_t val) const { if(val < fThreshold) val = fThreshold; if(val > fMaxVal) val = fMaxVal; return fColorArray + 4 * (val - fThreshold); } -inline void TPCSectorViz::ColorFromArray(Int_t val, UChar_t* pix) const +inline void AliEveTPCSectorViz::ColorFromArray(Int_t val, UChar_t* pix) const { UChar_t* c = ColorFromArray(val); pix[0] = c[0]; pix[1] = c[1]; pix[2] = c[2]; pix[3] = c[3]; } -} - #endif diff --git a/EVE/Alieve/TPCSectorVizEditor.cxx b/EVE/Alieve/AliEveTPCSectorVizEditor.cxx similarity index 69% rename from EVE/Alieve/TPCSectorVizEditor.cxx rename to EVE/Alieve/AliEveTPCSectorVizEditor.cxx index 912176640b6..d369ea18d77 100644 --- a/EVE/Alieve/TPCSectorVizEditor.cxx +++ b/EVE/Alieve/AliEveTPCSectorVizEditor.cxx @@ -1,7 +1,14 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TPCSectorVizEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTPCSectorVizEditor.h" +#include #include #include @@ -15,15 +22,15 @@ #include #include #include -using namespace Alieve; + //______________________________________________________________________ -// TPCSectorVizEditor +// AliEveTPCSectorVizEditor // -ClassImp(TPCSectorVizEditor) +ClassImp(AliEveTPCSectorVizEditor) -TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, +AliEveTPCSectorVizEditor::AliEveTPCSectorVizEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), @@ -41,11 +48,11 @@ TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, MakeTitle("Transformation matrix"); fHMTrans = new TEveTransSubEditor(this); - fHMTrans->Connect("UseTrans()", "Alieve::TPCSectorVizEditor", this, "Update()"); - fHMTrans->Connect("TransChanged()", "Alieve::TPCSectorVizEditor", this, "Update()"); + fHMTrans->Connect("UseTrans()", "AliEveTPCSectorVizEditor", this, "Update()"); + fHMTrans->Connect("TransChanged()", "AliEveTPCSectorVizEditor", this, "Update()"); AddFrame(fHMTrans, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 2, 0, 0, 0)); - MakeTitle("TPCSectorViz"); + MakeTitle("AliEveTPCSectorViz"); fSectorID = new TEveGValuator(this, "SectorID", 110, 0); fSectorID->SetLabelWidth(labelW); @@ -55,12 +62,12 @@ TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, fSectorID->SetLimits(0, 35); fSectorID->SetToolTip("0-17 +z plate; 18-35 -z plate"); fSectorID->Connect("ValueSet(Double_t)", - "Alieve::TPCSectorVizEditor", this, "DoSectorID()"); + "AliEveTPCSectorVizEditor", this, "DoSectorID()"); // Reuse sectorID for auto-transformation button fAutoTrans = new TGCheckButton(fSectorID, "AutoTrans"); fAutoTrans->SetToolTipText("Automatically set transformation to true position"); fSectorID->AddFrame(fAutoTrans, new TGLayoutHints(kLHintsLeft, 12, 0, 1, 0)); - fAutoTrans->Connect("Toggled(Bool_t)","Alieve::TPCSectorVizEditor", this, "DoAutoTrans()"); + fAutoTrans->Connect("Toggled(Bool_t)","AliEveTPCSectorVizEditor", this, "DoAutoTrans()"); AddFrame(fSectorID, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); { @@ -68,15 +75,15 @@ TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, fRnrInn = new TGCheckButton(f, "Inner"); f->AddFrame(fRnrInn, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fRnrInn->Connect("Toggled(Bool_t)","Alieve::TPCSectorVizEditor", this, "DoRnrInn()"); + fRnrInn->Connect("Toggled(Bool_t)","AliEveTPCSectorVizEditor", this, "DoRnrInn()"); fRnrOut1 = new TGCheckButton(f, "Outer 1"); f->AddFrame(fRnrOut1, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fRnrOut1->Connect("Toggled(Bool_t)","Alieve::TPCSectorVizEditor", this, "DoRnrOut1()"); + fRnrOut1->Connect("Toggled(Bool_t)","AliEveTPCSectorVizEditor", this, "DoRnrOut1()"); fRnrOut2 = new TGCheckButton(f, "Outer 2"); f->AddFrame(fRnrOut2, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); - fRnrOut2->Connect("Toggled(Bool_t)","Alieve::TPCSectorVizEditor", this, "DoRnrOut2()"); + fRnrOut2->Connect("Toggled(Bool_t)","AliEveTPCSectorVizEditor", this, "DoRnrOut2()"); AddFrame(f, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); } @@ -88,7 +95,7 @@ TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, fThreshold->GetSlider()->SetWidth(120); fThreshold->SetLimits(0,250); fThreshold->Connect("ValueSet(Double_t)", - "Alieve::TPCSectorVizEditor", this, "DoThreshold()"); + "AliEveTPCSectorVizEditor", this, "DoThreshold()"); AddFrame(fThreshold, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fMaxVal = new TEveGValuator(this,"MaxVal", 200, 0); @@ -98,7 +105,7 @@ TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, fMaxVal->GetSlider()->SetWidth(120); fMaxVal->SetLimits(0, 500); fMaxVal->Connect("ValueSet(Double_t)", - "Alieve::TPCSectorVizEditor", this, "DoMaxVal()"); + "AliEveTPCSectorVizEditor", this, "DoMaxVal()"); AddFrame(fMaxVal, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); fTime = new TEveGDoubleValuator(this,"Time", 200, 0); @@ -108,18 +115,18 @@ TPCSectorVizEditor::TPCSectorVizEditor(const TGWindow *p, fTime->GetSlider()->SetWidth(224); fTime->SetLimits(0, 1023, TGNumberFormat::kNESInteger); fTime->Connect("ValueSet()", - "Alieve::TPCSectorVizEditor", this, "DoTime()"); + "AliEveTPCSectorVizEditor", this, "DoTime()"); AddFrame(fTime, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); } -TPCSectorVizEditor::~TPCSectorVizEditor() +AliEveTPCSectorVizEditor::~AliEveTPCSectorVizEditor() {} /**************************************************************************/ -void TPCSectorVizEditor::SetModel(TObject* obj) +void AliEveTPCSectorVizEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fHMTrans->SetModel(&fM->fHMTrans); @@ -138,13 +145,13 @@ void TPCSectorVizEditor::SetModel(TObject* obj) /**************************************************************************/ -void TPCSectorVizEditor::DoSectorID() +void AliEveTPCSectorVizEditor::DoSectorID() { fM->SetSectorID((Int_t) fSectorID->GetValue()); Update(); } -void TPCSectorVizEditor::DoAutoTrans() +void AliEveTPCSectorVizEditor::DoAutoTrans() { fM->SetAutoTrans(fAutoTrans->IsOn()); Update(); @@ -152,19 +159,19 @@ void TPCSectorVizEditor::DoAutoTrans() /**************************************************************************/ -void TPCSectorVizEditor::DoRnrInn() +void AliEveTPCSectorVizEditor::DoRnrInn() { fM->SetRnrInn(fRnrInn->IsOn()); Update(); } -void TPCSectorVizEditor::DoRnrOut1() +void AliEveTPCSectorVizEditor::DoRnrOut1() { fM->SetRnrOut1(fRnrOut1->IsOn()); Update(); } -void TPCSectorVizEditor::DoRnrOut2() +void AliEveTPCSectorVizEditor::DoRnrOut2() { fM->SetRnrOut2(fRnrOut2->IsOn()); Update(); @@ -172,14 +179,14 @@ void TPCSectorVizEditor::DoRnrOut2() /**************************************************************************/ -void TPCSectorVizEditor::DoThreshold() +void AliEveTPCSectorVizEditor::DoThreshold() { fM->SetThreshold((Short_t) fThreshold->GetValue()); fThreshold->SetValue(fM->fThreshold); Update(); } -void TPCSectorVizEditor::DoMaxVal() +void AliEveTPCSectorVizEditor::DoMaxVal() { fM->SetMaxVal((Int_t) fMaxVal->GetValue()); fMaxVal->SetValue(fM->fMaxVal); @@ -188,7 +195,7 @@ void TPCSectorVizEditor::DoMaxVal() /**************************************************************************/ -void TPCSectorVizEditor::DoTime() +void AliEveTPCSectorVizEditor::DoTime() { fM->SetMinTime((Int_t) fTime->GetMin()); fM->SetMaxTime((Int_t) fTime->GetMax()); diff --git a/EVE/Alieve/AliEveTPCSectorVizEditor.h b/EVE/Alieve/AliEveTPCSectorVizEditor.h new file mode 100644 index 00000000000..ad564316620 --- /dev/null +++ b/EVE/Alieve/AliEveTPCSectorVizEditor.h @@ -0,0 +1,72 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TPCSectorVizEditor_H +#define ALIEVE_TPCSectorVizEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; +class TGDoubleHSlider; +class TGHSlider; + +class TEveGValuator; +class TEveGDoubleValuator; +class TEveTransSubEditor; + + +class AliEveTPCSectorViz; + +class AliEveTPCSectorVizEditor : public TGedFrame +{ + AliEveTPCSectorVizEditor(const AliEveTPCSectorVizEditor&); // Not implemented + AliEveTPCSectorVizEditor& operator=(const AliEveTPCSectorVizEditor&); // Not implemented + +protected: + AliEveTPCSectorViz* fM; // fModel dynamic-casted to AliEveTPCSectorVizEditor + + TEveTransSubEditor* fHMTrans; + + TEveGValuator* fSectorID; + TGCheckButton* fAutoTrans; + + TGCheckButton* fRnrInn; + TGCheckButton* fRnrOut1; + TGCheckButton* fRnrOut2; + + TEveGValuator* fThreshold; + TEveGValuator* fMaxVal; + + TEveGDoubleValuator* fTime; + +public: + AliEveTPCSectorVizEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, + UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + ~AliEveTPCSectorVizEditor(); + + virtual void SetModel(TObject* obj); + + void DoSectorID(); + void DoAutoTrans(); + + void DoRnrInn(); + void DoRnrOut1(); + void DoRnrOut2(); + + void DoThreshold(); + void DoMaxVal(); + + void DoTime(); + + ClassDef(AliEveTPCSectorVizEditor, 0); // Editor for AliEveTPCSectorViz +}; // endclass AliEveTPCSectorVizEditor + +#endif diff --git a/EVE/Alieve/TRDData.cxx b/EVE/Alieve/AliEveTRDData.cxx similarity index 76% rename from EVE/Alieve/TRDData.cxx rename to EVE/Alieve/AliEveTRDData.cxx index 95989891947..0488a2aef1a 100644 --- a/EVE/Alieve/TRDData.cxx +++ b/EVE/Alieve/AliEveTRDData.cxx @@ -1,5 +1,13 @@ -#include "TRDData.h" -#include "TRDModuleImp.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTRDData.h" +#include "AliEveTRDModuleImp.h" #include "AliLog.h" #include "AliTRDhit.h" @@ -9,23 +17,22 @@ #include "AliTRDgeometry.h" #include "AliTRDdigitsManager.h" -using namespace Alieve; using namespace std; -ClassImp(TRDHits) -ClassImp(TRDDigits) -ClassImp(TRDClusters) +ClassImp(AliEveTRDHits) +ClassImp(AliEveTRDDigits) +ClassImp(AliEveTRDClusters) /////////////////////////////////////////////////////////// -///////////// TRDDigits ///////////////////// +///////////// AliEveTRDDigits ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDDigits::TRDDigits(TRDChamber *p): TEveQuadSet("digits", ""), fParent(p) +AliEveTRDDigits::AliEveTRDDigits(AliEveTRDChamber *p): TEveQuadSet("digits", ""), fParent(p) {} //________________________________________________________ -void TRDDigits::SetData(AliTRDdigitsManager *digits) +void AliEveTRDDigits::SetData(AliTRDdigitsManager *digits) { fData.Allocate(fParent->rowMax, fParent->colMax, fParent->timeMax); @@ -39,7 +46,7 @@ void TRDDigits::SetData(AliTRDdigitsManager *digits) } //________________________________________________________ -void TRDDigits::ComputeRepresentation() +void AliEveTRDDigits::ComputeRepresentation() { // Calculate digits representation according to user settings. The // user can set the following parameters: @@ -125,14 +132,14 @@ void TRDDigits::ComputeRepresentation() } //________________________________________________________ -void TRDDigits::Paint(Option_t *option) +void AliEveTRDDigits::Paint(Option_t *option) { if(fParent->GetDigitsBox()) fBoxes.Paint(option); else TEveQuadSet::Paint(option); } //________________________________________________________ -void TRDDigits::Reset() +void AliEveTRDDigits::Reset() { TEveQuadSet::Reset(TEveQuadSet::kQT_FreeQuad, kTRUE, 64); // MT fBoxes.fBoxes.clear(); @@ -140,15 +147,15 @@ void TRDDigits::Reset() } /////////////////////////////////////////////////////////// -///////////// TRDHits ///////////////////// +///////////// AliEveTRDHits ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDHits::TRDHits(TRDChamber *p):TEvePointSet("hits", 20), fParent(p) +AliEveTRDHits::AliEveTRDHits(AliEveTRDChamber *p):TEvePointSet("hits", 20), fParent(p) {} //________________________________________________________ -void TRDHits::PointSelected(Int_t n) +void AliEveTRDHits::PointSelected(Int_t n) { fParent->SpawnEditor(); AliTRDhit *h = dynamic_cast(GetPointId(n)); @@ -162,15 +169,15 @@ void TRDHits::PointSelected(Int_t n) /////////////////////////////////////////////////////////// -///////////// TRDHits ///////////////////// +///////////// AliEveTRDHits ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDClusters::TRDClusters(TRDChamber *p):TRDHits(p) +AliEveTRDClusters::AliEveTRDClusters(AliEveTRDChamber *p):AliEveTRDHits(p) {} //________________________________________________________ -void TRDClusters::PointSelected(Int_t n) +void AliEveTRDClusters::PointSelected(Int_t n) { fParent->SpawnEditor(); AliTRDcluster *c = dynamic_cast(GetPointId(n)); @@ -192,20 +199,20 @@ void TRDClusters::PointSelected(Int_t n) } /////////////////////////////////////////////////////////// -///////////// TRDHitsEditor ///////////////////// +///////////// AliEveTRDHitsEditor ///////////////////// /////////////////////////////////////////////////////////// -TRDHitsEditor::TRDHitsEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options, back) +AliEveTRDHitsEditor::AliEveTRDHitsEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options, back) { MakeTitle("TRD Hits"); } -TRDHitsEditor::~TRDHitsEditor() +AliEveTRDHitsEditor::~AliEveTRDHitsEditor() {} -void TRDHitsEditor::SetModel(TObject* obj) +void AliEveTRDHitsEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); // Float_t x, y, z; // for(int ihit=0; ihitGetN(); ihit++){ @@ -215,20 +222,20 @@ void TRDHitsEditor::SetModel(TObject* obj) } /////////////////////////////////////////////////////////// -///////////// TRDDigitsEditor ///////////////////// +///////////// AliEveTRDDigitsEditor ///////////////////// /////////////////////////////////////////////////////////// -TRDDigitsEditor::TRDDigitsEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options, back) +AliEveTRDDigitsEditor::AliEveTRDDigitsEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options, back) { MakeTitle("TRD Digits"); } -TRDDigitsEditor::~TRDDigitsEditor() +AliEveTRDDigitsEditor::~AliEveTRDDigitsEditor() {} -void TRDDigitsEditor::SetModel(TObject* obj) +void AliEveTRDDigitsEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fM->fParent->SpawnEditor(); // printf("Chamber %d", fM->fParent->GetID()); diff --git a/EVE/Alieve/AliEveTRDData.h b/EVE/Alieve/AliEveTRDData.h new file mode 100644 index 00000000000..b5d0a0c5ef7 --- /dev/null +++ b/EVE/Alieve/AliEveTRDData.h @@ -0,0 +1,117 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +///////////////////////////////////////////////////////////////////////// +// +// - AliEVE implementation - +// Containers for visualisation of TRD data structures +// - AliEveTRDHits - visualisation of MC Hits, Clusters (RecPoints) +// - AliEveTRDDigits - visualisation of TRD digits +// +// by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 +/////////////////////////////////////////////////////////////////////// + +#ifndef ALIEVE_TRDData_H +#define ALIEVE_TRDData_H + +#ifndef REVE_QuadSet_H +#include +#endif + +#ifndef REVE_BoxSet_H +#include +#endif + +#ifndef REVE_PointSet_H +#include +#endif + +#ifndef ROOT_TGedFrame +#include +#endif + +#include "AliTRDdataArrayI.h" + +class AliTRDdigitsManager; + + class AliEveTRDChamber; + class AliEveTRDHits : public TEvePointSet + { + public: + AliEveTRDHits(AliEveTRDChamber *p); + + void PointSelected(Int_t n); + + protected: + AliEveTRDChamber *fParent; + + ClassDef(AliEveTRDHits,1) // Base class for TRD hits visualisation + }; + + class AliEveTRDHitsEditor : public TGedFrame + { + public: + AliEveTRDHitsEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); + ~AliEveTRDHitsEditor(); + + virtual void SetModel(TObject* obj); + + protected: + AliEveTRDHits* fM; + + ClassDef(AliEveTRDHitsEditor,1) // Editor for AliEveTRDHits + }; + + + class AliEveTRDDigits : public TEveQuadSet + { + friend class AliEveTRDDigitsEditor; + public: + AliEveTRDDigits(AliEveTRDChamber *p); + + void ComputeRepresentation(); + void Paint(Option_t *opt=""); + void Reset(); + void SetData(AliTRDdigitsManager *digits); + + protected: + AliEveTRDChamber *fParent; + + private: + TEveBoxSet fBoxes; + AliTRDdataArrayI fData; + + ClassDef(AliEveTRDDigits,1) // Digits visualisation for TRD + }; + + class AliEveTRDDigitsEditor : public TGedFrame + { + public: + AliEveTRDDigitsEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); + ~AliEveTRDDigitsEditor(); + + virtual void SetModel(TObject* obj); + + protected: + AliEveTRDDigits* fM; + + ClassDef(AliEveTRDDigitsEditor,1) // Editor for AliEveTRDDigits + }; + + + class AliEveTRDClusters : public AliEveTRDHits + { + public: + AliEveTRDClusters(AliEveTRDChamber *p); + + void PointSelected(Int_t n); + + ClassDef(AliEveTRDClusters,1) // Base class for TRD clusters visualisation + }; + +#endif diff --git a/EVE/Alieve/TRDLoader.cxx b/EVE/Alieve/AliEveTRDLoader.cxx similarity index 79% rename from EVE/Alieve/TRDLoader.cxx rename to EVE/Alieve/AliEveTRDLoader.cxx index 7969ee88442..0f2f4471cbb 100644 --- a/EVE/Alieve/TRDLoader.cxx +++ b/EVE/Alieve/AliEveTRDLoader.cxx @@ -1,5 +1,13 @@ -#include "TRDLoader.h" -#include "TRDModuleImp.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTRDLoader.h" +#include "AliEveTRDModuleImp.h" #include #include @@ -31,20 +39,20 @@ #include -using namespace Alieve; + using namespace std; class AliTRDdataArrayI; -ClassImp(Alieve::TRDLoader) -ClassImp(Alieve::TRDLoaderEditor) +ClassImp(AliEveTRDLoader) +ClassImp(AliEveTRDLoaderEditor) /////////////////////////////////////////////////////////// -///////////// TRDLoader ///////////////////// +///////////// AliEveTRDLoader ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoader::TRDLoader(const Text_t* n, const Text_t* t) : TEveElementList(n, t), fSM(-1), fStack(-1), fLy(-1), fEvent(0) +AliEveTRDLoader::AliEveTRDLoader(const Text_t* n, const Text_t* t) : TEveElementList(n, t), fSM(-1), fStack(-1), fLy(-1), fEvent(0) { kLoadHits = kFALSE; kLoadDigits = kFALSE; @@ -63,7 +71,7 @@ TRDLoader::TRDLoader(const Text_t* n, const Text_t* t) : TEveElementList(n, t), } //________________________________________________________ -TRDLoader::~TRDLoader() +AliEveTRDLoader::~AliEveTRDLoader() { // if(fChambers) {fChambers->clear(); delete fChambers;} } @@ -75,12 +83,12 @@ class ID public: ID( int value ) : id(value) {} bool operator()(const T &t) const { - return ((dynamic_cast(t))->GetID() == id); + return ((dynamic_cast(t))->GetID() == id); } private: const int id; }; -void TRDLoader::AddChambers(int sm, int stk, int ly) +void AliEveTRDLoader::AddChambers(int sm, int stk, int ly) { Int_t ism_start = (sm == -1) ? 0 : sm; Int_t ism_stop = (sm == -1) ? 18 : sm+1; @@ -96,25 +104,25 @@ void TRDLoader::AddChambers(int sm, int stk, int ly) ichmb++; } - TRDNode *SM=0x0, *STK=0x0; - TRDChamber *CHMB = 0x0; + AliEveTRDNode *SM=0x0, *STK=0x0; + AliEveTRDChamber *CHMB = 0x0; int det; for(int ism=ism_start; ism(ism)); if(ichmb != fChildren.end()){ - SM = (TRDNode*)(*ichmb); + SM = (AliEveTRDNode*)(*ichmb); SM->SetRnrSelf(kTRUE); }else{ - gEve->AddElement(SM = new TRDNode("SM", ism), this); + gEve->AddElement(SM = new AliEveTRDNode("SM", ism), this); SM->FindListTreeItem(gEve->GetListTree())->SetTipText(Form("Supermodule %2d", ism)); } for(int istk=istk_start; istkbegin(), SM->end(), ID(istk)); if(ichmb != SM->end()){ - STK = (TRDNode*)(*ichmb); + STK = (AliEveTRDNode*)(*ichmb); STK->SetRnrSelf(kTRUE); }else{ - gEve->AddElement(STK = new TRDNode("Stack", istk), SM); + gEve->AddElement(STK = new AliEveTRDNode("Stack", istk), SM); STK->FindListTreeItem(gEve->GetListTree())->SetTipText(Form("SM %2d Stack %1d", ism, istk)); } for(int ily=ily_start; ilybegin(), STK->end(), ID(det)); if(ichmb != STK->end()) (*ichmb)->SetRnrSelf(kTRUE); else{ - gEve->AddElement(CHMB = new TRDChamber(det), STK); + gEve->AddElement(CHMB = new AliEveTRDChamber(det), STK); CHMB->SetGeometry(fGeo); CHMB->FindListTreeItem(gEve->GetListTree())->SetTipText(Form("SM %2d Stack %1d Layer %1d", ism, istk, ily)); } @@ -133,21 +141,21 @@ void TRDLoader::AddChambers(int sm, int stk, int ly) } //________________________________________________________ -TRDChamber* TRDLoader::GetChamber(int d) +AliEveTRDChamber* AliEveTRDLoader::GetChamber(int d) { List_i ism, istack, ichmb; ism = find_if(fChildren.begin(), fChildren.end(), ID(fGeo->GetSector(d))); if(ism == fChildren.end()) return 0x0; - istack = find_if(((TRDNode*)(*ism))->begin(), ((TRDNode*)(*ism))->end(), ID(fGeo->GetChamber(d))); - if(istack == ((TRDNode*)(*ism))->end()) return 0x0; - ichmb = find_if(((TRDNode*)(*istack))->begin(), ((TRDNode*)(*istack))->end(), ID(d)); - if(ichmb == ((TRDNode*)(*istack))->end()) return 0x0; - return dynamic_cast(*ichmb); + istack = find_if(((AliEveTRDNode*)(*ism))->begin(), ((AliEveTRDNode*)(*ism))->end(), ID(fGeo->GetChamber(d))); + if(istack == ((AliEveTRDNode*)(*ism))->end()) return 0x0; + ichmb = find_if(((AliEveTRDNode*)(*istack))->begin(), ((AliEveTRDNode*)(*istack))->end(), ID(d)); + if(ichmb == ((AliEveTRDNode*)(*istack))->end()) return 0x0; + return dynamic_cast(*ichmb); } //________________________________________________________ -Bool_t TRDLoader::GoToEvent(int ev) +Bool_t AliEveTRDLoader::GoToEvent(int ev) { if(!fChildren.size()){ AliWarning("Please select first the chamber that you want to monitor from \"Chamber(s) selector\"."); @@ -160,7 +168,7 @@ Bool_t TRDLoader::GoToEvent(int ev) TTree *t = 0x0; TFile *f = new TFile(Form("%s/%s", fDir.Data(), fFilename.Data())); - if(! f->cd(Form("Event%d", ev))){ + if(! f->cd(Form("AliEveEventManager%d", ev))){ AliError(Form("Couldn't find event %d in file \"%s/%s\".", ev, fDir.Data(), fFilename.Data())); f->Close(); delete f; return kFALSE; @@ -189,7 +197,7 @@ Bool_t TRDLoader::GoToEvent(int ev) //________________________________________________________ -Bool_t TRDLoader::LoadClusters(TTree *tC) +Bool_t AliEveTRDLoader::LoadClusters(TTree *tC) { AliInfo("Loading ..."); if(!fChildren.size()) return kTRUE; @@ -197,7 +205,7 @@ Bool_t TRDLoader::LoadClusters(TTree *tC) TObjArray *clusters = new TObjArray(); tC->SetBranchAddress("TRDcluster", &clusters); - TRDChamber *chmb = 0x0; + AliEveTRDChamber *chmb = 0x0; AliTRDcluster *c=0x0; for(int idet=0; idet<540; idet++){ tC->GetEntry(idet); @@ -211,13 +219,13 @@ Bool_t TRDLoader::LoadClusters(TTree *tC) //________________________________________________________ -Bool_t TRDLoader::LoadDigits(TTree *tD) +Bool_t AliEveTRDLoader::LoadDigits(TTree *tD) { AliInfo("Loading ..."); if(!fChildren.size()) return kTRUE; - TRDChamber *chmb; + AliEveTRDChamber *chmb; AliTRDdigitsManager dm; dm.ReadDigits(tD); for(int idet=0; idet<540; idet++){ @@ -232,7 +240,7 @@ Bool_t TRDLoader::LoadDigits(TTree *tD) //________________________________________________________ -Bool_t TRDLoader::LoadTracklets(TTree *tT) +Bool_t AliEveTRDLoader::LoadTracklets(TTree *tT) { AliInfo("Loading ..."); if(!fChildren.size()) return kTRUE; @@ -240,7 +248,7 @@ Bool_t TRDLoader::LoadTracklets(TTree *tT) TObjArray *tracks = new TObjArray(); tT->SetBranchAddress("TRDmcmTracklet",&tracks); - TRDChamber *chmb = 0x0; + AliEveTRDChamber *chmb = 0x0; AliTRDmcmTracklet *trk=0x0; for(int idet=0; idet<540; idet++){ if(!tT->GetEntry(idet)) continue; @@ -253,7 +261,7 @@ Bool_t TRDLoader::LoadTracklets(TTree *tT) //________________________________________________________ -Bool_t TRDLoader::Open(const char *filename, const char *dir) +Bool_t AliEveTRDLoader::Open(const char *filename, const char *dir) { fFilename = filename; fDir = dir; @@ -296,17 +304,17 @@ Bool_t TRDLoader::Open(const char *filename, const char *dir) //________________________________________________________ -void TRDLoader::Paint(Option_t *option) +void AliEveTRDLoader::Paint(Option_t *option) { List_i ichmb = fChildren.begin(); while(ichmb != fChildren.end()){ - (dynamic_cast(*ichmb))->Paint(option); + (dynamic_cast(*ichmb))->Paint(option); ichmb++; } } //________________________________________________________ -void TRDLoader::SetDataType(TRDDataTypes type) +void AliEveTRDLoader::SetDataType(TRDDataTypes type) { kLoadHits = kFALSE; kLoadDigits = kFALSE; @@ -323,23 +331,23 @@ void TRDLoader::SetDataType(TRDDataTypes type) } //________________________________________________________ -void TRDLoader::Unload() +void AliEveTRDLoader::Unload() { List_i ichmb = fChildren.begin(); while(ichmb != fChildren.end()){ - (dynamic_cast(*ichmb))->Reset(); + (dynamic_cast(*ichmb))->Reset(); ichmb++; } } /////////////////////////////////////////////////////////// -///////////// TRDLoaderEditor ///////////////////// +///////////// AliEveTRDLoaderEditor ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoaderEditor::TRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) +AliEveTRDLoaderEditor::AliEveTRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { - MakeTitle("TRDLoader"); + MakeTitle("AliEveTRDLoader"); fFile = 0x0; TGTextButton *fOpenFile = 0x0; @@ -353,16 +361,16 @@ TRDLoaderEditor::TRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, U fFile = new TGTextEntry(f); fFile->SetToolTipText("Select TRD data file or galice.root"); fFile->SetWidth(140); - fFile->Connect("DoubleClicked()", "Alieve::TRDLoaderEditor", this, "FileOpen()"); + fFile->Connect("DoubleClicked()", "AliEveTRDLoaderEditor", this, "FileOpen()"); f->AddFrame(fFile); fOpenFile = new TGTextButton(f, "Browse"); f->AddFrame(fOpenFile); - fOpenFile->Connect("Clicked()", "Alieve::TRDLoaderEditor", this, "FileOpen()"); + fOpenFile->Connect("Clicked()", "AliEveTRDLoaderEditor", this, "FileOpen()"); AddFrame(f); - fEvent = new TEveGValuator(this, "Event:", 110, 0); + fEvent = new TEveGValuator(this, "AliEveEventManager:", 110, 0); fEvent->SetShowSlider(kFALSE); fEvent->SetLabelWidth(labelW); fEvent->SetNELength(6); @@ -370,7 +378,7 @@ TRDLoaderEditor::TRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, U fEvent->SetLimits(-1, 1000); fEvent->SetToolTip("Set event number to be monitored"); fEvent->Connect("ValueSet(Double_t)", - "Alieve::TRDLoaderEditor", this, "SetEvent(Double_t)"); + "AliEveTRDLoaderEditor", this, "SetEvent(Double_t)"); AddFrame(fEvent); @@ -413,7 +421,7 @@ TRDLoaderEditor::TRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, U fGroupFrame1974->AddFrame(fTextButton2037, new TGLayoutHints(kLHintsExpandY | kLHintsCenterX,2,2,2,2)); fTextButton2037->SetToolTipText("Apply selection", 400); fTextButton2037->Connect("Clicked()", - "Alieve::TRDLoaderEditor", this, "AddChambers()"); + "AliEveTRDLoaderEditor", this, "AddChambers()"); fGroupFrame1974->SetLayoutManager(new TGHorizontalLayout(fGroupFrame1974)); AddFrame(fGroupFrame1974, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); @@ -424,18 +432,18 @@ TRDLoaderEditor::TRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, U fTextButton2004->Resize(164,22); AddFrame(fTextButton2004, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fTextButton2004->SetToolTipText("Load data according to selection", 400); - fTextButton2004->Connect("Clicked()", "Alieve::TRDLoaderEditor", this, "Load()"); + fTextButton2004->Connect("Clicked()", "AliEveTRDLoaderEditor", this, "Load()"); } //________________________________________________________ -TRDLoaderEditor::~TRDLoaderEditor() +AliEveTRDLoaderEditor::~AliEveTRDLoaderEditor() {} //_________________________________________________________ -void TRDLoaderEditor::SetModel(TObject* obj) +void AliEveTRDLoaderEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); fFile->SetText(gSystem->BaseName(fM->fFilename.Data())); @@ -458,7 +466,7 @@ void TRDLoaderEditor::SetModel(TObject* obj) } //________________________________________________________ -void TRDLoaderEditor::AddChambers() +void AliEveTRDLoaderEditor::AddChambers() { fM->fSM = (int)fSMNumber->GetEntry()->GetNumber(); fM->fStack = (int)fStackNumber->GetEntry()->GetNumber(); @@ -467,7 +475,7 @@ void TRDLoaderEditor::AddChambers() } //________________________________________________________ -void TRDLoaderEditor::FileOpen() +void AliEveTRDLoaderEditor::FileOpen() { TGFileInfo fi; fi.fIniDir = StrDup(gSystem->DirName (fM->fFilename.Data())); @@ -485,7 +493,7 @@ void TRDLoaderEditor::FileOpen() this->SetModel(fM); } -void TRDLoaderEditor::Load() +void AliEveTRDLoaderEditor::Load() { fM->GoToEvent(fM->fEvent); } diff --git a/EVE/Alieve/TRDLoader.h b/EVE/Alieve/AliEveTRDLoader.h similarity index 59% rename from EVE/Alieve/TRDLoader.h rename to EVE/Alieve/AliEveTRDLoader.h index e3965b42698..47700356774 100644 --- a/EVE/Alieve/TRDLoader.h +++ b/EVE/Alieve/AliEveTRDLoader.h @@ -1,11 +1,19 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TRDLoader_H #define ALIEVE_TRDLoader_H //////////////////////////////////////////////////////////////////////// // // - ALIEVE implementation - // Loader for the TRD detector - base class -// - TRDLoader - loader of TRD data (simulation + measured) -// - TRDLoaderEditor - UI +// - AliEveTRDLoader - loader of TRD data (simulation + measured) +// - AliEveTRDLoaderEditor - UI // // by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 //////////////////////////////////////////////////////////////////////// @@ -24,9 +32,8 @@ class TTree; class TEveGValuator; -namespace Alieve { - class TRDChamber; - class TRDLoaderManager; + class AliEveTRDChamber; + class AliEveTRDLoaderManager; enum TRDDataTypes{ kHits = 0, kDigits = 1, @@ -35,17 +42,17 @@ namespace Alieve { kRawRoot = 4, kRawData = 5 }; - class TRDLoader : public TEveElementList + class AliEveTRDLoader : public TEveElementList { - friend class TRDLoaderEditor; + friend class AliEveTRDLoaderEditor; public: - TRDLoader(const Text_t* n="TRDLoader", const Text_t* t=0x0); - ~TRDLoader(); + AliEveTRDLoader(const Text_t* n="AliEveTRDLoader", const Text_t* t=0x0); + ~AliEveTRDLoader(); virtual void Paint(Option_t *option=""); virtual void SetDataType(TRDDataTypes type); protected: virtual void AddChambers(int sm=-1, int stk=-1, int ly=-1); - virtual TRDChamber* GetChamber(int d); + virtual AliEveTRDChamber* GetChamber(int d); virtual Bool_t GoToEvent(int ev); virtual Bool_t LoadClusters(TTree *tC); virtual Bool_t LoadDigits(TTree *tD); @@ -64,16 +71,16 @@ namespace Alieve { AliTRDv1 *fTRD; // the TRD detector AliTRDgeometry *fGeo; // the TRD geometry - ClassDef(TRDLoader, 1) // Alieve Loader class for the TRD detector + ClassDef(AliEveTRDLoader, 1) // Alieve Loader class for the TRD detector }; - class TRDLoaderEditor : public TGedFrame + class AliEveTRDLoaderEditor : public TGedFrame { public: - TRDLoaderEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - ~TRDLoaderEditor(); + AliEveTRDLoaderEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); + ~AliEveTRDLoaderEditor(); virtual void AddChambers(); virtual void FileOpen(); @@ -82,13 +89,12 @@ namespace Alieve { virtual void SetModel(TObject* obj); protected: - TRDLoader *fM; + AliEveTRDLoader *fM; TGTextEntry *fFile; TEveGValuator *fEvent; TEveGValuator *fSMNumber, *fStackNumber, *fPlaneNumber; - ClassDef(TRDLoaderEditor,1) // Editor for TRDLoader + ClassDef(AliEveTRDLoaderEditor,1) // Editor for AliEveTRDLoader }; -} #endif diff --git a/EVE/Alieve/TRDLoaderImp.cxx b/EVE/Alieve/AliEveTRDLoaderImp.cxx similarity index 77% rename from EVE/Alieve/TRDLoaderImp.cxx rename to EVE/Alieve/AliEveTRDLoaderImp.cxx index 1e7e918e828..8951b19e605 100644 --- a/EVE/Alieve/TRDLoaderImp.cxx +++ b/EVE/Alieve/AliEveTRDLoaderImp.cxx @@ -1,5 +1,13 @@ -#include "TRDLoaderImp.h" -#include "TRDModuleImp.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTRDLoaderImp.h" +#include "AliEveTRDModuleImp.h" //#include "AliTRDv1.h" @@ -21,31 +29,31 @@ #include "AliTRDv1.h" #include "AliTRDhit.h" #include "AliTRDdigitsManager.h" -using namespace Alieve; + using namespace std; -ClassImp(Alieve::TRDLoaderSim) -ClassImp(Alieve::TRDLoaderRaw) -ClassImp(Alieve::TRDLoaderSimEditor) -//ClassImp(Alieve::TRDLoaderRawEditor) +ClassImp(AliEveTRDLoaderSim) +ClassImp(AliEveTRDLoaderRaw) +ClassImp(AliEveTRDLoaderSimEditor) +//ClassImp(TRDLoaderRawEditor) /////////////////////////////////////////////////////////// -///////////// TRDLoaderSim ///////////////////// +///////////// AliEveTRDLoaderSim ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoaderSim::TRDLoaderSim(const Text_t* n, const Text_t* t) : TRDLoader(n, t) +AliEveTRDLoaderSim::AliEveTRDLoaderSim(const Text_t* n, const Text_t* t) : AliEveTRDLoader(n, t) { fRunLoader = 0x0; } //________________________________________________________ -TRDLoaderSim::~TRDLoaderSim() +AliEveTRDLoaderSim::~AliEveTRDLoaderSim() {} //________________________________________________________ -Bool_t TRDLoaderSim::GoToEvent(int ev) +Bool_t AliEveTRDLoaderSim::GoToEvent(int ev) { if(!fChildren.size()){ AliWarning("Please select first the chamber that you want to monitor from \"Chamber(s) selector\"."); @@ -100,12 +108,12 @@ Bool_t TRDLoaderSim::GoToEvent(int ev) //________________________________________________________ -Bool_t TRDLoaderSim::LoadHits(TTree *tH) +Bool_t AliEveTRDLoaderSim::LoadHits(TTree *tH) { Info("LoadHits()", "Loading ..."); if(!fChildren.size()) return kTRUE; - TRDChamber *chmb = 0x0; + AliEveTRDChamber *chmb = 0x0; AliTRDhit *hit = 0x0; Int_t d; for(int iTrack=0; iTrackGetEntries(); iTrack++){ @@ -128,7 +136,7 @@ Bool_t TRDLoaderSim::LoadHits(TTree *tH) } //________________________________________________________ -Bool_t TRDLoaderSim::Open(const char *filename, const char *dir) +Bool_t AliEveTRDLoaderSim::Open(const char *filename, const char *dir) { //Info("Open()", ""); @@ -164,12 +172,12 @@ Bool_t TRDLoaderSim::Open(const char *filename, const char *dir) /////////////////////////////////////////////////////////// -///////////// TRDLoaderRaw ///////////////////// +///////////// AliEveTRDLoaderRaw ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoaderRaw::TRDLoaderRaw(const Text_t* n, const Text_t* t) : TRDLoader(n, t) +AliEveTRDLoaderRaw::AliEveTRDLoaderRaw(const Text_t* n, const Text_t* t) : AliEveTRDLoader(n, t) { fRawDateReader = 0x0; fRawRootReader = 0x0; @@ -179,14 +187,14 @@ TRDLoaderRaw::TRDLoaderRaw(const Text_t* n, const Text_t* t) : TRDLoader(n, t) } //________________________________________________________ -TRDLoaderRaw::~TRDLoaderRaw() +AliEveTRDLoaderRaw::~AliEveTRDLoaderRaw() { } //________________________________________________________ -Bool_t TRDLoaderRaw::Open(const char *filename, const char *dir) +Bool_t AliEveTRDLoaderRaw::Open(const char *filename, const char *dir) { // Info("Open()", Form("Open %s/%s", dir, filename)); fFilename = filename; @@ -209,20 +217,20 @@ Bool_t TRDLoaderRaw::Open(const char *filename, const char *dir) } //________________________________________________________ -void TRDLoaderRaw::SetDataType(TRDDataTypes type) +void AliEveTRDLoaderRaw::SetDataType(TRDDataTypes type) { fDataRoot = (type == kRawRoot) ? kTRUE : kFALSE; } //________________________________________________________ -Bool_t TRDLoaderRaw::GoToEvent(int ev) +Bool_t AliEveTRDLoaderRaw::GoToEvent(int ev) { if(!fChildren.size()){ AliWarning("Please select first the chamber that you want to monitor from \"Chamber(s) selector\"."); return kFALSE; } - static const TEveException eH("TRDLoader::GotoEvent "); + static const TEveException eH("AliEveTRDLoader::GotoEvent "); if(fRawRootReader == 0x0) throw(eH + "data file not opened."); @@ -242,17 +250,17 @@ Bool_t TRDLoaderRaw::GoToEvent(int ev) } //________________________________________________________ -Bool_t TRDLoaderRaw::LoadEvent() +Bool_t AliEveTRDLoaderRaw::LoadEvent() { Info("LoadEvent()", "Loading ..."); - static const TEveException eH("TRDLoader::LoadEvent "); + static const TEveException eH("AliEveTRDLoader::LoadEvent "); if(fRawRootReader == 0x0) throw(eH + "data file not opened."); fRawRootReader->Reset(); - TRDChamber *chmb; + AliEveTRDChamber *chmb; AliTRDdigitsManager *dm; dm = fRaw->Raw2Digits(fRawRootReader); @@ -264,9 +272,9 @@ Bool_t TRDLoaderRaw::LoadEvent() } //________________________________________________________ -void TRDLoaderRaw::NextEvent(Bool_t rewindOnEnd) +void AliEveTRDLoaderRaw::NextEvent(Bool_t rewindOnEnd) { - static const TEveException eH("TRDLoader::NextEvent "); + static const TEveException eH("AliEveTRDLoader::NextEvent "); if(fRawRootReader == 0x0) throw(eH + "data file not opened."); @@ -285,30 +293,30 @@ void TRDLoaderRaw::NextEvent(Bool_t rewindOnEnd) /////////////////////////////////////////////////////////// -///////////// TRDLoaderSimEditor ///////////////////// +///////////// AliEveTRDLoaderSimEditor ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoaderSimEditor::TRDLoaderSimEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) +AliEveTRDLoaderSimEditor::AliEveTRDLoaderSimEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { - MakeTitle("TRDLoaderSim"); + MakeTitle("AliEveTRDLoaderSim"); // "Data selector" group frame TGGroupFrame *fGroupFrame = new TGGroupFrame(this,"Data selector"); fLoadHits = new TGCheckButton(fGroupFrame," Hits"); - fLoadHits->Connect("Clicked()", "Alieve::TRDLoaderSimEditor", this, "Toggle(=0)"); + fLoadHits->Connect("Clicked()", "AliEveTRDLoaderSimEditor", this, "Toggle(=0)"); fGroupFrame->AddFrame(fLoadHits, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fLoadDigits = new TGCheckButton(fGroupFrame," Digits"); - fLoadDigits->Connect("Clicked()", "Alieve::TRDLoaderSimEditor", this, "Toggle(=1)"); + fLoadDigits->Connect("Clicked()", "AliEveTRDLoaderSimEditor", this, "Toggle(=1)"); fGroupFrame->AddFrame(fLoadDigits, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fLoadClusters = new TGCheckButton(fGroupFrame," Clusters"); - fLoadClusters->Connect("Clicked()", "Alieve::TRDLoaderSimEditor", this, "Toggle(=2)"); + fLoadClusters->Connect("Clicked()", "AliEveTRDLoaderSimEditor", this, "Toggle(=2)"); fGroupFrame->AddFrame(fLoadClusters, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fLoadTracks = new TGCheckButton(fGroupFrame," Tracklets "); - fLoadTracks->Connect("Clicked()", "Alieve::TRDLoaderSimEditor", this, "Toggle(=3)"); + fLoadTracks->Connect("Clicked()", "AliEveTRDLoaderSimEditor", this, "Toggle(=3)"); fGroupFrame->AddFrame(fLoadTracks, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fGroupFrame->SetLayoutManager(new TGVerticalLayout(fGroupFrame)); @@ -317,13 +325,13 @@ TRDLoaderSimEditor::TRDLoaderSimEditor(const TGWindow* p, Int_t width, Int_t hei } //________________________________________________________ -TRDLoaderSimEditor::~TRDLoaderSimEditor() +AliEveTRDLoaderSimEditor::~AliEveTRDLoaderSimEditor() {} //_________________________________________________________ -void TRDLoaderSimEditor::SetModel(TObject* obj) +void AliEveTRDLoaderSimEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); Bool_t kFile = kTRUE; if(fM->fFilename.CompareTo("") == 0) kFile = kFALSE; @@ -343,7 +351,7 @@ void TRDLoaderSimEditor::SetModel(TObject* obj) } //________________________________________________________ -void TRDLoaderSimEditor::Toggle(Int_t id) +void AliEveTRDLoaderSimEditor::Toggle(Int_t id) { switch(id){ case 0: @@ -368,11 +376,11 @@ void TRDLoaderSimEditor::Toggle(Int_t id) // //________________________________________________________ // TRDLoaderRawEditor::TRDLoaderRawEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) // { -// MakeTitle("TRDLoaderRaw"); +// MakeTitle("AliEveTRDLoaderRaw"); // } // // void TRDLoaderRawEditor::SetModel(TObject* obj) // { // Info("SetModel()", ""); -// fM = dynamic_cast(obj); +// fM = dynamic_cast(obj); // } diff --git a/EVE/Alieve/AliEveTRDLoaderImp.h b/EVE/Alieve/AliEveTRDLoaderImp.h new file mode 100644 index 00000000000..8262457999f --- /dev/null +++ b/EVE/Alieve/AliEveTRDLoaderImp.h @@ -0,0 +1,91 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#ifndef ALIEVE_TRDLoaderImp_H +#define ALIEVE_TRDLoaderImp_H + +//////////////////////////////////////////////////////////////////////// +// // - ALIEVE implementation - +// Single event loader for the TRD detector +// - AliEveTRDLoaderSim - loader for simulations based on gAlice +// - AliEveTRDLoaderRaw - loader for raw data +// +// by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 +//////////////////////////////////////////////////////////////////////// + +#ifndef ALIEVE_TRDLoader_H +#include "AliEveTRDLoader.h" +#endif + + +class AliRunLoader; +class AliTRDrawData; +class AliRawReaderDate; +class AliRawReaderRoot; + +class TGCheckButton; + + class AliEveTRDLoaderSim : public AliEveTRDLoader + { + friend class AliEveTRDLoaderSimEditor; + public: + AliEveTRDLoaderSim(const Text_t* n="AliEveTRDLoaderSim", const Text_t* t=0); + ~AliEveTRDLoaderSim(); + + Bool_t GoToEvent(int ev); + Bool_t LoadHits(TTree *tH); + Bool_t Open(const char *file, const char *dir="."); + + private: + AliRunLoader *fRunLoader; // Run Loader + + ClassDef(AliEveTRDLoaderSim, 1) // Alieve loader for the TRD detector (gAlice) + }; + + + class AliEveTRDLoaderRaw : public AliEveTRDLoader + { + public: + AliEveTRDLoaderRaw(const Text_t* n="AliEveTRDLoaderRaw", const Text_t* t=0); + ~AliEveTRDLoaderRaw(); + + Bool_t GoToEvent(int ev); + Bool_t LoadEvent(); + Bool_t Open(const char *file, const char *dir="."); + void SetDataType(TRDDataTypes type); + + + private: + void NextEvent(Bool_t rewindOnEnd=kTRUE); + + private: + AliRawReaderDate *fRawDateReader; + AliRawReaderRoot *fRawRootReader; + AliTRDrawData *fRaw; + Bool_t fDataRoot; + Int_t fEventOld; + + ClassDef(AliEveTRDLoaderRaw, 1) // Alieve loader for the TRD detector (raw) + }; + + class AliEveTRDLoaderSimEditor : public TGedFrame + { + public: + AliEveTRDLoaderSimEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); + ~AliEveTRDLoaderSimEditor(); + + virtual void SetModel(TObject* obj); + virtual void Toggle(Int_t id); + + protected: + AliEveTRDLoaderSim* fM; + TGCheckButton *fLoadHits, *fLoadDigits, *fLoadClusters, *fLoadTracks; + + ClassDef(AliEveTRDLoaderSimEditor,1) // Editor for AliEveTRDLoaderSim + }; +#endif diff --git a/EVE/Alieve/TRDLoaderManager.cxx b/EVE/Alieve/AliEveTRDLoaderManager.cxx similarity index 70% rename from EVE/Alieve/TRDLoaderManager.cxx rename to EVE/Alieve/AliEveTRDLoaderManager.cxx index 95bbd0f94a4..3662738338d 100644 --- a/EVE/Alieve/TRDLoaderManager.cxx +++ b/EVE/Alieve/AliEveTRDLoaderManager.cxx @@ -1,6 +1,14 @@ -#include "TRDLoaderManager.h" -#include "TRDLoader.h" -#include "TRDLoaderImp.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTRDLoaderManager.h" +#include "AliEveTRDLoader.h" +#include "AliEveTRDLoaderImp.h" #include @@ -14,55 +22,55 @@ #include #include "AliLog.h" -using namespace Alieve; + using namespace std; -ClassImp(Alieve::TRDLoaderManager) -ClassImp(Alieve::TRDLoaderManagerEditor) +ClassImp(AliEveTRDLoaderManager) +ClassImp(AliEveTRDLoaderManagerEditor) /////////////////////////////////////////////////////////// -///////////// TRDLoaderManager ////////////// +///////////// AliEveTRDLoaderManager ////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoaderManager::TRDLoaderManager(const Text_t* n, const Text_t* t) : TEveElementList(n, t) +AliEveTRDLoaderManager::AliEveTRDLoaderManager(const Text_t* n, const Text_t* t) : TEveElementList(n, t) { } //________________________________________________________ -TRDLoaderManager::~TRDLoaderManager() +AliEveTRDLoaderManager::~AliEveTRDLoaderManager() { } //________________________________________________________ -void TRDLoaderManager::Add(Int_t type, const Text_t *name, const Text_t *title) +void AliEveTRDLoaderManager::Add(Int_t type, const Text_t *name, const Text_t *title) { //Info("Add()", Form("type %d, name %s, title %s", type, name, title)); - Alieve::TRDLoader *trdl = 0x0; + AliEveTRDLoader *trdl = 0x0; switch(type){ case 0: - //fChildren.push_back(new TRDLoaderSim(name, title)); - gEve->AddElement(trdl = new TRDLoaderSim(name, title), this); - ((TRDLoaderSim*)trdl)->FindListTreeItem(gEve->GetListTree())->SetTipText(title); + //fChildren.push_back(new AliEveTRDLoaderSim(name, title)); + gEve->AddElement(trdl = new AliEveTRDLoaderSim(name, title), this); + ((AliEveTRDLoaderSim*)trdl)->FindListTreeItem(gEve->GetListTree())->SetTipText(title); break; case 1: case 2: case 3: - //fChildren.push_back(new TRDLoader(name, title)); - gEve->AddElement(trdl = new TRDLoader(name, title), this); + //fChildren.push_back(new AliEveTRDLoader(name, title)); + gEve->AddElement(trdl = new AliEveTRDLoader(name, title), this); trdl->FindListTreeItem(gEve->GetListTree())->SetTipText(title); - trdl->SetDataType((Alieve::TRDDataTypes)type); + trdl->SetDataType((TRDDataTypes)type); break; case 4: case 5: - //fChildren.push_back(new TRDLoaderRaw(name, title)); - gEve->AddElement(trdl = new TRDLoaderRaw(name, title), this); - ((TRDLoaderRaw*)trdl)->FindListTreeItem(gEve->GetListTree())->SetTipText(title); - trdl->SetDataType((Alieve::TRDDataTypes)type); + //fChildren.push_back(new AliEveTRDLoaderRaw(name, title)); + gEve->AddElement(trdl = new AliEveTRDLoaderRaw(name, title), this); + ((AliEveTRDLoaderRaw*)trdl)->FindListTreeItem(gEve->GetListTree())->SetTipText(title); + trdl->SetDataType((TRDDataTypes)type); break; } @@ -72,19 +80,19 @@ void TRDLoaderManager::Add(Int_t type, const Text_t *name, const Text_t *title) //________________________________________________________ -void TRDLoaderManager::Paint(Option_t *option) +void AliEveTRDLoaderManager::Paint(Option_t *option) { List_i ichmb = fChildren.begin(); while(ichmb != fChildren.end()){ - (dynamic_cast(*ichmb))->Paint(option); + (dynamic_cast(*ichmb))->Paint(option); ichmb++; } } //________________________________________________________ -void TRDLoaderManager::Remove(Int_t entry) +void AliEveTRDLoaderManager::Remove(Int_t entry) { - //printf("TRDLoaderManager::Remove(%d)\n", entry); + //printf("AliEveTRDLoaderManager::Remove(%d)\n", entry); List_i it = fChildren.begin(); for(int i=0; iRemoveElement((*it), this); @@ -92,13 +100,13 @@ void TRDLoaderManager::Remove(Int_t entry) } /////////////////////////////////////////////////////////// -///////////// TRDLoaderManagerEditor ////////////// +///////////// AliEveTRDLoaderManagerEditor ////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDLoaderManagerEditor::TRDLoaderManagerEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) +AliEveTRDLoaderManagerEditor::AliEveTRDLoaderManagerEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { - MakeTitle("TRDLoaderManager"); + MakeTitle("AliEveTRDLoaderManager"); // gClient->GetColorByName("#ffffff", bg); // ChangeBackground(bg); @@ -125,7 +133,7 @@ TRDLoaderManagerEditor::TRDLoaderManagerEditor(const TGWindow* p, Int_t width, I fAdd->SetTextJustify(36); fAdd->Resize(31,22); fAdd->SetToolTipText("Add selected loader to list"); - fAdd->Connect("Clicked()", "Alieve::TRDLoaderManagerEditor", this, "Add()"); + fAdd->Connect("Clicked()", "AliEveTRDLoaderManagerEditor", this, "Add()"); fHorizontalFrame539->AddFrame(fAdd, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2)); AddFrame(fHorizontalFrame539, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsExpandX,2,2,2,2)); @@ -134,14 +142,14 @@ TRDLoaderManagerEditor::TRDLoaderManagerEditor(const TGWindow* p, Int_t width, I } //________________________________________________________ -TRDLoaderManagerEditor::~TRDLoaderManagerEditor() +AliEveTRDLoaderManagerEditor::~AliEveTRDLoaderManagerEditor() { } //_________________________________________________________ -void TRDLoaderManagerEditor::Add() +void AliEveTRDLoaderManagerEditor::Add() { TGTextLBEntry *entry = (TGTextLBEntry*)fSelector->GetSelectedEntry(); if(!entry){ @@ -202,7 +210,7 @@ void TRDLoaderManagerEditor::Add() fRemoveButton = new((*fRemove)[nbutton]) TGTextButton(fHorizontalFrame, "Remove", nbutton); fRemoveButton->SetTextJustify(36); fRemoveButton->Resize(53,22); - fRemoveButton->Connect("Clicked()", "Alieve::TRDLoaderManagerEditor", this, Form("Remove(=%d)", nbutton)); + fRemoveButton->Connect("Clicked()", "AliEveTRDLoaderManagerEditor", this, Form("Remove(=%d)", nbutton)); fRemoveButton->SetToolTipText(Form("Remove %s Loader", entry->GetText()->GetString())); fHorizontalFrame->AddFrame(fRemoveButton, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2)); @@ -218,7 +226,7 @@ void TRDLoaderManagerEditor::Add() //_________________________________________________________ -void TRDLoaderManagerEditor::Remove(Int_t entry) +void AliEveTRDLoaderManagerEditor::Remove(Int_t entry) { TIterator *it = fGroupFrame->GetList()->MakeIterator(); int ientry = 0; @@ -240,8 +248,8 @@ void TRDLoaderManagerEditor::Remove(Int_t entry) } //_________________________________________________________ -void TRDLoaderManagerEditor::SetModel(TObject* obj) +void AliEveTRDLoaderManagerEditor::SetModel(TObject* obj) { - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); } diff --git a/EVE/Alieve/AliEveTRDLoaderManager.h b/EVE/Alieve/AliEveTRDLoaderManager.h new file mode 100644 index 00000000000..2d0a553c927 --- /dev/null +++ b/EVE/Alieve/AliEveTRDLoaderManager.h @@ -0,0 +1,73 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#ifndef ALIEVE_TRDLoaderManager_H +#define ALIEVE_TRDLoaderManager_H + +//////////////////////////////////////////////////////////////////////// +// // - ALIEVE implementation - +// Loader manager for the TRD detector +// - AliEveTRDLoaderManager - manager of TRD data loaders (simulation + measured) +// - AliEveTRDLoaderManagerEditor - UI +// +// by A.Bercuci (A.Bercuci@gsi.de) Mon Feb 26 2007 +//////////////////////////////////////////////////////////////////////// + +#include + +#ifndef ROOT_TNamed +#include +#endif + +#ifndef ROOT_TGedFrame +#include +#endif + +class TGComboBox; +class TGTextButton; +class TClonesArray; + + + class AliEveTRDLoaderManager : public TEveElementList + { + friend class AliEveTRDLoaderManagerEditor; + public: + AliEveTRDLoaderManager(const Text_t* name="AliEveTRDLoader", const Text_t* title=0x0); + ~AliEveTRDLoaderManager(); + void Paint(Option_t *option); + + protected: + void Add(Int_t type, const Text_t *name, const Text_t *title=0x0); + void Remove(Int_t entry); + + ClassDef(AliEveTRDLoaderManager, 1) // Alieve loaders manager for TRD + }; + + class AliEveTRDLoaderManagerEditor : public TGedFrame + { + public: + AliEveTRDLoaderManagerEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); + ~AliEveTRDLoaderManagerEditor(); + virtual void Add(); + virtual void Remove(Int_t entry); + virtual void SetModel(TObject* obj); + + protected: + AliEveTRDLoaderManager* fM; + + private: + ULong_t bg; // background color + TGComboBox *fSelector; + TGTextButton *fAdd, *fRemoveButton; + TGGroupFrame *fGroupFrame; + TClonesArray *fRemove; + + ClassDef(AliEveTRDLoaderManagerEditor, 1)// Editor for AliEveTRDLoaderManager + }; +#endif + diff --git a/EVE/Alieve/TRDModule.cxx b/EVE/Alieve/AliEveTRDModule.cxx similarity index 81% rename from EVE/Alieve/TRDModule.cxx rename to EVE/Alieve/AliEveTRDModule.cxx index 94df2c03b6d..8d0487c6b3c 100644 --- a/EVE/Alieve/TRDModule.cxx +++ b/EVE/Alieve/AliEveTRDModule.cxx @@ -1,5 +1,13 @@ -#include "TRDModule.h" -#include "TRDModuleImp.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTRDModule.h" +#include "AliEveTRDModuleImp.h" #include "TGButton.h" #include "TGColorSelect.h" @@ -11,13 +19,12 @@ #include "TEveManager.h" #include "TEveTrack.h" -using namespace Alieve; -ClassImp(TRDModule) -ClassImp(TRDModuleEditor) +ClassImp(AliEveTRDModule) +ClassImp(AliEveTRDModuleEditor) //________________________________________________________ -TRDModule::TRDModule(const char *typ, Int_t det) : +AliEveTRDModule::AliEveTRDModule(const char *typ, Int_t det) : TNamed(Form("%s%03d", typ, det), ""), fDet(det) { fLoadHits = kFALSE; @@ -42,11 +49,11 @@ TRDModule::TRDModule(const char *typ, Int_t det) : /////////////////////////////////////////////////////////// -///////////// TRDModuleEditor ///////////////////// +///////////// AliEveTRDModuleEditor ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) +AliEveTRDModuleEditor::AliEveTRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { MakeTitle("TRD Detector"); @@ -57,7 +64,7 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fDisplayHits->SetState(kButtonDown); fGroupFrame615->AddFrame(fDisplayHits, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fDisplayHits->Connect("Clicked()", - "Alieve::TRDModuleEditor", this, "UpdateChamber()"); + "AliEveTRDModuleEditor", this, "UpdateChamber()"); // color select widget ULong_t ColPar1; @@ -66,7 +73,7 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fGroupFrame615->AddFrame(fHitsColor, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2)); fHitsColor->Connect("ColorSelected(Pixel_t)", - "Alieve::TRDModuleEditor", this, "UpdateHits(Pixel_t)"); + "AliEveTRDModuleEditor", this, "UpdateHits(Pixel_t)"); fGroupFrame615->SetLayoutManager(new TGVerticalLayout(fGroupFrame615)); AddFrame(fGroupFrame615, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); @@ -79,20 +86,20 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fDisplayDigits->SetToolTipText("Toggle display digits attached to chamber"); fVerticalFrame538->AddFrame(fDisplayDigits, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fDisplayDigits->Connect("Clicked()", - "Alieve::TRDModuleEditor", this, "UpdateChamber()"); + "AliEveTRDModuleEditor", this, "UpdateChamber()"); fToggleLog = new TGCheckButton(fVerticalFrame538,"Log"); fToggleLog->SetState(kButtonUp); fToggleLog->SetToolTipText("Toggle logarithmic representation of digits"); fVerticalFrame538->AddFrame(fToggleLog, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fToggleLog->Connect("Clicked()", - "Alieve::TRDModuleEditor", this, "ModifyDigitsView()"); + "AliEveTRDModuleEditor", this, "ModifyDigitsView()"); fToggleBox = new TGCheckButton(fVerticalFrame538,"Box"); fToggleBox->SetState(kButtonUp); fToggleBox->SetToolTipText("Toggle display digits as boxes"); fVerticalFrame538->AddFrame(fToggleBox, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fToggleBox->Connect("Clicked()", - "Alieve::TRDModuleEditor", this, "ModifyDigitsView()"); + "AliEveTRDModuleEditor", this, "ModifyDigitsView()"); fGroupFrame636->AddFrame(fVerticalFrame538, new TGLayoutHints(kLHintsLeft | kLHintsTop,2,2,2,2)); TGVertical3DLine *fVertical3DLine773 = new TGVertical3DLine(fGroupFrame636,8,63); @@ -105,7 +112,7 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fVerticalFrame543->AddFrame(fThreshold, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fThresValue = new TGNumberEntry(fVerticalFrame543, (Int_t)10, 5, -1, TGNumberFormat::kNESInteger, TGNumberFormat::kNEAPositive, TGNumberFormat::kNELLimitMinMax, 0, 1024); fThresValue->Connect("ValueSet(Long_t)", - "Alieve::TRDModuleEditor", this, "SetThreshold(Long_t)"); + "AliEveTRDModuleEditor", this, "SetThreshold(Long_t)"); fVerticalFrame543->AddFrame(fThresValue, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fGroupFrame636->AddFrame(fVerticalFrame543, new TGLayoutHints(kLHintsLeft | kLHintsTop,2,2,2,2)); @@ -120,7 +127,7 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fGroupFrame649->AddFrame(fDisplayClusters, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fDisplayClusters->SetState(kButtonDown); fDisplayClusters->Connect("Clicked()", - "Alieve::TRDModuleEditor", this, "UpdateChamber()"); + "AliEveTRDModuleEditor", this, "UpdateChamber()"); // color select widget ULong_t ColPar2; @@ -129,7 +136,7 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fGroupFrame649->AddFrame(fClustersColor, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2)); fClustersColor->Connect("ColorSelected(Pixel_t)", - "Alieve::TRDModuleEditor", this, "UpdateClusters(Pixel_t)"); + "AliEveTRDModuleEditor", this, "UpdateClusters(Pixel_t)"); fGroupFrame649->SetLayoutManager(new TGVerticalLayout(fGroupFrame649)); AddFrame(fGroupFrame649, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); @@ -141,23 +148,23 @@ TRDModuleEditor::TRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, U fGroupFrame676->AddFrame(fDisplayTracks, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); fDisplayTracks->SetState(kButtonDown); fDisplayTracks->Connect("Clicked()", - "Alieve::TRDModuleEditor", this, "UpdateChamber()"); + "AliEveTRDModuleEditor", this, "UpdateChamber()"); fGroupFrame676->SetLayoutManager(new TGVerticalLayout(fGroupFrame676)); AddFrame(fGroupFrame676, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); } //________________________________________________________ -TRDModuleEditor::~TRDModuleEditor() +AliEveTRDModuleEditor::~AliEveTRDModuleEditor() {} //_________________________________________________________ -void TRDModuleEditor::SetModel(TObject* obj) +void AliEveTRDModuleEditor::SetModel(TObject* obj) { // Takes care to update UI state according to model state - fM = dynamic_cast(obj); - if(TRDNode *node = dynamic_cast(fM)) node->UpdateNode(); + fM = dynamic_cast(obj); + if(AliEveTRDNode *node = dynamic_cast(fM)) node->UpdateNode(); fDisplayHits->SetEnabled(fM->fLoadHits); if(fM->fLoadHits) fDisplayHits->SetState( fM->fRnrHits ? kButtonDown : kButtonUp); @@ -185,14 +192,14 @@ void TRDModuleEditor::SetModel(TObject* obj) } //_________________________________________________________ -void TRDModuleEditor::ModifyDigitsView() +void AliEveTRDModuleEditor::ModifyDigitsView() { fM->kDigitsNeedRecompute = kTRUE; UpdateChamber(); } //________________________________________________________ -void TRDModuleEditor::SetThreshold(Long_t tres) +void AliEveTRDModuleEditor::SetThreshold(Long_t tres) { if(!fM->fLoadDigits) return; @@ -203,7 +210,7 @@ void TRDModuleEditor::SetThreshold(Long_t tres) //_________________________________________________________ -void TRDModuleEditor::UpdateChamber() +void AliEveTRDModuleEditor::UpdateChamber() { // Info("UpdateChamber()", ""); @@ -225,13 +232,13 @@ void TRDModuleEditor::UpdateChamber() fM->fRnrTracklets = kFALSE; if(fDisplayTracks->IsDown()) fM->fRnrTracklets = kTRUE; - if(dynamic_cast(fM)) (dynamic_cast(fM))->UpdateLeaves(); + if(dynamic_cast(fM)) (dynamic_cast(fM))->UpdateLeaves(); gEve->Redraw3D(); } //_________________________________________________________ -void TRDModuleEditor::UpdateClusters(Pixel_t /*col*/) +void AliEveTRDModuleEditor::UpdateClusters(Pixel_t /*col*/) { // Info("UpdateClusters()",""); /* @@ -243,7 +250,7 @@ void TRDModuleEditor::UpdateClusters(Pixel_t /*col*/) } //_________________________________________________________ -void TRDModuleEditor::UpdateHits(Pixel_t /*col*/) +void AliEveTRDModuleEditor::UpdateHits(Pixel_t /*col*/) { // Info("UpdateHits()",""); /* diff --git a/EVE/Alieve/TRDModule.h b/EVE/Alieve/AliEveTRDModule.h similarity index 58% rename from EVE/Alieve/TRDModule.h rename to EVE/Alieve/AliEveTRDModule.h index 0c555f12e7c..3847595af3d 100644 --- a/EVE/Alieve/TRDModule.h +++ b/EVE/Alieve/AliEveTRDModule.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TRDModule_H #define ALIEVE_TRDModule_H @@ -5,8 +13,8 @@ // // - AliEVE implementation - // The common structure of a TRD module (SM, Stack or Chamber) -// - TRDModule - structure of TRD module for visualisation -// - TRDModuleEditor - UI +// - AliEveTRDModule - structure of TRD module for visualisation +// - AliEveTRDModuleEditor - UI // // by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 /////////////////////////////////////////////////////////////////////// @@ -25,16 +33,15 @@ class TGCheckButton; class TGNumberEntry; class TGColorSelect; -namespace Alieve { - class TRDModule : public TNamed + class AliEveTRDModule : public TNamed { - friend class TRDModuleEditor; - friend class TRDNode; - friend class TRDChamber; + friend class AliEveTRDModuleEditor; + friend class AliEveTRDNode; + friend class AliEveTRDChamber; public: - TRDModule(const char *typ="XXX", Int_t id=0); - virtual ~TRDModule() {} + AliEveTRDModule(const char *typ="XXX", Int_t id=0); + virtual ~AliEveTRDModule() {} virtual Bool_t GetDigitsBox(){return fDigitsBox;} virtual Bool_t GetDigitsLog(){return fDigitsLog;} @@ -54,15 +61,15 @@ namespace Alieve { Int_t fDet; // detector number UShort_t fDigitsThreshold; // digits threshold - ClassDef(TRDModule,1) // Structure holder for TRD chamber + ClassDef(AliEveTRDModule,1) // Structure holder for TRD chamber }; - class TRDModuleEditor : public TGedFrame + class AliEveTRDModuleEditor : public TGedFrame { public: - TRDModuleEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - ~TRDModuleEditor(); + AliEveTRDModuleEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); + ~AliEveTRDModuleEditor(); virtual void SetModel(TObject* obj); @@ -73,7 +80,7 @@ namespace Alieve { void UpdateHits(Pixel_t); protected: - TRDModule* fM; + AliEveTRDModule* fM; private: TGCheckButton *fDisplayHits; @@ -84,8 +91,6 @@ namespace Alieve { TGColorSelect *fClustersColor; TGCheckButton *fDisplayTracks; - ClassDef(TRDModuleEditor,1) // Editor for TRDModule + ClassDef(AliEveTRDModuleEditor,1) // Editor for AliEveTRDModule }; -} - #endif diff --git a/EVE/Alieve/TRDModuleImp.cxx b/EVE/Alieve/AliEveTRDModuleImp.cxx similarity index 73% rename from EVE/Alieve/TRDModuleImp.cxx rename to EVE/Alieve/AliEveTRDModuleImp.cxx index 8bb2da6d963..00d6a9dd267 100644 --- a/EVE/Alieve/TRDModuleImp.cxx +++ b/EVE/Alieve/AliEveTRDModuleImp.cxx @@ -1,5 +1,13 @@ -#include "TRDModuleImp.h" -#include "TRDData.h" +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +#include "AliEveTRDModuleImp.h" +#include "AliEveTRDData.h" #include "TMath.h" #include @@ -20,107 +28,106 @@ #include "AliTRDdataArrayI.h" #include "AliTRDmcmTracklet.h" -using namespace Alieve; using namespace std; -ClassImp(TRDChamber) -ClassImp(TRDNode) +ClassImp(AliEveTRDChamber) +ClassImp(AliEveTRDNode) //________________________________________________________ -TRDNode::TRDNode(const char *typ, Int_t det) : - TEveElement(), TRDModule(typ, det) +AliEveTRDNode::AliEveTRDNode(const char *typ, Int_t det) : + TEveElement(), AliEveTRDModule(typ, det) { } //________________________________________________________ -void TRDNode::Paint(Option_t* option) +void AliEveTRDNode::Paint(Option_t* option) { List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - (dynamic_cast(*iter))->Paint(option); + (dynamic_cast(*iter))->Paint(option); iter++; } } //________________________________________________________ -void TRDNode::Reset() +void AliEveTRDNode::Reset() { List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - (dynamic_cast(*iter))->Reset(); + (dynamic_cast(*iter))->Reset(); iter++; } } //________________________________________________________ -void TRDNode::Collapse() +void AliEveTRDNode::Collapse() { TGListTree *list = gEve->GetListTree(); - TRDNode *node = 0x0; + AliEveTRDNode *node = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - if((node = dynamic_cast(*iter))) node->Collapse(); + if((node = dynamic_cast(*iter))) node->Collapse(); list->CloseItem(FindListTreeItem(list)); iter++; } } //________________________________________________________ -void TRDNode::Expand() +void AliEveTRDNode::Expand() { TGListTree *list = gEve->GetListTree(); - TRDNode *node = 0x0; + AliEveTRDNode *node = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - if((node = dynamic_cast(*iter))) node->Expand(); + if((node = dynamic_cast(*iter))) node->Expand(); list->OpenItem(FindListTreeItem(list)); iter++; } } //________________________________________________________ -void TRDNode::EnableListElements() +void AliEveTRDNode::EnableListElements() { SetRnrSelf(kTRUE); - TRDNode *node = 0x0; - TRDChamber *chmb = 0x0; + AliEveTRDNode *node = 0x0; + AliEveTRDChamber *chmb = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - if((node = dynamic_cast(*iter))){ + if((node = dynamic_cast(*iter))){ node->SetRnrSelf(kTRUE); node->EnableListElements(); } - if((chmb = dynamic_cast(*iter))) chmb->SetRnrSelf(kTRUE); + if((chmb = dynamic_cast(*iter))) chmb->SetRnrSelf(kTRUE); iter++; } gEve->Redraw3D(); } //________________________________________________________ -void TRDNode::DisableListElements() +void AliEveTRDNode::DisableListElements() { SetRnrSelf(kFALSE); - TRDNode *node = 0x0; - TRDChamber *chmb = 0x0; + AliEveTRDNode *node = 0x0; + AliEveTRDChamber *chmb = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - if((node = dynamic_cast(*iter))){ + if((node = dynamic_cast(*iter))){ node->SetRnrSelf(kFALSE); node->DisableListElements(); } - if((chmb = dynamic_cast(*iter))) chmb->SetRnrSelf(kFALSE); + if((chmb = dynamic_cast(*iter))) chmb->SetRnrSelf(kFALSE); iter++; } gEve->Redraw3D(); } //________________________________________________________ -void TRDNode::UpdateLeaves() +void AliEveTRDNode::UpdateLeaves() { - TRDModule *module; + AliEveTRDModule *module; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - module = dynamic_cast(*iter); + module = dynamic_cast(*iter); if(!module) continue; module->fRnrHits = fRnrHits; @@ -134,32 +141,32 @@ void TRDNode::UpdateLeaves() iter++; } - TRDNode *node = 0x0; + AliEveTRDNode *node = 0x0; iter = fChildren.begin(); while(iter != fChildren.end()){ - if((node = dynamic_cast(*iter))) node->UpdateLeaves(); + if((node = dynamic_cast(*iter))) node->UpdateLeaves(); iter++; } } //________________________________________________________ -void TRDNode::UpdateNode() +void AliEveTRDNode::UpdateNode() { // Info("UpdateNode()", Form("%s", GetName())); - TRDNode *node = 0x0; + AliEveTRDNode *node = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ - if((node = dynamic_cast(*iter))) node->UpdateNode(); + if((node = dynamic_cast(*iter))) node->UpdateNode(); iter++; } Int_t score[11]; for(int i=0; i<11; i++) score[i] = 0; - TRDModule *module; + AliEveTRDModule *module; iter = fChildren.begin(); while(iter != fChildren.end()){ - module = dynamic_cast(*iter); + module = dynamic_cast(*iter); if(!module) continue; score[0] += (module->fLoadHits) ? 1 : 0; score[1] += (module->fRnrHits) ? 1 : 0; @@ -197,12 +204,12 @@ void TRDNode::UpdateNode() /////////////////////////////////////////////////////////// -///////////// TRDChamber ///////////////////// +///////////// AliEveTRDChamber ///////////////////// /////////////////////////////////////////////////////////// //________________________________________________________ -TRDChamber::TRDChamber(Int_t det) : - TEveElement(), TRDModule("Chmb", det), rowMax(-1), colMax(-1), timeMax(22), fX0(0.), fPla(-1) +AliEveTRDChamber::AliEveTRDChamber(Int_t det) : + TEveElement(), AliEveTRDModule("Chmb", det), rowMax(-1), colMax(-1), timeMax(22), fX0(0.), fPla(-1) { // // Constructor @@ -221,8 +228,8 @@ TRDChamber::TRDChamber(Int_t det) : } //________________________________________________________ -TRDChamber::TRDChamber(const TRDChamber &mod): - TEveElement(), TRDModule("Chmb", mod.fDet) +AliEveTRDChamber::AliEveTRDChamber(const AliEveTRDChamber &mod): + TEveElement(), AliEveTRDModule("Chmb", mod.fDet) { // // Copy constructor @@ -235,7 +242,7 @@ TRDChamber::TRDChamber(const TRDChamber &mod): } //________________________________________________________ -TRDChamber& TRDChamber::operator=(const TRDChamber &mod) +AliEveTRDChamber& AliEveTRDChamber::operator=(const AliEveTRDChamber &mod) { // // Assignment operator @@ -251,7 +258,7 @@ TRDChamber& TRDChamber::operator=(const TRDChamber &mod) } //________________________________________________________ -Int_t TRDChamber::GetSM() const +Int_t AliEveTRDChamber::GetSM() const { if(!fGeo){ AliWarning("Fail. No TRD geometry defined."); @@ -261,7 +268,7 @@ Int_t TRDChamber::GetSM() const } //________________________________________________________ -Int_t TRDChamber::GetSTK() const +Int_t AliEveTRDChamber::GetSTK() const { if(!fGeo){ AliWarning("Fail. No TRD geometry defined."); @@ -271,19 +278,19 @@ Int_t TRDChamber::GetSTK() const } //________________________________________________________ -void TRDChamber::LoadClusters(TObjArray *clusters) +void AliEveTRDChamber::LoadClusters(TObjArray *clusters) { // // Draw clusters // if(!fGeo){ - AliError(Form("Geometry not set for chamber %d. Please call first TRDChamber::SetGeometry().", fDet)); + AliError(Form("Geometry not set for chamber %d. Please call first AliEveTRDChamber::SetGeometry().", fDet)); return; } if(!fRecPoints){ - fRecPoints = new TRDClusters(this); + fRecPoints = new AliEveTRDClusters(this); fRecPoints->SetMarkerSize(1.); fRecPoints->SetMarkerStyle(24); fRecPoints->SetMarkerColor(6); @@ -308,18 +315,18 @@ void TRDChamber::LoadClusters(TObjArray *clusters) } //________________________________________________________ -void TRDChamber::LoadDigits(AliTRDdigitsManager *digits) +void AliEveTRDChamber::LoadDigits(AliTRDdigitsManager *digits) { // // Draw digits // if(!fGeo){ - AliError(Form("Geometry not set for chamber %d. Please call first TRDChamber::SetGeometry().", fDet)); + AliError(Form("Geometry not set for chamber %d. Please call first AliEveTRDChamber::SetGeometry().", fDet)); return; } // Info("LoadDigits()", Form("digits =0x%x", digits)); - if(!fDigits) fDigits = new TRDDigits(this); + if(!fDigits) fDigits = new AliEveTRDDigits(this); else fDigits->Reset(); fDigits->SetData(digits); @@ -327,7 +334,7 @@ void TRDChamber::LoadDigits(AliTRDdigitsManager *digits) } //________________________________________________________ -void TRDChamber::AddHit(AliTRDhit *hit) +void AliEveTRDChamber::AddHit(AliTRDhit *hit) { // // Draw hits @@ -335,7 +342,7 @@ void TRDChamber::AddHit(AliTRDhit *hit) // Info("AddHit()", Form("%s", GetName())); if(!fHits){ - fHits = new TRDHits(this); + fHits = new AliEveTRDHits(this); fHits->SetMarkerSize(.1); fHits->SetMarkerColor(2); fHits->SetOwnIds(kTRUE); @@ -347,13 +354,13 @@ void TRDChamber::AddHit(AliTRDhit *hit) } //________________________________________________________ -void TRDChamber::LoadTracklets(TObjArray *tracks) +void AliEveTRDChamber::LoadTracklets(TObjArray *tracks) { // // Draw tracks // if(!fGeo){ - Error("LoadTracklets()", Form("Geometry not set for chamber %d. Please call first TRDChamber::SetGeometry().", fDet)); + Error("LoadTracklets()", Form("Geometry not set for chamber %d. Please call first AliEveTRDChamber::SetGeometry().", fDet)); return; } // Info("LoadTracklets()", Form("tracks = 0x%x", tracks)); @@ -386,7 +393,7 @@ void TRDChamber::LoadTracklets(TObjArray *tracks) } //____________________________________________________ -void TRDChamber::Paint(Option_t* option) +void AliEveTRDChamber::Paint(Option_t* option) { /* Info("Paint()", Form("%s", GetName()));*/ if(!fRnrSelf) return; @@ -405,7 +412,7 @@ void TRDChamber::Paint(Option_t* option) } //________________________________________________________ -void TRDChamber::Reset() +void AliEveTRDChamber::Reset() { if(fHits){ fHits->Reset(); @@ -426,7 +433,7 @@ void TRDChamber::Reset() } //________________________________________________________ -void TRDChamber::SetGeometry(AliTRDgeometry *geo) +void AliEveTRDChamber::SetGeometry(AliTRDgeometry *geo) { fGeo = geo; diff --git a/EVE/Alieve/TRDModuleImp.h b/EVE/Alieve/AliEveTRDModuleImp.h similarity index 58% rename from EVE/Alieve/TRDModuleImp.h rename to EVE/Alieve/AliEveTRDModuleImp.h index 1d7f0398e6a..ae43921af57 100644 --- a/EVE/Alieve/TRDModuleImp.h +++ b/EVE/Alieve/AliEveTRDModuleImp.h @@ -1,11 +1,19 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TRDModuleImp_H #define ALIEVE_TRDModuleImp_H ///////////////////////////////////////////////////////////////////////// // -// Implementation of TRDModule: -// - TRDChamber - Data holder -// - TRDNode - Node structure +// Implementation of AliEveTRDModule: +// - AliEveTRDChamber - Data holder +// - AliEveTRDNode - Node structure // // by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 ///////////////////////////////////////////////////////////////////////// @@ -15,7 +23,7 @@ #include #ifndef ALIEVE_TRDModule_H -#include "TRDModule.h" +#include "AliEveTRDModule.h" #endif class AliTRDpadPlane; @@ -27,20 +35,19 @@ class TObjArray; class TEveTrack; -namespace Alieve { - class TRDHits; - class TRDDigits; + class AliEveTRDHits; + class AliEveTRDDigits; - class TRDChamber : public TEveElement, public TRDModule + class AliEveTRDChamber : public TEveElement, public AliEveTRDModule { - friend class TRDDigits; + friend class AliEveTRDDigits; public: - TRDChamber(Int_t det=0); - virtual ~TRDChamber() {} + AliEveTRDChamber(Int_t det=0); + virtual ~AliEveTRDChamber() {} - TRDChamber(const TRDChamber&); - TRDChamber& operator=(const TRDChamber&); + AliEveTRDChamber(const AliEveTRDChamber&); + AliEveTRDChamber& operator=(const AliEveTRDChamber&); void AddHit(AliTRDhit *hit); Int_t GetRowMax() const {return rowMax;} @@ -57,9 +64,9 @@ namespace Alieve { void SetGeometry(AliTRDgeometry *geo); protected: - TRDDigits *fDigits; // digits representation - TRDHits *fHits; // hits representation - TRDHits *fRecPoints;// cluster representation + AliEveTRDDigits *fDigits; // digits representation + AliEveTRDHits *fHits; // hits representation + AliEveTRDHits *fRecPoints;// cluster representation std::vector *fTracklets; // mcm tracklets // data representation section @@ -72,14 +79,14 @@ namespace Alieve { AliTRDpadPlane *fPadPlane; // pad plane object AliTRDgeometry *fGeo; // TRD geometry - ClassDef(TRDChamber,1) // Holder for TRD chamber data + ClassDef(AliEveTRDChamber,1) // Holder for TRD chamber data }; - class TRDNode : public TEveElement, public TRDModule + class AliEveTRDNode : public TEveElement, public AliEveTRDModule { public: - TRDNode(const char *typ, Int_t det=0); + AliEveTRDNode(const char *typ, Int_t det=0); void Paint(Option_t* option=""); void Reset(); @@ -93,8 +100,6 @@ namespace Alieve { List_i begin(){return fChildren.begin();} List_i end(){return fChildren.end();} - ClassDef(TRDNode, 1) + ClassDef(AliEveTRDNode, 1) }; -} - #endif diff --git a/EVE/Alieve/TrackFitter.cxx b/EVE/Alieve/AliEveTrackFitter.cxx similarity index 80% rename from EVE/Alieve/TrackFitter.cxx rename to EVE/Alieve/AliEveTrackFitter.cxx index fe6f51f9ef6..8da24f9b86b 100644 --- a/EVE/Alieve/TrackFitter.cxx +++ b/EVE/Alieve/AliEveTrackFitter.cxx @@ -1,6 +1,13 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TrackFitter.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTrackFitter.h" #include "TCanvas.h" #include "TGraph.h" @@ -15,20 +22,19 @@ #include #include -using namespace Alieve; //______________________________________________________________________ -// TrackFitter +// AliEveTrackFitter // -// TrackFitter is an interface to helix fit. It creates a set of +// AliEveTrackFitter is an interface to helix fit. It creates a set of // points, listening to signal PointCtrlClicked() of any // TEvePointSet. Via editor it fits selected points and creates a // reconstructed track. // -ClassImp(TrackFitter) +ClassImp(AliEveTrackFitter) -TrackFitter::TrackFitter(const Text_t* name, Int_t n_points) : +AliEveTrackFitter::AliEveTrackFitter(const Text_t* name, Int_t n_points) : TEvePointSet(name, n_points), fGraphSelected(0), @@ -62,7 +68,7 @@ TrackFitter::TrackFitter(const Text_t* name, Int_t n_points) : UpdateItems(); } -TrackFitter::~TrackFitter() +AliEveTrackFitter::~AliEveTrackFitter() { // Destructor. @@ -72,7 +78,7 @@ TrackFitter::~TrackFitter() } /**************************************************************************/ -void TrackFitter::DestroyElements() +void AliEveTrackFitter::DestroyElements() { // Virtual method of base class TEveElement. // It preserves track list to have coomon track propagator attributes. @@ -84,7 +90,7 @@ void TrackFitter::DestroyElements() } /**************************************************************************/ -void TrackFitter::Start() +void AliEveTrackFitter::Start() { // Start selection of points. @@ -92,13 +98,13 @@ void TrackFitter::Start() if(fConnected == kFALSE) { TQObject::Connect("TEvePointSet", "PointCtrlClicked(TEvePointSet*,Int_t)", - "Alieve::TrackFitter", this, "AddFitPoint(TEvePointSet*,Int_t)"); + "AliEveTrackFitter", this, "AddFitPoint(TEvePointSet*,Int_t)"); fConnected = kTRUE; } } -void TrackFitter::Stop() +void AliEveTrackFitter::Stop() { // Stop selection of points. @@ -111,7 +117,7 @@ void TrackFitter::Stop() /**************************************************************************/ -void TrackFitter::AddFitPoint(TEvePointSet* ps, Int_t n) +void AliEveTrackFitter::AddFitPoint(TEvePointSet* ps, Int_t n) { // Add/remove given point depending if exists in the fMapPS. @@ -142,7 +148,7 @@ void TrackFitter::AddFitPoint(TEvePointSet* ps, Int_t n) /**************************************************************************/ -void TrackFitter::FitTrack() +void AliEveTrackFitter::FitTrack() { // Fit selected points with AliRieman fitter. @@ -187,12 +193,12 @@ void TrackFitter::FitTrack() trackParam.Print(); // make track - Double_t V0[3]; - trackParam.GetXYZAt(r, TEveTrackPropagator::fgDefMagField, V0); + Double_t AliEveV0[3]; + trackParam.GetXYZAt(r, TEveTrackPropagator::fgDefMagField, AliEveV0); Double_t P0[3]; trackParam.GetPxPyPzAt(r, TEveTrackPropagator::fgDefMagField, P0); TEveRecTrack rc; - rc.fV.Set(V0); + rc.fV.Set(AliEveV0); rc.fP.Set(P0); rc.fSign = trackParam.Charge(); @@ -212,7 +218,7 @@ void TrackFitter::FitTrack() } -void TrackFitter::Reset(Int_t n, Int_t ids) +void AliEveTrackFitter::Reset(Int_t n, Int_t ids) { // Reset selection. @@ -222,11 +228,11 @@ void TrackFitter::Reset(Int_t n, Int_t ids) } /**************************************************************************/ -void TrackFitter::DrawRiemanGraph() +void AliEveTrackFitter::DrawRiemanGraph() { // Draw graph of rieman fit. - static const TEveException eH("TrackFitter::DrawRiemanGraph "); + static const TEveException eH("AliEveTrackFitter::DrawRiemanGraph "); if(fRieman == 0) throw(eH + "fitter not set."); diff --git a/EVE/Alieve/TrackFitter.h b/EVE/Alieve/AliEveTrackFitter.h similarity index 68% rename from EVE/Alieve/TrackFitter.h rename to EVE/Alieve/AliEveTrackFitter.h index fec8033f655..c29d0e48349 100644 --- a/EVE/Alieve/TrackFitter.h +++ b/EVE/Alieve/AliEveTrackFitter.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_TrackFitter_H #define ALIEVE_TrackFitter_H @@ -13,13 +20,12 @@ class AliRieman; class TEveTrackList; -namespace Alieve { -class TrackFitter : public TEvePointSet +class AliEveTrackFitter : public TEvePointSet { private: - TrackFitter(const TrackFitter&); // Not implemented - TrackFitter& operator=(const TrackFitter&); // Not implemented + AliEveTrackFitter(const AliEveTrackFitter&); // Not implemented + AliEveTrackFitter& operator=(const AliEveTrackFitter&); // Not implemented TGraph *fGraphSelected; // graph of selected points TGraphErrors *fGraphFitted; // graph of fitted points @@ -44,8 +50,8 @@ protected: std::map fMapPS; // map of selected points from different TEvePointSet public: - TrackFitter(const Text_t* name, Int_t n_points=0); - virtual ~TrackFitter(); + AliEveTrackFitter(const Text_t* name, Int_t n_points=0); + virtual ~AliEveTrackFitter(); virtual void AddFitPoint(TEvePointSet*,Int_t); // slot for PointCtrlClicked() signal @@ -64,9 +70,7 @@ public: TGraph* GetGraphSelected() { return fGraphSelected; } TGraphErrors* GetGraphFitted() { return fGraphFitted; } - ClassDef(TrackFitter, 0); // Interface to AliRieman fit. -}; // endclass TrackFitter - -} + ClassDef(AliEveTrackFitter, 0); // Interface to AliRieman fit. +}; // endclass AliEveTrackFitter #endif diff --git a/EVE/Alieve/TrackFitterEditor.cxx b/EVE/Alieve/AliEveTrackFitterEditor.cxx similarity index 58% rename from EVE/Alieve/TrackFitterEditor.cxx rename to EVE/Alieve/AliEveTrackFitterEditor.cxx index b6b5e4e0c7a..fa7b0e940f0 100644 --- a/EVE/Alieve/TrackFitterEditor.cxx +++ b/EVE/Alieve/AliEveTrackFitterEditor.cxx @@ -1,18 +1,25 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "TrackFitterEditor.h" -#include +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveTrackFitterEditor.h" +#include #include -using namespace Alieve; + //______________________________________________________________________ -// TrackFitterEditor +// AliEveTrackFitterEditor // -ClassImp(TrackFitterEditor) +ClassImp(AliEveTrackFitterEditor) -TrackFitterEditor::TrackFitterEditor(const TGWindow *p, Int_t width, Int_t height, +AliEveTrackFitterEditor::AliEveTrackFitterEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), fM(0), @@ -24,41 +31,41 @@ TrackFitterEditor::TrackFitterEditor(const TGWindow *p, Int_t width, Int_t heigh { // Constructor. - MakeTitle("TrackFitter"); + MakeTitle("AliEveTrackFitter"); fStart = new TGTextButton(this, "Start"); AddFrame(fStart, new TGLayoutHints(kLHintsLeft | kLHintsExpandX, 4, 1, 1, 1)); fStart->Connect("Clicked()", - "Alieve::TrackFitterEditor", this, "DoStart()"); + "AliEveTrackFitterEditor", this, "DoStart()"); fFit = new TGTextButton(this, "Fit"); AddFrame(fFit, new TGLayoutHints(kLHintsLeft | kLHintsExpandX, 4, 1, 1, 1)); fFit->Connect("Clicked()", - "Alieve::TrackFitterEditor", this, "DoFit()"); + "AliEveTrackFitterEditor", this, "DoFit()"); fReset = new TGTextButton(this, "Reset"); AddFrame(fReset, new TGLayoutHints(kLHintsLeft | kLHintsExpandX, 4, 1, 1, 1)); fReset->Connect("Clicked()", - "Alieve::TrackFitterEditor", this, "DoReset()"); + "AliEveTrackFitterEditor", this, "DoReset()"); fStop = new TGTextButton(this, "Stop"); AddFrame(fStop, new TGLayoutHints(kLHintsLeft | kLHintsExpandX, 4, 1, 1, 1)); fStop->Connect("Clicked()", - "Alieve::TrackFitterEditor", this, "DoStop()"); + "AliEveTrackFitterEditor", this, "DoStop()"); fGraph = new TGTextButton(this, " RiemanGraph "); AddFrame(fGraph, new TGLayoutHints(kLHintsLeft, 4, 2, 4, 1)); fGraph->Connect("Clicked()", - "Alieve::TrackFitterEditor", this, "DoGraph()"); + "AliEveTrackFitterEditor", this, "DoGraph()"); } /**************************************************************************/ -void TrackFitterEditor::SetModel(TObject* obj) +void AliEveTrackFitterEditor::SetModel(TObject* obj) { // Set model object. - fM = dynamic_cast(obj); + fM = dynamic_cast(obj); if(fM->GetConnected()) { @@ -73,7 +80,7 @@ void TrackFitterEditor::SetModel(TObject* obj) } } -void TrackFitterEditor::DoFit() +void AliEveTrackFitterEditor::DoFit() { // Fit slot. @@ -81,7 +88,7 @@ void TrackFitterEditor::DoFit() Update(); } -void TrackFitterEditor::DoReset() +void AliEveTrackFitterEditor::DoReset() { // Reset slot. @@ -89,7 +96,7 @@ void TrackFitterEditor::DoReset() Update(); } -void TrackFitterEditor::DoStart() +void AliEveTrackFitterEditor::DoStart() { // Start selection slot. @@ -98,7 +105,7 @@ void TrackFitterEditor::DoStart() fStop->SetState(kButtonUp); } -void TrackFitterEditor::DoStop() +void AliEveTrackFitterEditor::DoStop() { // Stop selection slot. @@ -109,7 +116,7 @@ void TrackFitterEditor::DoStop() /**************************************************************************/ -void TrackFitterEditor::DoGraph() +void AliEveTrackFitterEditor::DoGraph() { // Draw graph slot. diff --git a/EVE/Alieve/AliEveTrackFitterEditor.h b/EVE/Alieve/AliEveTrackFitterEditor.h new file mode 100644 index 00000000000..086bb82c19f --- /dev/null +++ b/EVE/Alieve/AliEveTrackFitterEditor.h @@ -0,0 +1,52 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#ifndef ALIEVE_TrackFitterEditor_H +#define ALIEVE_TrackFitterEditor_H + +#include + +class TGCheckButton; +class TGNumberEntry; +class TGColorSelect; + + +class AliEveTrackFitter; + +class AliEveTrackFitterEditor : public TGedFrame +{ +private: + AliEveTrackFitterEditor(const AliEveTrackFitterEditor&); // Not implemented + AliEveTrackFitterEditor& operator=(const AliEveTrackFitterEditor&); // Not implemented + +protected: + AliEveTrackFitter* fM; // fModel dynamic-casted to AliEveTrackFitterEditor + + TGTextButton* fFit; // button to fit selection + TGTextButton* fReset; // button to reset selection + TGTextButton* fStart; // button to connect to signal + TGTextButton* fStop; // button to disconnect from signal + TGTextButton* fGraph; // button to draw graph + +public: + AliEveTrackFitterEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + virtual ~AliEveTrackFitterEditor() {} + + virtual void SetModel(TObject* obj); + + void DoStart(); + void DoFit(); + void DoReset(); + void DoStop(); + void DoGraph(); + + ClassDef(AliEveTrackFitterEditor, 0); // Editor for AliEveTrackFitter class. +}; // endclass AliEveTrackFitterEditor + +#endif diff --git a/EVE/Alieve/VSDCreator.cxx b/EVE/Alieve/AliEveVSDCreator.cxx similarity index 90% rename from EVE/Alieve/VSDCreator.cxx rename to EVE/Alieve/AliEveVSDCreator.cxx index 14e3e0382cd..c3ca35eaab5 100644 --- a/EVE/Alieve/VSDCreator.cxx +++ b/EVE/Alieve/AliEveVSDCreator.cxx @@ -1,6 +1,13 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 -#include "VSDCreator.h" +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + +#include "AliEveVSDCreator.h" #include @@ -28,17 +35,16 @@ #include #include -using namespace Alieve; using namespace std; //______________________________________________________________________ -// VSDCreator +// AliEveVSDCreator // -ClassImp(VSDCreator) +ClassImp(AliEveVSDCreator) -VSDCreator::VSDCreator(const Text_t* name, const Text_t* title) : +AliEveVSDCreator::AliEveVSDCreator(const Text_t* name, const Text_t* title) : TEveVSD(name, title), mKineType (KT_Standard), @@ -81,10 +87,10 @@ VSDCreator::VSDCreator(const Text_t* name, const Text_t* title) : /**************************************************************************/ -void VSDCreator::CreateVSD(const Text_t* data_dir, Int_t event, +void AliEveVSDCreator::CreateVSD(const Text_t* data_dir, Int_t event, const Text_t* vsd_file) { - static const TEveException eH("VSDCreator::CreateVSD "); + static const TEveException eH("AliEveVSDCreator::CreateVSD "); mDataDir = data_dir; mEvent = event; @@ -158,9 +164,9 @@ void VSDCreator::CreateVSD(const Text_t* data_dir, Int_t event, printf("%s all done.\n", eH.Data()); } -void VSDCreator::CreateTrees() +void AliEveVSDCreator::CreateTrees() { - static const TEveException eH("VSDCreator::CreateTrees "); + static const TEveException eH("AliEveVSDCreator::CreateTrees "); if(fDirectory == 0) throw(eH + "output directory not set."); @@ -188,7 +194,7 @@ void VSDCreator::CreateTrees() printf("%sConvertRecTracks.\n", eH.Data()); ConvertRecTracks(); } catch(TEveException& exc) { - Warning(exc, "skipping V0 extraction."); + Warning(exc, "skipping AliEveV0 extraction."); goto end_esd_processing; } @@ -219,9 +225,9 @@ end_esd_processing: // Kinematics /**************************************************************************/ -void VSDCreator::ConvertKinematics() +void AliEveVSDCreator::ConvertKinematics() { - static const TEveException eH("VSDCreator::ConvertKinematics "); + static const TEveException eH("AliEveVSDCreator::ConvertKinematics "); if(fTreeK != 0) throw (eH + "kinematics already converted"); @@ -242,7 +248,7 @@ void VSDCreator::ConvertKinematics() } // read track refrences - // functionality now in KineTools. + // functionality now in AliEveKineTools. /* TTree* fTreeTR = pRunLoader->TreeTR(); @@ -332,9 +338,9 @@ namespace { /**************************************************************************/ -void VSDCreator::ConvertHits() +void AliEveVSDCreator::ConvertHits() { - static const TEveException eH("VSDCreator::ConvertHits "); + static const TEveException eH("AliEveVSDCreator::ConvertHits "); if(fTreeH != 0) throw(eH + "hits already converted."); @@ -440,9 +446,9 @@ void VSDCreator::ConvertHits() // Clusters /**************************************************************************/ -void VSDCreator::ConvertClusters() +void AliEveVSDCreator::ConvertClusters() { - static const TEveException eH("VSDCreator::ConvertClusters "); + static const TEveException eH("AliEveVSDCreator::ConvertClusters "); if(fTreeC != 0) throw(eH + "clusters already converted."); @@ -462,9 +468,9 @@ void VSDCreator::ConvertClusters() /**************************************************************************/ -void VSDCreator::ConvertTPCClusters() +void AliEveVSDCreator::ConvertTPCClusters() { - static const TEveException eH("VSDCreator::ConvertTPCClusters "); + static const TEveException eH("AliEveVSDCreator::ConvertTPCClusters "); auto_ptr f ( TFile::Open(Form("%s/TPC.RecPoints.root", mDataDir.Data())) ); @@ -472,7 +478,7 @@ void VSDCreator::ConvertTPCClusters() throw(eH + "can not open 'TPC.RecPoints.root' file."); auto_ptr d - ( (TDirectory*) f->Get(Form("Event%d", mEvent)) ); + ( (TDirectory*) f->Get(Form("AliEveEventManager%d", mEvent)) ); if(!d.get()) throw(eH + Form("event directory '%d' not found.", 0)); @@ -542,9 +548,9 @@ void VSDCreator::ConvertTPCClusters() /**************************************************************************/ -void VSDCreator::ConvertITSClusters() +void AliEveVSDCreator::ConvertITSClusters() { - static const TEveException eH("VSDCreator::ConvertITSClusters "); + static const TEveException eH("AliEveVSDCreator::ConvertITSClusters "); auto_ptr f ( TFile::Open(Form("%s/ITS.RecPoints.root", mDataDir.Data())) ); @@ -552,7 +558,7 @@ void VSDCreator::ConvertITSClusters() throw(eH + "can not open 'ITS.RecPoints.root' file."); auto_ptr d - ( (TDirectory*) f->Get(Form("Event%d", mEvent)) ); + ( (TDirectory*) f->Get(Form("AliEveEventManager%d", mEvent)) ); if(!d.get()) throw(eH + Form("event directory '%d' not found.", 0)); @@ -626,9 +632,9 @@ void VSDCreator::ConvertITSClusters() // ESD /**************************************************************************/ -void VSDCreator::ConvertRecTracks() +void AliEveVSDCreator::ConvertRecTracks() { - static const TEveException eH("VSDCreator::ConvertRecTracks "); + static const TEveException eH("AliEveVSDCreator::ConvertRecTracks "); if(fTreeR != 0) throw(eH + "tracks already converted."); @@ -674,17 +680,17 @@ void VSDCreator::ConvertRecTracks() /**************************************************************************/ -void VSDCreator::ConvertV0() +void AliEveVSDCreator::ConvertV0() { - static const TEveException eH("VSDCreator::ConvertV0 "); + static const TEveException eH("AliEveVSDCreator::ConvertV0 "); if(fTreeV0 != 0) - throw(eH + "V0 already converted."); + throw(eH + "AliEveV0 already converted."); fDirectory->cd(); - fTreeV0 = new TTree("V0", "V0 points"); + fTreeV0 = new TTree("AliEveV0", "AliEveV0 points"); - fTreeV0->Branch("V0", "TEveRecV0", &fpV0, 512*1024,1); + fTreeV0->Branch("AliEveV0", "TEveRecV0", &fpV0, 512*1024,1); TFile f(Form("%s/AliESDs.root", mDataDir.Data())); if(!f.IsOpen()){ @@ -737,7 +743,7 @@ void VSDCreator::ConvertV0() fV0.fDLabel[0] = TMath::Abs(trackN->GetLabel()); fV0.fDLabel[1] = TMath::Abs(trackP->GetLabel()); - // printf("V0 convert labels(%d,%d) index(%d,%d)\n", + // printf("AliEveV0 convert labels(%d,%d) index(%d,%d)\n", // fV0.d_label[0], fV0.d_label[1], // av->GetNIndex(), av->GetPIndex()); @@ -749,9 +755,9 @@ void VSDCreator::ConvertV0() /**************************************************************************/ -void VSDCreator::ConvertKinks() +void AliEveVSDCreator::ConvertKinks() { - static const TEveException eH("VSDCreator::ConvertKinks "); + static const TEveException eH("AliEveVSDCreator::ConvertKinks "); if(fTreeKK != 0) throw(eH + "Kinks already converted."); @@ -816,9 +822,9 @@ void VSDCreator::ConvertKinks() // TEveMCRecCrossRef /**************************************************************************/ -void VSDCreator::ConvertGenInfo() +void AliEveVSDCreator::ConvertGenInfo() { - static const TEveException eH("VSDCreator::ConvertGenInfo "); + static const TEveException eH("AliEveVSDCreator::ConvertGenInfo "); if(fTreeGI != 0) throw(eH + "GI already converted."); @@ -843,7 +849,7 @@ void VSDCreator::ConvertGenInfo() } // Int_t has_v0 = fTreeV0->GetEntryNumberWithIndex(j->first); //if (has_v0 != -1) - // fGI.has_V0 = true; + // fGI.has_AliEveV0 = true; if (fTreeKK) { Int_t has_kk = fTreeKK->GetEntryNumberWithIndex(j->first); if (has_kk != -1) @@ -860,7 +866,7 @@ void VSDCreator::ConvertGenInfo() /**************************************************************************/ /**************************************************************************/ -AliTPCParam* VSDCreator::GetTpcParam(const TEveException& eh) +AliTPCParam* AliEveVSDCreator::GetTpcParam(const TEveException& eh) { auto_ptr fp( TFile::Open(Form("%s/galice.root", mDataDir.Data())) ); if(!fp.get()) @@ -873,7 +879,7 @@ AliTPCParam* VSDCreator::GetTpcParam(const TEveException& eh) -TEveMCRecCrossRef* VSDCreator::GetGeninfo(Int_t label) +TEveMCRecCrossRef* AliEveVSDCreator::GetGeninfo(Int_t label) { // printf("get_geninfo %d\n", label); TEveMCRecCrossRef* gi; diff --git a/EVE/Alieve/VSDCreator.h b/EVE/Alieve/AliEveVSDCreator.h similarity index 63% rename from EVE/Alieve/VSDCreator.h rename to EVE/Alieve/AliEveVSDCreator.h index 0cdc9261092..5ef4ea12a86 100644 --- a/EVE/Alieve/VSDCreator.h +++ b/EVE/Alieve/AliEveVSDCreator.h @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_VSDCreator_H #define ALIEVE_VSDCreator_H @@ -10,12 +17,11 @@ class AliRunLoader; #include -namespace Alieve { -class VSDCreator : public TEveVSD +class AliEveVSDCreator : public TEveVSD { - VSDCreator(const VSDCreator&); // Not implemented - VSDCreator& operator=(const VSDCreator&); // Not implemented + AliEveVSDCreator(const AliEveVSDCreator&); // Not implemented + AliEveVSDCreator& operator=(const AliEveVSDCreator&); // Not implemented public: enum KineType_e { KT_Standard, KT_ProtonProton }; @@ -37,8 +43,8 @@ protected: std::map mGenInfoMap; //! public: - VSDCreator(const Text_t* name="Alieve::VSDCreator", const Text_t* title=""); - virtual ~VSDCreator() {} + AliEveVSDCreator(const Text_t* name="AliEveVSDCreator", const Text_t* title=""); + virtual ~AliEveVSDCreator() {} void CreateVSD(const Text_t* data_dir, Int_t event, const Text_t* vsd_file); // X{Ed} @@ -68,9 +74,7 @@ public: AliRunLoader* pRunLoader; - ClassDef(VSDCreator, 1); -}; // endclass VSDCreator - -} + ClassDef(AliEveVSDCreator, 1); +}; // endclass AliEveVSDCreator #endif diff --git a/EVE/Alieve/ITSModule.h b/EVE/Alieve/ITSModule.h deleted file mode 100644 index c366c516b1d..00000000000 --- a/EVE/Alieve/ITSModule.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef ALIEVE_ITSModule_H -#define ALIEVE_ITSModule_H - -#include - -#include - -namespace Alieve { - -class ITSModule : public TEveQuadSet -{ - ITSModule(const ITSModule&); // Not implemented - ITSModule& operator=(const ITSModule&); // Not implemented - -protected: - ITSDigitsInfo* fInfo; - - Int_t fID; // Module id - Int_t fDetID; // Detector id (0~SPD, 1~SDD, 2~SSD) - - Int_t fLayer; - Int_t fLadder; - Int_t fDet; - - Float_t fDx; - Float_t fDz; - Float_t fDy; - - static Bool_t fgStaticInitDone; - -public: - ITSModule(const Text_t* n="ITSModule", const Text_t* t=0); - ITSModule(Int_t gid, ITSDigitsInfo* info); - virtual ~ITSModule(); - - static void InitStatics(ITSDigitsInfo* info); - - ITSDigitsInfo* GetDigitsInfo() const { return fInfo; } - void SetDigitsInfo(ITSDigitsInfo* info); - - Int_t GetSubDetID() const { return fDetID; } - - Int_t GetID() const { return fID; } - void SetID(Int_t gid, Bool_t tran=kTRUE); - - virtual void LoadQuads(); - void SetTrans(); - - virtual void DigitSelected(Int_t idx); - - virtual void Print(Option_t* opt="") const; - - static TEveFrameBox* fgSPDFrameBox; - static TEveFrameBox* fgSDDFrameBox; - static TEveFrameBox* fgSSDFrameBox; - - static TEveRGBAPalette* fgSPDPalette; - static TEveRGBAPalette* fgSDDPalette; - static TEveRGBAPalette* fgSSDPalette; - - ClassDef(ITSModule, 1); -}; - -} - -#endif diff --git a/EVE/Alieve/ITSModuleStepperEditor.cxx b/EVE/Alieve/ITSModuleStepperEditor.cxx deleted file mode 100644 index f4608e1671b..00000000000 --- a/EVE/Alieve/ITSModuleStepperEditor.cxx +++ /dev/null @@ -1,56 +0,0 @@ -// $Header$ - -#include "ITSModuleStepperEditor.h" -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -using namespace Alieve; - -//______________________________________________________________________ -// ITSModuleStepperEditor -// - -ClassImp(ITSModuleStepperEditor) - -ITSModuleStepperEditor::ITSModuleStepperEditor(const TGWindow *p, Int_t width, Int_t height, - UInt_t options, Pixel_t back) : - TGedFrame(p, width, height, options | kVerticalFrame, back), - - fM(0), - fStepper(0) -{ - MakeTitle("ITSModuleStepper"); - - fStepper = new TEveGridStepperSubEditor(this); - fStepper->Connect("Changed()", "Alieve::ITSModuleStepperEditor", this, "UpdateStore()"); - AddFrame(fStepper, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 2, 0, 0, 0)); -} - -ITSModuleStepperEditor::~ITSModuleStepperEditor() -{} - -/**************************************************************************/ - -void ITSModuleStepperEditor::SetModel(TObject* obj) -{ - fM = dynamic_cast(obj); - fStepper->SetModel(fM->GetStepper()); -} - -/**************************************************************************/ - -void ITSModuleStepperEditor::UpdateStore() -{ - fM->Apply(); - Update(); - gEve->Redraw3D(kTRUE); -} diff --git a/EVE/Alieve/ITSModuleStepperEditor.h b/EVE/Alieve/ITSModuleStepperEditor.h deleted file mode 100644 index 05bb764869e..00000000000 --- a/EVE/Alieve/ITSModuleStepperEditor.h +++ /dev/null @@ -1,41 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_ITSModuleStepperEditor_H -#define ALIEVE_ITSModuleStepperEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; - -class TEveGridStepperSubEditor; - -namespace Alieve { - -class ITSModuleStepper; - -class ITSModuleStepperEditor : public TGedFrame -{ -private: - ITSModuleStepperEditor(const ITSModuleStepperEditor&); // Not implemented - ITSModuleStepperEditor& operator=(const ITSModuleStepperEditor&); // Not implemented - -protected: - ITSModuleStepper* fM; // fModel dynamic-casted to ITSModuleStepperEditor - - TEveGridStepperSubEditor* fStepper; - -public: - ITSModuleStepperEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~ITSModuleStepperEditor(); - - virtual void SetModel(TObject* obj); - - void UpdateStore(); - ClassDef(ITSModuleStepperEditor, 0); // Editor for ITSModuleStepper -}; // endclass ITSModuleStepperEditor - -} - -#endif diff --git a/EVE/Alieve/ITSScaledModuleEditor.h b/EVE/Alieve/ITSScaledModuleEditor.h deleted file mode 100644 index 53972cad96f..00000000000 --- a/EVE/Alieve/ITSScaledModuleEditor.h +++ /dev/null @@ -1,58 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_ITSScaledModuleEditor_H -#define ALIEVE_ITSScaledModuleEditor_H - -#include -#include - -class TGNumberEntry; -class TGColorSelect; -class TGComboBox; - -class TEveGValuator; -class TEveGDoubleValuator; -class TEveRGBAPalette; - -namespace Alieve { - -class DigitScaleInfo; -class ITSScaledModule; -class AliITSsegmentation; - -/**************************************************************************/ - -class ITSScaledModuleEditor : public TGedFrame -{ -private: - ITSScaledModuleEditor(const ITSScaledModuleEditor&); // Not implemented - ITSScaledModuleEditor& operator=(const ITSScaledModuleEditor&); // Not implemented - - void CreateInfoFrame(); - -protected: - TGVerticalFrame* fInfoFrame; - - ITSScaledModule* fModule; // fModel dynamic-casted to ITSScaledModuleEditor - - TGNumberEntry* fScale; - TGComboBox* fStatistic; - - TGLabel* fInfoLabel0; - TGLabel* fInfoLabel1; - -public: - ITSScaledModuleEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~ITSScaledModuleEditor(); - - virtual void SetModel(TObject* obj); - - void DoScale(); - void DoStatType(Int_t t); - - ClassDef(ITSScaledModuleEditor, 0); // Editor for ITSScaledModule -}; // endclass ITSScaledModuleEditor - -} - -#endif diff --git a/EVE/Alieve/JetPlaneGL.h b/EVE/Alieve/JetPlaneGL.h deleted file mode 100644 index 2ba3a81c86f..00000000000 --- a/EVE/Alieve/JetPlaneGL.h +++ /dev/null @@ -1,42 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_JetPlaneGL_H -#define ALIEVE_JetPlaneGL_H - -#include - -class TGLViewer; -class TGLScene; - -namespace Alieve { - -class JetPlane; - -class JetPlaneGL : public TGLObject -{ -private: - JetPlaneGL(const JetPlaneGL&); // Not implemented - JetPlaneGL& operator=(const JetPlaneGL&); // Not implemented - -protected: - JetPlane* fM; // fModel dynamic-casted to JetPlaneGL - - virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; - -public: - JetPlaneGL(); - virtual ~JetPlaneGL(); - - virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); - virtual void SetBBox(); - - // To support two-level selection - virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } - virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec); - - ClassDef(JetPlaneGL, 0); -}; // endclass JetPlaneGL - -} - -#endif diff --git a/EVE/Alieve/KineTools.h b/EVE/Alieve/KineTools.h deleted file mode 100644 index f76c86dd0b0..00000000000 --- a/EVE/Alieve/KineTools.h +++ /dev/null @@ -1,41 +0,0 @@ -// $Header$ - -// Tools for import of kinematics. -// Preliminary/minimal solution. - -#ifndef ALIEVE_KineTools_H -#define ALIEVE_KineTools_H - -#include -#include - -class TTree; -class AliStack; - -class TEveTrackList; - -namespace Alieve { - -class KineTools -{ -private: - KineTools(const KineTools&); // Not implemented - KineTools& operator=(const KineTools&); // Not implemented - -protected: - // data from TreeK -public: - KineTools(); - virtual ~KineTools(){} - - // data from TreeTR - void SetDaughterPathMarks(TEveElement* cont, AliStack* stack, Bool_t recurse=kFALSE); - void SetTrackReferences (TEveElement* cont, TTree* treeTR=0, Bool_t recurse=kFALSE); - void SortPathMarks (TEveElement* cont, Bool_t recurse=kFALSE); - - ClassDef(KineTools, 1); -}; // endclass KineTools - -} // end namespace Alieve - -#endif diff --git a/EVE/Alieve/LinkDef.h b/EVE/Alieve/LinkDef.h index 27bcd9f0437..8a063bda50c 100644 --- a/EVE/Alieve/LinkDef.h +++ b/EVE/Alieve/LinkDef.h @@ -1,130 +1,139 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #pragma link off all functions; #pragma link off all globals; #pragma link off all classes; -#pragma link C++ namespace Alieve; //================================ // base/ //================================ -// Event -#pragma link C++ class Alieve::Event+; -#pragma link C++ global Alieve::gEvent; +// AliEveEventManager +#pragma link C++ class AliEveEventManager+; +#pragma link C++ global gEvent; -#pragma link C++ class Alieve::KineTools+; +#pragma link C++ class AliEveKineTools+; -#pragma link C++ class Alieve::VSDCreator+; +#pragma link C++ class AliEveVSDCreator+; -#pragma link C++ class AliEVEHOMERManager+; -#pragma link C++ class AliEVEHOMERManagerEditor+; -#pragma link C++ class AliEVEHOMERSource+; -#pragma link C++ class AliEVEHOMERSourceList+; +// Fit +#pragma link C++ class AliEveTrackFitter+; +#pragma link C++ class AliEveTrackFitterEditor+; -//================================ -// compound classes -//================================ +// AliEveJetPlane +#pragma link C++ class AliEveJetPlane+; +#pragma link C++ class AliEveJetPlaneGL+; +#pragma link C++ class AliEveJetPlaneEditor+; +#pragma link C++ class AliEveJetPlaneEditor::StaticDataWindow+; // Removed. Messy code, tons of violations and incompatible with TEve // classes. Author Ludovic Gaudichet left ALICE. // Should be thoroughly revised. +// +// AliEveCascade +//#pragma link C++ class AliEveCascade+; +//#pragma link C++ class CascadeList+; +//#pragma link C++ class CascadeListEditor+; +// +// AliEveV0 +//#pragma link C++ class AliEveV0+; +//#pragma link C++ class V0List+; +//#pragma link C++ class V0ListEditor+; -// Cascade -//#pragma link C++ class Alieve::Cascade+; -//#pragma link C++ class Alieve::CascadeList+; -//#pragma link C++ class Alieve::CascadeListEditor+; - -// V0 -//#pragma link C++ class Alieve::V0+; -//#pragma link C++ class Alieve::V0List+; -//#pragma link C++ class Alieve::V0ListEditor+; - -// Fit -#pragma link C++ class Alieve::TrackFitter+; -#pragma link C++ class Alieve::TrackFitterEditor+; //================================ // detectors/ //================================ // ITS -#pragma link C++ class Alieve::ITSModuleSelection+; -#pragma link C++ class Alieve::ITSDigitsInfo+; -#pragma link C++ class Alieve::ITSModule+; -#pragma link C++ class Alieve::DigitScaleInfo+; -#pragma link C++ class Alieve::ITSScaledModule+; -#pragma link C++ class Alieve::ITSScaledModuleEditor+; -#pragma link C++ class Alieve::ITSModuleStepper+; -#pragma link C++ class Alieve::ITSModuleStepperEditor; +#pragma link C++ class AliEveITSModuleSelection+; +#pragma link C++ class AliEveITSDigitsInfo+; +#pragma link C++ class AliEveITSModule+; +#pragma link C++ class AliEveDigitScaleInfo+; +#pragma link C++ class AliEveITSScaledModule+; +#pragma link C++ class AliEveITSScaledModuleEditor+; +#pragma link C++ class AliEveITSModuleStepper+; +#pragma link C++ class AliEveITSModuleStepperEditor; // MUON -#pragma link C++ class Alieve::MUONData+; -#pragma link C++ class Alieve::MUONChamber+; -#pragma link C++ class Alieve::MUONChamberData+; -#pragma link C++ class Alieve::MUONChamberEditor+; -#pragma link C++ class Alieve::MUONChamberGL+; -#pragma link C++ class Alieve::MUONTrack+; +#pragma link C++ class AliEveMUONData+; +#pragma link C++ class AliEveMUONChamber+; +#pragma link C++ class AliEveMUONChamberData+; +#pragma link C++ class AliEveMUONChamberEditor+; +#pragma link C++ class AliEveMUONChamberGL+; +#pragma link C++ class AliEveMUONTrack+; // PMD -#pragma link C++ class Alieve::PMDModule+; -#pragma link C++ class Alieve::PMDModuleEditor+; +#pragma link C++ class AliEvePMDModule+; +#pragma link C++ class AliEvePMDModuleEditor+; // T0 -#pragma link C++ class Alieve::T0Module+; +#pragma link C++ class AliEveT0Module+; // TPC -#pragma link C++ class Alieve::TPCData+; +#pragma link C++ class AliEveTPCData+; -#pragma link C++ class Alieve::TPCSectorData+; -#pragma link C++ class Alieve::TPCSectorData::PadData; -#pragma link C++ class Alieve::TPCSectorData::PadIterator; -#pragma link C++ class Alieve::TPCSectorData::RowIterator; -#pragma link C++ class Alieve::TPCSectorData::SegmentInfo; +#pragma link C++ class AliEveTPCSectorData+; +#pragma link C++ class AliEveTPCSectorData::PadData; +#pragma link C++ class AliEveTPCSectorData::PadIterator; +#pragma link C++ class AliEveTPCSectorData::RowIterator; +#pragma link C++ class AliEveTPCSectorData::SegmentInfo; -#pragma link C++ class Alieve::TPCSectorData::PadRowHack; +#pragma link C++ class AliEveTPCSectorData::PadRowHack; -#pragma link C++ class Alieve::TPCSectorViz+; -#pragma link C++ class Alieve::TPCSectorVizEditor+; -#pragma link C++ class Alieve::TPCSector2D+; -#pragma link C++ class Alieve::TPCSector2DEditor+; -#pragma link C++ class Alieve::TPCSector2DGL+; -#pragma link C++ class Alieve::TPCSector3D+; -#pragma link C++ class Alieve::TPCSector3DEditor+; -#pragma link C++ class Alieve::TPCSector3DGL+; +#pragma link C++ class AliEveTPCSectorViz+; +#pragma link C++ class AliEveTPCSectorVizEditor+; +#pragma link C++ class AliEveTPCSector2D+; +#pragma link C++ class AliEveTPCSector2DEditor+; +#pragma link C++ class AliEveTPCSector2DGL+; +#pragma link C++ class AliEveTPCSector3D+; +#pragma link C++ class AliEveTPCSector3DEditor+; +#pragma link C++ class AliEveTPCSector3DGL+; -#pragma link C++ class Alieve::TPCLoader+; -#pragma link C++ class Alieve::TPCLoaderEditor+; +#pragma link C++ class AliEveTPCLoader+; +#pragma link C++ class AliEveTPCLoaderEditor+; // TRD -#pragma link C++ class Alieve::TRDLoaderManager+; -#pragma link C++ class Alieve::TRDLoaderManagerEditor+; -#pragma link C++ class Alieve::TRDLoader+; -#pragma link C++ class Alieve::TRDLoaderEditor+; -#pragma link C++ class Alieve::TRDLoaderSim+; -#pragma link C++ class Alieve::TRDLoaderSimEditor+; -#pragma link C++ class Alieve::TRDLoaderRaw+; -//#pragma link C++ class Alieve::TRDLoaderRawEditor+; -#pragma link C++ class Alieve::TRDModule+; -#pragma link C++ class Alieve::TRDChamber+; -#pragma link C++ class Alieve::TRDNode+; -#pragma link C++ class Alieve::TRDModuleEditor+; -#pragma link C++ class Alieve::TRDDigits+; -#pragma link C++ class Alieve::TRDDigitsEditor+; -#pragma link C++ class Alieve::TRDHits+; -#pragma link C++ class Alieve::TRDHitsEditor+; -#pragma link C++ class Alieve::TRDClusters+; +#pragma link C++ class AliEveTRDLoaderManager+; +#pragma link C++ class AliEveTRDLoaderManagerEditor+; +#pragma link C++ class AliEveTRDLoader+; +#pragma link C++ class AliEveTRDLoaderEditor+; +#pragma link C++ class AliEveTRDLoaderSim+; +#pragma link C++ class AliEveTRDLoaderSimEditor+; +#pragma link C++ class AliEveTRDLoaderRaw+; +//#pragma link C++ class TRDLoaderRawEditor+; +#pragma link C++ class AliEveTRDModule+; +#pragma link C++ class AliEveTRDChamber+; +#pragma link C++ class AliEveTRDNode+; +#pragma link C++ class AliEveTRDModuleEditor+; +#pragma link C++ class AliEveTRDDigits+; +#pragma link C++ class AliEveTRDDigitsEditor+; +#pragma link C++ class AliEveTRDHits+; +#pragma link C++ class AliEveTRDHitsEditor+; +#pragma link C++ class AliEveTRDClusters+; // TOF -#pragma link C++ class Alieve::TOFDigitsInfo+; -#pragma link C++ class Alieve::TOFSector+; -#pragma link C++ class Alieve::TOFStrip+; - -#pragma link C++ class Alieve::TOFDigitsInfoEditor+; -#pragma link C++ class Alieve::TOFSectorEditor+; -#pragma link C++ class Alieve::TOFStripEditor+; - -// JetPlane -#pragma link C++ class Alieve::JetPlane+; -#pragma link C++ class Alieve::JetPlaneGL+; -#pragma link C++ class Alieve::JetPlaneEditor+; -#pragma link C++ class Alieve::JetPlaneEditor::StaticDataWindow+; +#pragma link C++ class AliEveTOFDigitsInfo+; +#pragma link C++ class AliEveTOFSector+; +#pragma link C++ class AliEveTOFStrip+; + +#pragma link C++ class AliEveTOFDigitsInfoEditor+; +#pragma link C++ class AliEveTOFSectorEditor+; +#pragma link C++ class AliEveTOFStripEditor+; + + +//================================ +// HLT/ +//================================ + +#pragma link C++ class AliEveHOMERManager+; +#pragma link C++ class AliEveHOMERManagerEditor+; +#pragma link C++ class AliEveHOMERSource+; +#pragma link C++ class AliEveHOMERSourceList+; diff --git a/EVE/Alieve/MUONChamberEditor.h b/EVE/Alieve/MUONChamberEditor.h deleted file mode 100644 index 2273183e33b..00000000000 --- a/EVE/Alieve/MUONChamberEditor.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef ALIEVE_MUONChamberEditor_H -#define ALIEVE_MUONChamberEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; -class TGDoubleHSlider; -class TGHSlider; - -class TEveGValuator; - -namespace Alieve { - -class MUONChamber; - -class MUONChamberEditor : public TGedFrame -{ - - MUONChamberEditor(const MUONChamberEditor&); // Not implemented - MUONChamberEditor& operator=(const MUONChamberEditor&); // Not implemented - - protected: - - MUONChamber* fM; // fModel dynamic-casted to MUONChamberEditor - - TEveGValuator *fThreshold; // digit ADC min - TEveGValuator *fMaxVal; // digit ADC max - TEveGValuator *fClusterSize; // cluster point size - TEveGValuator *fHitSize; // hit point size - - public: - - MUONChamberEditor(const TGWindow* p = 0, - Int_t width = 170, Int_t height = 30, - UInt_t options = kChildFrame, - Pixel_t back = GetDefaultFrameBackground()); - - virtual ~MUONChamberEditor(); - - virtual void SetModel(TObject* obj); - - void DoThreshold(); - void DoMaxVal(); - void DoClusterSize(); - void DoHitSize(); - - ClassDef(MUONChamberEditor, 0); // Editor for MUONChamber - -}; - -} - -#endif diff --git a/EVE/Alieve/MUONChamberGL.h b/EVE/Alieve/MUONChamberGL.h deleted file mode 100644 index 4aa384b812c..00000000000 --- a/EVE/Alieve/MUONChamberGL.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef ALIEVE_MUONChamberGL_H -#define ALIEVE_MUONChamberGL_H - -#include -#include - -class TEveQuadSetGL; - -namespace Alieve { - -class MUONChamber; - -class MUONChamberGL : public TGLObject -{ - - MUONChamberGL(const MUONChamberGL&); // Not implemented - MUONChamberGL& operator=(const MUONChamberGL&); // Not implemented - - protected: - - virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; - void DrawChamberFrame() const; - void DrawQuads(TGLRnrCtx& rnrCtx) const; - void DrawPoints() const; - - MUONChamber* fChamber; // fModel dynamic-casted to MUONChamberGL - TEveQuadSetGL fQS1; - TEveQuadSetGL fQS2; - - mutable UInt_t fRTS; // render time stamp - - public: - - MUONChamberGL(); - virtual ~MUONChamberGL(); - - virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); - virtual void SetBBox(); - - ClassDef(MUONChamberGL,1); // the GL drawing class of one chamber - -}; - -} - - -#endif diff --git a/EVE/Alieve/MUONData.h b/EVE/Alieve/MUONData.h index 74d818b8ffd..7afeae4a33a 100644 --- a/EVE/Alieve/MUONData.h +++ b/EVE/Alieve/MUONData.h @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef ALIEVE_MUONData_H #define ALIEVE_MUONData_H @@ -12,16 +20,15 @@ class TString; class AliRawReader; -namespace Alieve { -class MUONChamberData; +class AliEveMUONChamberData; -class MUONData : public TObject, public TEveRefCnt +class AliEveMUONData : public TObject, public TEveRefCnt { protected: - std::vector fChambers; // vector of 14 chambers + std::vector fChambers; // vector of 14 chambers static AliRawReader* fgRawReader; // raw reader @@ -30,11 +37,11 @@ class MUONData : public TObject, public TEveRefCnt public: - MUONData(); - virtual ~MUONData(); + AliEveMUONData(); + virtual ~AliEveMUONData(); - MUONData(const MUONData&); - MUONData& operator=(const MUONData&); + AliEveMUONData(const AliEveMUONData&); + AliEveMUONData& operator=(const AliEveMUONData&); void Reset(); @@ -52,12 +59,10 @@ class MUONData : public TObject, public TEveRefCnt Int_t GetNTrackList() { return fNTrackList; } Int_t GetTrack(Int_t index); - MUONChamberData* GetChamberData(Int_t chamber); + AliEveMUONChamberData* GetChamberData(Int_t chamber); - ClassDef(MUONData,1); // Manages MUON data for one event + ClassDef(AliEveMUONData,1); // Manages MUON data for one event }; -} - #endif diff --git a/EVE/Alieve/PMDModuleEditor.h b/EVE/Alieve/PMDModuleEditor.h deleted file mode 100644 index 7a72f635ce6..00000000000 --- a/EVE/Alieve/PMDModuleEditor.h +++ /dev/null @@ -1,54 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_PMDModuleEditor_H -#define ALIEVE_PMDModuleEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; - -namespace Alieve { - -class PMDModule; - -class PMDModuleEditor : public TGedFrame -{ -private: - PMDModuleEditor(const PMDModuleEditor&); // Not implemented - PMDModuleEditor& operator=(const PMDModuleEditor&); // Not implemented - - void CreateInfoFrame(); - -protected: - PMDModule* fM; // fModel dynamic-casted to PMDModuleEditor - - TGVerticalFrame* fInfoFrame; - - TGLabel* fInfoLabel0; - TGLabel* fInfoLabel1; - TGLabel* fInfoLabel2; - TGLabel* fInfoLabel3; - TGLabel* fInfoLabel4; - TGLabel* fInfoLabel5; - -public: - PMDModuleEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~PMDModuleEditor(); - - virtual void SetModel(TObject* obj); - void DisplayHistos(); - // void PrintADC(); - - - - // Declare callback/slot methods - // void DoXYZZ(); - - ClassDef(PMDModuleEditor, 0); // Editor for PMDModule -}; // endclass PMDModuleEditor - -} - -#endif diff --git a/EVE/Alieve/TOFDigitsInfoEditor.cxx b/EVE/Alieve/TOFDigitsInfoEditor.cxx deleted file mode 100644 index 462897fb681..00000000000 --- a/EVE/Alieve/TOFDigitsInfoEditor.cxx +++ /dev/null @@ -1,57 +0,0 @@ -// $Header$ - -#include "TOFDigitsInfoEditor.h" -#include - -#include -#include - -#include -#include -#include -#include -#include -using namespace Alieve; - -//______________________________________________________________________ -// TOFDigitsInfoEditor -// - -ClassImp(TOFDigitsInfoEditor) - -TOFDigitsInfoEditor::TOFDigitsInfoEditor(const TGWindow *p, Int_t width, Int_t height, - UInt_t options, Pixel_t back) : - TGedFrame(p, width, height, options | kVerticalFrame, back), - fM(0) - // Initialize widget pointers to 0 -{ - MakeTitle("TOFDigitsInfo"); - - // Create widgets - // fXYZZ = new TGSomeWidget(this, ...); - // AddFrame(fXYZZ, new TGLayoutHints(...)); - // fXYZZ->Connect("SignalName()", "Alieve::TOFDigitsInfoEditor", this, "DoXYZZ()"); -} - -TOFDigitsInfoEditor::~TOFDigitsInfoEditor() -{} - -/**************************************************************************/ - -void TOFDigitsInfoEditor::SetModel(TObject* obj) -{ - fM = dynamic_cast(obj); - - // Set values of widgets - // fXYZZ->SetValue(fM->GetXYZZ()); -} - -/**************************************************************************/ - -// Implements callback/slot methods - -// void TOFDigitsInfoEditor::DoXYZZ() -// { -// fM->SetXYZZ(fXYZZ->GetValue()); -// Update(); -// } diff --git a/EVE/Alieve/TOFDigitsInfoEditor.h b/EVE/Alieve/TOFDigitsInfoEditor.h deleted file mode 100644 index 1e953285a68..00000000000 --- a/EVE/Alieve/TOFDigitsInfoEditor.h +++ /dev/null @@ -1,42 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TOFDigitsInfoEditor_H -#define ALIEVE_TOFDigitsInfoEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; - -namespace Alieve { - -class TOFDigitsInfo; - -class TOFDigitsInfoEditor : public TGedFrame -{ -private: - TOFDigitsInfoEditor(const TOFDigitsInfoEditor&); // Not implemented - TOFDigitsInfoEditor& operator=(const TOFDigitsInfoEditor&); // Not implemented - -protected: - TOFDigitsInfo* fM; // fModel dynamic-casted to TOFDigitsInfoEditor - - // Declare widgets - // TGSomeWidget* fXYZZ; - -public: - TOFDigitsInfoEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~TOFDigitsInfoEditor(); - - virtual void SetModel(TObject* obj); - - // Declare callback/slot methods - // void DoXYZZ(); - - ClassDef(TOFDigitsInfoEditor, 0); // Editor for TOFDigitsInfo -}; // endclass TOFDigitsInfoEditor - -} - -#endif diff --git a/EVE/Alieve/TOFSectorEditor.h b/EVE/Alieve/TOFSectorEditor.h deleted file mode 100644 index 618e8911ca3..00000000000 --- a/EVE/Alieve/TOFSectorEditor.h +++ /dev/null @@ -1,77 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TOFSectorEditor_H -#define ALIEVE_TOFSectorEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; -class TGDoubleHSlider; - -class TGHSlider; - -class TEveGValuator; -class TEveGDoubleValuator; -class TEveTransSubEditor; - -namespace Alieve { - - class TOFSector; - - class TOFSectorEditor : public TGedFrame - { - //private: - TOFSectorEditor(const TOFSectorEditor&); // Not implemented - TOFSectorEditor& operator=(const TOFSectorEditor&); // Not implemented - - protected: - TOFSector* fM; // fModel dynamic-casted to TOFSectorEditor - - TEveGValuator* fSectorID; - - TGCheckButton* fAutoTrans; - - TGCheckButton** fPlate; - - TGCheckButton* fPlate0; - TGCheckButton* fPlate1; - TGCheckButton* fPlate2; - TGCheckButton* fPlate3; - TGCheckButton* fPlate4; - - TEveGValuator* fThreshold; - TEveGValuator* fMaxVal; - - - // Declare widgets - // TGSomeWidget* fXYZZ; - - public: - TOFSectorEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~TOFSectorEditor(); - - virtual void SetModel(TObject* obj); - void DoSectorID(); - void DoAutoTrans(); - void DoPlate0(); - void DoPlate1(); - void DoPlate2(); - void DoPlate3(); - void DoPlate4(); - - void DoPlate(Int_t nPlate); - void DoThreshold(); - void DoMaxVal(); - - - // Declare callback/slot methods - // void DoXYZZ(); - - ClassDef(TOFSectorEditor, 0); // Editor for TOFSector - }; // endclass TOFSectorEditor - -} - -#endif diff --git a/EVE/Alieve/TOFStrip.h b/EVE/Alieve/TOFStrip.h deleted file mode 100644 index 3f134b8fa7f..00000000000 --- a/EVE/Alieve/TOFStrip.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef ALIEVE_TOFStrip_H -#define ALIEVE_TOFStrip_H - -#include -#include - -#include -#include - -#include -#include - -#include - -namespace Alieve { - -class TOFStrip : public TEveQuadSet -{ - TOFStrip(const TOFStrip&); // Not implemented - TOFStrip& operator=(const TOFStrip&); // Not implemented - -private: - void LoadQuads(); - -protected: - virtual void InitModule(); - virtual void SetTrans(); - - AliTOFGeometry* fTOFgeometry; - - TClonesArray *fTOFarray; - - Int_t fSector; - Int_t fPlate; - Int_t fStrip; - - Float_t fDx; - Float_t fDz; - - TGeoManager *fGeoManager; - -public: - TOFStrip(const Text_t* n="TOFStrip", const Text_t* t=0); - TOFStrip(TGeoManager *localGeoManager, - Int_t nSector, Int_t nPlate, Int_t nStrip); - - TOFStrip(TGeoManager *localGeoManager, - Int_t nSector, Int_t nPlate, Int_t nStrip, - TClonesArray *tofArray); - virtual ~TOFStrip(); - - static Bool_t fgStaticInitDone; - static void InitStatics(); - - static TEveFrameBox* fgTOFstripFrameBox; - - static TEveRGBAPalette* fgTOFstripPalette; - - ClassDef(TOFStrip, 1); -}; -} -#endif diff --git a/EVE/Alieve/TOFStripEditor.cxx b/EVE/Alieve/TOFStripEditor.cxx deleted file mode 100644 index 3e8d805aa7d..00000000000 --- a/EVE/Alieve/TOFStripEditor.cxx +++ /dev/null @@ -1,57 +0,0 @@ -// $Header$ - -#include "TOFStripEditor.h" -#include - -#include -#include - -#include -#include -#include -#include -#include -using namespace Alieve; - -//______________________________________________________________________ -// TOFStripEditor -// - -ClassImp(TOFStripEditor) - -TOFStripEditor::TOFStripEditor(const TGWindow *p, Int_t width, Int_t height, - UInt_t options, Pixel_t back) : - TGedFrame(p, width, height, options | kVerticalFrame, back), - fM(0) - // Initialize widget pointers to 0 -{ - MakeTitle("TOFStrip"); - - // Create widgets - // fXYZZ = new TGSomeWidget(this, ...); - // AddFrame(fXYZZ, new TGLayoutHints(...)); - // fXYZZ->Connect("SignalName()", "Alieve::TOFStripEditor", this, "DoXYZZ()"); -} - -TOFStripEditor::~TOFStripEditor() -{} - -/**************************************************************************/ - -void TOFStripEditor::SetModel(TObject* obj) -{ - fM = dynamic_cast(obj); - - // Set values of widgets - // fXYZZ->SetValue(fM->GetXYZZ()); -} - -/**************************************************************************/ - -// Implements callback/slot methods - -// void TOFStripEditor::DoXYZZ() -// { -// fM->SetXYZZ(fXYZZ->GetValue()); -// Update(); -// } diff --git a/EVE/Alieve/TOFStripEditor.h b/EVE/Alieve/TOFStripEditor.h deleted file mode 100644 index af9f3d3b07f..00000000000 --- a/EVE/Alieve/TOFStripEditor.h +++ /dev/null @@ -1,42 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TOFStripEditor_H -#define ALIEVE_TOFStripEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; - -namespace Alieve { - -class TOFStrip; - -class TOFStripEditor : public TGedFrame -{ -private: - TOFStripEditor(const TOFStripEditor&); // Not implemented - TOFStripEditor& operator=(const TOFStripEditor&); // Not implemented - -protected: - TOFStrip* fM; // fModel dynamic-casted to TOFStripEditor - - // Declare widgets - // TGSomeWidget* fXYZZ; - -public: - TOFStripEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~TOFStripEditor(); - - virtual void SetModel(TObject* obj); - - // Declare callback/slot methods - // void DoXYZZ(); - - ClassDef(TOFStripEditor, 0); // Editor for TOFStrip -}; // endclass TOFStripEditor - -} - -#endif diff --git a/EVE/Alieve/TPCSector2D.h b/EVE/Alieve/TPCSector2D.h deleted file mode 100644 index 5d8817c0445..00000000000 --- a/EVE/Alieve/TPCSector2D.h +++ /dev/null @@ -1,50 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSector2D_H -#define ALIEVE_TPCSector2D_H - -#include "TPCSectorViz.h" - - -namespace Alieve { - -class TPCSector2DEditor; -class TPCSector2DGL; - -class TPCSector2D : public TPCSectorViz -{ - friend class TPCSector2DGL; - friend class TPCSector2DEditor; - -protected: - Bool_t fShowMax; - Bool_t fAverage; - - Bool_t fUseTexture; - Bool_t fPickEmpty; - Int_t fPickMode; // 0-print, 1-1dhisto of pad, 2-2dhisto of padrow - -public: - TPCSector2D(const Text_t* n="TPCSector2D", const Text_t* t=0); - virtual ~TPCSector2D(); - - void SetShowMax(Bool_t sm) { fShowMax = sm; IncRTS(); } - void SetAverage(Bool_t avg) { fAverage = avg; IncRTS(); } - - Int_t GetPickMode() const { return fPickMode; } - void SetPickMode(Int_t mode) { fPickMode = mode; } - - void MakeSector3D(); // *MENU* - - virtual void ComputeBBox(); - - virtual void PadSelected(Int_t row, Int_t pad); - - virtual void Paint(Option_t* option=""); - - ClassDef(TPCSector2D, 1); // Visualization of TPC raw-data in 2D -}; // endclass TPCSector2D - -} - -#endif diff --git a/EVE/Alieve/TPCSector2DEditor.h b/EVE/Alieve/TPCSector2DEditor.h deleted file mode 100644 index baf658dff02..00000000000 --- a/EVE/Alieve/TPCSector2DEditor.h +++ /dev/null @@ -1,51 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSector2DEditor_H -#define ALIEVE_TPCSector2DEditor_H - -#include - -class TGCheckButton; -class TGComboBox; - - -namespace Alieve { - -class TPCSector2D; - -class TPCSector2DEditor : public TGedFrame -{ - TPCSector2DEditor(const TPCSector2DEditor&); // Not implemented - TPCSector2DEditor& operator=(const TPCSector2DEditor&); // Not implemented - -protected: - TPCSector2D* fM; // fModel dynamic-casted to TPCSector2DEditor - - TGCheckButton* fShowMax; - TGCheckButton* fAverage; - - TGCheckButton* fUseTexture; - TGCheckButton* fPickEmpty; - TGComboBox* fPickMode; - -public: - TPCSector2DEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, - UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - ~TPCSector2DEditor(); - - virtual void SetModel(TObject* obj); - - void DoShowMax(); - void DoAverage(); - void SetupAverage(); - - void DoUseTexture(); - void DoPickEmpty(); - void DoPickMode(Int_t mode); - - ClassDef(TPCSector2DEditor, 0); // Editor for TPCSector2D -}; // endclass TPCSector2DEditor - -} - -#endif diff --git a/EVE/Alieve/TPCSector2DGL.h b/EVE/Alieve/TPCSector2DGL.h deleted file mode 100644 index ec6938c8f87..00000000000 --- a/EVE/Alieve/TPCSector2DGL.h +++ /dev/null @@ -1,72 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSector2DGL_H -#define ALIEVE_TPCSector2DGL_H - -#include - -#include -#include - -class TGLViewer; -class TGLScene; - -namespace Alieve { - -class TPCSector2DGL : public TGLObject -{ - TPCSector2DGL(const TPCSector2DGL&); // Not implemented - TPCSector2DGL& operator=(const TPCSector2DGL&); // Not implemented - -protected: - virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; - - void LoadPadrow(TPCSectorData::RowIterator& iter, Int_t row, Int_t off) const; - void CreateTexture() const; - - void DisplayTexture(const TPCSectorData::SegmentInfo& seg, - Int_t startCol, Int_t startRow) const; - void DisplayQuads(const TPCSectorData::SegmentInfo& seg, - Int_t startCol, Int_t startRow) const; - void DisplayNamedQuads(const TPCSectorData::SegmentInfo& seg, - Int_t startCol, Int_t startRow) const; - void DisplayFrame() const; - - UChar_t* GetRowCol(Int_t row, Int_t col) const; - - TPCSector2D* fSector; - mutable TPCSectorData* fSectorData; - - mutable UChar_t* fImage; - mutable UInt_t fTexture; - mutable UInt_t fRTS; - -public: - TPCSector2DGL(); - virtual ~TPCSector2DGL(); - - virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); - virtual void SetBBox(); - virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } - - virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec); - - static void TraceStepsUp (const TPCSectorData::SegmentInfo& s); - static void TraceStepsDown(const TPCSectorData::SegmentInfo& s); - - static const Int_t fgkTextureWidth; - static const Int_t fgkTextureHeight; - static const Int_t fgkTextureByteSize; - -}; // endclass TPCSector2D_GL_Rnr - - -inline UChar_t* TPCSector2DGL::GetRowCol(Int_t row, Int_t col) const -{ - return fImage + 4*(row*fgkTextureWidth + col); -} - - -} - -#endif diff --git a/EVE/Alieve/TPCSector3D.h b/EVE/Alieve/TPCSector3D.h deleted file mode 100644 index d6532062c51..00000000000 --- a/EVE/Alieve/TPCSector3D.h +++ /dev/null @@ -1,56 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSector3D_H -#define ALIEVE_TPCSector3D_H - -#include -#include - -#include -#include - - -namespace Alieve { - -class TPCSector3D : public TPCSectorViz -{ - friend class TPCSector3DEditor; - friend class TPCSector3DGL; - -protected: - void LoadPadrow(TPCSectorData::RowIterator& iter, - Float_t sx, Float_t sy, Float_t pw, Float_t ph); - void UpdateBoxes(); - void SetupPointSetArray(); - - TEveBoxSet fBoxSet; - TEvePointSetArray fPointSetArray; - Float_t fPointFrac; - Float_t fPointSize; - Bool_t fPointSetOn; - Int_t fPointSetMaxVal; - - Float_t fDriftVel; - Float_t fZStep; - -public: - TPCSector3D(const Text_t* n="TPCSector3D", const Text_t* t=0); - virtual ~TPCSector3D(); - - void SetPointFrac(Float_t f) { fPointFrac = f; IncRTS(); } - void SetPointSize(Float_t s) { fPointSize = s; } - - void SetDriftVel(Float_t v) { fDriftVel = v; IncRTS(); } - void SetZStep(Float_t step) { fZStep = step; IncRTS(); } - - virtual void SetRnrFrame(Bool_t rf); - - virtual void ComputeBBox(); - virtual void Paint(Option_t* option=""); - - ClassDef(TPCSector3D, 1); -}; // endclass TPCSector3D - -} - -#endif diff --git a/EVE/Alieve/TPCSector3DEditor.h b/EVE/Alieve/TPCSector3DEditor.h deleted file mode 100644 index 71bc9f5f325..00000000000 --- a/EVE/Alieve/TPCSector3DEditor.h +++ /dev/null @@ -1,51 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSector3DEditor_H -#define ALIEVE_TPCSector3DEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; - -class TEveGValuator; -class TEveGDoubleValuator; - -namespace Alieve { - -class TPCSector3D; - -class TPCSector3DEditor : public TGedFrame -{ - TPCSector3DEditor(const TPCSector3DEditor&); // Not implemented - TPCSector3DEditor& operator=(const TPCSector3DEditor&); // Not implemented - -protected: - TPCSector3D* fM; // fModel dynamic-casted to TPCSector3DEditor - - TGCheckButton* fRnrFrame; - TEveGValuator* fDriftVel; - - TEveGValuator* fPointFrac; - TEveGValuator* fPointSize; - -public: - TPCSector3DEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, - UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~TPCSector3DEditor(); - - virtual void SetModel(TObject* obj); - - void DoRnrFrame(); - void DoDriftVel(); - - void DoPointFrac(); - void DoPointSize(); - - ClassDef(TPCSector3DEditor, 0); // Editor for TPCSector3D -}; // endclass TPCSector3DEditor - -} - -#endif diff --git a/EVE/Alieve/TPCSector3DGL.h b/EVE/Alieve/TPCSector3DGL.h deleted file mode 100644 index 5042d8428c4..00000000000 --- a/EVE/Alieve/TPCSector3DGL.h +++ /dev/null @@ -1,51 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSector3DGL_H -#define ALIEVE_TPCSector3DGL_H - -#include - -#include - -class TEveBoxSetGL; - -namespace Alieve { - -class TPCSector3D; - -class TPCSector3DGL : public TGLObject -{ - TPCSector3DGL(const TPCSector3DGL&); // Not implemented - TPCSector3DGL& operator=(const TPCSector3DGL&); // Not implemented - -protected: - TPCSector3D* fSector; // fModel dynamic-casted to TPCSector3DGL - TEveBoxSetGL* fBoxRnr; - - mutable UInt_t fRTS; - - virtual void DirectDraw(TGLRnrCtx & rnrCtx) const; - -public: - TPCSector3DGL(); - virtual ~TPCSector3DGL(); - - virtual Bool_t ShouldDLCache(const TGLRnrCtx&) const { return kFALSE; } - virtual ELODAxes SupportedLODAxes() const { return kLODAxesAll; } - virtual Short_t QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) const; - - virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); - virtual void SetBBox(); - - void DrawSegmentFrame(const TPCSectorData::SegmentInfo& s, - Int_t botExtraPads=0, Int_t topExtraPads=0) const; - - virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } - virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec); - - ClassDef(TPCSector3DGL, 0); -}; // endclass TPCSector3DGL - -} - -#endif diff --git a/EVE/Alieve/TPCSectorVizEditor.h b/EVE/Alieve/TPCSectorVizEditor.h deleted file mode 100644 index 7a604fae507..00000000000 --- a/EVE/Alieve/TPCSectorVizEditor.h +++ /dev/null @@ -1,68 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TPCSectorVizEditor_H -#define ALIEVE_TPCSectorVizEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; -class TGDoubleHSlider; -class TGHSlider; - -class TEveGValuator; -class TEveGDoubleValuator; -class TEveTransSubEditor; - -namespace Alieve { - -class TPCSectorViz; - -class TPCSectorVizEditor : public TGedFrame -{ - TPCSectorVizEditor(const TPCSectorVizEditor&); // Not implemented - TPCSectorVizEditor& operator=(const TPCSectorVizEditor&); // Not implemented - -protected: - TPCSectorViz* fM; // fModel dynamic-casted to TPCSectorVizEditor - - TEveTransSubEditor* fHMTrans; - - TEveGValuator* fSectorID; - TGCheckButton* fAutoTrans; - - TGCheckButton* fRnrInn; - TGCheckButton* fRnrOut1; - TGCheckButton* fRnrOut2; - - TEveGValuator* fThreshold; - TEveGValuator* fMaxVal; - - TEveGDoubleValuator* fTime; - -public: - TPCSectorVizEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, - UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - ~TPCSectorVizEditor(); - - virtual void SetModel(TObject* obj); - - void DoSectorID(); - void DoAutoTrans(); - - void DoRnrInn(); - void DoRnrOut1(); - void DoRnrOut2(); - - void DoThreshold(); - void DoMaxVal(); - - void DoTime(); - - ClassDef(TPCSectorVizEditor, 0); // Editor for TPCSectorViz -}; // endclass TPCSectorVizEditor - -} - -#endif diff --git a/EVE/Alieve/TRDData.h b/EVE/Alieve/TRDData.h deleted file mode 100644 index 0a9649d1439..00000000000 --- a/EVE/Alieve/TRDData.h +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// - AliEVE implementation - -// Containers for visualisation of TRD data structures -// - TRDHits - visualisation of MC Hits, Clusters (RecPoints) -// - TRDDigits - visualisation of TRD digits -// -// by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 -/////////////////////////////////////////////////////////////////////// - -#ifndef ALIEVE_TRDData_H -#define ALIEVE_TRDData_H - -#ifndef REVE_QuadSet_H -#include -#endif - -#ifndef REVE_BoxSet_H -#include -#endif - -#ifndef REVE_PointSet_H -#include -#endif - -#ifndef ROOT_TGedFrame -#include -#endif - -#include "AliTRDdataArrayI.h" - -class AliTRDdigitsManager; -namespace Alieve { - class TRDChamber; - class TRDHits : public TEvePointSet - { - public: - TRDHits(TRDChamber *p); - - void PointSelected(Int_t n); - - protected: - TRDChamber *fParent; - - ClassDef(TRDHits,1) // Base class for TRD hits visualisation - }; - - class TRDHitsEditor : public TGedFrame - { - public: - TRDHitsEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - ~TRDHitsEditor(); - - virtual void SetModel(TObject* obj); - - protected: - TRDHits* fM; - - ClassDef(TRDHitsEditor,1) // Editor for TRDHits - }; - - - class TRDDigits : public TEveQuadSet - { - friend class TRDDigitsEditor; - public: - TRDDigits(TRDChamber *p); - - void ComputeRepresentation(); - void Paint(Option_t *opt=""); - void Reset(); - void SetData(AliTRDdigitsManager *digits); - - protected: - TRDChamber *fParent; - - private: - TEveBoxSet fBoxes; - AliTRDdataArrayI fData; - - ClassDef(TRDDigits,1) // Digits visualisation for TRD - }; - - class TRDDigitsEditor : public TGedFrame - { - public: - TRDDigitsEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - ~TRDDigitsEditor(); - - virtual void SetModel(TObject* obj); - - protected: - TRDDigits* fM; - - ClassDef(TRDDigitsEditor,1) // Editor for TRDDigits - }; - - - class TRDClusters : public TRDHits - { - public: - TRDClusters(TRDChamber *p); - - void PointSelected(Int_t n); - - ClassDef(TRDClusters,1) // Base class for TRD clusters visualisation - }; - -} - -#endif diff --git a/EVE/Alieve/TRDLoaderImp.h b/EVE/Alieve/TRDLoaderImp.h deleted file mode 100644 index a32e3e436df..00000000000 --- a/EVE/Alieve/TRDLoaderImp.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef ALIEVE_TRDLoaderImp_H -#define ALIEVE_TRDLoaderImp_H - -//////////////////////////////////////////////////////////////////////// -// // - ALIEVE implementation - -// Single event loader for the TRD detector -// - TRDLoaderSim - loader for simulations based on gAlice -// - TRDLoaderRaw - loader for raw data -// -// by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 -//////////////////////////////////////////////////////////////////////// - -#ifndef ALIEVE_TRDLoader_H -#include "TRDLoader.h" -#endif - - -class AliRunLoader; -class AliTRDrawData; -class AliRawReaderDate; -class AliRawReaderRoot; - -class TGCheckButton; -namespace Alieve { - class TRDLoaderSim : public TRDLoader - { - friend class TRDLoaderSimEditor; - public: - TRDLoaderSim(const Text_t* n="TRDLoaderSim", const Text_t* t=0); - ~TRDLoaderSim(); - - Bool_t GoToEvent(int ev); - Bool_t LoadHits(TTree *tH); - Bool_t Open(const char *file, const char *dir="."); - - private: - AliRunLoader *fRunLoader; // Run Loader - - ClassDef(TRDLoaderSim, 1) // Alieve loader for the TRD detector (gAlice) - }; - - - class TRDLoaderRaw : public TRDLoader - { - public: - TRDLoaderRaw(const Text_t* n="TRDLoaderRaw", const Text_t* t=0); - ~TRDLoaderRaw(); - - Bool_t GoToEvent(int ev); - Bool_t LoadEvent(); - Bool_t Open(const char *file, const char *dir="."); - void SetDataType(TRDDataTypes type); - - - private: - void NextEvent(Bool_t rewindOnEnd=kTRUE); - - private: - AliRawReaderDate *fRawDateReader; - AliRawReaderRoot *fRawRootReader; - AliTRDrawData *fRaw; - Bool_t fDataRoot; - Int_t fEventOld; - - ClassDef(TRDLoaderRaw, 1) // Alieve loader for the TRD detector (raw) - }; - - class TRDLoaderSimEditor : public TGedFrame - { - public: - TRDLoaderSimEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - ~TRDLoaderSimEditor(); - - virtual void SetModel(TObject* obj); - virtual void Toggle(Int_t id); - - protected: - TRDLoaderSim* fM; - TGCheckButton *fLoadHits, *fLoadDigits, *fLoadClusters, *fLoadTracks; - - ClassDef(TRDLoaderSimEditor,1) // Editor for TRDLoaderSim - }; -} -#endif diff --git a/EVE/Alieve/TRDLoaderManager.h b/EVE/Alieve/TRDLoaderManager.h deleted file mode 100644 index 81f160823eb..00000000000 --- a/EVE/Alieve/TRDLoaderManager.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef ALIEVE_TRDLoaderManager_H -#define ALIEVE_TRDLoaderManager_H - -//////////////////////////////////////////////////////////////////////// -// // - ALIEVE implementation - -// Loader manager for the TRD detector -// - TRDLoaderManager - manager of TRD data loaders (simulation + measured) -// - TRDLoaderManagerEditor - UI -// -// by A.Bercuci (A.Bercuci@gsi.de) Mon Feb 26 2007 -//////////////////////////////////////////////////////////////////////// - -#include - -#ifndef ROOT_TNamed -#include -#endif - -#ifndef ROOT_TGedFrame -#include -#endif - -class TGComboBox; -class TGTextButton; -class TClonesArray; - -namespace Alieve { - - class TRDLoaderManager : public TEveElementList - { - friend class TRDLoaderManagerEditor; - public: - TRDLoaderManager(const Text_t* name="TRDLoader", const Text_t* title=0x0); - ~TRDLoaderManager(); - void Paint(Option_t *option); - - protected: - void Add(Int_t type, const Text_t *name, const Text_t *title=0x0); - void Remove(Int_t entry); - - ClassDef(TRDLoaderManager, 1) // Alieve loaders manager for TRD - }; - - class TRDLoaderManagerEditor : public TGedFrame - { - public: - TRDLoaderManagerEditor(const TGWindow* p=0, Int_t width = 170, Int_t height = 30, UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - ~TRDLoaderManagerEditor(); - virtual void Add(); - virtual void Remove(Int_t entry); - virtual void SetModel(TObject* obj); - - protected: - TRDLoaderManager* fM; - - private: - ULong_t bg; // background color - TGComboBox *fSelector; - TGTextButton *fAdd, *fRemoveButton; - TGGroupFrame *fGroupFrame; - TClonesArray *fRemove; - - ClassDef(TRDLoaderManagerEditor, 1)// Editor for TRDLoaderManager - }; -} - -#endif - diff --git a/EVE/Alieve/TrackFitterEditor.h b/EVE/Alieve/TrackFitterEditor.h deleted file mode 100644 index bb33ce59d47..00000000000 --- a/EVE/Alieve/TrackFitterEditor.h +++ /dev/null @@ -1,48 +0,0 @@ -// $Header$ - -#ifndef ALIEVE_TrackFitterEditor_H -#define ALIEVE_TrackFitterEditor_H - -#include - -class TGCheckButton; -class TGNumberEntry; -class TGColorSelect; - -namespace Alieve { - -class TrackFitter; - -class TrackFitterEditor : public TGedFrame -{ -private: - TrackFitterEditor(const TrackFitterEditor&); // Not implemented - TrackFitterEditor& operator=(const TrackFitterEditor&); // Not implemented - -protected: - TrackFitter* fM; // fModel dynamic-casted to TrackFitterEditor - - TGTextButton* fFit; // button to fit selection - TGTextButton* fReset; // button to reset selection - TGTextButton* fStart; // button to connect to signal - TGTextButton* fStop; // button to disconnect from signal - TGTextButton* fGraph; // button to draw graph - -public: - TrackFitterEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); - virtual ~TrackFitterEditor() {} - - virtual void SetModel(TObject* obj); - - void DoStart(); - void DoFit(); - void DoReset(); - void DoStop(); - void DoGraph(); - - ClassDef(TrackFitterEditor, 0); // Editor for TrackFitter class. -}; // endclass TrackFitterEditor - -} - -#endif diff --git a/EVE/Alieve/alieve_main/alieve_main.cxx b/EVE/Alieve/alieve_main/alieve_main.cxx index 326c0cd953f..be4e67f2474 100644 --- a/EVE/Alieve/alieve_main/alieve_main.cxx +++ b/EVE/Alieve/alieve_main/alieve_main.cxx @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include #include #include diff --git a/EVE/alice-macros/MUON_display.C b/EVE/alice-macros/MUON_display.C index 25911f0df7e..b83390928db 100644 --- a/EVE/alice-macros/MUON_display.C +++ b/EVE/alice-macros/MUON_display.C @@ -1,12 +1,20 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include "TGLViewer.h" namespace Alieve { -class MUONData; -class Event; +class AliEveMUONData; +class AliEveEventManager; } -Alieve::MUONData* g_muon_data = 0; -Alieve::Event* g_muon_last_event = 0; +AliEveMUONData* g_muon_data = 0; +AliEveEventManager* g_muon_last_event = 0; Int_t g_currentEvent = -1; Bool_t g_fromRaw = kFALSE; @@ -21,33 +29,33 @@ void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) TTree* ct = 0; TTree* ht = 0; - if (Alieve::gEvent == 0) { + if (gEvent == 0) { printf("No alieve event: use alieve_init(...) \n"); return; } - if (g_currentEvent == Alieve::gEvent->GetEventId()) { + if (g_currentEvent == gEvent->GetEventId()) { if (g_fromRaw == fromRaw) { printf("Same event... \n"); return; } else { if (g_fromRaw) { printf("Same event with digits.\n"); - Alieve::gEvent->GotoEvent(g_currentEvent); + gEvent->GotoEvent(g_currentEvent); } else { printf("Same event with raw.\n"); - Alieve::gEvent->GotoEvent(g_currentEvent); + gEvent->GotoEvent(g_currentEvent); } } } g_fromRaw = fromRaw; - TString dataPath = TString(Alieve::gEvent->GetTitle()); + TString dataPath = TString(gEvent->GetTitle()); dataPath.Append("/rawmuon.root"); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); - g_muon_data = new Alieve::MUONData; + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); + g_muon_data = new AliEveMUONData; if (!fromRaw) { rl->LoadDigits("MUON"); @@ -75,7 +83,7 @@ void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) ht = rl->GetTreeH("MUON", false); g_muon_data->LoadHits(ht); - g_muon_last_event = Alieve::gEvent; + g_muon_last_event = gEvent; g_currentEvent = g_muon_last_event->GetEventId(); @@ -90,7 +98,7 @@ void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) for (Int_t ic = 0; ic < 14; ic++) { - Alieve::MUONChamber* mucha = new Alieve::MUONChamber(ic); + AliEveMUONChamber* mucha = new AliEveMUONChamber(ic); mucha->SetFrameColor(2); mucha->SetChamberID(ic); @@ -123,12 +131,12 @@ void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) //_____________________________________________________________________________ void MUON_tracks() { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadTracks("MUON"); TTree* tt = rl->GetTreeT("MUON", false); TClonesArray *tracks = 0; - tt->SetBranchAddress("MUONTrack",&tracks); + tt->SetBranchAddress("AliEveMUONTrack",&tracks); tt->GetEntry(0); Int_t ntracks = tracks->GetEntriesFast(); @@ -161,7 +169,7 @@ void MUON_tracks() { rt.label = n; - Alieve::MUONTrack* track = new Alieve::MUONTrack(&rt, lt->GetPropagator()); + AliEveMUONTrack* track = new AliEveMUONTrack(&rt, lt->GetPropagator()); track->MakeMUONTrack(mt); @@ -176,7 +184,7 @@ void MUON_tracks() { //_____________________________________________________________________________ void MUON_trigger_tracks() { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadTracks("MUON"); TTree* tt = rl->GetTreeT("MUON", false); @@ -214,7 +222,7 @@ void MUON_trigger_tracks() { rt.label = n; - Alieve::MUONTrack* track = new Alieve::MUONTrack(&rt, lt->GetPropagator()); + AliEveMUONTrack* track = new AliEveMUONTrack(&rt, lt->GetPropagator()); track->MakeMUONTriggerTrack(mt); @@ -229,7 +237,7 @@ void MUON_trigger_tracks() { //_____________________________________________________________________________ void MUON_ESD_tracks() { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); TEveTrackList* lt = new TEveTrackList("ESD-Tracks"); lt->SetMainColor(Color_t(6)); @@ -246,7 +254,7 @@ void MUON_ESD_tracks() { rt.label = n; - Alieve::MUONTrack* track = new Alieve::MUONTrack(&rt, lt->GetPropagator()); + AliEveMUONTrack* track = new AliEveMUONTrack(&rt, lt->GetPropagator()); track->MakeESDTrack(mt); @@ -259,11 +267,11 @@ void MUON_ESD_tracks() { //_____________________________________________________________________________ void MUON_Ref_tracks() { - TString dataPath = TString(Alieve::gEvent->GetTitle()); + TString dataPath = TString(gEvent->GetTitle()); dataPath.Append("/"); AliMUONRecoCheck recoCheck(dataPath.Data(),dataPath.Data()); - AliMUONVTrackStore* trackRefStore = recoCheck.ReconstructibleTracks(Alieve::gEvent->GetEventId()); + AliMUONVTrackStore* trackRefStore = recoCheck.ReconstructibleTracks(gEvent->GetEventId()); TIter next(trackRefStore->CreateIterator()); AliMUONTrack* trackRef; @@ -278,7 +286,7 @@ void MUON_Ref_tracks() { rt.label = i++; - Alieve::MUONTrack* track = new Alieve::MUONTrack(&rt, lt->GetPropagator()); + AliEveMUONTrack* track = new AliEveMUONTrack(&rt, lt->GetPropagator()); track->MakeRefTrack(trackRef); @@ -293,7 +301,7 @@ void MUON_MC_tracks() { Double_t RADDEG = 180.0/TMath::Pi(); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); @@ -324,7 +332,7 @@ void MUON_MC_tracks() { if (part->P() < 0.001) continue; // skip momenta < 1.0 MeV/c rt.label = i; - Alieve::MUONTrack* track = new Alieve::MUONTrack(&rt, lt->GetPropagator()); + AliEveMUONTrack* track = new AliEveMUONTrack(&rt, lt->GetPropagator()); track->MakeMCTrack(part); diff --git a/EVE/alice-macros/MUON_geom.C b/EVE/alice-macros/MUON_geom.C index 628760244c7..a8d28205bf8 100644 --- a/EVE/alice-macros/MUON_geom.C +++ b/EVE/alice-macros/MUON_geom.C @@ -1,8 +1,15 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void MUON_geom() { - TString dataPath = TString(Alieve::gEvent->GetTitle()); + TString dataPath = TString(gEvent->GetTitle()); dataPath.Append("/geometry.root"); gGeoManager = gEve->GetGeometry(dataPath.Data()); diff --git a/EVE/alice-macros/MUON_geomAll.C b/EVE/alice-macros/MUON_geomAll.C index 1f92d040628..88a730daf35 100644 --- a/EVE/alice-macros/MUON_geomAll.C +++ b/EVE/alice-macros/MUON_geomAll.C @@ -1,11 +1,18 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void MUON_geomAll() { using namespace std; - TString dataPath = TString(Alieve::gEvent->GetTitle()); + TString dataPath = TString(gEvent->GetTitle()); dataPath.Append("/geometry.root"); gGeoManager = gEve->GetGeometry(dataPath.Data()); diff --git a/EVE/alice-macros/MUON_trigger_info.C b/EVE/alice-macros/MUON_trigger_info.C index a2979d15b5d..8616c966b7b 100644 --- a/EVE/alice-macros/MUON_trigger_info.C +++ b/EVE/alice-macros/MUON_trigger_info.C @@ -1,13 +1,21 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include void MUON_trigger_info(Int_t label) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); TTree* tt = rl->GetTreeT("MUON", false); TClonesArray *tracks = 0; - tt->SetBranchAddress("MUONTrack",&tracks); + tt->SetBranchAddress("AliEveMUONTrack",&tracks); tt->GetEntry(0); Int_t ntracks = tracks->GetEntriesFast(); diff --git a/EVE/alice-macros/NLT_test.C b/EVE/alice-macros/NLT_test.C index 364740aff1e..29f40d6dc98 100644 --- a/EVE/alice-macros/NLT_test.C +++ b/EVE/alice-macros/NLT_test.C @@ -1,7 +1,15 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEveProjectionManager* NLT_test(TEveElement* top=0) { - TEveScene* s = gEve->SpawnNewScene("Projected Event"); + TEveScene* s = gEve->SpawnNewScene("Projected AliEveEventManager"); gEve->GetDefViewer()->AddScene(s); TGLViewer* v = (TGLViewer *)gEve->GetGLViewer(); diff --git a/EVE/alice-macros/NLT_trackcount_init.C b/EVE/alice-macros/NLT_trackcount_init.C index a44263b199d..cf7de35273e 100644 --- a/EVE/alice-macros/NLT_trackcount_init.C +++ b/EVE/alice-macros/NLT_trackcount_init.C @@ -1,9 +1,15 @@ -namespace TEveUtil -{ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + class TEveProjectionManager; class TEveGeoShape; -class RnrElement*; -} +class TEveUtil; TEveProjectionManager * proj = 0; TEveGeoShape * geom = 0; @@ -40,8 +46,8 @@ void NLT_trackcount_init() geom = gg; // event - Alieve::gEvent->AddNewEventCommand("on_new_event();"); - Alieve::gEvent->GotoEvent(0); + gEvent->AddNewEventCommand("on_new_event();"); + gEvent->GotoEvent(0); gEve->Redraw3D(kTRUE); } @@ -71,7 +77,7 @@ void on_new_event() Int_t count = 1; TEveTrackCounter* g_trkcnt = TEveTrackCounter::fgInstance; g_trkcnt->Reset(); - g_trkcnt->SetEventId(Alieve::gEvent->GetEventId()); + g_trkcnt->SetEventId(gEvent->GetEventId()); TEveElement::List_i i = cont->BeginChildren(); while (i != cont->EndChildren()) { TEveTrackList* l = dynamic_cast(*i); @@ -84,7 +90,7 @@ void on_new_event() } TEveElement* top = gEve->GetCurrentEvent(); proj->DestroyElements(); - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); Double_t x[3]; esd->GetPrimaryVertex()->GetXYZ(x); proj->SetCenter(x[0], x[1], x[2]); @@ -100,7 +106,7 @@ void on_new_event() TParticle* id(Int_t label=0, Bool_t showParents=kTRUE) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); diff --git a/EVE/alice-macros/acorde_hits.C b/EVE/alice-macros/acorde_hits.C index c33459f01db..96ca3eb1837 100644 --- a/EVE/alice-macros/acorde_hits.C +++ b/EVE/alice-macros/acorde_hits.C @@ -1,11 +1,18 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* acorde_hits(const char *varexp = "ACORDE.fX:ACORDE.fY:ACORDE.fZ", const char *selection = "", TEveElement* cont = 0) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("ACORDE"); TTree* ht = rl->GetTreeH("ACORDE", false); diff --git a/EVE/alice-macros/clusters_from_index.C b/EVE/alice-macros/clusters_from_index.C index b0cdb92f08a..0daa87a31ed 100644 --- a/EVE/alice-macros/clusters_from_index.C +++ b/EVE/alice-macros/clusters_from_index.C @@ -1,8 +1,15 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0) { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); if (index < 0) { Warning("clusters_from_index", "index not set."); diff --git a/EVE/alice-macros/clusters_from_label.C b/EVE/alice-macros/clusters_from_label.C index 6d6505b37bb..8547b263850 100644 --- a/EVE/alice-macros/clusters_from_label.C +++ b/EVE/alice-macros/clusters_from_label.C @@ -1,8 +1,15 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* clusters_from_label(Int_t label=0, TEveElement* cont=0) { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); TEvePointSet* clusters = new TEvePointSet(64); clusters->SetOwnIds(kTRUE); diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C index 6e9f20b9b55..1290c7c59c5 100644 --- a/EVE/alice-macros/emcal_digits.C +++ b/EVE/alice-macros/emcal_digits.C @@ -1,6 +1,14 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void emcal_digits() { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadgAlice(); AliEMCAL * emcal = (AliEMCAL*) rl->GetAliRun()->GetDetector("EMCAL"); diff --git a/EVE/alice-macros/emcal_hits.C b/EVE/alice-macros/emcal_hits.C index 12af37a679f..56518af5144 100644 --- a/EVE/alice-macros/emcal_hits.C +++ b/EVE/alice-macros/emcal_hits.C @@ -1,11 +1,18 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* emcal_hits(const char *varexp = "fX:fY:fZ", const char *selection = "", TEveElement* cont = 0) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("EMCAL"); TTree* ht = rl->GetTreeH("EMCAL", false); diff --git a/EVE/alice-macros/esd_Cascade.C b/EVE/alice-macros/esd_Cascade.C index 1cc1d31b239..1a0b8c7360f 100644 --- a/EVE/alice-macros/esd_Cascade.C +++ b/EVE/alice-macros/esd_Cascade.C @@ -1,6 +1,14 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // #include "EVE/Alieve/EventAlieve.h" // #include "TEveManager.h" -// #include "Cascade.h" +// #include "AliEveCascade.h" // #include "AliESD.h" // #include "AliESDtrack.h" @@ -12,11 +20,11 @@ -Alieve::Cascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, +AliEveCascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, AliESDcascade* cas, AliESDtrack* neg, AliESDtrack* pos, AliESDtrack* bach,Int_t i) { - Alieve::Cascade* myCas = new Alieve::Cascade(rnrStyle); + AliEveCascade* myCas = new AliEveCascade(rnrStyle); myCas->SetESDIndex(i); static Double_t vx,vy,vz, px,py,pz; @@ -56,17 +64,17 @@ Alieve::Cascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primV -Alieve::CascadeList* esd_Cascade(Double_t min_pt=0.1, Double_t max_pt=100) +CascadeList* esd_AliEveCascade(Double_t min_pt=0.1, Double_t max_pt=100) { printf("THIS SCRIPT DOES NOT WORK.\n" - "Alieve::Cascade classes have been temporarily removed.\n" + "AliEveCascade classes have been temporarily removed.\n" "They need to be cleaned up.\n"); return; - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); AliESDVertex* primVertex =(AliESDVertex*) esd->GetVertex(); - Alieve::CascadeList* cont = new Alieve::CascadeList("ESD cascade"); + CascadeList* cont = new CascadeList("ESD cascade"); cont->SetMainColor(Color_t(3)); // green TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); @@ -86,7 +94,7 @@ Alieve::CascadeList* esd_Cascade(Double_t min_pt=0.1, Double_t max_pt=100) AliESDtrack* bachTr = esd->GetTrack(bachInd); if (cas) { - Alieve::Cascade* myCas = esd_make_cas(rnrStyle, primVertex, cas, + AliEveCascade* myCas = esd_make_cas(rnrStyle, primVertex, cas, negTr, posTr, bachTr, n); if (myCas) { gEve->AddElement(myCas, cont); diff --git a/EVE/alice-macros/esd_V0.C b/EVE/alice-macros/esd_V0.C index ab9f0ed552d..6e67247439b 100644 --- a/EVE/alice-macros/esd_V0.C +++ b/EVE/alice-macros/esd_V0.C @@ -1,8 +1,16 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // #include "EVE/Alieve/EventAlieve.h" // #include "TEveManager.h" -// #include "V0.h" +// #include "AliEveV0.h" // #include "AliESD.h" // #include "AliESDtrack.h" @@ -13,7 +21,7 @@ // using namespace Alieve; -Alieve::V0* esd_make_v0(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, +AliEveV0* esd_make_v0(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, AliESDtrack* neg, AliESDtrack* pos, AliESDv0* v0, Int_t i) { if (! v0->GetOnFlyStatus()) @@ -49,7 +57,7 @@ Alieve::V0* esd_make_v0(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, rcPos.beta = ep/TMath::Sqrt(ep*ep + mc*mc); - Alieve::V0* myV0 = new Alieve::V0(&rcNeg, &rcPos, &rcV0, rnrStyle); + AliEveV0* myV0 = new AliEveV0(&rcNeg, &rcPos, &rcV0, rnrStyle); char ch[50]; // sprintf(ch,"ESDv0%i",i); // myV0->SetName(ch); @@ -72,17 +80,17 @@ Alieve::V0* esd_make_v0(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, } -Alieve::V0List* esd_V0(Double_t min_pt=0.1, Double_t max_pt=100) +V0List* esd_AliEveV0(Double_t min_pt=0.1, Double_t max_pt=100) { printf("THIS SCRIPT DOES NOT WORK.\n" - "Alieve::V0 classes have been temporarily removed.\n" + "AliEveV0 classes have been temporarily removed.\n" "They need to be cleaned up.\n"); return; - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); AliESDVertex* primVertex =(AliESDVertex*) esd->GetVertex(); - Alieve::V0List* cont = new Alieve::V0List("ESD v0"); + V0List* cont = new V0List("ESD v0"); cont->SetMainColor(Color_t(3)); // green TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); @@ -101,7 +109,7 @@ Alieve::V0List* esd_V0(Double_t min_pt=0.1, Double_t max_pt=100) AliESDtrack* negTr = esd->GetTrack(negInd); AliESDtrack* posTr = esd->GetTrack(posInd); - Alieve::V0* myV0 = esd_make_v0(rnrStyle, primVertex, negTr,posTr, v0, n); + AliEveV0* myV0 = esd_make_v0(rnrStyle, primVertex, negTr,posTr, v0, n); if (myV0) { gEve->AddElement(myV0, cont); count++; diff --git a/EVE/alice-macros/esd_V0_points.C b/EVE/alice-macros/esd_V0_points.C index cebb3768746..ac88fce2369 100644 --- a/EVE/alice-macros/esd_V0_points.C +++ b/EVE/alice-macros/esd_V0_points.C @@ -1,12 +1,19 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* esd_V0_points() { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); Int_t NV0s = esd->GetNumberOfV0s(); - TEvePointSet* points = new TEvePointSet("V0 CA points", NV0s); + TEvePointSet* points = new TEvePointSet("AliEveV0 CA points", NV0s); for (Int_t n =0; nGetPrimaryVertex(); AliMultiplicity* mul = esd->GetMultiplicity(); diff --git a/EVE/alice-macros/esd_tracks.C b/EVE/alice-macros/esd_tracks.C index d1db1af42bd..1dc284a7f0f 100644 --- a/EVE/alice-macros/esd_tracks.C +++ b/EVE/alice-macros/esd_tracks.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEveTrack* esd_make_track(TEveTrackPropagator* rnrStyle, Int_t index, @@ -41,7 +48,7 @@ Bool_t gkFixFailedITSExtr = kFALSE; TEveTrackList* esd_tracks(Double_t min_pt=0.1, Double_t max_pt=100) { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); Double_t minptsq = min_pt*min_pt; Double_t maxptsq = max_pt*max_pt; @@ -105,7 +112,7 @@ TEveTrackList* esd_tracks_from_array(TCollection* col, AliESDEvent* esd=0) // Retrieves AliESDTrack's from collection. // See example usage with AliAnalysisTrackCuts in the next function. - if (esd == 0) esd = Alieve::Event::AssertESD(); + if (esd == 0) esd = AliEveEventManager::AssertESD(); TEveTrackList* cont = new TEveTrackList("ESD Tracks"); cont->SetMainColor(Color_t(6)); @@ -151,7 +158,7 @@ TEveTrackList* esd_tracks_from_array(TCollection* col, AliESDEvent* esd=0) void esd_tracks_alianalcuts_demo() { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); gSystem->Load("libANALYSIS"); AliAnalysisTrackCuts atc; @@ -211,7 +218,7 @@ TEveElementList* esd_tracks_vertex_cut() // Import ESD tracks, separate them into five containers according to // primary-vertex cut and ITS refit status. - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); TEveElementList* cont = new TEveElementList("ESD Tracks", 0, kTRUE); gEve->AddElement(cont); diff --git a/EVE/alice-macros/event_goto.C b/EVE/alice-macros/event_goto.C index 2027c8f0e2b..fa522e95bad 100644 --- a/EVE/alice-macros/event_goto.C +++ b/EVE/alice-macros/event_goto.C @@ -1,8 +1,16 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void event_goto(Int_t event=0) { - if(Alieve::gEvent == 0) { - printf("Event not set!\n"); + if(gEvent == 0) { + printf("AliEveEventManager not set!\n"); return; } - Alieve::gEvent->GotoEvent(event); + gEvent->GotoEvent(event); } diff --git a/EVE/alice-macros/event_next.C b/EVE/alice-macros/event_next.C index 6b667822e9e..b6ea804426c 100644 --- a/EVE/alice-macros/event_next.C +++ b/EVE/alice-macros/event_next.C @@ -1,8 +1,16 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void event_next() { - if(Alieve::gEvent == 0) { - printf("Event not set!\n"); + if(gEvent == 0) { + printf("AliEveEventManager not set!\n"); return; } - Alieve::gEvent->NextEvent(); + gEvent->NextEvent(); } diff --git a/EVE/alice-macros/event_prev.C b/EVE/alice-macros/event_prev.C index f6a7864c526..fcf8c626da1 100644 --- a/EVE/alice-macros/event_prev.C +++ b/EVE/alice-macros/event_prev.C @@ -1,8 +1,16 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void event_prev() { - if(Alieve::gEvent == 0) { - printf("Event not set!\n"); + if(gEvent == 0) { + printf("AliEveEventManager not set!\n"); return; } - Alieve::gEvent->PrevEvent(); + gEvent->PrevEvent(); } diff --git a/EVE/alice-macros/fmd_hits.C b/EVE/alice-macros/fmd_hits.C index 745f10a38d9..fe9b0594aa4 100644 --- a/EVE/alice-macros/fmd_hits.C +++ b/EVE/alice-macros/fmd_hits.C @@ -1,10 +1,17 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* fmd_hits(const char *varexp = "fX:fY:fZ", const char *selection = "") { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("FMD"); TTree* ht = rl->GetTreeH("FMD", false); diff --git a/EVE/alice-macros/geom_acorde.C b/EVE/alice-macros/geom_acorde.C index 00327cf52a1..b134f00500a 100644 --- a/EVE/alice-macros/geom_acorde.C +++ b/EVE/alice-macros/geom_acorde.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_acorde() { diff --git a/EVE/alice-macros/geom_all.C b/EVE/alice-macros/geom_all.C index a4020b78804..91be4416dc2 100644 --- a/EVE/alice-macros/geom_all.C +++ b/EVE/alice-macros/geom_all.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_all() { diff --git a/EVE/alice-macros/geom_ddip.C b/EVE/alice-macros/geom_ddip.C index 1986d845c35..3d23e985fc4 100644 --- a/EVE/alice-macros/geom_ddip.C +++ b/EVE/alice-macros/geom_ddip.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_ddip() { diff --git a/EVE/alice-macros/geom_emcal.C b/EVE/alice-macros/geom_emcal.C index e98f47e3c79..f14e91c0d53 100644 --- a/EVE/alice-macros/geom_emcal.C +++ b/EVE/alice-macros/geom_emcal.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_emcal() { diff --git a/EVE/alice-macros/geom_fmd.C b/EVE/alice-macros/geom_fmd.C index 2a0efbc5e2c..c9f9d8f5ec5 100644 --- a/EVE/alice-macros/geom_fmd.C +++ b/EVE/alice-macros/geom_fmd.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_fmd() { diff --git a/EVE/alice-macros/geom_gentle.C b/EVE/alice-macros/geom_gentle.C index 83ecd0e0bb8..b19fad0d93d 100644 --- a/EVE/alice-macros/geom_gentle.C +++ b/EVE/alice-macros/geom_gentle.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEveGeoShape* geom_gentle() { diff --git a/EVE/alice-macros/geom_hmpid.C b/EVE/alice-macros/geom_hmpid.C index 423d5c1a228..25b73a93f1e 100644 --- a/EVE/alice-macros/geom_hmpid.C +++ b/EVE/alice-macros/geom_hmpid.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_hmpid() { diff --git a/EVE/alice-macros/geom_its.C b/EVE/alice-macros/geom_its.C index 0dfacf5f945..9d7c4b45576 100644 --- a/EVE/alice-macros/geom_its.C +++ b/EVE/alice-macros/geom_its.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_its() { diff --git a/EVE/alice-macros/geom_phos.C b/EVE/alice-macros/geom_phos.C index ce86844f1b4..a682b333d5a 100644 --- a/EVE/alice-macros/geom_phos.C +++ b/EVE/alice-macros/geom_phos.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_phos() { diff --git a/EVE/alice-macros/geom_pmd.C b/EVE/alice-macros/geom_pmd.C index 62851036606..876f63f9c59 100644 --- a/EVE/alice-macros/geom_pmd.C +++ b/EVE/alice-macros/geom_pmd.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_pmd() { diff --git a/EVE/alice-macros/geom_simple.C b/EVE/alice-macros/geom_simple.C index 876e70a986a..3411f294589 100644 --- a/EVE/alice-macros/geom_simple.C +++ b/EVE/alice-macros/geom_simple.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_simple() { diff --git a/EVE/alice-macros/geom_t0.C b/EVE/alice-macros/geom_t0.C index 8c5cf8b8188..0e20de6ee68 100644 --- a/EVE/alice-macros/geom_t0.C +++ b/EVE/alice-macros/geom_t0.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_t0() { diff --git a/EVE/alice-macros/geom_tpc.C b/EVE/alice-macros/geom_tpc.C index 6280303b502..0f2737187b8 100644 --- a/EVE/alice-macros/geom_tpc.C +++ b/EVE/alice-macros/geom_tpc.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_tpc() { diff --git a/EVE/alice-macros/geom_trd_tof.C b/EVE/alice-macros/geom_trd_tof.C index 726e09e82d2..d45ab61f530 100644 --- a/EVE/alice-macros/geom_trd_tof.C +++ b/EVE/alice-macros/geom_trd_tof.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_trd_tof() { diff --git a/EVE/alice-macros/geom_vzero.C b/EVE/alice-macros/geom_vzero.C index 34102a7fe48..eceacd61012 100644 --- a/EVE/alice-macros/geom_vzero.C +++ b/EVE/alice-macros/geom_vzero.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void geom_vzero() { diff --git a/EVE/alice-macros/hits_from_label.C b/EVE/alice-macros/hits_from_label.C index 7800838601d..6eb77a321ad 100644 --- a/EVE/alice-macros/hits_from_label.C +++ b/EVE/alice-macros/hits_from_label.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void hits_from_label(Int_t label=0, TEveElement* cont) { diff --git a/EVE/alice-macros/hmpid_clusters.C b/EVE/alice-macros/hmpid_clusters.C index 26194067c3d..6248ddbf72f 100644 --- a/EVE/alice-macros/hmpid_clusters.C +++ b/EVE/alice-macros/hmpid_clusters.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifdef __CINT__ namespace TEveUtil @@ -38,9 +46,9 @@ TEvePointSet* hmpid_clusters(TEveElement* cont=0, Float_t maxR=1000) TEvePointSet* clusters = new TEvePointSet(10000); clusters->SetOwnIds(kTRUE); - Alieve::Event::AssertGeometry(); + AliEveEventManager::AssertGeometry(); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadRecPoints("HMPID"); TTree *cTree = rl->GetTreeR("HMPID", false); diff --git a/EVE/alice-macros/init_trd.C b/EVE/alice-macros/init_trd.C index 9c5ad9c6ed8..211cd9968eb 100644 --- a/EVE/alice-macros/init_trd.C +++ b/EVE/alice-macros/init_trd.C @@ -1,12 +1,20 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void init_trd() { TString macdir("$(REVESYS)/alice-macros"); gSystem->ExpandPathName(macdir); gROOT->GetListOfBrowsables()->Add (new TSystemDirectory(macdir.Data(), macdir.Data())); - AssertMacro("region_marker.C"); + TEveUtil::AssertMacro("region_marker.C"); - Alieve::TRDLoaderManager *trd=new Alieve::TRDLoaderManager("TRD manager", "Loader manager for TRD data monitoring"); + AliEveTRDLoaderManager *trd=new AliEveTRDLoaderManager("TRD manager", "Loader manager for TRD data monitoring"); gEve->AddElement(trd); gEve->AddToListTree(trd, kTRUE); } diff --git a/EVE/alice-macros/its_clusters.C b/EVE/alice-macros/its_clusters.C index f43ee581526..14921d45061 100644 --- a/EVE/alice-macros/its_clusters.C +++ b/EVE/alice-macros/its_clusters.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifdef __CINT__ namespace TEveUtil @@ -8,10 +16,9 @@ class TEvePointSet; #else -#include #include #include -#include +#include #include #include @@ -22,9 +29,9 @@ class TEvePointSet; TEvePointSet* its_clusters(TEveElement* cont=0, Float_t maxR=50) { - Alieve::Event::AssertGeometry(); + AliEveEventManager::AssertGeometry(); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadRecPoints("ITS"); TTree *cTree = rl->GetTreeR("ITS", false); diff --git a/EVE/alice-macros/its_digits.C b/EVE/alice-macros/its_digits.C index 8d9bc9d8307..6d758448066 100644 --- a/EVE/alice-macros/its_digits.C +++ b/EVE/alice-macros/its_digits.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Load ITS digits. // Argument mode is a bitwise or determining which layers to import: @@ -9,14 +16,14 @@ void its_digits(Int_t mode=63) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("ITS"); TTree* dt = rl->GetTreeD("ITS", false); - Alieve::ITSDigitsInfo* di = new Alieve::ITSDigitsInfo(); + AliEveITSDigitsInfo* di = new AliEveITSDigitsInfo(); di->SetTree(dt); di->Dump(); - // Could initialize ITSModule statics (?) + // Could initialize AliEveITSModule statics (?) AliITSgeom* g = di->fGeom; @@ -53,7 +60,7 @@ void its_digits(Int_t mode=63) relStave->SetMainColor((Color_t)2); gEve->AddElement(relStave, relSector); for (nMod=0; nMod<4; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relStave); } } @@ -81,7 +88,7 @@ void its_digits(Int_t mode=63) relStave->SetMainColor((Color_t)2); gEve->AddElement(relStave, relSector); for (nMod=0; nMod<4; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relStave); } } @@ -103,7 +110,7 @@ void its_digits(Int_t mode=63) relLadder->SetMainColor((Color_t)3); gEve->AddElement(relLadder, l); for (nMod=0; nMod<6; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } @@ -123,7 +130,7 @@ void its_digits(Int_t mode=63) relLadder->SetMainColor((Color_t)3); gEve->AddElement(relLadder, l); for (nMod=0; nMod<8; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } @@ -143,7 +150,7 @@ void its_digits(Int_t mode=63) relLadder->SetMainColor((Color_t)4); gEve->AddElement(relLadder, l); for (nMod=0; nMod<22; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } @@ -163,7 +170,7 @@ void its_digits(Int_t mode=63) relLadder->SetMainColor((Color_t)4); gEve->AddElement(relLadder, l); for (nMod=0; nMod<25; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } diff --git a/EVE/alice-macros/its_hits.C b/EVE/alice-macros/its_hits.C index 6bec89e879f..c6c74ebb838 100644 --- a/EVE/alice-macros/its_hits.C +++ b/EVE/alice-macros/its_hits.C @@ -1,11 +1,18 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* its_hits(const char *varexp = "fX:fY:fZ", const char *selection = "", TEveElement* cont = 0) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("ITS"); TTree* ht = rl->GetTreeH("ITS", false); diff --git a/EVE/alice-macros/its_hits_layer_split.C b/EVE/alice-macros/its_hits_layer_split.C index e28e9faecd6..26cdbd0af26 100644 --- a/EVE/alice-macros/its_hits_layer_split.C +++ b/EVE/alice-macros/its_hits_layer_split.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void its_hits_layer_split(const char *varexp = "fX:fY:fZ:GetLayer()", const char *selection = "") @@ -11,7 +18,7 @@ void its_hits_layer_split(const char *varexp = "fX:fY:fZ:GetLayer()", "Needs to be fixed together with ITS experts.\n"); return; - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("ITS"); TTree* ht = rl->GetTreeH("ITS", false); diff --git a/EVE/alice-macros/its_module_stepper.C b/EVE/alice-macros/its_module_stepper.C index 87e203eb3d4..79ffd9e7ba0 100644 --- a/EVE/alice-macros/its_module_stepper.C +++ b/EVE/alice-macros/its_module_stepper.C @@ -1,7 +1,15 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include "TGLViewer.h" namespace Alieve { -class ITSModuleStepper; +class AliEveITSModuleStepper; } void its_module_stepper(Int_t det = 0) @@ -9,11 +17,11 @@ void its_module_stepper(Int_t det = 0) TFile *file = TFile::Open("ITS.Digits.root"); TDirectory* dir = (TDirectory*) file->Get("Event0"); TTree* tree = (TTree*)dir->Get("TreeD"); - Alieve::ITSDigitsInfo* di = new Alieve::ITSDigitsInfo(); + AliEveITSDigitsInfo* di = new AliEveITSDigitsInfo(); di->SetTree(tree); gEve->DisableRedraw(); - Alieve::ITSModuleStepper* ms = new Alieve::ITSModuleStepper(di); + AliEveITSModuleStepper* ms = new AliEveITSModuleStepper(di); ms->SetMainColor(Color_t(8)); gStyle->SetPalette(1, 0); ms->DisplayDet(det, -1); diff --git a/EVE/alice-macros/its_raw.C b/EVE/alice-macros/its_raw.C index 1e63fb7c3c7..4021e13e8ee 100644 --- a/EVE/alice-macros/its_raw.C +++ b/EVE/alice-macros/its_raw.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void its_raw(const char *input = "rawdata.root", Int_t mode = 63, Int_t event = 0, @@ -20,12 +28,12 @@ void its_raw(const char *input = "rawdata.root", rawReader->SelectEvents(7); } - Alieve::ITSDigitsInfo* di = new Alieve::ITSDigitsInfo(); + AliEveITSDigitsInfo* di = new AliEveITSDigitsInfo(); if (accumulate) AliLog::SetGlobalLogLevel(AliLog::kError); Int_t ev = 0; do { - if (ev % 100 == 0) printf("Event: %d\n", ev); + if (ev % 100 == 0) printf("AliEveEventManager: %d\n", ev); if (rawReader->NextEvent() == kFALSE) { Error("its_raw", "Reading event %d failed (requested event %d).", ev, event); @@ -42,7 +50,7 @@ void its_raw(const char *input = "rawdata.root", di->Dump(); delete rawReader; - // Could initialize ITSModule statics (?) + // Could initialize AliEveITSModule statics (?) AliITSgeom* g = di->fGeom; @@ -82,7 +90,7 @@ void its_raw(const char *input = "rawdata.root", { if (di->GetDigits(i, 0) && di->GetDigits(i, 0)->GetEntriesFast() > 0) { - Alieve::ITSModule* m = new Alieve::ITSModule(i, di); + AliEveITSModule* m = new AliEveITSModule(i, di); gEve->AddElement(m, relStave); } ++i; @@ -115,7 +123,7 @@ void its_raw(const char *input = "rawdata.root", { if (di->GetDigits(i, 0) && di->GetDigits(i, 0)->GetEntriesFast() > 0) { - Alieve::ITSModule* m = new Alieve::ITSModule(i, di); + AliEveITSModule* m = new AliEveITSModule(i, di); gEve->AddElement(m, relStave); } ++i; @@ -139,7 +147,7 @@ void its_raw(const char *input = "rawdata.root", relLadder->SetMainColor((Color_t)3); gEve->AddElement(relLadder, l); for (nMod=0; nMod<6; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } @@ -159,7 +167,7 @@ void its_raw(const char *input = "rawdata.root", relLadder->SetMainColor((Color_t)3); gEve->AddElement(relLadder, l); for (nMod=0; nMod<8; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } @@ -179,7 +187,7 @@ void its_raw(const char *input = "rawdata.root", relLadder->SetMainColor((Color_t)4); gEve->AddElement(relLadder, l); for (nMod=0; nMod<22; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } @@ -199,7 +207,7 @@ void its_raw(const char *input = "rawdata.root", relLadder->SetMainColor((Color_t)4); gEve->AddElement(relLadder, l); for (nMod=0; nMod<25; nMod++) { - Alieve::ITSModule* m = new Alieve::ITSModule(i++, di); + AliEveITSModule* m = new AliEveITSModule(i++, di); gEve->AddElement(m, relLadder); } } diff --git a/EVE/alice-macros/jetplane.C b/EVE/alice-macros/jetplane.C index 94a6434d8a3..4059191367b 100644 --- a/EVE/alice-macros/jetplane.C +++ b/EVE/alice-macros/jetplane.C @@ -1,4 +1,12 @@ -Alieve::JetPlane* jetplane(Int_t iev) +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ +AliEveJetPlane* jetplane(Int_t iev) { TFile* f = new TFile("aod.root"); TTree* treeAOD = (TTree*) f->Get("AOD"); @@ -6,14 +14,13 @@ Alieve::JetPlane* jetplane(Int_t iev) aod->ReadFromTree(treeAOD); treeAOD->GetEntry(iev); - using namespace Alieve; - JetPlane* jp = new JetPlane(iev); + AliEveJetPlane* jp = new AliEveJetPlane(iev); // Read Jets in current event TClonesArray* jets = aod->GetJets(); Int_t njets = jets->GetEntries(); - printf("Event: %5d Number of jets: %5d \n", iev, njets); + printf("AliEveEventManager: %5d Number of jets: %5d \n", iev, njets); for (Int_t ij = 0; ij < njets; ij++) { @@ -25,7 +32,7 @@ Alieve::JetPlane* jetplane(Int_t iev) TClonesArray* tracks = aod->GetTracks(); Int_t ntracks = tracks->GetEntries(); - printf("Event: %5d Number of tracks: %5d \n", iev, ntracks); + printf("AliEveEventManager: %5d Number of tracks: %5d \n", iev, ntracks); for (Int_t ij = 0; ij < ntracks; ij++) { diff --git a/EVE/alice-macros/kine_tracks.C b/EVE/alice-macros/kine_tracks.C index 0be211b106f..5a2613ef3de 100644 --- a/EVE/alice-macros/kine_tracks.C +++ b/EVE/alice-macros/kine_tracks.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Import tracks from kinematics-tree / particle-stack. // Preliminary/minimal solution. @@ -8,7 +16,7 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, Bool_t pdg_col = kTRUE, Bool_t recurse = kTRUE, Bool_t use_track_refs = kTRUE) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); if (!stack) { @@ -55,7 +63,7 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, } // set path marks - Alieve::KineTools kt; + AliEveKineTools kt; kt.SetDaughterPathMarks(cont, stack, recurse); if (use_track_refs && rl->LoadTrackRefs() == 0) { @@ -179,7 +187,7 @@ kine_track(Int_t label, return 0; } - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); if (label >= stack->GetNtrack()) diff --git a/EVE/alice-macros/phos_clusters.C b/EVE/alice-macros/phos_clusters.C index 1bf63a1b69a..6b7078d7b18 100644 --- a/EVE/alice-macros/phos_clusters.C +++ b/EVE/alice-macros/phos_clusters.C @@ -1,9 +1,17 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* phos_clusters(TEveElement* cont=0) { - Alieve::Event::AssertGeometry(); + AliEveEventManager::AssertGeometry(); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadRecPoints("PHOS"); TTree *cTree = rl->GetTreeR("PHOS", false); diff --git a/EVE/alice-macros/pmd_digits.C b/EVE/alice-macros/pmd_digits.C index d2572d76ace..bc2bcbd23a9 100644 --- a/EVE/alice-macros/pmd_digits.C +++ b/EVE/alice-macros/pmd_digits.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // ---------------------------------------------------------------------- // void pmd_digits(Int_t mode = 0) { @@ -12,7 +20,7 @@ void pmd_digits(Int_t mode = 0) TString bsddl="DDL"; - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("PMD"); TTree* pmdt = rl->GetTreeD("PMD", false); @@ -104,7 +112,7 @@ void pmd_digits(Int_t mode = 0) for (Int_t ism = 0; ism < NSM; ism++) { - Alieve::PMDModule *lmodule = new Alieve::PMDModule(); + AliEvePMDModule *lmodule = new AliEvePMDModule(); lmodule->SetPosition(0.,0.,zpos); lmodule->DisplayDigitsData(modnumber, pmdt); lmodule->SetPalette(pal); diff --git a/EVE/alice-macros/pmd_hits.C b/EVE/alice-macros/pmd_hits.C index 4d722be8018..c1580a04e0a 100644 --- a/EVE/alice-macros/pmd_hits.C +++ b/EVE/alice-macros/pmd_hits.C @@ -1,10 +1,17 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* pmd_hits(const char *varexp = "fX:fY:fZ", const char *selection = "") { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("PMD"); TTree* ht = rl->GetTreeH("PMD", false); diff --git a/EVE/alice-macros/pmd_raw.C b/EVE/alice-macros/pmd_raw.C index 0c3f2d1c7f7..390dd3d502f 100644 --- a/EVE/alice-macros/pmd_raw.C +++ b/EVE/alice-macros/pmd_raw.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // ---------------------------------------------------------------------- // void pmd_raw(Int_t mode = 0) { @@ -101,7 +109,7 @@ void pmd_raw(Int_t mode = 0) for (Int_t ism = 0; ism < NSM; ism++) { - Alieve::PMDModule *lmodule = new Alieve::PMDModule(); + AliEvePMDModule *lmodule = new AliEvePMDModule(); lmodule->SetPosition(0.,0.,zpos); lmodule->DisplayRawData(modnumber,pmdddlcont); gEve->AddElement(lmodule, lddl); diff --git a/EVE/alice-macros/primary_vertex.C b/EVE/alice-macros/primary_vertex.C index 593bda0e0ad..02c6cfb2650 100644 --- a/EVE/alice-macros/primary_vertex.C +++ b/EVE/alice-macros/primary_vertex.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TPolyMarker3D* make_vertex_marker(AliESDVertex* v, const Text_t* name ) { @@ -41,7 +48,7 @@ TEveBoxSet* make_vertex_boxes(AliESDVertex* v) void register_vertex_marker(TPolyMarker3D* m) { - Color_t* colp = FindColorVar(m, "fMarkerColor"); + Color_t* colp = TEveUtil::FindColorVar(m, "fMarkerColor"); TEveElementObjectPtr* rnrEl = new TEveElementObjectPtr(m, *colp); gEve->AddElement(rnrEl); gEve->Redraw3D(); @@ -49,7 +56,7 @@ void register_vertex_marker(TPolyMarker3D* m) void primary_vertex_primitive(Bool_t showSPD=kTRUE, Bool_t showBoxes=kFALSE) { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); AliESDVertex* pv = esd->GetPrimaryVertex(); TPolyMarker3D* pvm = make_vertex_marker(pv, "Primary Vertex"); @@ -141,7 +148,7 @@ void make_vertex_ellipses(TEveStraightLineSet* ls, AliESDVertex* v, Bool_t ellip void primary_vertex(Bool_t showSPD=kTRUE, Bool_t rnrEllipse=kTRUE) { - AliESDEvent* esd = Alieve::Event::AssertESD(); + AliESDEvent* esd = AliEveEventManager::AssertESD(); TEveStraightLineSet* ls; AliESDVertex* PV = esd->GetPrimaryVertex(); diff --git a/EVE/alice-macros/primary_vertex_tracks.C b/EVE/alice-macros/primary_vertex_tracks.C index 33520446a6f..91ba67359c2 100644 --- a/EVE/alice-macros/primary_vertex_tracks.C +++ b/EVE/alice-macros/primary_vertex_tracks.C @@ -1,7 +1,15 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEveTrackList* primary_vertex_tracks() { TEveUtil::LoadMacro("esd_tracks.C"); - AliESDEvent *esd = Alieve::Event::AssertESD(); + AliESDEvent *esd = AliEveEventManager::AssertESD(); AliESDVertex *pv = esd->GetPrimaryVertex(); TEveTrackList* cont = new TEveTrackList("Tracks for Primary Vertex"); diff --git a/EVE/alice-macros/print_kine_from_label.C b/EVE/alice-macros/print_kine_from_label.C index bcbd2c518b4..2309d7015be 100644 --- a/EVE/alice-macros/print_kine_from_label.C +++ b/EVE/alice-macros/print_kine_from_label.C @@ -1,6 +1,14 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void print_kine_from_label(Int_t label) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); diff --git a/EVE/alice-macros/region_marker.C b/EVE/alice-macros/region_marker.C index 918b477bd1c..3ba9b937485 100644 --- a/EVE/alice-macros/region_marker.C +++ b/EVE/alice-macros/region_marker.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ 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) @@ -16,7 +23,7 @@ void region_marker(Float_t a=10, Float_t b=10, Float_t c=20, mark->SetPoint(5, x+a, y-b, z-c); mark->SetPoint(6, x-a, y+b, z-c); mark->SetPoint(7, x-a, y-b, z-c); - Color_t* colp = FindColorVar(mark, "fMarkerColor"); + Color_t* colp = TEveUtil::FindColorVar(mark, "fMarkerColor"); TEveElementObjectPtr* rnrEl = new TEveElementObjectPtr(mark, *colp); gEve->AddGlobalElement(rnrEl); gEve->Redraw3D(); diff --git a/EVE/alice-macros/t0_digits.C b/EVE/alice-macros/t0_digits.C index 55fdc7e9a4d..46482326f99 100644 --- a/EVE/alice-macros/t0_digits.C +++ b/EVE/alice-macros/t0_digits.C @@ -1,12 +1,19 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ namespace Alieve { -class Event; +class AliEveEventManager; } void t0_digits() { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("T0"); TTree* dt = rl->GetTreeD("T0", false); @@ -17,6 +24,6 @@ void t0_digits() gStyle->SetPalette(1, 0); - Alieve::T0Module::MakeModules(digits); + AliEveT0Module::MakeModules(digits); } diff --git a/EVE/alice-macros/t0_hits.C b/EVE/alice-macros/t0_hits.C index 443ac8c0945..ff287d88cf7 100644 --- a/EVE/alice-macros/t0_hits.C +++ b/EVE/alice-macros/t0_hits.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* t0_hits(const char *varexp = "T0.fX:T0.fY:T0.fZ", @@ -7,7 +14,7 @@ t0_hits(const char *varexp = "T0.fX:T0.fY:T0.fZ", // Extracts T0 hits. - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("T0"); TTree* ht = rl->GetTreeH("T0", false); diff --git a/EVE/alice-macros/t0_raw.C b/EVE/alice-macros/t0_raw.C index 1dad3eaae31..557b1e44e85 100644 --- a/EVE/alice-macros/t0_raw.C +++ b/EVE/alice-macros/t0_raw.C @@ -1,20 +1,27 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ namespace Alieve { -class Event; +class AliEveEventManager; } void t0_raw() { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); - Int_t ievt = Alieve::gEvent->GetEventId(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); + Int_t ievt = gEvent->GetEventId(); cout<SetPalette(1, 0); - Alieve::T0Module::LoadRaw("raw.root",ievt); + AliEveT0Module::LoadRaw("raw.root",ievt); } diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C index 426cda534b7..86deb4010e1 100644 --- a/EVE/alice-macros/tof_digits.C +++ b/EVE/alice-macros/tof_digits.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void tof_digits() { TClonesArray *array = 0x0; @@ -9,11 +17,11 @@ void tof_digits() printf("ERROR: no TGeo\n"); } - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("TOF"); TTree* dt = rl->GetTreeD("TOF", false); - Alieve::TOFDigitsInfo* di = new Alieve::TOFDigitsInfo(); + AliEveTOFDigitsInfo* di = new AliEveTOFDigitsInfo(); di->SetTree(dt); di->LoadDigits(); di->Dump(); @@ -32,7 +40,7 @@ void tof_digits() array = di->GetDigits(iSector); - Alieve::TOFSector* m = new Alieve::TOFSector(localGeoManager,iSector,array); + AliEveTOFSector* m = new AliEveTOFSector(localGeoManager,iSector,array); gEve->AddElement(m, ll); diff --git a/EVE/alice-macros/tof_digits_sector.C b/EVE/alice-macros/tof_digits_sector.C index 56ffec5591d..8ebd6035667 100644 --- a/EVE/alice-macros/tof_digits_sector.C +++ b/EVE/alice-macros/tof_digits_sector.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void tof_digits_sector(Int_t sector=0) { Int_t nDigitsInVolume[3] = {-1, -1, -1}; @@ -7,11 +15,11 @@ void tof_digits_sector(Int_t sector=0) printf("ERROR: no TGeo\n"); } - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("TOF"); TTree* dt = rl->GetTreeD("TOF", false); - Alieve::TOFDigitsInfo* di = new Alieve::TOFDigitsInfo(); + AliEveTOFDigitsInfo* di = new AliEveTOFDigitsInfo(); di->SetTree(dt); @@ -28,7 +36,7 @@ void tof_digits_sector(Int_t sector=0) ll->SetMainColor((Color_t)2); gEve->AddElement(ll); - Alieve::TOFSector* m = new Alieve::TOFSector(localGeoManager, sector, dt); + AliEveTOFSector* m = new AliEveTOFSector(localGeoManager, sector, dt); m->SetName("Sector"); m->SetAutoTrans(kFALSE); m->SetTrans(); diff --git a/EVE/alice-macros/tof_digits_strips.C b/EVE/alice-macros/tof_digits_strips.C index 22afd424bab..e8a426abed7 100644 --- a/EVE/alice-macros/tof_digits_strips.C +++ b/EVE/alice-macros/tof_digits_strips.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void tof_digits_strips() { TClonesArray *array = 0x0; @@ -9,11 +17,11 @@ void tof_digits_strips() printf("ERROR: no TGeo\n"); } - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("TOF"); TTree* dt = rl->GetTreeD("TOF", false); - Alieve::TOFDigitsInfo* di = new Alieve::TOFDigitsInfo(); + AliEveTOFDigitsInfo* di = new AliEveTOFDigitsInfo(); di->SetTree(dt); di->LoadDigits(); di->Dump(); @@ -64,7 +72,7 @@ void tof_digits_strips() array = di->GetDigits(iSector,iPlate, iStrip); - Alieve::TOFStrip* m = new Alieve::TOFStrip(localGeoManager,iSector,iPlate,iStrip,array); + AliEveTOFStrip* m = new AliEveTOFStrip(localGeoManager,iSector,iPlate,iStrip,array); gEve->AddElement(m, relPlate); } diff --git a/EVE/alice-macros/tof_hits.C b/EVE/alice-macros/tof_hits.C index 4cb5bab2508..97eb561054c 100644 --- a/EVE/alice-macros/tof_hits.C +++ b/EVE/alice-macros/tof_hits.C @@ -1,11 +1,18 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* tof_hits(const char *varexp = "fX:fY:fZ", const char *selection = "", TEveElement* cont) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("TOF"); TTree* ht = rl->GetTreeH("TOF", false); diff --git a/EVE/alice-macros/tpc_calib_viewer.C b/EVE/alice-macros/tpc_calib_viewer.C index 88982a07501..47ba5415aac 100644 --- a/EVE/alice-macros/tpc_calib_viewer.C +++ b/EVE/alice-macros/tpc_calib_viewer.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void tpc_calib_viewer(const char* file="CalibTree.root") { TEveBrowser* b = gEve->GetBrowser(); diff --git a/EVE/alice-macros/tpc_clusters.C b/EVE/alice-macros/tpc_clusters.C index 7550fbcdba0..6fccade9b73 100644 --- a/EVE/alice-macros/tpc_clusters.C +++ b/EVE/alice-macros/tpc_clusters.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifdef __CINT__ namespace TEveUtil @@ -8,10 +16,9 @@ class TEvePointSet; #else -#include #include #include -#include +#include #include #include @@ -23,12 +30,12 @@ TEvePointSet* tpc_clusters(TEveElement* cont=0, Float_t maxR=270) { const Int_t kMaxCl=100*160; - Alieve::Event::AssertGeometry(); + AliEveEventManager::AssertGeometry(); TEvePointSet* clusters = new TEvePointSet(kMaxCl); clusters->SetOwnIds(kTRUE); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadRecPoints("TPC"); AliTPCClustersRow *clrow=new AliTPCClustersRow(); diff --git a/EVE/alice-macros/tpc_digits.C b/EVE/alice-macros/tpc_digits.C index 3ed72c820a1..88a5c3dae75 100644 --- a/EVE/alice-macros/tpc_digits.C +++ b/EVE/alice-macros/tpc_digits.C @@ -1,26 +1,33 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include "TGLViewer.h" namespace Alieve { -class TPCData; -class Event; +class AliEveTPCData; +class AliEveEventManager; } -Alieve::TPCData* g_tpc_data = 0; -Alieve::Event* g_tpc_last_event = 0; +AliEveTPCData* g_tpc_data = 0; +AliEveEventManager* g_tpc_last_event = 0; void tpc_digits(Int_t mode=1) { - if (g_tpc_data == 0 || g_tpc_last_event != Alieve::gEvent) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + if (g_tpc_data == 0 || g_tpc_last_event != gEvent) { + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("TPC"); TTree* dt = rl->GetTreeD("TPC", false); - g_tpc_data = new Alieve::TPCData; + g_tpc_data = new AliEveTPCData; g_tpc_data->LoadDigits(dt, kTRUE); // Create all present sectors. - g_tpc_last_event = Alieve::gEvent; + g_tpc_last_event = gEvent; } // Viewport limits. @@ -39,7 +46,7 @@ void tpc_digits(Int_t mode=1) switch(mode) { case 0: { // Display a single sector - Alieve::TPCSector2D* s = new Alieve::TPCSector2D(); + AliEveTPCSector2D* s = new AliEveTPCSector2D(); s->SetFrameColor(col); s->SetDataSource(g_tpc_data); gEve->AddElement(s); @@ -62,7 +69,7 @@ void tpc_digits(Int_t mode=1) gEve->AddElement(l); for(Int_t i = 0; i<18; i++) { - Alieve::TPCSector2D* s = new Alieve::TPCSector2D(Form("TPCSector2D %d", i)); + AliEveTPCSector2D* s = new AliEveTPCSector2D(Form("AliEveTPCSector2D %d", i)); s->SetSectorID(i); s->SetDataSource(g_tpc_data); s->SetFrameColor(col); @@ -77,7 +84,7 @@ void tpc_digits(Int_t mode=1) gEve->AddElement(l); for(Int_t i = 18; i<36; i++) { - Alieve::TPCSector2D* s = new Alieve::TPCSector2D(Form("TPCSector2D %d", i)); + AliEveTPCSector2D* s = new AliEveTPCSector2D(Form("AliEveTPCSector2D %d", i)); s->SetSectorID(i); s->SetDataSource(g_tpc_data); s->SetFrameColor(col); @@ -91,7 +98,7 @@ void tpc_digits(Int_t mode=1) } case 2 : { // Display a single sector in 3D - Alieve::TPCSector3D* s = new Alieve::TPCSector3D(); + AliEveTPCSector3D* s = new AliEveTPCSector3D(); s->SetFrameColor(col); s->SetDataSource(g_tpc_data); gEve->AddElement(s); @@ -108,7 +115,7 @@ void tpc_digits(Int_t mode=1) gEve->AddElement(l); for(Int_t i = 0; i<18; i++) { - Alieve::TPCSector3D* s = new Alieve::TPCSector3D(Form("TPCSector3D %d", i)); + AliEveTPCSector3D* s = new AliEveTPCSector3D(Form("AliEveTPCSector3D %d", i)); s->SetSectorID(i); s->SetDataSource(g_tpc_data); s->SetFrameColor(col); @@ -123,7 +130,7 @@ void tpc_digits(Int_t mode=1) gEve->AddElement(l); for(Int_t i = 18; i<36; i++) { - Alieve::TPCSector3D* s = new Alieve::TPCSector3D(Form("TPCSector3D %d", i)); + AliEveTPCSector3D* s = new AliEveTPCSector3D(Form("AliEveTPCSector3D %d", i)); s->SetSectorID(i); s->SetDataSource(g_tpc_data); s->SetFrameColor(col); @@ -145,15 +152,15 @@ void tpc_digits_2drange(Int_t start, Int_t end) if (start < 0) start = 0; if (end > 35) end = 35; - if (g_tpc_data == 0 || g_tpc_last_event != Alieve::gEvent) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + if (g_tpc_data == 0 || g_tpc_last_event != gEvent) { + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("TPC"); TTree* dt = rl->GetTreeD("TPC", false); - g_tpc_data = new Alieve::TPCData; + g_tpc_data = new AliEveTPCData; g_tpc_data->LoadDigits(dt, kTRUE); // Create all present sectors. - g_tpc_last_event = Alieve::gEvent; + g_tpc_last_event = gEvent; } gStyle->SetPalette(1, 0); @@ -166,7 +173,7 @@ void tpc_digits_2drange(Int_t start, Int_t end) gEve->AddElement(l); for(Int_t i=start; i<=end; i++) { - Alieve::TPCSector2D* s = new Alieve::TPCSector2D(); + AliEveTPCSector2D* s = new AliEveTPCSector2D(); s->SetSectorID(i); s->SetDataSource(g_tpc_data); s->SetFrameColor(col); diff --git a/EVE/alice-macros/tpc_hits.C b/EVE/alice-macros/tpc_hits.C index e19b00e0149..af74117d0d9 100644 --- a/EVE/alice-macros/tpc_hits.C +++ b/EVE/alice-macros/tpc_hits.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* tpc_hits(const char *varexp = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ", @@ -8,7 +15,7 @@ tpc_hits(const char *varexp = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ" // Extracts 'major' TPC hits (not the compressed ones). // This gives ~2.5% of all hits. - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("TPC"); TTree* ht = rl->GetTreeH("TPC", false); diff --git a/EVE/alice-macros/tpc_hits_charge_split.C b/EVE/alice-macros/tpc_hits_charge_split.C index 2a77dd3acea..bc6a43f7cbd 100644 --- a/EVE/alice-macros/tpc_hits_charge_split.C +++ b/EVE/alice-macros/tpc_hits_charge_split.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void tpc_hits_charge_split(const char *varexp = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ" @@ -8,7 +15,7 @@ void tpc_hits_charge_split(const char *varexp = // Extracts 'major' TPC hits (not the compressed ones). // This gives ~2.5% of all hits. - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("TPC"); TTree* ht = rl->GetTreeH("TPC", false); diff --git a/EVE/alice-macros/tpc_hits_eta_split.C b/EVE/alice-macros/tpc_hits_eta_split.C index 850cfa56760..579802afe2d 100644 --- a/EVE/alice-macros/tpc_hits_eta_split.C +++ b/EVE/alice-macros/tpc_hits_eta_split.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void tpc_hits_eta_split(const char *varexp = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ" @@ -8,7 +15,7 @@ void tpc_hits_eta_split(const char *varexp = // Extracts 'major' TPC hits (not the compressed ones). // This gives ~2.5% of all hits. - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("TPC"); TTree* ht = rl->GetTreeH("TPC", false); diff --git a/EVE/alice-macros/trd_hits.C b/EVE/alice-macros/trd_hits.C index 95b3d99e498..1d0d36fbfa9 100644 --- a/EVE/alice-macros/trd_hits.C +++ b/EVE/alice-macros/trd_hits.C @@ -1,11 +1,18 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* trd_hits(const char *varexp = "fX:fY:fZ", const char *selection = "", TEveElement* cont = 0) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("TRD"); TTree* ht = rl->GetTreeH("TRD", false); diff --git a/EVE/alice-macros/trd_hits_z_split.C b/EVE/alice-macros/trd_hits_z_split.C index 902346503ec..0134e248892 100644 --- a/EVE/alice-macros/trd_hits_z_split.C +++ b/EVE/alice-macros/trd_hits_z_split.C @@ -1,9 +1,16 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void trd_hits_z_split(const char *varexp = "fX:fY:fZ:fZ", const char *selection = "") { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("TRD"); TTree* ht = rl->GetTreeH("TRD", false); diff --git a/EVE/alice-macros/vzero_digits.C b/EVE/alice-macros/vzero_digits.C index cede8179e4d..2e193b001b7 100644 --- a/EVE/alice-macros/vzero_digits.C +++ b/EVE/alice-macros/vzero_digits.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // fV0CHeight1 = 2.5; // height of cell 1 // fV0CHeight2 = 4.4; // height of cell 2 // fV0CHeight3 = 7.4; // height of cell 3 @@ -20,7 +28,7 @@ void vzero_digits() gStyle->SetPalette(1, 0); - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("VZERO"); TTree* dt = rl->GetTreeD("VZERO", false); @@ -42,7 +50,7 @@ void vzero_digits() AliVZEROdigit* d = (AliVZEROdigit*) dca->UncheckedAt(entr); Int_t i = d->PMNumber(); - if (i < 32) // V0 Right + if (i < 32) // AliEveV0 Right { TEveQuadSet* module = modR; Int_t ri = i / 8; @@ -59,7 +67,7 @@ void vzero_digits() module->QuadValue(d->ADC()); module->QuadId(d); } - else // V0 Left + else // AliEveV0 Left { TEveQuadSet* module = modL; Int_t ri = (i-32) / 8; diff --git a/EVE/alice-macros/vzero_hits.C b/EVE/alice-macros/vzero_hits.C index 73422dafa72..5b6abb2a6c9 100644 --- a/EVE/alice-macros/vzero_hits.C +++ b/EVE/alice-macros/vzero_hits.C @@ -1,10 +1,17 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ TEvePointSet* vzero_hits(const char *varexp = "fX:fY:fZ", const char *selection = "") { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadHits("VZERO"); TTree* ht = rl->GetTreeH("VZERO", false); diff --git a/EVE/hlt-macros/command_queue.C b/EVE/hlt-macros/command_queue.C index ce0588c76bc..d5b454ab2aa 100644 --- a/EVE/hlt-macros/command_queue.C +++ b/EVE/hlt-macros/command_queue.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include #include #include diff --git a/EVE/hlt-macros/hlt_structs.C b/EVE/hlt-macros/hlt_structs.C index f755d89d6ed..823a50b81d7 100644 --- a/EVE/hlt-macros/hlt_structs.C +++ b/EVE/hlt-macros/hlt_structs.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #include struct AliHLTTPCSpacePointData diff --git a/EVE/hlt-macros/homer_display.C b/EVE/hlt-macros/homer_display.C index 5325046a6e1..a9ac5a806ef 100644 --- a/EVE/hlt-macros/homer_display.C +++ b/EVE/hlt-macros/homer_display.C @@ -1,4 +1,11 @@ -// $Header$ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Functions to read data from HOMER. // @@ -15,11 +22,11 @@ #include "TTimer.h" #include "TRandom.h" #include "TVirtualPad.h" -//#include "AliEVEHOMERManager.h" +//#include "AliEveHOMERManager.h" class AliRawReaderMemory; -class AliEVEHOMERManager; +class AliEveHOMERManager; class AliHLTHOMERBlockDesc; class TEvePointSet; @@ -27,20 +34,20 @@ class TEveTrackList; class TEveTrack; namespace Alieve { -class TPCLoader; -class TPCData; -class TPCSector2D; -class TPCSector3D; +class AliEveTPCLoader; +class AliEveTPCData; +class AliEveTPCSector2D; +class AliEveTPCSector3D; } -using namespace Alieve; -TPCLoader* loader = 0; -TPCData* tpcdata = 0; + +AliEveTPCLoader* loader = 0; +AliEveTPCData* tpcdata = 0; TEvePointSet* tpc_cls = 0; TEveTrackList* tpc_trk = 0; AliRawReaderMemory* memreader = 0; -AliEVEHOMERManager* homerM = 0; +AliEveHOMERManager* homerM = 0; Int_t event = -1; @@ -63,8 +70,8 @@ void process_tpc_clusters(AliHLTHOMERBlockDesc* b); //**************************************************************************** void homer_display() { - homerM = new AliEVEHOMERManager("/local/home/hlt/TPC-SCC1-Generate.xml"); - // homerM = new AliEVEHOMERManager("/local/home/hlt/sampleConfig2.xml"); + homerM = new AliEveHOMERManager("/local/home/hlt/TPC-SCC1-Generate.xml"); + // homerM = new AliEveHOMERManager("/local/home/hlt/sampleConfig2.xml"); gEve->AddToListTree(homerM, kTRUE); @@ -77,7 +84,7 @@ void homer_display() memreader = new AliRawReaderMemory(0, 0); gStyle->SetPalette(1, 0); - loader = new TPCLoader; + loader = new AliEveTPCLoader; loader->SetDoubleSR(kTRUE); loader->SetInitParams(40, 900, 10, 100); // Sector params (mint, maxt, thr, maxval) //loader->SetInitParams(40, 1023, 10); // Sector params (mint, maxt, thr) diff --git a/EVE/hlt-macros/rootlogon.C b/EVE/hlt-macros/rootlogon.C index 0c89190eb87..ce6c65d334b 100644 --- a/EVE/hlt-macros/rootlogon.C +++ b/EVE/hlt-macros/rootlogon.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ { diff --git a/EVE/macros/alieve_create_vsd.C b/EVE/macros/alieve_create_vsd.C index 458cbca45cf..97b13e165bb 100644 --- a/EVE/macros/alieve_create_vsd.C +++ b/EVE/macros/alieve_create_vsd.C @@ -1,3 +1,11 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void alieve_create_vsd() { // Invoke as: aliroot alieve_create_vsd.C @@ -15,7 +23,7 @@ void alieve_create_vsd() TGeoManager::Import("geometry.root"); - Alieve::VSDCreator vc; + AliEveVSDCreator vc; vc.SetDebugLevel(2); vc.CreateVSD(".", 0, "AliVSD.root"); } diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C index 2626e107acf..a629c238da4 100644 --- a/EVE/macros/alieve_init.C +++ b/EVE/macros/alieve_init.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ #ifndef __CINT_ #include @@ -14,18 +21,18 @@ void alieve_init(const Text_t* path = ".", Int_t event=0, alieve_init_import_macros(); gSystem->cd(hack); - // AssertMacro("region_marker.C"); + // TEveUtil::AssertMacro("region_marker.C"); gSystem->ProcessEvents(); // Open event if(path != 0) { - Alieve::Event::SetCdbUri(cdburi); - Alieve::Event::SetAssertElements(assert_runloader, assert_esd); + AliEveEventManager::SetCdbUri(cdburi); + AliEveEventManager::SetAssertElements(assert_runloader, assert_esd); printf("Opening event %d from '%s' ...", event, path); fflush(stdout); - Alieve::gEvent = new Alieve::Event(path, event); + gEvent = new AliEveEventManager(path, event); printf(" done.\n"); - gEve->AddEvent(Alieve::gEvent); + gEve->AddEvent(gEvent); } } diff --git a/EVE/macros/alieve_loadlibs.C b/EVE/macros/alieve_loadlibs.C index 12f6612e342..565302640ef 100644 --- a/EVE/macros/alieve_loadlibs.C +++ b/EVE/macros/alieve_loadlibs.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ void alieve_loadlibs () { diff --git a/EVE/macros/isegv.C b/EVE/macros/isegv.C index 17d3556adf1..cc18d02dbd3 100644 --- a/EVE/macros/isegv.C +++ b/EVE/macros/isegv.C @@ -1,4 +1,11 @@ // $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Cause ROOT to properly crash and dump core on SigSEGV. { diff --git a/EVE/macros/trackcount_init.C b/EVE/macros/trackcount_init.C index b728b8caf92..7b9b8b7bf8c 100644 --- a/EVE/macros/trackcount_init.C +++ b/EVE/macros/trackcount_init.C @@ -1,18 +1,27 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ + void trackcount_init() { - LoadMacro("alieve_init.C"); + TEveUtil::LoadMacro("alieve_init.C"); alieve_init(".", -1); - LoadMacro("primary_vertex.C"); - LoadMacro("esd_tracks.C"); - LoadMacro("its_clusters.C+"); - LoadMacro("tpc_clusters.C+"); + TEveUtil::LoadMacro("primary_vertex.C"); + TEveUtil::LoadMacro("esd_tracks.C"); + TEveUtil::LoadMacro("its_clusters.C+"); + TEveUtil::LoadMacro("tpc_clusters.C+"); TEveTrackCounter* g_trkcnt = new TEveTrackCounter("Primary Counter"); gEve->AddGlobalElement(g_trkcnt); - Alieve::gEvent->AddNewEventCommand("on_new_event();"); - Alieve::gEvent->GotoEvent(0); + gEvent->AddNewEventCommand("on_new_event();"); + gEvent->GotoEvent(0); gEve->Redraw3D(kTRUE); } @@ -38,7 +47,7 @@ void on_new_event() Int_t count = 1; TEveTrackCounter* g_trkcnt = TEveTrackCounter::fgInstance; g_trkcnt->Reset(); - g_trkcnt->SetEventId(Alieve::gEvent->GetEventId()); + g_trkcnt->SetEventId(gEvent->GetEventId()); TEveElement::List_i i = cont->BeginChildren(); while (i != cont->EndChildren()) { TEveTrackList* l = dynamic_cast(*i); @@ -53,7 +62,7 @@ void on_new_event() TParticle* id(Int_t label=0, Bool_t showParents=kTRUE) { - AliRunLoader* rl = Alieve::Event::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); diff --git a/EVE/test-macros/tpc_digi_test.C b/EVE/test-macros/tpc_digi_test.C index 571e6097fe4..cd30d2164ee 100644 --- a/EVE/test-macros/tpc_digi_test.C +++ b/EVE/test-macros/tpc_digi_test.C @@ -1,10 +1,18 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ class TTree; namespace Alieve { -class TPCData; +class AliEveTPCData; } -Alieve::TPCData* x = 0; +AliEveTPCData* x = 0; TTree* tree = 0; void tpc_digi_test() @@ -15,14 +23,14 @@ void tpc_digi_test() TFile* f = new TFile("coctail_1k/TPC.Digits.root"); tree = (TTree*) gDirectory->Get("Event0/TreeD"); - x = new Alieve::TPCData; + x = new AliEveTPCData; // x->SetSectorBlockSize(8192); // x->SetLoadThreshold(5); x->CreateAllSectors(); x->LoadDigits(tree, kFALSE); gStyle->SetPalette(1, 0); - Alieve::TPCSector2D* s = new Alieve::TPCSector2D(); + AliEveTPCSector2D* s = new AliEveTPCSector2D(); s->SetDataSource(x); s->SetMainColor(36); gEve->AddElement(s); @@ -32,8 +40,8 @@ void tpc_digi_test() void tpc_digi_pad_dump(Int_t s, Int_t r, Int_t p) { - if(r >= Alieve::TPCSectorData::GetInnSeg().fNRows) { - r -= Alieve::TPCSectorData::GetInnSeg().fNRows; + if(r >= AliEveTPCSectorData::GetInnSeg().fNRows) { + r -= AliEveTPCSectorData::GetInnSeg().fNRows; s += 36; } @@ -44,7 +52,7 @@ void tpc_digi_pad_dump(Int_t s, Int_t r, Int_t p) for (Int_t ent=0; entGetEntry(ent); Int_t sector, row; - Alieve::TPCSectorData::GetParam().AdjustSectorRow(digit->GetID(), sector, row); + AliEveTPCSectorData::GetParam().AdjustSectorRow(digit->GetID(), sector, row); if(sector != s || row != r) continue; diff --git a/EVE/test-macros/tpc_gui.C b/EVE/test-macros/tpc_gui.C index bf129b0f437..604882b1dd9 100644 --- a/EVE/test-macros/tpc_gui.C +++ b/EVE/test-macros/tpc_gui.C @@ -1,9 +1,16 @@ -// $Header: /soft/cvsroot/AliRoot/EVE/test-macros/tpc_gui.C,v 1.8 2007/10/22 14:49:12 mtadel Exp $ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Function to spawn a gui for reading rootified raw-data from TPC sector test. // // To use: -// a) select TPCLoader entry in the list-tree view; +// a) select AliEveTPCLoader entry in the list-tree view; // you'll get a dialog to steer the data-loading process in an adjacent window // b) to select a ROOT file containing the raw-data double-click on 'File:' // text entry to spawn a file-dialog or type in the name @@ -14,18 +21,18 @@ class AliRawReaderRoot; namespace Alieve { -class TPCData; -class TPCSector2D; -class TPCSector3D; +class AliEveTPCData; +class AliEveTPCSector2D; +class AliEveTPCSector3D; } #else #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -36,16 +43,14 @@ class TPCSector3D; #endif -using namespace Alieve; - -TPCLoader* tpc_loader = 0; +AliEveTPCLoader* tpc_loader = 0; void tpc_gui(const char *file=0, Int_t ievent=0) { gStyle->SetPalette(1, 0); - TPCLoader* l = tpc_loader = new TPCLoader; - TPCData* d = new TPCData; + AliEveTPCLoader* l = tpc_loader = new AliEveTPCLoader; + AliEveTPCData* d = new AliEveTPCData; // d->SetLoadPedestal(5); d->SetLoadThreshold(5); d->SetAutoPedestal(kTRUE); diff --git a/EVE/test-macros/tpc_gui_hack.C b/EVE/test-macros/tpc_gui_hack.C index 362b0ec150c..29087a90199 100644 --- a/EVE/test-macros/tpc_gui_hack.C +++ b/EVE/test-macros/tpc_gui_hack.C @@ -1,4 +1,11 @@ -// $Header: /soft/cvsroot/AliRoot/EVE/test-macros/tpc_gui_hack.C,v 1.5 2007/10/22 14:49:12 mtadel Exp $ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Function to spawn a gui for reading rootified raw-data from TPC sector test. @@ -7,18 +14,18 @@ class AliRawReaderRoot; namespace Alieve { -class TPCData; -class TPCSector2D; -class TPCSector3D; +class AliEveTPCData; +class AliEveTPCSector2D; +class AliEveTPCSector3D; } #else #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -29,19 +36,17 @@ class TPCSector3D; #endif -using namespace Alieve; - -TPCSectorData* su = 0; -TPCSectorData* sl = 0; +AliEveTPCSectorData* su = 0; +AliEveTPCSectorData* sl = 0; -TPCLoader* loader = 0; +AliEveTPCLoader* loader = 0; void tpc_gui_hack(const char *file=0, Int_t ievent=0) { gStyle->SetPalette(1, 0); - TPCLoader* l = new TPCLoader; loader = l; - TPCData* d = new TPCData; + AliEveTPCLoader* l = new AliEveTPCLoader; loader = l; + AliEveTPCData* d = new AliEveTPCData; // d->SetLoadPedestal(5); d->SetLoadThreshold(5); d->SetAutoPedestal(kTRUE); @@ -64,13 +69,13 @@ void tpc_gui_hack(const char *file=0, Int_t ievent=0) } } -void disable_pad(Int_t row, Int_t pad, TPCSectorData* sd, +void disable_pad(Int_t row, Int_t pad, AliEveTPCSectorData* sd, Int_t thrExt=10, Float_t thrFac=2) { - if(row < 0 || row >= TPCSectorData::GetNAllRows()) + if(row < 0 || row >= AliEveTPCSectorData::GetNAllRows()) { printf("row off, %d\n", row); return; } - Int_t npads = TPCSectorData::GetNPadsInRow(row); + Int_t npads = AliEveTPCSectorData::GetNPadsInRow(row); if(pad < 0) pad = npads + pad; if(pad < 0 || pad >= npads) { printf("pad off\n"); return; } @@ -98,7 +103,7 @@ void disable_std() } { // Top 12, 4 pads on the negative side. - TPCSectorData::SegmentInfo& o1si = TPCSectorData::GetOut1Seg(); + AliEveTPCSectorData::SegmentInfo& o1si = AliEveTPCSectorData::GetOut1Seg(); Int_t last = o1si.GetLastRow(); for(Int_t r=last - 11; r<=last; ++r) { disable_pad(r, -1, su, 20, 4); @@ -129,7 +134,7 @@ void disable_std() } { - TPCSectorData::SegmentInfo& o2si = TPCSectorData::GetOut2Seg(); + AliEveTPCSectorData::SegmentInfo& o2si = AliEveTPCSectorData::GetOut2Seg(); Int_t first = o2si.GetFirstRow(); Int_t last = o2si.GetLastRow(); diff --git a/EVE/test-macros/tpc_raw_test.C b/EVE/test-macros/tpc_raw_test.C index 29948bae5d9..580304df847 100644 --- a/EVE/test-macros/tpc_raw_test.C +++ b/EVE/test-macros/tpc_raw_test.C @@ -1,10 +1,18 @@ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ class AliRawReaderFile; namespace Alieve { -class TPCData; +class AliEveTPCData; } -Alieve::TPCData* x = 0; +AliEveTPCData* x = 0; AliRawReaderFile* reader = 0; void tpc_raw_test() @@ -17,7 +25,7 @@ void tpc_raw_test() reader->NextEvent(); AliTPCRawStream input(reader); - x = new Alieve::TPCData; + x = new AliEveTPCData; //x->SetSectorBlockSize(8192); //x->SetLoadThreshold(5); x->CreateAllSectors(); @@ -25,7 +33,7 @@ void tpc_raw_test() gStyle->SetPalette(1, 0); - Alieve::TPCSector2D* s = new Alieve::TPCSector2D(); + AliEveTPCSector2D* s = new AliEveTPCSector2D(); s->SetDataSource(x); s->SetMainColor(36); gEve->AddElement(s); @@ -38,8 +46,8 @@ void tpc_raw_pad_dump(Int_t s, Int_t r, Int_t p) reader->Reset(); reader->NextEvent(); - if(r >= Alieve::TPCSectorData::GetInnSeg().fNRows) { - r -= Alieve::TPCSectorData::GetInnSeg().fNRows; + if(r >= AliEveTPCSectorData::GetInnSeg().fNRows) { + r -= AliEveTPCSectorData::GetInnSeg().fNRows; s += 36; } diff --git a/EVE/test-macros/tpc_sector_raw_test.C b/EVE/test-macros/tpc_sector_raw_test.C index 1a578b2fe0e..0360c2d330f 100644 --- a/EVE/test-macros/tpc_sector_raw_test.C +++ b/EVE/test-macros/tpc_sector_raw_test.C @@ -1,4 +1,11 @@ -// $Header: /soft/cvsroot/AliRoot/EVE/test-macros/tpc_sector_raw_test.C,v 1.10 2006/10/18 17:00:14 mtadel Exp $ +// $Id$ +// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007 + +/************************************************************************** + * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * + * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * + * full copyright notice. * + **************************************************************************/ // Functions to read rootified raw-data from TPC sector test. // @@ -9,16 +16,15 @@ class AliRawReaderRoot; namespace Alieve { -class TPCData; -class TPCSector2D; -class TPCSector3D; +class AliEveTPCData; +class AliEveTPCSector2D; +class AliEveTPCSector3D; } -using namespace Alieve; -TPCData* x = 0; -TPCSector2D* s = 0; -TPCSector3D* t = 0; +AliEveTPCData* x = 0; +AliEveTPCSector2D* s = 0; +AliEveTPCSector3D* t = 0; AliRawReaderRoot* reader = 0; Int_t event = -1; @@ -41,12 +47,12 @@ void tpc_sector_raw_test(const char *file = "", Int_t ievent = 0) } } - x = new TPCData; + x = new AliEveTPCData; // x->SetLoadPedestal(5); x->SetLoadThreshold(5); x->SetAutoPedestal(kTRUE); - s = new TPCSector2D(); + s = new AliEveTPCSector2D(); s->SetSectorID(default_sector); s->SetAutoTrans(kTRUE); // place on proper 3D coordinates s->SetDataSource(x); @@ -54,7 +60,7 @@ void tpc_sector_raw_test(const char *file = "", Int_t ievent = 0) gEve->AddElement(s); gEve->DrawElement(s); - t = new TPCSector3D(); + t = new AliEveTPCSector3D(); t->SetSectorID(default_sector); t->SetAutoTrans(kTRUE); t->SetDataSource(x); @@ -94,8 +100,8 @@ void next_event() void tpc_raw_pad_dump(Int_t s, Int_t r, Int_t p) { - if(r >= TPCSectorData::GetInnSeg().GetNRows()) { - r -= TPCSectorData::GetInnSeg().GetNRows(); + if(r >= AliEveTPCSectorData::GetInnSeg().GetNRows()) { + r -= AliEveTPCSectorData::GetInnSeg().GetNRows(); s += 36; } -- 2.43.0