Naming consistency changes

CCDB/CMakeLists.txt

@@ -35,9 +35,9 @@ Set(NO_DICT_SRCS
   src/ConditionsMQClient.cxx
 )
 
-set(LIBRARY_NAME CCDB)
+set(LIBRARY_NAME ${MODULE_NAME})
 set(LINKDEF src/CCDBLinkDef.h)
-set(BUCKET_NAME CCDB_Bucket)
+set(BUCKET_NAME CCDB_bucket)
 
 O2_GENERATE_LIBRARY()
 
@@ -52,8 +52,8 @@ Set(Exe_Source
 )
 
 # todo we repeat ourselves because the macro O2_GENERATE_LIBRARY dares deleting the variables we pass to it.
-set(LIBRARY_NAME CCDB)
-set(BUCKET_NAME CCDB_Bucket)
+set(LIBRARY_NAME ${MODULE_NAME})
+set(BUCKET_NAME CCDB_bucket)
 
 list(LENGTH Exe_Names _length)
 math(EXPR _length ${_length}-1)
@@ -77,4 +77,4 @@ install(
     config/conditions-client.json
     example/fill_local_ocdb.C
     DESTINATION bin/config
-)
+)

Common/Field/CMakeLists.txt

@@ -12,7 +12,7 @@ set(HEADERS
     include/${MODULE_NAME}/MagneticField.h
     )
 set(LINKDEF src/FieldLinkDef.h)
-set(LIBRARY_NAME Field)
+set(LIBRARY_NAME ${MODULE_NAME})
 set(BUCKET_NAME common_field_bucket)
 
 O2_GENERATE_LIBRARY()

Common/MathUtils/CMakeLists.txt

@@ -12,7 +12,7 @@ set(HEADERS
   include/${MODULE_NAME}/Chebyshev3DCalc.h
 )
 set(LINKDEF src/MathUtilsLinkDef.h)
-set(LIBRARY_NAME MathUtils)
+set(LIBRARY_NAME ${MODULE_NAME})
 set(BUCKET_NAME common_math_bucket)
 
 O2_GENERATE_LIBRARY()

Detectors/Base/CMakeLists.txt

@@ -12,7 +12,7 @@ Set(HEADERS
   include/${MODULE_NAME}/Detector.h
 )
 Set(LINKDEF src/BaseLinkDef.h)
-Set(LIBRARY_NAME ${MODULE_NAME})#AliceO2Base)
+Set(LIBRARY_NAME ${MODULE_NAME})
 set(BUCKET_NAME detectors_base)
 
 O2_GENERATE_LIBRARY()

Detectors/ITSMFT/ITS/CMakeLists.txt

@@ -15,5 +15,4 @@
 
 # Libraries
 add_subdirectory(base)
-#add_subdirectory(reconstruction)
 add_subdirectory(simulation)

Detectors/ITSMFT/ITS/base/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(MODULE_NAME "itsBase")
+set(MODULE_NAME "ITSBase")
 
 O2_SETUP(NAME ${MODULE_NAME})
 
@@ -13,8 +13,8 @@ set(HEADERS
     )
 
 
-Set(LINKDEF src/itsBaseLinkDef.h)
-Set(LIBRARY_NAME itsBase)
+Set(LINKDEF src/ITSBaseLinkDef.h)
+Set(LIBRARY_NAME ${MODULE_NAME})
 set(BUCKET_NAME its_base_bucket)
 
 O2_GENERATE_LIBRARY()

Detectors/ITSMFT/ITS/base/src/ContainerFactory.cxx

@@ -1,7 +1,7 @@
 /// \file ContainerFactory.cxx
 /// \brief Implementation of the ContainerFactory class
 
-#include "itsBase/ContainerFactory.h"
+#include "ITSBase/ContainerFactory.h"
 #include "FairRuntimeDb.h"  // for FairRuntimeDb
 #include "TString.h"        // for TString
 

Detectors/ITSMFT/ITS/base/src/MisalignmentParameter.cxx

@@ -1,7 +1,7 @@
 /// \file MisalignmentParameter.cxx
 /// \brief Implementation of the MisalignmentParameter class
 
-#include "itsBase/MisalignmentParameter.h"
+#include "ITSBase/MisalignmentParameter.h"
 
 #include "FairParamList.h"
 

Detectors/ITSMFT/ITS/simulation/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(MODULE_NAME "itsSimulation")
+set(MODULE_NAME "ITSSimulation")
 
 O2_SETUP(NAME ${MODULE_NAME})
 
@@ -41,8 +41,8 @@ set(HEADERS
     include/${MODULE_NAME}/V11Geometry.h
     )
 
-Set(LINKDEF src/itsSimulationLinkDef.h)
-Set(LIBRARY_NAME itsSimulation)
+Set(LINKDEF src/ITSSimulationLinkDef.h)
+Set(LIBRARY_NAME ${MODULE_NAME})
 set(BUCKET_NAME its_simulation_bucket)
 
 O2_GENERATE_LIBRARY()

Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitWriteoutBuffer.h → Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitWriteoutBuffer.h

@@ -13,7 +13,7 @@
 #include <TString.h>             // for TString
 #include "FairWriteoutBuffer.h"  // for FairWriteoutBuffer
 #include "Rtypes.h"              // for DigitWriteoutBuffer::Class, Bool_t, etc
