Dear all,
as decided during the last EMC subgroup meeting, I added the less operator for pointers using in std::map's and std::set's. To get the complete PandaRoot code compiling again, one has to modify the packages "lhetrack", "PndTools" and "pid". Due to the fact that I haven't got write permissions for these directories I would kindly like to ask the relevant package coordinators to commit the mandatory changes. What exactly you have to change, you can find in the output of my local svn diff's below:
"svn diff lhetrack"
Toggle Spoiler
Index: lhetrack/PndLhePidMaker.cxx
===================================================================
--- lhetrack/PndLhePidMaker.cxx (revision 7036)
+++ lhetrack/PndLhePidMaker.cxx (working copy)
@@ -8,6 +8,7 @@
#include "PndEmcBump.h"
#include "PndEmcDigi.h"
#include "PndEmcStructure.h"
+#include "PndEmcDataTypes.h"
#include "PndEmcXtal.h"
#include "PndMvdHit.h"
#include "PndSttHit.h"
@@ -541,7 +542,7 @@
vertex.SetXYZ(-10000, -10000, -10000);
}
- std::map<PndEmcTwoCoordIndex*, PndEmcXtal*> tciXtalMap=PndEmcStructure::Instance()->GetTciXtalMap();
+ PndEmcTciXtalMap tciXtalMap=PndEmcStructure::Instance()->GetTciXtalMap();
PndEmcDigi *lDigi= (PndEmcDigi*)emcHit->Maxima();
PndEmcXtal* xtal = tciXtalMap[lDigi->GetTCI()];
emcPos = xtal->frontCentre();
Index: lhetrack/CMakeLists.txt
===================================================================
--- lhetrack/CMakeLists.txt (revision 7036)
+++ lhetrack/CMakeLists.txt (working copy)
@@ -5,7 +5,8 @@
${GEANT3_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/geobase
${CMAKE_SOURCE_DIR}/parbase
-${CMAKE_SOURCE_DIR}/base
+${CMAKE_SOURCE_DIR}/base
+${CMAKE_SOURCE_DIR}/pndbase/PndStdUtils
${CMAKE_SOURCE_DIR}/field
${CMAKE_SOURCE_DIR}/trackbase
${CMAKE_SOURCE_DIR}/passive
"svn diff PndTools"
Toggle Spoiler
Index: PndTools/AnalysisTools/CMakeLists.txt
===================================================================
--- PndTools/AnalysisTools/CMakeLists.txt (revision 7036)
+++ PndTools/AnalysisTools/CMakeLists.txt (working copy)
@@ -4,7 +4,8 @@
${ROOT_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/geobase
${CMAKE_SOURCE_DIR}/parbase
-${CMAKE_SOURCE_DIR}/base
+${CMAKE_SOURCE_DIR}/base
+${CMAKE_SOURCE_DIR}/pndbase/PndStdUtils
${CMAKE_SOURCE_DIR}/field
${CMAKE_SOURCE_DIR}/trackbase
${CMAKE_SOURCE_DIR}/pnddata
"svn diff pid"
Toggle Spoiler
Index: pid/CMakeLists.txt
===================================================================
--- pid/CMakeLists.txt (revision 7036)
+++ pid/CMakeLists.txt (working copy)
@@ -5,7 +5,8 @@
${GEANT3_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/geobase
${CMAKE_SOURCE_DIR}/parbase
-${CMAKE_SOURCE_DIR}/base
+${CMAKE_SOURCE_DIR}/base
+${CMAKE_SOURCE_DIR}/pndbase/PndStdUtils
${CMAKE_SOURCE_DIR}/field
${CMAKE_SOURCE_DIR}/trackbase
${CMAKE_SOURCE_DIR}/passive
Thanks in advance,
Bertram.