*ContFact: Drop setAllContainers

The constructor of nearly all "Container Factories" calls a private member function called setAllContainers. And it's the only call. And that member function is called from nowhere else. So move the contents into the constructor. (cherry picked from commit 1f3511b)
FairRootGroup · Feb 3, 2023 · 65b6434 · 65b6434
1 parent 393178b
commit 65b6434
Show file tree

Hide file tree

Showing 32 changed files with 32 additions and 145 deletions.
diff --git a/base/sim/FairBaseContFact.cxx b/base/sim/FairBaseContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -31,11 +31,7 @@ FairBaseContFact::FairBaseContFact()
     : FairContFact("FairBaseContFact", "Factory for parameter containers in libSts")
 {
     // Constructor (called when the library is loaded)
-    setAllContainers();
-}
 
-void FairBaseContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted contexts and adds them to
      *  the list of containers for the base library.*/
     FairContainer* pTest = new FairContainer("FairBaseParSet", "class for parameter io", "DefaultContext");

diff --git a/base/sim/FairBaseContFact.h b/base/sim/FairBaseContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -17,9 +17,6 @@ class FairParSet;
 class FairBaseContFact : public FairContFact
 {
     /** Factory for all Base parameter containers */
-  private:
-    void setAllContainers();
-
   public:
     /**default ctor*/
     FairBaseContFact();

diff --git a/examples/MQ/parameters/FairMQExParamsContFact.cxx b/examples/MQ/parameters/FairMQExParamsContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,11 +16,6 @@ static FairMQExParamsContFact gFairMQExParamsContFact;
 
 FairMQExParamsContFact::FairMQExParamsContFact()
     : FairContFact("FairMQExParamsContFact", "Factory for parameter containers in FairMQ Example 7")
-{
-    setAllContainers();
-}
-
-void FairMQExParamsContFact::setAllContainers()
 {
     FairContainer* container =
         new FairContainer("FairMQExParamsParOne", "FairMQExParamsParOne Parameters", "TestDefaultContext");

diff --git a/examples/MQ/parameters/FairMQExParamsContFact.h b/examples/MQ/parameters/FairMQExParamsContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -15,9 +15,6 @@ class FairParSet;
 
 class FairMQExParamsContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairMQExParamsContFact();
     ~FairMQExParamsContFact() override = default;

diff --git a/examples/MQ/pixelDetector/src/PixelContFact.cxx b/examples/MQ/pixelDetector/src/PixelContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -25,11 +25,7 @@ PixelContFact::PixelContFact()
     : FairContFact("PixelContFact", "Factory for parameter containers in libPixel")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void PixelContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
       contexts and adds them to
       the list of containers for the Pixel library.

diff --git a/examples/MQ/pixelDetector/src/PixelContFact.h b/examples/MQ/pixelDetector/src/PixelContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -14,9 +14,6 @@
 
 class PixelContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     PixelContFact();
     ~PixelContFact() override = default;

diff --git a/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.cxx b/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -24,11 +24,7 @@ FairTestDetectorContFact::FairTestDetectorContFact()
     : FairContFact("FairTestDetectorContFact", "Factory for parameter containers in libFairTestDetector")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void FairTestDetectorContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
         contexts and adds them to
         the list of containers for the FairTestDetector library.

diff --git a/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.h b/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,9 +16,6 @@ class FairParSet;
 
 class FairTestDetectorContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairTestDetectorContFact();
     ~FairTestDetectorContFact() override = default;

diff --git a/examples/advanced/propagator/src/FairTutPropContFact.cxx b/examples/advanced/propagator/src/FairTutPropContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2019-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2019-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -21,11 +21,7 @@ FairTutPropContFact::FairTutPropContFact()
     : FairContFact("FairTutPropContFact", "Factory for parameter containers in libFairTutProp")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void FairTutPropContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
         contexts and adds them to
         the list of containers for the FairTutProp library.

diff --git a/examples/advanced/propagator/src/FairTutPropContFact.h b/examples/advanced/propagator/src/FairTutPropContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2019-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2019-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -15,9 +15,6 @@ class FairParSet;
 
 class FairTutPropContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairTutPropContFact();
     ~FairTutPropContFact() override = default;

diff --git a/examples/common/passive/FairPassiveContFact.cxx b/examples/common/passive/FairPassiveContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -33,11 +33,7 @@ FairPassiveContFact::FairPassiveContFact()
     : FairContFact("FairPassiveContFact", "Factory for parameter containers in libPassive")
 {
     // Constructor (called when the library is loaded)
-    setAllContainers();
-}
 
-void FairPassiveContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted contexts and adds them to
      *  the list of containers for the STS library.*/
 

diff --git a/examples/common/passive/FairPassiveContFact.h b/examples/common/passive/FairPassiveContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,9 +16,6 @@ class FairParSet;
 
 class FairPassiveContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairPassiveContFact();
     ~FairPassiveContFact() {}

diff --git a/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.cxx b/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -23,11 +23,7 @@ FairTutorialDet1ContFact::FairTutorialDet1ContFact()
     : FairContFact("FairTutorialDet1ContFact", "Factory for parameter containers in libTutorial1")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void FairTutorialDet1ContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
       contexts and adds them to
       the list of containers for the Tutorial1 library.

diff --git a/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h b/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,9 +16,6 @@ class FairParSet;
 
 class FairTutorialDet1ContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairTutorialDet1ContFact();
     ~FairTutorialDet1ContFact() {}

diff --git a/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.cxx b/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -20,11 +20,7 @@ FairTutorialDet2ContFact::FairTutorialDet2ContFact()
     : FairContFact("FairTutorialDet2ContFact", "Factory for parameter containers in libTutorial1")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void FairTutorialDet2ContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
       contexts and adds them to
       the list of containers for the Tutorial1 library.

diff --git a/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h b/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,9 +16,6 @@ class FairParSet;
 
 class FairTutorialDet2ContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairTutorialDet2ContFact();
     ~FairTutorialDet2ContFact() {}

diff --git a/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.cxx b/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -24,11 +24,7 @@ FairTutorialDet4ContFact::FairTutorialDet4ContFact()
     : FairContFact("FairTutorialDet4ContFact", "Factory for parameter containers in libTutorial1")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void FairTutorialDet4ContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
       contexts and adds them to
       the list of containers for the Tutorial1 library.

diff --git a/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h b/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,9 +16,6 @@ class FairParSet;
 
 class FairTutorialDet4ContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairTutorialDet4ContFact();
     ~FairTutorialDet4ContFact() {}

diff --git a/examples/simulation/rutherford/src/FairRutherfordContFact.cxx b/examples/simulation/rutherford/src/FairRutherfordContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -23,11 +23,7 @@ FairRutherfordContFact::FairRutherfordContFact()
     : FairContFact("FairRutherfordContFact", "Factory for parameter containers in libFairRutherford")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void FairRutherfordContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
       contexts and adds them to
       the list of containers for the FairRutherford library.

diff --git a/examples/simulation/rutherford/src/FairRutherfordContFact.h b/examples/simulation/rutherford/src/FairRutherfordContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,9 +16,6 @@ class FairParSet;
 
 class FairRutherfordContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     FairRutherfordContFact();
     ~FairRutherfordContFact() override {}

diff --git a/templates/NewDetector_root_containers/NewDetectorContFact.cxx b/templates/NewDetector_root_containers/NewDetectorContFact.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -19,11 +19,7 @@ NewDetectorContFact::NewDetectorContFact()
     : FairContFact("NewDetectorContFact", "Factory for parameter containers in libNewDetector")
 {
     /** Constructor (called when the library is loaded) */
-    setAllContainers();
-}
 
-void NewDetectorContFact::setAllContainers()
-{
     /** Creates the Container objects with all accepted
       contexts and adds them to
       the list of containers for the NewDetector library.

diff --git a/templates/NewDetector_root_containers/NewDetectorContFact.h b/templates/NewDetector_root_containers/NewDetectorContFact.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -14,9 +14,6 @@ class FairContainer;
 
 class NewDetectorContFact : public FairContFact
 {
-  private:
-    void setAllContainers();
-
   public:
     NewDetectorContFact();
     ~NewDetectorContFact() {}