-#include "itsSimulation/Digit.h"            // for Digit
+#include "ITSSimulation/Digit.h"            // for Digit
 
 namespace AliceO2 {
 namespace ITS {

Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Digitizer.h → Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Digitizer.h

@@ -5,7 +5,7 @@
 
 #include "Rtypes.h"   // for Digitizer::Class, Double_t, ClassDef, etc
 #include "TObject.h"  // for TObject
-#include "itsSimulation/Chip.h"
+#include "ITSSimulation/Chip.h"
 
 class TClonesArray;  // lines 13-13
 namespace AliceO2 { namespace ITS { class DigitContainer; }}  // lines 19-19

Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeGeometryTGeo.h → Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeGeometryTGeo.h

@@ -11,7 +11,7 @@
 #include <TObject.h>       // for TObject
 #include <TString.h>       // for TString
 #include "Rtypes.h"        // for Int_t, Double_t, Bool_t, UInt_t, etc
-#include "itsSimulation/Segmentation.h"  // for Segmentation
+#include "ITSSimulation/Segmentation.h"  // for Segmentation
 
 class TGeoPNEntry;  // lines 17-17
 

Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeSegmentationPixel.h → Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeSegmentationPixel.h

@@ -6,7 +6,7 @@
 
 #include "FairLogger.h"    // for LOG
 #include "Rtypes.h"        // for Int_t, Float_t, Double_t, UInt_t, etc
-#include "itsSimulation/Segmentation.h"  // for Segmentation
+#include "ITSSimulation/Segmentation.h"  // for Segmentation
 
 class TObjArray;
 

Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeV1Layer.h → Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeV1Layer.h

@@ -8,8 +8,8 @@
 
 #include <TGeoManager.h>   // for gGeoManager
 #include "Rtypes.h"        // for Double_t, Int_t, Bool_t, etc
-#include "itsSimulation/V11Geometry.h"   // for V11Geometry
-#include "itsSimulation/Detector.h"  // for Detector, Detector::UpgradeModel
+#include "ITSSimulation/V11Geometry.h"   // for V11Geometry
+#include "ITSSimulation/Detector.h"  // for Detector, Detector::UpgradeModel
 
 class TGeoArb8;
 

Detectors/ITSMFT/ITS/simulation/src/Chip.cxx

@@ -6,12 +6,12 @@
 //  Adapted from AliITSUChip by Massimo Masera
 //
 
-#include "itsSimulation/Chip.h"
+#include "ITSSimulation/Chip.h"
 #include <TMath.h>                    // for Sqrt
 #include <string.h>                   // for memset
 #include "TObjArray.h"                // for TObjArray
-#include "itsSimulation/Point.h"
-#include "itsSimulation/UpgradeGeometryTGeo.h"
+#include "ITSSimulation/Point.h"
+#include "ITSSimulation/UpgradeGeometryTGeo.h"
 
 ClassImp(AliceO2::ITS::Chip)
 

Detectors/ITSMFT/ITS/simulation/src/Detector.cxx

@@ -1,13 +1,13 @@
 /// \file Detector.cxx
 /// \brief Implementation of the Detector class
 
-#include "itsSimulation/Detector.h"
-#include "itsSimulation/GeometryHandler.h"
-#include "itsSimulation/UpgradeGeometryTGeo.h"
-#include "itsSimulation/UpgradeV1Layer.h"
-#include "itsSimulation/Point.h"
+#include "ITSSimulation/Detector.h"
+#include "ITSSimulation/GeometryHandler.h"
+#include "ITSSimulation/UpgradeGeometryTGeo.h"
+#include "ITSSimulation/UpgradeV1Layer.h"
+#include "ITSSimulation/Point.h"
 
-#include "itsBase/MisalignmentParameter.h"  // for MisalignmentParameter
+#include "ITSBase/MisalignmentParameter.h"  // for MisalignmentParameter
 
 #include "SimulationDataFormat/DetectorList.h"
 #include "SimulationDataFormat/Stack.h"

Detectors/ITSMFT/ITS/simulation/src/Digit.cxx

@@ -1,7 +1,7 @@
 /// \file AliITSUpgradeDigi.cxx
 /// \brief Digits structure for ITS digits
 
-#include "itsSimulation/Digit.h"
+#include "ITSSimulation/Digit.h"
 
 ClassImp(AliceO2::ITS::Digit)
 

Detectors/ITSMFT/ITS/simulation/src/DigitContainer.cxx

@@ -5,10 +5,10 @@
 //  Created by Markus Fasel on 25.03.15.
 //
 //
-#include "itsSimulation/DigitContainer.h"
-#include "itsSimulation/UpgradeGeometryTGeo.h"
-#include "itsSimulation/Digit.h"
-#include "itsSimulation/DigitLayer.h"
+#include "ITSSimulation/DigitContainer.h"
+#include "ITSSimulation/UpgradeGeometryTGeo.h"
+#include "ITSSimulation/Digit.h"
+#include "ITSSimulation/DigitLayer.h"
 
 #include "FairLogger.h"           // for LOG
 #include "Rtypes.h"               // for Int_t, nullptr