Merge pull request #364 from vvolkl/release-v0.11

Release v0.11
HEP-FCC · Sep 19, 2019 · 1845a71 · 1845a71
2 parents 7f9ba61 + 2b6096f
commit 1845a71
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,6 @@
+<lcgdict>
+  <class name="hitINFO" >
+  </class>
+  <class name="std::vector<hitINFO>" >
+  </class>
+</lcgdict>
diff --git 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/