Fix namespace naming: o2::Passive o2::EventVisualisation

anerokhi · sawenzel · commit f8fa2d6522bb · 2019-05-22T08:02:08.000+02:00
diff --git a/Detectors/CPV/testsimulation/drawCPVgeometry.C b/Detectors/CPV/testsimulation/drawCPVgeometry.C
@@ -34,7 +34,7 @@ void drawCPVgeometry()
 
   // Create geometry
 
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/CPV/testsimulation/run_sim_cpv.C b/Detectors/CPV/testsimulation/run_sim_cpv.C
@@ -66,7 +66,7 @@ void run_sim_cpv(Int_t nEvents = 10, TString mcEngine = "TGeant3")
   run->SetMaterials("media.geo"); // Materials
 
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/EMCAL/testsimulation/PutEmcalInTop.C b/Detectors/EMCAL/testsimulation/PutEmcalInTop.C
@@ -30,7 +30,7 @@ void PutEmcalInTop()
   run->SetMaterials("media.geo"); // Materials
 
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/EMCAL/testsimulation/drawEMCALgeometry.C b/Detectors/EMCAL/testsimulation/drawEMCALgeometry.C
@@ -35,7 +35,7 @@ void drawEMCALgeometry()
 
   // Create geometry
 
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/EMCAL/testsimulation/run_sim_emcal.C b/Detectors/EMCAL/testsimulation/run_sim_emcal.C
@@ -67,7 +67,7 @@ void run_sim_emcal(Int_t nEvents = 10, TString mcEngine = "TGeant3")
   run->SetMaterials("media.geo"); // Materials
 
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/ITSMFT/ITS/macros/EVE/DisplayEvents.C b/Detectors/ITSMFT/ITS/macros/EVE/DisplayEvents.C
@@ -409,7 +409,7 @@ void Data::displayData(int entry, int chip)
   mEvent = new TEveElementList(ename.c_str());
   mEvent->AddElement(clusters);
   mEvent->AddElement(tracks);
-  auto multi = o2::EventVisualisation::MultiView::getInstance();
+  auto multi = o2::event_visualisation::MultiView::getInstance();
   multi->registerEvent(mEvent);
 
   gEve->Redraw3D(kFALSE);
@@ -457,7 +457,7 @@ void init(int entry = 0, int chip = 13,
   co->SetOrthographicMode(TGLCameraOverlay::kGridFront);
 
   // Event View
-  auto multi = o2::EventVisualisation::MultiView::getInstance();
+  auto multi = o2::event_visualisation::MultiView::getInstance();
   multi->drawGeometryForDetector("ITS");
 
   // Event navigation
diff --git a/Detectors/MUON/MID/Simulation/macros/drawMIDGeometry.C b/Detectors/MUON/MID/Simulation/macros/drawMIDGeometry.C
@@ -28,7 +28,7 @@ void drawMIDGeometry()
   run->SetMaterials("media.geo"); // Materials
 
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/PHOS/testsimulation/PutPhosInTop.C b/Detectors/PHOS/testsimulation/PutPhosInTop.C
@@ -29,7 +29,7 @@ void PutPhosInTop()
   run->SetMaterials("media.geo"); // Materials
 
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/PHOS/testsimulation/drawPHOSgeometry.C b/Detectors/PHOS/testsimulation/drawPHOSgeometry.C
@@ -33,7 +33,7 @@ void drawPHOSgeometry()
 
   // Create geometry
 
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/PHOS/testsimulation/run_sim_phos.C b/Detectors/PHOS/testsimulation/run_sim_phos.C
@@ -65,7 +65,7 @@ void run_sim_phos(Int_t nEvents = 10, TString mcEngine = "TGeant3")
   run->SetMaterials("media.geo"); // Materials
 
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/Passive/include/DetectorsPassive/Cave.h b/Detectors/Passive/include/DetectorsPassive/Cave.h
@@ -31,7 +31,7 @@
 #include <vector>
 namespace o2
 {
-namespace Passive
+namespace passive
 {
 
 // This class represents the mother container
@@ -76,8 +76,8 @@ class Cave : public FairDetector
 
   bool mHasZDC = true; //! flag indicating if ZDC will be included
 
-  ClassDefOverride(o2::Passive::Cave, 1) //
+  ClassDefOverride(o2::passive::Cave, 1) //
 };
-} // namespace Passive
+} // namespace passive
 } // namespace o2
 #endif //Cave_H
