From 4e47b8822bcc8928e9bb85c4351c614cc5fce27d Mon Sep 17 00:00:00 2001 From: fca Date: Mon, 28 Feb 2000 19:51:04 +0000 Subject: [PATCH] Make drawing and viewving named macros --- CASTOR/DrawCASTOR.C | 5 +++-- CASTOR/ViewCASTOR.C | 2 +- FMD/DrawFMD.C | 5 +++-- FMD/ViewFMD.C | 2 +- ITS/DrawITS.C | 5 +++-- ITS/ViewITS.C | 2 +- ITS/ViewITS_v3.C | 2 +- MUON/DrawMUON.C | 5 +++-- MUON/ViewMUON.C | 2 +- PHOS/DrawPHOS.C | 5 +++-- PHOS/ViewPHOS.C | 2 +- PMD/DrawPMD.C | 5 +++-- PMD/ViewPMD.C | 2 +- RICH/DrawRICH.C | 5 +++-- RICH/ViewRICH.C | 2 +- START/DrawSTART.C | 5 +++-- START/ViewSTART.C | 2 +- STRUCT/DrawABSO.C | 5 +++-- STRUCT/DrawDIPO.C | 5 +++-- STRUCT/DrawFRAME.C | 5 +++-- STRUCT/DrawHALL.C | 5 +++-- STRUCT/DrawMAG.C | 5 +++-- STRUCT/DrawPIPE.C | 5 +++-- STRUCT/DrawSHIL.C | 5 +++-- STRUCT/ViewABSO.C | 2 +- STRUCT/ViewDIPO.C | 2 +- STRUCT/ViewFRAME.C | 2 +- STRUCT/ViewHALL.C | 2 +- STRUCT/ViewMAG.C | 2 +- STRUCT/ViewPIPE.C | 2 +- STRUCT/ViewSHIL.C | 2 +- TOF/DrawTOF.C | 5 +++-- TOF/DrawTOF0.C | 5 +++-- TOF/DrawTOF1.C | 5 +++-- TOF/ViewTOF.C | 2 +- TOF/ViewTOF0.C | 2 +- TOF/ViewTOF1.C | 2 +- TOF/ViewTOF2.C | 2 +- TPC/DrawTPC.C | 5 +++-- TPC/ViewTPC.C | 2 +- TRD/DrawTRD.C | 6 ++++-- TRD/ViewTRD.C | 2 +- TRD/ViewTRD0.C | 2 +- TRD/ViewTRD1.C | 2 +- TRD/ViewTRD2.C | 2 +- macros/DrawABSO.C | 5 +++-- macros/DrawCASTOR.C | 5 +++-- macros/DrawDIPO.C | 5 +++-- macros/DrawFMD.C | 5 +++-- macros/DrawFRAME.C | 5 +++-- macros/DrawHALL.C | 5 +++-- macros/DrawITS.C | 5 +++-- macros/DrawMAG.C | 5 +++-- macros/DrawMUON.C | 5 +++-- macros/DrawPHOS.C | 5 +++-- macros/DrawPIPE.C | 5 +++-- macros/DrawPMD.C | 5 +++-- macros/DrawRICH.C | 5 +++-- macros/DrawSHIL.C | 5 +++-- macros/DrawTOF.C | 5 +++-- macros/DrawTOF0.C | 5 +++-- macros/DrawTOF1.C | 5 +++-- macros/DrawTPC.C | 5 +++-- macros/DrawTRD.C | 5 +++-- macros/ViewABSO.C | 2 +- macros/ViewCASTOR.C | 2 +- macros/ViewDIPO.C | 2 +- macros/ViewFMD.C | 2 +- macros/ViewFRAME.C | 2 +- macros/ViewHALL.C | 2 +- macros/ViewITS.C | 2 +- macros/ViewMAG.C | 2 +- macros/ViewMUON.C | 2 +- macros/ViewPHOS.C | 2 +- macros/ViewPIPE.C | 2 +- macros/ViewPMD.C | 2 +- macros/ViewRICH.C | 2 +- macros/ViewSHIL.C | 2 +- macros/ViewTOF.C | 2 +- macros/ViewTOF0.C | 2 +- macros/ViewTOF1.C | 2 +- macros/ViewTOF2.C | 2 +- macros/ViewTPC.C | 2 +- macros/ViewTRD.C | 2 +- 84 files changed, 163 insertions(+), 123 deletions(-) diff --git a/CASTOR/DrawCASTOR.C b/CASTOR/DrawCASTOR.C index c6a3f19b713..83f5a17229e 100644 --- a/CASTOR/DrawCASTOR.C +++ b/CASTOR/DrawCASTOR.C @@ -1,8 +1,9 @@ -//void DrawCASTOR() +void DrawCASTOR() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewCASTOR.C"); + gROOT->LoadMacro("ViewCASTOR.C"); + gInterpreter->ProcessLine("ViewCASTOR()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/CASTOR/ViewCASTOR.C b/CASTOR/ViewCASTOR.C index 0076ed5bff9..3fec238be0d 100644 --- a/CASTOR/ViewCASTOR.C +++ b/CASTOR/ViewCASTOR.C @@ -1,4 +1,4 @@ -//void ViewCASTOR() +void ViewCASTOR() { gMC->Gsatt("OCTA","seen",0); gMC->Gsatt("EM ","seen",0); diff --git a/FMD/DrawFMD.C b/FMD/DrawFMD.C index a039e096ba3..72744cc6d16 100644 --- a/FMD/DrawFMD.C +++ b/FMD/DrawFMD.C @@ -1,8 +1,9 @@ -//void DrawFMD() +void DrawFMD() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewFMD.C"); + gROOT->LoadMacro("ViewFMD.C"); + gInterpreter->ProcessLine("ViewFMD()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/FMD/ViewFMD.C b/FMD/ViewFMD.C index c5a9e2c1cdf..984359cbd04 100644 --- a/FMD/ViewFMD.C +++ b/FMD/ViewFMD.C @@ -1,4 +1,4 @@ -//void ViewFMD() +void ViewFMD() { gMC->Gsatt("IWR3","seen",1); gMC->Gsatt("FWR3","seen",1); diff --git a/ITS/DrawITS.C b/ITS/DrawITS.C index f5e54100746..fc1b90e9ef9 100644 --- a/ITS/DrawITS.C +++ b/ITS/DrawITS.C @@ -1,8 +1,9 @@ -//void DrawITS() +void DrawITS() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewITS.C"); + gROOT->LoadMacro("ViewITS.C"); + gInterpreter->ProcessLine("ViewITS()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/ITS/ViewITS.C b/ITS/ViewITS.C index dfba13b0bf4..6cc651a3982 100644 --- a/ITS/ViewITS.C +++ b/ITS/ViewITS.C @@ -1,4 +1,4 @@ -//void ViewITS() +void ViewITS() { gMC->Gsatt("ITSV","seen",0); gMC->Gsatt("IT12","seen",0); diff --git a/ITS/ViewITS_v3.C b/ITS/ViewITS_v3.C index 568e547c059..413cf652a7b 100644 --- a/ITS/ViewITS_v3.C +++ b/ITS/ViewITS_v3.C @@ -1,4 +1,4 @@ -//void ViewITS_v3() +void ViewITS_v3() { gMC->Gsatt("ITSV","seen",0); gMC->Gsatt("IT12","seen",0); diff --git a/MUON/DrawMUON.C b/MUON/DrawMUON.C index bc3cb701a54..d651a4fea55 100644 --- a/MUON/DrawMUON.C +++ b/MUON/DrawMUON.C @@ -1,8 +1,9 @@ -//void DrawMUON() +void DrawMUON() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewMUON.C"); + gROOT->LoadMacro("ViewMUON.C"); + gInterpreter->ProcessLine("ViewMUON()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/MUON/ViewMUON.C b/MUON/ViewMUON.C index 548233f6d8e..2d62399b29f 100644 --- a/MUON/ViewMUON.C +++ b/MUON/ViewMUON.C @@ -1,4 +1,4 @@ -//void ViewMUON() +void ViewMUON() { gMC->Gsatt("CH1A","seen",1); gMC->Gsatt("CH1G","seen",0); diff --git a/PHOS/DrawPHOS.C b/PHOS/DrawPHOS.C index f9769640ea3..e415a7aa6bc 100644 --- a/PHOS/DrawPHOS.C +++ b/PHOS/DrawPHOS.C @@ -1,8 +1,9 @@ -//void DrawPHOS() +void DrawPHOS() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewPHOS.C"); + gROOT->LoadMacro("ViewPHOS.C"); + gInterpreter->ProcessLine("ViewPHOS()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/PHOS/ViewPHOS.C b/PHOS/ViewPHOS.C index c70fb9a5315..78873102430 100644 --- a/PHOS/ViewPHOS.C +++ b/PHOS/ViewPHOS.C @@ -1,4 +1,4 @@ -//void ViewPHOS() +void ViewPHOS() { // Set drawing attributes for PHOS version #2 diff --git a/PMD/DrawPMD.C b/PMD/DrawPMD.C index 0faaa5269e3..5f90fa28eb9 100644 --- a/PMD/DrawPMD.C +++ b/PMD/DrawPMD.C @@ -1,8 +1,9 @@ -//void DrawPMD() +void DrawPMD() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewPMD.C"); + gROOT->LoadMacro("ViewPMD.C"); + gInterpreter->ProcessLine("ViewPMD()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/PMD/ViewPMD.C b/PMD/ViewPMD.C index 8bc4c6121e6..dc0315bbeef 100644 --- a/PMD/ViewPMD.C +++ b/PMD/ViewPMD.C @@ -1,4 +1,4 @@ -//void ViewPMD() +void ViewPMD() { gMC->Gsatt("DP21","seen",0); gMC->Gsatt("DP22","seen",0); diff --git a/RICH/DrawRICH.C b/RICH/DrawRICH.C index 90b5b89f6ee..091573276d5 100644 --- a/RICH/DrawRICH.C +++ b/RICH/DrawRICH.C @@ -1,8 +1,9 @@ -//void DrawRICH() +void DrawRICH() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewRICH.C"); + gROOT->LoadMacro("ViewRICH.C"); + gInterpreter->ProcessLine("ViewRICH()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/RICH/ViewRICH.C b/RICH/ViewRICH.C index 6719da6ec15..10403b3c21c 100644 --- a/RICH/ViewRICH.C +++ b/RICH/ViewRICH.C @@ -1,4 +1,4 @@ -//void ViewRICH() +void ViewRICH() { gMC->Gsatt("RICH","seen",0); gMC->Gsatt("SRIC","seen",0); diff --git a/START/DrawSTART.C b/START/DrawSTART.C index a3ba444dfb6..0c323cdde78 100755 --- a/START/DrawSTART.C +++ b/START/DrawSTART.C @@ -1,8 +1,9 @@ -//void DrawSTART() +void DrawSTART() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewSTART.C"); + gROOT->LoadMacro("ViewSTART.C"); + gInterpreter->ProcessLine("ViewSTART()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/START/ViewSTART.C b/START/ViewSTART.C index 1842b29e1ae..095aad2d192 100755 --- a/START/ViewSTART.C +++ b/START/ViewSTART.C @@ -1,4 +1,4 @@ -//void ViewSTART() +void ViewSTART() { gMC->Gsatt("STRT","seen",0); gMC->Gsatt("PMT ","seen",1); diff --git a/STRUCT/DrawABSO.C b/STRUCT/DrawABSO.C index d13f0efd708..2d60c8478b1 100644 --- a/STRUCT/DrawABSO.C +++ b/STRUCT/DrawABSO.C @@ -1,8 +1,9 @@ -//void DrawABSO() +void DrawABSO() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewABSO.C"); + gROOT->LoadMacro("ViewABSO.C"); + gInterpreter->ProcessLine("ViewABSO()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/STRUCT/DrawDIPO.C b/STRUCT/DrawDIPO.C index 9db306aa737..9ec2b40e05c 100644 --- a/STRUCT/DrawDIPO.C +++ b/STRUCT/DrawDIPO.C @@ -1,8 +1,9 @@ -//void DrawDIPO() +void DrawDIPO() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewDIPO.C"); + gROOT->LoadMacro("ViewDIPO.C"); + gInterpreter->ProcessLine("ViewDIPO()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/STRUCT/DrawFRAME.C b/STRUCT/DrawFRAME.C index f5595fa2dea..e0d6869f93d 100644 --- a/STRUCT/DrawFRAME.C +++ b/STRUCT/DrawFRAME.C @@ -1,8 +1,9 @@ -//void DrawFRAME() +void DrawFRAME() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewFRAME.C"); + gROOT->LoadMacro("ViewFRAME.C"); + gInterpreter->ProcessLine("ViewFRAME()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 5); diff --git a/STRUCT/DrawHALL.C b/STRUCT/DrawHALL.C index 1f47d907e16..54dbc116d20 100644 --- a/STRUCT/DrawHALL.C +++ b/STRUCT/DrawHALL.C @@ -1,8 +1,9 @@ -//void DrawHALL() +void DrawHALL() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewHALL.C"); + gROOT->LoadMacro("ViewHALL.C"); + gInterpreter->ProcessLine("ViewHALL()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/STRUCT/DrawMAG.C b/STRUCT/DrawMAG.C index 3202e604557..50301ce6fcc 100644 --- a/STRUCT/DrawMAG.C +++ b/STRUCT/DrawMAG.C @@ -1,8 +1,9 @@ -//void DrawMAG() +void DrawMAG() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewMAG.C"); + gROOT->LoadMacro("ViewMAG.C"); + gInterpreter->ProcessLine("ViewMAG()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/STRUCT/DrawPIPE.C b/STRUCT/DrawPIPE.C index 8e76c0795c2..7a6caa0242e 100644 --- a/STRUCT/DrawPIPE.C +++ b/STRUCT/DrawPIPE.C @@ -1,8 +1,9 @@ -//void DrawPIPE() +void DrawPIPE() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewPIPE.C"); + gROOT->LoadMacro("ViewPIPE.C"); + gInterpreter->ProcessLine("ViewPIPE()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/STRUCT/DrawSHIL.C b/STRUCT/DrawSHIL.C index c36ee1a0d85..607d56ffbf6 100644 --- a/STRUCT/DrawSHIL.C +++ b/STRUCT/DrawSHIL.C @@ -1,8 +1,9 @@ -//void DrawSHIL() +void DrawSHIL() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewSHIL.C"); + gROOT->LoadMacro("ViewSHIL.C"); + gInterpreter->ProcessLine("ViewSHIL()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/STRUCT/ViewABSO.C b/STRUCT/ViewABSO.C index 1a7fcaa57cc..452aa5a8bec 100644 --- a/STRUCT/ViewABSO.C +++ b/STRUCT/ViewABSO.C @@ -1,4 +1,4 @@ -//void ViewABSO() +void ViewABSO() { gMC->Gsatt("ABSM","seen",1); gMC->Gsatt("ANOS","seen",1); diff --git a/STRUCT/ViewDIPO.C b/STRUCT/ViewDIPO.C index 3f722d8663d..1f232451fe1 100644 --- a/STRUCT/ViewDIPO.C +++ b/STRUCT/ViewDIPO.C @@ -1,4 +1,4 @@ -//void ViewDIPO() +void ViewDIPO() { gMC->Gsatt("DDIP","seen",0); gMC->Gsatt("DC1 ","seen",1); diff --git a/STRUCT/ViewFRAME.C b/STRUCT/ViewFRAME.C index d1f1c86edf2..1b065bd1616 100644 --- a/STRUCT/ViewFRAME.C +++ b/STRUCT/ViewFRAME.C @@ -1,4 +1,4 @@ -//void ViewFRAME() +void ViewFRAME() { /* gMC->Gsatt("BFMO","seen",0); diff --git a/STRUCT/ViewHALL.C b/STRUCT/ViewHALL.C index 76bb6bcba98..f16d7e7241f 100644 --- a/STRUCT/ViewHALL.C +++ b/STRUCT/ViewHALL.C @@ -1,4 +1,4 @@ -//void ViewHALL() +void ViewHALL() { gMC->Gsatt("HUFL","seen",1); gMC->Gsatt("HUWA","seen",1); diff --git a/STRUCT/ViewMAG.C b/STRUCT/ViewMAG.C index 8d54220bb1a..aad1d4cb627 100644 --- a/STRUCT/ViewMAG.C +++ b/STRUCT/ViewMAG.C @@ -1,4 +1,4 @@ -//void ViewMAG() +void ViewMAG() { gMC->Gsatt("L3MO","seen",0); gMC->Gsatt("L3CO","seen",1); diff --git a/STRUCT/ViewPIPE.C b/STRUCT/ViewPIPE.C index 4b116884caa..d110e3ab5a7 100644 --- a/STRUCT/ViewPIPE.C +++ b/STRUCT/ViewPIPE.C @@ -1,4 +1,4 @@ -//void ViewPIPE() +void ViewPIPE() { gMC->Gsatt("QQMO","seen",1); gMC->Gsatt("QDT1","seen",1); diff --git a/STRUCT/ViewSHIL.C b/STRUCT/ViewSHIL.C index 6fca123296a..4e09a227f08 100644 --- a/STRUCT/ViewSHIL.C +++ b/STRUCT/ViewSHIL.C @@ -1,4 +1,4 @@ -//void ViewSHIL() +void ViewSHIL() { gMC->Gsatt("YMOT","seen",1); gMC->Gsatt("YMS1","seen",1); diff --git a/TOF/DrawTOF.C b/TOF/DrawTOF.C index d2444d8502c..6a16440c72f 100644 --- a/TOF/DrawTOF.C +++ b/TOF/DrawTOF.C @@ -1,8 +1,9 @@ -//void DrawTOF() +void DrawTOF() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTOF4.C"); + gROOT->LoadMacro("ViewTOF4.C"); + gInterpreter->ProcessLine("ViewTOF4()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/TOF/DrawTOF0.C b/TOF/DrawTOF0.C index 10a31397966..a9033e92726 100644 --- a/TOF/DrawTOF0.C +++ b/TOF/DrawTOF0.C @@ -1,8 +1,9 @@ -//void DrawTOF0() +void DrawTOF0() { geant3->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTOF0.C"); + gROOT->LoadMacro("ViewTOF0.C"); + gInterpreter->ProcessLine("ViewTOF0()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/TOF/DrawTOF1.C b/TOF/DrawTOF1.C index a2c98c7e161..2c5636aa461 100644 --- a/TOF/DrawTOF1.C +++ b/TOF/DrawTOF1.C @@ -1,8 +1,9 @@ -//void DrawTPC() +void DrawTPC() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTPC.C"); + gROOT->LoadMacro("ViewTPC.C"); + gInterpreter->ProcessLine("ViewTPC()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/TOF/ViewTOF.C b/TOF/ViewTOF.C index 95133ba6f60..f3dbc4ab291 100644 --- a/TOF/ViewTOF.C +++ b/TOF/ViewTOF.C @@ -1,4 +1,4 @@ -//void ViewTOF() +void ViewTOF() { AliDetector *TOF = gAlice->GetDetector("TOF"); gMC->Gsatt("*","seen",0); diff --git a/TOF/ViewTOF0.C b/TOF/ViewTOF0.C index c38442ae006..c81607d3bce 100644 --- a/TOF/ViewTOF0.C +++ b/TOF/ViewTOF0.C @@ -1,4 +1,4 @@ -//void ViewTOF0() +void ViewTOF0() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FSEC","seen",0); diff --git a/TOF/ViewTOF1.C b/TOF/ViewTOF1.C index a4154534273..8b3d263303f 100644 --- a/TOF/ViewTOF1.C +++ b/TOF/ViewTOF1.C @@ -1,4 +1,4 @@ -//void ViewTOF1() +void ViewTOF1() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FGP1","seen",1); diff --git a/TOF/ViewTOF2.C b/TOF/ViewTOF2.C index 5c0d236aca4..5a6752cff1b 100644 --- a/TOF/ViewTOF2.C +++ b/TOF/ViewTOF2.C @@ -1,4 +1,4 @@ -//void ViewTOF2() +void ViewTOF2() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FTOF","seen",0); diff --git a/TPC/DrawTPC.C b/TPC/DrawTPC.C index 798f8485ef3..257faac4e19 100644 --- a/TPC/DrawTPC.C +++ b/TPC/DrawTPC.C @@ -1,8 +1,9 @@ -//void DrawTPC() +void DrawTPC() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTPC.C"); + gROOT->LoadMacro("ViewTPC.C"); + gInterpreter->ProcessLine("ViewTPC()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/TPC/ViewTPC.C b/TPC/ViewTPC.C index f593d3e34e1..dd53766f8da 100644 --- a/TPC/ViewTPC.C +++ b/TPC/ViewTPC.C @@ -1,4 +1,4 @@ -//void ViewTPC() +void ViewTPC() { gMC->Gsatt("TPC","SEEN",0); gMC->Gsatt("TPEC","SEEN",0); diff --git a/TRD/DrawTRD.C b/TRD/DrawTRD.C index 02e91db66b1..c5945996ab5 100644 --- a/TRD/DrawTRD.C +++ b/TRD/DrawTRD.C @@ -4,9 +4,11 @@ void DrawTRD() gMC->Gsatt("alic", "seen", 0); AliTRD *TRD = gAlice->GetModule("TRD"); if (TRD->Hole()) - gROOT->Macro("ViewTRDhole.C"); + gROOT->LoadMacro("ViewTRDhole.C"); + gInterpreter->ProcessLine("ViewTRDhole()"); else - gROOT->Macro("ViewTRDfull.C"); + gROOT->LoadMacro("ViewTRDfull.C"); + gInterpreter->ProcessLine("ViewTRDfull()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/TRD/ViewTRD.C b/TRD/ViewTRD.C index 61d9b312e32..1dbb0838896 100644 --- a/TRD/ViewTRD.C +++ b/TRD/ViewTRD.C @@ -1,4 +1,4 @@ -//void ViewTRD() +void ViewTRD() { gMC->Gsatt("B032","SEEN", 0); diff --git a/TRD/ViewTRD0.C b/TRD/ViewTRD0.C index 80c786b0b63..6492a598916 100644 --- a/TRD/ViewTRD0.C +++ b/TRD/ViewTRD0.C @@ -1,4 +1,4 @@ -//void ViewTRD() +void ViewTRD() { geant3->Gsatt("TRD ","seen",0); geant3->Gsatt("UTRS","seen",0); diff --git a/TRD/ViewTRD1.C b/TRD/ViewTRD1.C index 496a38a824d..c32e36fe901 100644 --- a/TRD/ViewTRD1.C +++ b/TRD/ViewTRD1.C @@ -1,4 +1,4 @@ -//void ViewTRD() +void ViewTRD() { geant3->Gsatt("TRD ","seen",0); geant3->Gsatt("UTRD","seen",0); diff --git a/TRD/ViewTRD2.C b/TRD/ViewTRD2.C index bb6026a54ee..e956bc0fca5 100644 --- a/TRD/ViewTRD2.C +++ b/TRD/ViewTRD2.C @@ -1,4 +1,4 @@ -//void ViewTRD() +void ViewTRD() { geant3->Gsatt("TRD ","seen",0); diff --git a/macros/DrawABSO.C b/macros/DrawABSO.C index d13f0efd708..2d60c8478b1 100644 --- a/macros/DrawABSO.C +++ b/macros/DrawABSO.C @@ -1,8 +1,9 @@ -//void DrawABSO() +void DrawABSO() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewABSO.C"); + gROOT->LoadMacro("ViewABSO.C"); + gInterpreter->ProcessLine("ViewABSO()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawCASTOR.C b/macros/DrawCASTOR.C index c6a3f19b713..83f5a17229e 100644 --- a/macros/DrawCASTOR.C +++ b/macros/DrawCASTOR.C @@ -1,8 +1,9 @@ -//void DrawCASTOR() +void DrawCASTOR() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewCASTOR.C"); + gROOT->LoadMacro("ViewCASTOR.C"); + gInterpreter->ProcessLine("ViewCASTOR()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawDIPO.C b/macros/DrawDIPO.C index 9db306aa737..9ec2b40e05c 100644 --- a/macros/DrawDIPO.C +++ b/macros/DrawDIPO.C @@ -1,8 +1,9 @@ -//void DrawDIPO() +void DrawDIPO() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewDIPO.C"); + gROOT->LoadMacro("ViewDIPO.C"); + gInterpreter->ProcessLine("ViewDIPO()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawFMD.C b/macros/DrawFMD.C index a039e096ba3..72744cc6d16 100644 --- a/macros/DrawFMD.C +++ b/macros/DrawFMD.C @@ -1,8 +1,9 @@ -//void DrawFMD() +void DrawFMD() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewFMD.C"); + gROOT->LoadMacro("ViewFMD.C"); + gInterpreter->ProcessLine("ViewFMD()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawFRAME.C b/macros/DrawFRAME.C index f5595fa2dea..e0d6869f93d 100644 --- a/macros/DrawFRAME.C +++ b/macros/DrawFRAME.C @@ -1,8 +1,9 @@ -//void DrawFRAME() +void DrawFRAME() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewFRAME.C"); + gROOT->LoadMacro("ViewFRAME.C"); + gInterpreter->ProcessLine("ViewFRAME()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 5); diff --git a/macros/DrawHALL.C b/macros/DrawHALL.C index 1f47d907e16..54dbc116d20 100644 --- a/macros/DrawHALL.C +++ b/macros/DrawHALL.C @@ -1,8 +1,9 @@ -//void DrawHALL() +void DrawHALL() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewHALL.C"); + gROOT->LoadMacro("ViewHALL.C"); + gInterpreter->ProcessLine("ViewHALL()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawITS.C b/macros/DrawITS.C index f5e54100746..fc1b90e9ef9 100644 --- a/macros/DrawITS.C +++ b/macros/DrawITS.C @@ -1,8 +1,9 @@ -//void DrawITS() +void DrawITS() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewITS.C"); + gROOT->LoadMacro("ViewITS.C"); + gInterpreter->ProcessLine("ViewITS()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawMAG.C b/macros/DrawMAG.C index 3202e604557..50301ce6fcc 100644 --- a/macros/DrawMAG.C +++ b/macros/DrawMAG.C @@ -1,8 +1,9 @@ -//void DrawMAG() +void DrawMAG() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewMAG.C"); + gROOT->LoadMacro("ViewMAG.C"); + gInterpreter->ProcessLine("ViewMAG()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawMUON.C b/macros/DrawMUON.C index bc3cb701a54..d651a4fea55 100644 --- a/macros/DrawMUON.C +++ b/macros/DrawMUON.C @@ -1,8 +1,9 @@ -//void DrawMUON() +void DrawMUON() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewMUON.C"); + gROOT->LoadMacro("ViewMUON.C"); + gInterpreter->ProcessLine("ViewMUON()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawPHOS.C b/macros/DrawPHOS.C index f9769640ea3..e415a7aa6bc 100644 --- a/macros/DrawPHOS.C +++ b/macros/DrawPHOS.C @@ -1,8 +1,9 @@ -//void DrawPHOS() +void DrawPHOS() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewPHOS.C"); + gROOT->LoadMacro("ViewPHOS.C"); + gInterpreter->ProcessLine("ViewPHOS()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawPIPE.C b/macros/DrawPIPE.C index 8e76c0795c2..7a6caa0242e 100644 --- a/macros/DrawPIPE.C +++ b/macros/DrawPIPE.C @@ -1,8 +1,9 @@ -//void DrawPIPE() +void DrawPIPE() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewPIPE.C"); + gROOT->LoadMacro("ViewPIPE.C"); + gInterpreter->ProcessLine("ViewPIPE()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawPMD.C b/macros/DrawPMD.C index 0faaa5269e3..5f90fa28eb9 100644 --- a/macros/DrawPMD.C +++ b/macros/DrawPMD.C @@ -1,8 +1,9 @@ -//void DrawPMD() +void DrawPMD() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewPMD.C"); + gROOT->LoadMacro("ViewPMD.C"); + gInterpreter->ProcessLine("ViewPMD()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawRICH.C b/macros/DrawRICH.C index 90b5b89f6ee..091573276d5 100644 --- a/macros/DrawRICH.C +++ b/macros/DrawRICH.C @@ -1,8 +1,9 @@ -//void DrawRICH() +void DrawRICH() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewRICH.C"); + gROOT->LoadMacro("ViewRICH.C"); + gInterpreter->ProcessLine("ViewRICH()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawSHIL.C b/macros/DrawSHIL.C index c36ee1a0d85..607d56ffbf6 100644 --- a/macros/DrawSHIL.C +++ b/macros/DrawSHIL.C @@ -1,8 +1,9 @@ -//void DrawSHIL() +void DrawSHIL() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewSHIL.C"); + gROOT->LoadMacro("ViewSHIL.C"); + gInterpreter->ProcessLine("ViewSHIL()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawTOF.C b/macros/DrawTOF.C index 36bede7ca45..26af67a10f2 100644 --- a/macros/DrawTOF.C +++ b/macros/DrawTOF.C @@ -1,8 +1,9 @@ -//void DrawTOF() +void DrawTOF() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTOF.C"); + gROOT->LoadMacro("ViewTOF.C"); + gInterpreter->ProcessLine("ViewTOF()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawTOF0.C b/macros/DrawTOF0.C index 10a31397966..a9033e92726 100644 --- a/macros/DrawTOF0.C +++ b/macros/DrawTOF0.C @@ -1,8 +1,9 @@ -//void DrawTOF0() +void DrawTOF0() { geant3->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTOF0.C"); + gROOT->LoadMacro("ViewTOF0.C"); + gInterpreter->ProcessLine("ViewTOF0()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawTOF1.C b/macros/DrawTOF1.C index a2c98c7e161..2c5636aa461 100644 --- a/macros/DrawTOF1.C +++ b/macros/DrawTOF1.C @@ -1,8 +1,9 @@ -//void DrawTPC() +void DrawTPC() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTPC.C"); + gROOT->LoadMacro("ViewTPC.C"); + gInterpreter->ProcessLine("ViewTPC()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawTPC.C b/macros/DrawTPC.C index 798f8485ef3..257faac4e19 100644 --- a/macros/DrawTPC.C +++ b/macros/DrawTPC.C @@ -1,8 +1,9 @@ -//void DrawTPC() +void DrawTPC() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTPC.C"); + gROOT->LoadMacro("ViewTPC.C"); + gInterpreter->ProcessLine("ViewTPC()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/DrawTRD.C b/macros/DrawTRD.C index 444deac3fe3..30a9cb25d58 100644 --- a/macros/DrawTRD.C +++ b/macros/DrawTRD.C @@ -1,8 +1,9 @@ -//void DrawTRD() +void DrawTRD() { gMC->Gsatt("*", "seen", -1); gMC->Gsatt("alic", "seen", 0); - gROOT->Macro("ViewTRD.C"); + gROOT->LoadMacro("ViewTRD.C"); + gInterpreter->ProcessLine("ViewTRD()"); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); gMC->Gsatt("*", "fill", 7); diff --git a/macros/ViewABSO.C b/macros/ViewABSO.C index 1a7fcaa57cc..452aa5a8bec 100644 --- a/macros/ViewABSO.C +++ b/macros/ViewABSO.C @@ -1,4 +1,4 @@ -//void ViewABSO() +void ViewABSO() { gMC->Gsatt("ABSM","seen",1); gMC->Gsatt("ANOS","seen",1); diff --git a/macros/ViewCASTOR.C b/macros/ViewCASTOR.C index 0076ed5bff9..3fec238be0d 100644 --- a/macros/ViewCASTOR.C +++ b/macros/ViewCASTOR.C @@ -1,4 +1,4 @@ -//void ViewCASTOR() +void ViewCASTOR() { gMC->Gsatt("OCTA","seen",0); gMC->Gsatt("EM ","seen",0); diff --git a/macros/ViewDIPO.C b/macros/ViewDIPO.C index 3f722d8663d..1f232451fe1 100644 --- a/macros/ViewDIPO.C +++ b/macros/ViewDIPO.C @@ -1,4 +1,4 @@ -//void ViewDIPO() +void ViewDIPO() { gMC->Gsatt("DDIP","seen",0); gMC->Gsatt("DC1 ","seen",1); diff --git a/macros/ViewFMD.C b/macros/ViewFMD.C index c5a9e2c1cdf..984359cbd04 100644 --- a/macros/ViewFMD.C +++ b/macros/ViewFMD.C @@ -1,4 +1,4 @@ -//void ViewFMD() +void ViewFMD() { gMC->Gsatt("IWR3","seen",1); gMC->Gsatt("FWR3","seen",1); diff --git a/macros/ViewFRAME.C b/macros/ViewFRAME.C index d1f1c86edf2..1b065bd1616 100644 --- a/macros/ViewFRAME.C +++ b/macros/ViewFRAME.C @@ -1,4 +1,4 @@ -//void ViewFRAME() +void ViewFRAME() { /* gMC->Gsatt("BFMO","seen",0); diff --git a/macros/ViewHALL.C b/macros/ViewHALL.C index 76bb6bcba98..f16d7e7241f 100644 --- a/macros/ViewHALL.C +++ b/macros/ViewHALL.C @@ -1,4 +1,4 @@ -//void ViewHALL() +void ViewHALL() { gMC->Gsatt("HUFL","seen",1); gMC->Gsatt("HUWA","seen",1); diff --git a/macros/ViewITS.C b/macros/ViewITS.C index dfba13b0bf4..6cc651a3982 100644 --- a/macros/ViewITS.C +++ b/macros/ViewITS.C @@ -1,4 +1,4 @@ -//void ViewITS() +void ViewITS() { gMC->Gsatt("ITSV","seen",0); gMC->Gsatt("IT12","seen",0); diff --git a/macros/ViewMAG.C b/macros/ViewMAG.C index 8d54220bb1a..aad1d4cb627 100644 --- a/macros/ViewMAG.C +++ b/macros/ViewMAG.C @@ -1,4 +1,4 @@ -//void ViewMAG() +void ViewMAG() { gMC->Gsatt("L3MO","seen",0); gMC->Gsatt("L3CO","seen",1); diff --git a/macros/ViewMUON.C b/macros/ViewMUON.C index 548233f6d8e..2d62399b29f 100644 --- a/macros/ViewMUON.C +++ b/macros/ViewMUON.C @@ -1,4 +1,4 @@ -//void ViewMUON() +void ViewMUON() { gMC->Gsatt("CH1A","seen",1); gMC->Gsatt("CH1G","seen",0); diff --git a/macros/ViewPHOS.C b/macros/ViewPHOS.C index c70fb9a5315..78873102430 100644 --- a/macros/ViewPHOS.C +++ b/macros/ViewPHOS.C @@ -1,4 +1,4 @@ -//void ViewPHOS() +void ViewPHOS() { // Set drawing attributes for PHOS version #2 diff --git a/macros/ViewPIPE.C b/macros/ViewPIPE.C index 4b116884caa..d110e3ab5a7 100644 --- a/macros/ViewPIPE.C +++ b/macros/ViewPIPE.C @@ -1,4 +1,4 @@ -//void ViewPIPE() +void ViewPIPE() { gMC->Gsatt("QQMO","seen",1); gMC->Gsatt("QDT1","seen",1); diff --git a/macros/ViewPMD.C b/macros/ViewPMD.C index 8bc4c6121e6..dc0315bbeef 100644 --- a/macros/ViewPMD.C +++ b/macros/ViewPMD.C @@ -1,4 +1,4 @@ -//void ViewPMD() +void ViewPMD() { gMC->Gsatt("DP21","seen",0); gMC->Gsatt("DP22","seen",0); diff --git a/macros/ViewRICH.C b/macros/ViewRICH.C index 6719da6ec15..10403b3c21c 100644 --- a/macros/ViewRICH.C +++ b/macros/ViewRICH.C @@ -1,4 +1,4 @@ -//void ViewRICH() +void ViewRICH() { gMC->Gsatt("RICH","seen",0); gMC->Gsatt("SRIC","seen",0); diff --git a/macros/ViewSHIL.C b/macros/ViewSHIL.C index 6fca123296a..4e09a227f08 100644 --- a/macros/ViewSHIL.C +++ b/macros/ViewSHIL.C @@ -1,4 +1,4 @@ -//void ViewSHIL() +void ViewSHIL() { gMC->Gsatt("YMOT","seen",1); gMC->Gsatt("YMS1","seen",1); diff --git a/macros/ViewTOF.C b/macros/ViewTOF.C index b98491b8a5c..688d1071019 100644 --- a/macros/ViewTOF.C +++ b/macros/ViewTOF.C @@ -1,4 +1,4 @@ -//void ViewTOF() +void ViewTOF() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FTOF","seen",0); diff --git a/macros/ViewTOF0.C b/macros/ViewTOF0.C index c38442ae006..c81607d3bce 100644 --- a/macros/ViewTOF0.C +++ b/macros/ViewTOF0.C @@ -1,4 +1,4 @@ -//void ViewTOF0() +void ViewTOF0() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FSEC","seen",0); diff --git a/macros/ViewTOF1.C b/macros/ViewTOF1.C index a4154534273..8b3d263303f 100644 --- a/macros/ViewTOF1.C +++ b/macros/ViewTOF1.C @@ -1,4 +1,4 @@ -//void ViewTOF1() +void ViewTOF1() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FGP1","seen",1); diff --git a/macros/ViewTOF2.C b/macros/ViewTOF2.C index 5c0d236aca4..5a6752cff1b 100644 --- a/macros/ViewTOF2.C +++ b/macros/ViewTOF2.C @@ -1,4 +1,4 @@ -//void ViewTOF2() +void ViewTOF2() { gMC->Gsatt("FBAR","seen",0); gMC->Gsatt("FTOF","seen",0); diff --git a/macros/ViewTPC.C b/macros/ViewTPC.C index f593d3e34e1..dd53766f8da 100644 --- a/macros/ViewTPC.C +++ b/macros/ViewTPC.C @@ -1,4 +1,4 @@ -//void ViewTPC() +void ViewTPC() { gMC->Gsatt("TPC","SEEN",0); gMC->Gsatt("TPEC","SEEN",0); diff --git a/macros/ViewTRD.C b/macros/ViewTRD.C index a2b607f00ad..0fcbb249cab 100644 --- a/macros/ViewTRD.C +++ b/macros/ViewTRD.C @@ -1,4 +1,4 @@ -//void ViewUTD() +void ViewUTD() { gMC->Gsatt("TRD ","seen",0); -- 2.39.3