Merge pull request #34 from alicerobson/lxplus

Thanks for the additional info, Alice

examples/CMakeLists.txt

@@ -6,7 +6,6 @@ ${MAINDIR}/spdlog
 ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-
 add_executable(example_simple example_simple.cpp PythiaConnector.cpp )
 target_compile_definitions(example_simple PRIVATE WITHSORT=1)
 target_link_libraries(example_simple papas ${ROOT_LIBRARIES}   datamodel datamodelDict podio utilities)
@@ -46,4 +45,4 @@ install(TARGETS example_plot DESTINATION bin)
 add_test(NAME fcc-generate COMMAND $ENV{FCCPHYSICS}/bin/fcc-pythia8-generate $ENV{FCCPHYSICS}/share/ee_ZH_Zmumu_Hbb.txt WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 add_test(NAME example_loop  COMMAND $ENV{FCCPAPASCPP}/bin/example_loop ee_ZH_Zmumu_Hbb.root  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}  )
 
-#set_property(TEST example_loop PROPERTY DEPENDS fcc-generate)
+#set_property(TEST example_loop PROPERTY DEPENDS fcc-generate)

examples/PythiaConnector.cpp

@@ -11,7 +11,7 @@
 #include "papas/reconstruction/PapasManager.h"
 #include "papas/reconstruction/PapasManager.h"
 
-#include "datamodel/CaloClusterCollection.h"
+//#include "datamodel/CaloClusterCollection.h"
 #include "datamodel/EventInfoCollection.h"
 #include "datamodel/ParticleCollection.h"
 #include "utilities/ParticleUtils.h"
@@ -166,6 +166,7 @@ void PythiaConnector::writeParticlesROOT(const char* fname, const papas::Particl
   writer.finish();
 }
 
+/*
 void PythiaConnector::writeClustersROOT(const char* fname, const papas::Clusters& clusters) {
 
   podio::ROOTWriter writer(fname, &m_store);
@@ -217,7 +218,7 @@ void PythiaConnector::AddClustersToEDM(const papas::Clusters& papasClusters, fcc
     p3.z = c.second.position().Z();
   }
 }
-
+*/
 /*void PythiaConnector::readClustersROOT(unsigned int eventNo, papas::PapasManager& papasManager) {
 
   const fcc::ParticleCollection* ptcs(nullptr);

examples/example_simple.cpp

@@ -62,7 +62,7 @@ int main(int argc, char* argv[]) {
     }
 
     // testing (move elsewhere)
-    pythiaConnector.writeClustersROOT("simpleeg.root", papasManager.event().clusters("em"));
+    //pythiaConnector.writeClustersROOT("simpleeg.root", papasManager.event().clusters("em"));
 
     // produce papas display
     TApplication tApp("theApp", &argc, argv);

papas/datatypes/src/Cluster.cpp

@@ -10,7 +10,7 @@ double Cluster::s_maxEnergy = 0;
 
 Cluster::Cluster(double energy, const TVector3& position, double size_m, uint32_t index, IdCoder::ItemType type,
                  char subtype)
-    : m_id(IdCoder::makeId(index, type, subtype, fmax(0, energy))), m_position(position), m_subClusters({}) {
+    : m_id(IdCoder::makeId(index, type, subtype, fmax(0, energy))), m_position(position) {
   setSize(size_m);
   setEnergy(energy);
 }

papas/display/src/GDetectorElement.cpp

@@ -33,8 +33,8 @@ GDetectorElement::GDetectorElement(std::shared_ptr<const DetectorElement> detEle
     double radius = elem.radius();
     double dz = elem.z();
 
-    m_circles.push_back(std::move(TEllipse(0., 0., radius, radius)));
-    m_boxes.push_back(std::move(TBox(-dz, -radius, dz, radius)));
+    m_circles.push_back({0., 0., radius, radius});
+    m_boxes.push_back({-dz, -radius, dz, radius});
   }
 
   // Choose color according to which element it is
@@ -59,8 +59,8 @@ GDetectorElement::GDetectorElement(std::shared_ptr<const DetectorElement> detEle
 
 GDetectorElement::GDetectorElement(double radius, double dz) {
 
-  m_circles.push_back(std::move(TEllipse(0., 0., radius, radius)));
-  m_boxes.push_back(std::move(TBox(-dz, -radius, dz, radius)));
+  m_circles.push_back({0., 0., radius, radius});
+  m_boxes.push_back({-dz, -radius, dz, radius});
 
   // Choose color according to which element it is
   int color = 0;

papas/graphtools/src/EventRuler.cpp

@@ -11,18 +11,18 @@ Distance EventRuler::distance(Identifier id1, Identifier id2) const {
   // figure out the object types and then call ClusterCluster or ClusterTrack distance measures
   if (IdCoder::isCluster(id1) && IdCoder::isCluster(id2))
     if (IdCoder::type(id1) == IdCoder::type(id2))
-      return std::move(clusterClusterDistance(id1, id2));
+      return clusterClusterDistance(id1, id2);
     else  // hcal ecal not linked
       return Distance();
   else if (IdCoder::isTrack(id2) && IdCoder::isCluster(id1))
-    return std::move(clusterTrackDistance(id1, id2));
+    return clusterTrackDistance(id1, id2);
   else if (IdCoder::isTrack(id1) && IdCoder::isCluster(id2))
-    return std::move(clusterTrackDistance(id2, id1));
+    return clusterTrackDistance(id2, id1);
   else if (IdCoder::isTrack(id1) && IdCoder::isTrack(id2))
-    return std::move(Distance());
+    return Distance();
   std::cout << IdCoder::type(id1) << ":" << IdCoder::type(id2) << std::endl;
   throw "Distance between ids could not be computed";
-  return std::move(Distance());
+  return Distance();
 }
 
 Distance EventRuler::clusterClusterDistance(Identifier id1, Identifier id2) const {

papaslib/CMakeLists.txt

@@ -1,24 +1,11 @@
 cmake_minimum_required(VERSION 2.8)
 
 # use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+SET(CMAKE_SKIP_BUILD_RPATH  TRUE)
 
-# when building, don't use the install RPATH already
-# (but later on when installing)
+# when building, don't use the install RPATH 
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# the RPATH to be used when installing, but only if it's not a system directory
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-IF("${isSystemDir}" STREQUAL "-1")
-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-ENDIF("${isSystemDir}" STREQUAL "-1")
-
 include_directories(
 ${CMAKE_SOURCE_DIR}
 )

tests/unittest.cpp

@@ -445,7 +445,7 @@ TEST_CASE("BlockSplitter") {
   // create history nodes
   Nodes historyNodes;
   for (auto id : ids)
-    historyNodes.emplace(id, std::move(PFNode(id)));
+    historyNodes.emplace(id, PFNode(id));
 
   Nodes emptyNodes;
   Blocks blocks;