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

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

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