Author: [log in to unmask]
Date: Mon Jun 15 13:37:03 2015
New Revision: 3636

Log:
More changes from John Marshall.

Modified:
    projects/slicPandora/trunk/CMakeLists.txt
    projects/slicPandora/trunk/src/CalorimeterHitProcessor.cpp
    projects/slicPandora/trunk/src/PfoConstructionAlgorithm.cpp
    projects/slicPandora/trunk/src/PfoProcessor.cpp

Modified: projects/slicPandora/trunk/CMakeLists.txt
 =============================================================================
--- projects/slicPandora/trunk/CMakeLists.txt	(original)
+++ projects/slicPandora/trunk/CMakeLists.txt	Mon Jun 15 13:37:03 2015
@@ -11,9 +11,9 @@
 # ---- Project Info ----
 PROJECT( slicPandora )
 
-SET( ${PROJECT_NAME}_VERSION_MAJOR 1 )
-SET( ${PROJECT_NAME}_VERSION_MINOR 1 )
-SET( ${PROJECT_NAME}_VERSION_PATCH 1 )
+SET( ${PROJECT_NAME}_VERSION_MAJOR 2 )
+SET( ${PROJECT_NAME}_VERSION_MINOR 0 )
+SET( ${PROJECT_NAME}_VERSION_PATCH 0 )
 
 # ---- Turn off RPATH ----
 SET( CMAKE_SKIP_RPATH 1 )
@@ -24,10 +24,10 @@
 INCLUDE( ilcsoft_default_settings )
 
 FIND_PACKAGE( LCIO REQUIRED )
-FIND_PACKAGE( PandoraSDK 0.17 REQUIRED )
-FIND_PACKAGE( LCContent 0.17 REQUIRED )
+FIND_PACKAGE( PandoraSDK 02.00.00 REQUIRED )
+FIND_PACKAGE( LCContent 02.00.00 REQUIRED )
 #FIND_PACKAGE( ROOT )
-#FIND_PACKAGE( PandoraMonitoring 0.17 )
+#FIND_PACKAGE( PandoraMonitoring 02.00.00 )
 
 FOREACH( pkg LCIO PandoraSDK  )
     IF ( ${pkg}_FOUND )
@@ -60,6 +60,14 @@
 # ---- Compiler Flags ----
 ADD_DEFINITIONS( "-Wall -ansi -pedantic" )
 ADD_DEFINITIONS( "-Wno-long-long" )
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+    message( STATUS "The compiler ${CMAKE_CXX_COMPILER} has C++11 support." )
+    ADD_DEFINITIONS( "-std=c++11" )
+else()
+    message( STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Some Pandora functionality will be limited." )
+endif()
 
 # ---- Project Source Directory ----
 AUX_SOURCE_DIRECTORY( ./src library_sources )

Modified: projects/slicPandora/trunk/src/CalorimeterHitProcessor.cpp
 =============================================================================
--- projects/slicPandora/trunk/src/CalorimeterHitProcessor.cpp	(original)
+++ projects/slicPandora/trunk/src/CalorimeterHitProcessor.cpp	Mon Jun 15 13:37:03 2015
@@ -176,11 +176,14 @@
     params.m_pParentAddress = hit; 
     
     // Cell size U in mm.
-    params.m_cellSizeU = xsubdet->m_cellSizeU;
+    params.m_cellSize0 = xsubdet->m_cellSizeU;
 
     // Cell size V in mm.
-    params.m_cellSizeV = xsubdet->m_cellSizeV;
-
+    params.m_cellSize1 = xsubdet->m_cellSizeV;
+
+    // Cell geometry, rectangular or pointing
+    params.m_cellGeometry = pandora::RECTANGULAR;
+    
     // Cell thickness in mm.
     params.m_cellThickness = xlayerParams.m_cellThickness; 
 
@@ -218,7 +221,7 @@
     std::cout << "    energy: " << params.m_inputEnergy.Get() << " [GeV]" << std::endl;
     std::cout << "    layer: " << params.m_layer.Get() << std::endl;
     std::cout << "    time: " << params.m_time.Get() << " [ns]" << std::endl;
-    std::cout << "    cell sizes: " << params.m_cellSizeU.Get() << ", " << params.m_cellSizeV.Get() << " [mm]" << std::endl;
+    std::cout << "    cell sizes: " << params.m_cellSize0.Get() << ", " << params.m_cellSize1.Get() << " [mm]" << std::endl;
     std::cout << "    cell thick: " << params.m_cellThickness.Get() << " [mm]" << std::endl;
     std::cout << "    radLengths: " << params.m_nCellRadiationLengths.Get() << std::endl;
     std::cout << "    intLengths: " << params.m_nCellInteractionLengths.Get() << std::endl;

Modified: projects/slicPandora/trunk/src/PfoConstructionAlgorithm.cpp
 =============================================================================
--- projects/slicPandora/trunk/src/PfoConstructionAlgorithm.cpp	(original)
+++ projects/slicPandora/trunk/src/PfoConstructionAlgorithm.cpp	Mon Jun 15 13:37:03 2015
@@ -14,7 +14,7 @@
 
     for (ClusterList::const_iterator iter = pClusterList->begin(), iterEnd = pClusterList->end(); iter != iterEnd; ++iter)
     {
-        Cluster *pCluster = *iter;
+        const Cluster *pCluster = *iter;
 
         PandoraContentApi::ParticleFlowObjectParameters particleFlowObjectParameters;
         
@@ -28,7 +28,7 @@
         // Make a new pfo for every cluster.
         particleFlowObjectParameters.m_clusterList.insert(pCluster);            
 
-        ParticleFlowObject *pParticleFlowObject(NULL);
+        const ParticleFlowObject *pParticleFlowObject(NULL);
         PANDORA_RETURN_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraContentApi::ParticleFlowObject::Create(*this, particleFlowObjectParameters, pParticleFlowObject));
     }
 

Modified: projects/slicPandora/trunk/src/PfoProcessor.cpp
 =============================================================================
--- projects/slicPandora/trunk/src/PfoProcessor.cpp	(original)
+++ projects/slicPandora/trunk/src/PfoProcessor.cpp	Mon Jun 15 13:37:03 2015
@@ -62,7 +62,7 @@
     LCCollectionVec* pReconstructedParticleCollection = new LCCollectionVec(EVENT::LCIO::RECONSTRUCTEDPARTICLE);
 
     // Iterate over Pandora's PFO objects to create LCIO ReconstructedParticles.
-    for (pandora::PfoList::iterator itPFO = pfoList->begin(), itPFOEnd = pfoList->end(); itPFO != itPFOEnd; ++itPFO)
+    for (pandora::PfoList::const_iterator itPFO = pfoList->begin(), itPFOEnd = pfoList->end(); itPFO != itPFOEnd; ++itPFO)
     {
 #ifdef PFOPROCESSOR_DEBUG
         std::cout << std::endl << "proc PFO: " << (int)(&(*itPFO)) << std::endl;

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1