diff --git a/Detectors/Passive/include/DetectorsPassive/PassiveContFact.h b/Detectors/Passive/include/DetectorsPassive/PassiveContFact.h
@@ -31,7 +31,7 @@
 class FairParSet;
 
 namespace o2 {
-namespace Passive {
+namespace passive {
 
 class PassiveContFact : public FairContFact
 {
@@ -41,7 +41,7 @@ class PassiveContFact : public FairContFact
     PassiveContFact();
     ~PassiveContFact() override {;}
     FairParSet* createContainer(FairContainer*) override;
-    ClassDefOverride(o2::Passive::PassiveContFact,0) // Factory for all Passive parameter containers
+    ClassDefOverride(o2::passive::PassiveContFact,0) // Factory for all Passive parameter containers
 };
 }
 }
diff --git a/Detectors/Passive/macro/PutFrameInTop.C b/Detectors/Passive/macro/PutFrameInTop.C
@@ -28,7 +28,7 @@ void PutFrameInTop() {
   run->SetMaterials("media.geo"); // Materials
    
   // Create geometry
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/Passive/src/Cave.cxx b/Detectors/Passive/src/Cave.cxx
@@ -31,7 +31,7 @@
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 
-using namespace o2::Passive;
+using namespace o2::passive;
 
 void Cave::createMaterials()
 {
@@ -128,4 +128,4 @@ bool Cave::ProcessHits(FairVolume*)
   return false;
 }
 
-ClassImp(o2::Passive::Cave)
+ClassImp(o2::passive::Cave)
diff --git a/Detectors/Passive/src/PassiveContFact.cxx b/Detectors/Passive/src/PassiveContFact.cxx
@@ -40,9 +40,9 @@
 
 
 using namespace std;
-using namespace o2::Passive;
+using namespace o2::passive;
 
-ClassImp(o2::Passive::PassiveContFact)
+ClassImp(o2::passive::PassiveContFact)
 
 static PassiveContFact gPassiveContFact;
 
diff --git a/Detectors/Passive/src/PassiveLinkDef.h b/Detectors/Passive/src/PassiveLinkDef.h
@@ -31,8 +31,8 @@
 #pragma link C++ class  o2::passive::Dipole+;
 #pragma link C++ class  o2::passive::Compensator+;
 #pragma link C++ class  o2::passive::Magnet+;
-#pragma link C++ class  o2::Passive::Cave+;
-#pragma link C++ class  o2::Passive::PassiveContFact+;
+#pragma link C++ class  o2::passive::Cave+;
+#pragma link C++ class  o2::passive::PassiveContFact+;
 #pragma link C++ class  o2::passive::Pipe+;
 #pragma link C++ class  o2::passive::FrameStructure+;
 #pragma link C++ class  o2::passive::Shil+;
diff --git a/Detectors/TOF/prototyping/drawTOFgeometry.C b/Detectors/TOF/prototyping/drawTOFgeometry.C
@@ -44,7 +44,7 @@ void drawTOFgeometry()
 
   // Create geometry
 
-  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
+  o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
   cave->SetGeometryFileName("cave.geo");
   run->AddModule(cave);
 
diff --git a/Detectors/gconfig/commonConfig.C b/Detectors/gconfig/commonConfig.C
@@ -28,7 +28,7 @@ void stackSetup(T* vmc, R* run)
     for (auto m : *modules) {
       if(strcmp("CAVE", ((FairModule*)m)->GetName()) == 0) {
         // this thing is the cave
-        if(auto c=dynamic_cast<o2::Passive::Cave*>(m)) {
+        if(auto c=dynamic_cast<o2::passive::Cave*>(m)) {
           foundCave = true;
           c->addFinishPrimaryHook([st](){ st->notifyFinishPrimary();});
         }
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/ConfigurationManager.h b/EventVisualisation/Base/include/EventVisualisationBase/ConfigurationManager.h
@@ -19,7 +19,7 @@
 #include <TEnv.h>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
     
 /// Configuration Manager allows an easy access to the config file.
 ///
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/DataInterpreter.h b/EventVisualisation/Base/include/EventVisualisationBase/DataInterpreter.h
@@ -21,7 +21,7 @@
 #include <TEveElement.h>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
  
 /// DataInterpreter is a template class for detector-specific visualisation classes.
 ///
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/EventManager.h b/EventVisualisation/Base/include/EventVisualisationBase/EventManager.h
@@ -24,7 +24,7 @@
 #include <string>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// EventManager is a singleton class managing event loading.
 ///
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/GeometryManager.h b/EventVisualisation/Base/include/EventVisualisationBase/GeometryManager.h
@@ -20,7 +20,7 @@
 #include <string>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// GeometryManager allows access to geometries of detectors.
 ///
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/Track.h b/EventVisualisation/Base/include/EventVisualisationBase/Track.h
@@ -18,7 +18,7 @@
 #include <TEveTrack.h>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// Track class of Event Visualisation
 ///
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/VisualisationConstants.h b/EventVisualisation/Base/include/EventVisualisationBase/VisualisationConstants.h
@@ -19,7 +19,7 @@
 #include <string>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 enum EVisualisationGroup{
   ACO,
diff --git a/EventVisualisation/Base/src/ConfigurationManager.cxx b/EventVisualisation/Base/src/ConfigurationManager.cxx
@@ -22,7 +22,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
   
 ConfigurationManager& ConfigurationManager::getInstance()
 {
diff --git a/EventVisualisation/Base/src/DataInterpreter.cxx b/EventVisualisation/Base/src/DataInterpreter.cxx
@@ -19,7 +19,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
   
 DataInterpreter::DataInterpreter() = default;
 
diff --git a/EventVisualisation/Base/src/EventManager.cxx b/EventVisualisation/Base/src/EventManager.cxx
@@ -30,7 +30,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 EventManager& EventManager::getInstance()
 {
diff --git a/EventVisualisation/Base/src/GeometryManager.cxx b/EventVisualisation/Base/src/GeometryManager.cxx
@@ -29,7 +29,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
   
 GeometryManager& GeometryManager::getInstance()
 {
diff --git a/EventVisualisation/Base/src/Track.cxx b/EventVisualisation/Base/src/Track.cxx
@@ -27,7 +27,7 @@
 
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 Track::Track() : TEveTrack()
 {
diff --git a/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/MinimalisticEvent.h b/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/MinimalisticEvent.h
@@ -23,7 +23,7 @@
 #include <ctime>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// Minimalistic description of an event
 ///
diff --git a/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/MinimalisticTrack.h b/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/MinimalisticTrack.h
@@ -25,7 +25,7 @@
 #include <cmath>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// Minimalistic description of particles track
 ///
diff --git a/EventVisualisation/DataConverter/src/MinimalisticEvent.cxx b/EventVisualisation/DataConverter/src/MinimalisticEvent.cxx
@@ -19,7 +19,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// Ctor -- set the minimalistic event up
 MinimalisticEvent::MinimalisticEvent( int eventNumber,
diff --git a/EventVisualisation/DataConverter/src/MinimalisticTrack.cxx b/EventVisualisation/DataConverter/src/MinimalisticTrack.cxx
@@ -20,7 +20,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 
 MinimalisticTrack::MinimalisticTrack() = default;
diff --git a/EventVisualisation/Detectors/include/EventVisualisationDetectors/DataInterpreterRND.h b/EventVisualisation/Detectors/include/EventVisualisationDetectors/DataInterpreterRND.h
@@ -20,7 +20,7 @@
 #include "EventVisualisationBase/VisualisationConstants.h"
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
   
 /// DataInterpreterRND prepares random events
 ///
diff --git a/EventVisualisation/Detectors/src/DataInterpreterRND.cxx b/EventVisualisation/Detectors/src/DataInterpreterRND.cxx
@@ -28,7 +28,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 DataInterpreterRND::DataInterpreterRND() = default;
 
diff --git a/EventVisualisation/View/include/EventVisualisationView/Initializer.h b/EventVisualisation/View/include/EventVisualisationView/Initializer.h
@@ -19,7 +19,7 @@
 #include "EventVisualisationBase/EventManager.h"
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// This class initializes a core of the visualisation system.
 ///
diff --git a/EventVisualisation/View/include/EventVisualisationView/MultiView.h b/EventVisualisation/View/include/EventVisualisationView/MultiView.h
@@ -23,7 +23,7 @@
 #include <vector>
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 /// This singleton class manages views and scenes of the event display.
 ///
diff --git a/EventVisualisation/View/src/EventVisualisationViewLinkDef.h b/EventVisualisation/View/src/EventVisualisationViewLinkDef.h
@@ -14,7 +14,7 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::EventVisualisation::MultiView;
-#pragma link C++ class o2::EventVisualisation::Initializer;
+#pragma link C++ class o2::event_visualisation::MultiView;
+#pragma link C++ class o2::event_visualisation::Initializer;
 
 #endif
diff --git a/EventVisualisation/View/src/Initializer.cxx b/EventVisualisation/View/src/Initializer.cxx
@@ -35,7 +35,7 @@
 using namespace std;
 
 namespace o2  {
-namespace EventVisualisation {
+namespace event_visualisation {
 
 Initializer::Initializer(EventManager::EDataSource defaultDataSource)
 {
diff --git a/EventVisualisation/View/src/MultiView.cxx b/EventVisualisation/View/src/MultiView.cxx
diff --git a/EventVisualisation/View/src/main.cxx b/EventVisualisation/View/src/main.cxx
diff --git a/Framework/TestWorkflows/src/o2_sim_its_ALP3.cxx b/Framework/TestWorkflows/src/o2_sim_its_ALP3.cxx
diff --git a/Framework/TestWorkflows/src/o2_sim_tpc.cxx b/Framework/TestWorkflows/src/o2_sim_tpc.cxx
diff --git a/macro/build_geometry.C b/macro/build_geometry.C
diff --git a/macro/run_sim.C b/macro/run_sim.C
diff --git a/macro/run_sim_emcal.C b/macro/run_sim_emcal.C
diff --git a/macro/run_sim_mft.C b/macro/run_sim_mft.C
diff --git a/macro/run_sim_pythia8hi.C b/macro/run_sim_pythia8hi.C
diff --git a/macro/run_sim_tof.C b/macro/run_sim_tof.C
diff --git a/macro/run_sim_tpc.C b/macro/run_sim_tpc.C
