diff --git a/CMakeLists.txt b/CMakeLists.txt index a97d74e26..18ff0c416 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,5 +56,5 @@ install(FILES ${CMAKE_BINARY_DIR}/setup.sh GROUP_READ WORLD_READ) -gaudi_project(FCCSW v0r10 - USE Gaudi v29r2 ) +gaudi_project(FCCSW v0r11 + USE Gaudi v32r0 ) diff --git a/Detector/DetFCCeeIDEA-LAr/CMakeLists.txt b/Detector/DetFCCeeIDEA-LAr/CMakeLists.txt index c020521fe..0680f8df2 100644 --- a/Detector/DetFCCeeIDEA-LAr/CMakeLists.txt +++ b/Detector/DetFCCeeIDEA-LAr/CMakeLists.txt @@ -7,6 +7,6 @@ gaudi_depends_on_subdirs(GaudiKernel Detector/DetSegmentation) -install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/Detector/DetFCCeeIDEA) +install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/Detector/DetFCCeeIDEA-LAr) diff --git a/Detector/DetSegmentation/src/GridDriftChamber.cpp b/Detector/DetSegmentation/src/GridDriftChamber.cpp index b9d173caf..7e1a8af42 100644 --- a/Detector/DetSegmentation/src/GridDriftChamber.cpp +++ b/Detector/DetSegmentation/src/GridDriftChamber.cpp @@ -189,13 +189,6 @@ TVector3 GridDriftChamber::IntersectionTrackWire(const CellID& cID, const TVecto } - std::cout << "------- Segmentation -------" << std::endl; - hit_start.Print(); - hit_end.Print(); - Wstart.Print(); - Wend.Print(); - intersect.Print(); - return intersect; } diff --git a/Reconstruction/RecDriftChamber/CMakeLists.txt b/Reconstruction/RecDriftChamber/CMakeLists.txt index 967a20290..94beb9ec4 100644 --- a/Reconstruction/RecDriftChamber/CMakeLists.txt +++ b/Reconstruction/RecDriftChamber/CMakeLists.txt @@ -14,6 +14,9 @@ find_package(HepMC) find_package(DD4hep) find_package(Geant4) +gaudi_add_dictionary(RecDriftChamber src/components/dictionary.h src/components/dictionary.xml + LINK_LIBRARIES GaudiKernel ROOT) + gaudi_add_module(RecDriftChamberPlugins src/components/*.cpp INCLUDE_DIRS FWCore FastJet ROOT FWCore HepMC FCCEDM PODIO DD4hep DetInterface DetSegmentation Geant4 DetCommon RecInterface RecDriftChamber diff --git a/Reconstruction/RecDriftChamber/src/components/CreateDCHHits.h b/Reconstruction/RecDriftChamber/src/components/CreateDCHHits.h index 7e2f431a8..5477fae7a 100644 --- a/Reconstruction/RecDriftChamber/src/components/CreateDCHHits.h +++ b/Reconstruction/RecDriftChamber/src/components/CreateDCHHits.h @@ -17,23 +17,7 @@ #include "TString.h" #include "TVector3.h" -struct hitINFO { - double DCA; - double MC_x; - double MC_y; - double MC_z; - double EdepSum; - double TOF; - TVector3 hit_start; - TVector3 hit_end; - int layerId; - int wireId; - int trackNum; - unsigned long cellId; - double hitLength; - double radius; - double debug_zpos; -}; +#include "dictionary.h" class IGeoSvc; diff --git a/Reconstruction/RecDriftChamber/src/components/dictionary.h b/Reconstruction/RecDriftChamber/src/components/dictionary.h new file mode 100644 index 000000000..e909a981b --- /dev/null +++ b/Reconstruction/RecDriftChamber/src/components/dictionary.h @@ -0,0 +1,20 @@ + + +#include "TVector3.h" +struct hitINFO { + double DCA; + double MC_x; + double MC_y; + double MC_z; + double EdepSum; + double TOF; + TVector3 hit_start; + TVector3 hit_end; + int layerId; + int wireId; + int trackNum; + unsigned long cellId; + double hitLength; + double radius; + double debug_zpos; +}; diff --git a/Reconstruction/RecDriftChamber/src/components/dictionary.xml b/Reconstruction/RecDriftChamber/src/components/dictionary.xml new file mode 100644 index 000000000..6b1fa9fc1 --- /dev/null +++ b/Reconstruction/RecDriftChamber/src/components/dictionary.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/init.sh b/init.sh index 5e5caf964..d2985b7e7 100644 --- a/init.sh +++ b/init.sh @@ -21,7 +21,7 @@ if [ ! -L $FCCSWBASEDIR/.git/hooks/pre-commit ]; then fi # Version -versiontag="96.0.0" +versiontag="96b.0.0" if ! test "x$1" = "x" ; then versiontag="$1" fi @@ -57,5 +57,5 @@ else fi # TEMPORARY: fix to lcg releases -export Gaudi_DIR=/cvmfs/sft.cern.ch/lcg/releases/LCG_96/Gaudi/v32r0/$platform/ +export Gaudi_DIR=/cvmfs/sft.cern.ch/lcg/releases/LCG_96b/Gaudi/v32r0/$platform/