Print

Print


Commit in slicPandora/src on MAIN
PfoConstructionAlgorithm.cpp+51.3 -> 1.4
PfoProcessor.cpp+4-11.13 -> 1.14
SimpleTrackProcessor.cpp+1-11.7 -> 1.8
+10-2
3 modified files
compiles with LCD_WG2_Validation tag

slicPandora/src
PfoConstructionAlgorithm.cpp 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PfoConstructionAlgorithm.cpp	8 Jun 2010 21:43:02 -0000	1.3
+++ PfoConstructionAlgorithm.cpp	30 Jul 2010 16:59:58 -0000	1.4
@@ -4,6 +4,9 @@
  *  @brief  Implementation of the pfo construction algorithm class.
  * 
  *  $Log: PfoConstructionAlgorithm.cpp,v $
+ *  Revision 1.4  2010/07/30 16:59:58  jeremy
+ *  compiles with LCD_WG2_Validation tag
+ *
  *  Revision 1.3  2010/06/08 21:43:02  jeremy
  *  make compatible with Pandora release1 (set PANDORA_RELEASE macro to enable); add basic code for digital calorimetry
  *
@@ -18,6 +21,8 @@
 #include "PfoConstructionAlgorithm.h"
 
 #include "Api/PandoraApi.h"
+#include "Api/PandoraContentApi.h"
+#include "Xml/tinyxml.h"
 
 using namespace pandora;
 

slicPandora/src
PfoProcessor.cpp 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- PfoProcessor.cpp	8 Jun 2010 22:12:41 -0000	1.13
+++ PfoProcessor.cpp	30 Jul 2010 16:59:58 -0000	1.14
@@ -1,4 +1,4 @@
-// $Id: PfoProcessor.cpp,v 1.13 2010/06/08 22:12:41 jeremy Exp $
+// $Id: PfoProcessor.cpp,v 1.14 2010/07/30 16:59:58 jeremy Exp $
 #include "PfoProcessor.h"
 
 // lcio
@@ -19,6 +19,9 @@
 #include "ClusterShapes.h"
 #include "DetectorGeometry.h"
 
+// Pandora
+#include "Objects/ParticleFlowObject.h"
+
 using IMPL::LCCollectionVec;
 using IMPL::LCFlagImpl;
 using IMPL::ClusterImpl;

slicPandora/src
SimpleTrackProcessor.cpp 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- SimpleTrackProcessor.cpp	8 Jun 2010 22:12:41 -0000	1.7
+++ SimpleTrackProcessor.cpp	30 Jul 2010 16:59:58 -0000	1.8
@@ -56,7 +56,7 @@
         // Sign.
         const float signedCurvature(track->getOmega());
         if (0. != signedCurvature)
-            trackParameters.m_chargeSign = static_cast<int>(signedCurvature / std::fabs(signedCurvature));
+            trackParameters.m_charge = static_cast<int>(signedCurvature / std::fabs(signedCurvature));
 
         // FIXME Mass hard-coded to charged pion.
         trackParameters.m_mass = 0.13957018;
CVSspam 0.2.8