Remove usage of gSystem->Load

The explicit laoding of libraries isn't needed any longer since ROOT know which libraries to load from the rootmap files. The command is only used in the macro load_all_libs.C which is used for the coverage analysis and only loads all libraries produced without doing anything else. The loading of all libraries is needed to get the proper count of lines of code.
FairRootGroup · May 8, 2020 · 05f4d20 · 05f4d20
1 parent f6d0b62
commit 05f4d20
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 133 deletions.
diff --git a/examples/advanced/Tutorial3/macro/run_reco.C b/examples/advanced/Tutorial3/macro/run_reco.C
@@ -8,7 +8,6 @@
 void run_reco(TString mcEngine = "TGeant3")
 {
 
-    gSystem->Load("libFairTestDetector");
     FairLogger* logger = FairLogger::GetLogger();
     logger->SetLogFileName("MyLog.log");
     logger->SetLogToScreen(kTRUE);

diff --git a/examples/common/gconfig/basiclibs.C b/examples/common/gconfig/basiclibs.C
@@ -11,33 +11,4 @@
 
 void basiclibs()
 {
-    /* gSystem->Load("libGeom");
-  gSystem->Load("libGeomPainter");
-
-
-  gSystem->Load("libPhysics");
-  gSystem->Load("libEG");
-  gSystem->Load("libVMC");
-  gSystem->Load("libEGPythia6");
-  gSystem->Load("libPythia6");
-  gSystem->Load("libMinuit");
-  gSystem->Load("libTree");
-  */
-    gSystem->Load("libRIO");
-    gSystem->Load("libGeom");
-    gSystem->Load("libGeomPainter");
-    gSystem->Load("libVMC");
-    gSystem->Load("libEG");
-    gSystem->Load("libEGPythia6");
-    gSystem->Load("libPythia6");
-    gSystem->Load("libPhysics");
-    gSystem->Load("libNet");
-    gSystem->Load("libTree");
-    gSystem->Load("libMinuit");
-    gSystem->Load("libMathMore");
-
-    gSystem->Load("libProof");
-    gSystem->Load("libProofPlayer");
-    gSystem->Load("libGX11TTF");
-    gSystem->Load("libGX11");
 }
diff --git a/examples/common/gconfig/g3libs.C b/examples/common/gconfig/g3libs.C
@@ -9,11 +9,4 @@
 
 void g3libs()
 {
-    //  cout << "Loading Geant3 libraries ..." << endl;
-
-    gSystem->Load("libPythia6");
-    gSystem->Load("libEGPythia6");
-    gSystem->Load("libgeant321");
-
-    //  cout << "Loading Geant3 libraries ... finished" << endl;
 }
diff --git a/examples/common/gconfig/rootlogon.C b/examples/common/gconfig/rootlogon.C
@@ -7,18 +7,4 @@
  ********************************************************************************/
 rootlogon()
 {
-    gROOT->LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C");
-    basiclibs();
-
-    // Load this example libraries
-    gSystem->Load("libFairTools");
-    gSystem->Load("libGeoBase");
-    gSystem->Load("libParBase");
-    gSystem->Load("libBase");
-    gSystem->Load("libMCStack");
-    gSystem->Load("libField");
-    gSystem->Load("libPassive");
-    gSystem->Load("libGen");
-    gSystem->Load("libPGen");
-    gSystem->Load("libGeane");
 }
diff --git a/examples/simulation/Tutorial1/macros/load_all_libs.C b/examples/simulation/Tutorial1/macros/load_all_libs.C
@@ -1,35 +1,34 @@
 void load_all_libs()
 {
-    gSystem->Load("libBaseMQ");
+    gSystem->Load("libAlignment");
     gSystem->Load("libBase");
+    gSystem->Load("libBaseMQ");
     gSystem->Load("libEventDisplay");
+    gSystem->Load("libExHistogramServer");
+    gSystem->Load("libExLmd");
+    gSystem->Load("libExParameters");
+    gSystem->Load("libExSerialization");
     gSystem->Load("libFairDataMatch");
-    gSystem->Load("libFairMQExample1");
-    gSystem->Load("libFairMQExample2");
-    gSystem->Load("libFairMQExample4");
-    gSystem->Load("libFairMQExample5");
-    gSystem->Load("libFairMQExample6");
-    gSystem->Load("libFairMQExample7");
-    gSystem->Load("libFairMQExample8");
-    gSystem->Load("libFairMQExampleShm");
-    gSystem->Load("libfairmq_logger");
-    gSystem->Load("libFairMQ");
-    gSystem->Load("libFairMQTest");
+    gSystem->Load("libFairFastSim");
+    gSystem->Load("libFairMCStepLogger");
     gSystem->Load("libFairRutherford");
     gSystem->Load("libFairTestDetector");
     gSystem->Load("libFairTools");
+    gSystem->Load("libGConfig");
     gSystem->Load("libGeane");
-    gSystem->Load("libGenericMQTuto");
     gSystem->Load("libGen");
     gSystem->Load("libGeoBase");
-    gSystem->Load("libLmdMQSampler");
+    gSystem->Load("libMCConfigurator");
+    gSystem->Load("libMCStack");
     gSystem->Load("libMbsAPI");
     gSystem->Load("libMbsTutorial");
-    gSystem->Load("libMCStack");
     gSystem->Load("libParBase");
     gSystem->Load("libParMQ");
     gSystem->Load("libPassive");
     gSystem->Load("libPixel");
+    gSystem->Load("libPixelAlt");
+    gSystem->Load("libPropagatorExample");
+    gSystem->Load("libSimMQ");
     gSystem->Load("libTrkBase");
     gSystem->Load("libTutorial1");
     gSystem->Load("libTutorial2");

diff --git a/examples/simulation/Tutorial4/gconfig/basiclibs.C b/examples/simulation/Tutorial4/gconfig/basiclibs.C
@@ -11,33 +11,4 @@
 
 void basiclibs()
 {
-    /* gSystem->Load("libGeom");
-  gSystem->Load("libGeomPainter");
-
-
-  gSystem->Load("libPhysics");
-  gSystem->Load("libEG");
-  gSystem->Load("libVMC");
-  gSystem->Load("libEGPythia6");
-  gSystem->Load("libPythia6");
-  gSystem->Load("libMinuit");
-  gSystem->Load("libTree");
-  */
-    gSystem->Load("libRIO");
-    gSystem->Load("libGeom");
-    gSystem->Load("libGeomPainter");
-    gSystem->Load("libVMC");
-    gSystem->Load("libEG");
-    gSystem->Load("libEGPythia6");
-    gSystem->Load("libPythia6");
-    gSystem->Load("libPhysics");
-    gSystem->Load("libNet");
-    gSystem->Load("libTree");
-    gSystem->Load("libMinuit");
-    gSystem->Load("libMathMore");
-
-    gSystem->Load("libProof");
-    gSystem->Load("libProofPlayer");
-    gSystem->Load("libGX11TTF");
-    gSystem->Load("libGX11");
 }
diff --git a/examples/simulation/Tutorial4/gconfig/g3libs.C b/examples/simulation/Tutorial4/gconfig/g3libs.C
@@ -9,11 +9,4 @@
 
 void g3libs()
 {
-    cout << "Loading Geant3 libraries ..." << endl;
-
-    gSystem->Load("libPythia6");
-    gSystem->Load("libEGPythia6");
-    gSystem->Load("libgeant321");
-
-    cout << "Loading Geant3 libraries ... finished" << endl;
 }
diff --git a/examples/simulation/Tutorial4/gconfig/rootlogon.C b/examples/simulation/Tutorial4/gconfig/rootlogon.C
@@ -7,18 +7,4 @@
  ********************************************************************************/
 rootlogon()
 {
-    gROOT->LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C");
-    basiclibs();
-
-    // Load this example libraries
-    gSystem->Load("libFairTools");
-    gSystem->Load("libGeoBase");
-    gSystem->Load("libParBase");
-    gSystem->Load("libBase");
-    gSystem->Load("libMCStack");
-    gSystem->Load("libField");
-    gSystem->Load("libPassive");
-    gSystem->Load("libGen");
-    gSystem->Load("libPGen");
-    gSystem->Load("libGeane");
 }
diff --git a/examples/simulation/Tutorial4/macros/Create_Tutorial4_Geometry.C b/examples/simulation/Tutorial4/macros/Create_Tutorial4_Geometry.C
@@ -52,13 +52,6 @@ void add_alignable_volumes();
 
 void Create_Tutorial4_Geometry()
 {
-    // Load the necessary FairRoot libraries
-    //  gROOT->LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C");
-    //  basiclibs();
-    //  gSystem->Load("libGeoBase");
-    //  gSystem->Load("libParBase");
-    //  gSystem->Load("libBase");
-
     // Load needed material definition from media.geo file
     create_materials_from_media_file();
 

diff --git a/templates/project_root_containers/gconfig/g3libs.C b/templates/project_root_containers/gconfig/g3libs.C
@@ -10,9 +10,4 @@
 
 void g3libs()
 {
-    cout << "Loading Geant3 libraries ..." << endl;
-
-    gSystem->Load("libgeant321");
-
-    cout << "Loading Geant3 libraries ... finished" << endl;
 }
diff --git a/templates/project_stl_containers/gconfig/g3libs.C b/templates/project_stl_containers/gconfig/g3libs.C
@@ -10,9 +10,4 @@
 
 void g3libs()
 {
-    cout << "Loading Geant3 libraries ..." << endl;
-
-    gSystem->Load("libgeant321");
-
-    cout << "Loading Geant3 libraries ... finished" << endl;
 }