Commit in slicPandora/src on MAIN
CalorimeterHitProcessor.cpp+5-21.16 -> 1.17
DetectorGeometry.cpp+6-41.19 -> 1.20
SimpleTrackProcessor.cpp+2-21.19 -> 1.20
+13-8
3 modified files
#defines to adapt between Pandora versions (tagged and head)
slicPandora/src
CalorimeterHitProcessor.cpp 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- CalorimeterHitProcessor.cpp	26 Nov 2010 14:52:27 -0000	1.16
+++ CalorimeterHitProcessor.cpp	29 Nov 2010 10:29:48 -0000	1.17
@@ -1,10 +1,10 @@

-// $Id: CalorimeterHitProcessor.cpp,v 1.16 2010/11/26 14:52:27 speckmay Exp $

+// $Id: CalorimeterHitProcessor.cpp,v 1.17 2010/11/29 10:29:48 speckmay Exp $

 
 // variable names change from cdr to trunk version. use the new names, and keep the transformation of the names in defines
 #define m_nCellRadiationLengths m_nRadiationLengths
 #define m_nCellInteractionLengths m_nInteractionLengths
 #define m_cellNormalVector m_normalVector

-#define POST_CDR_VERSION 1

+//#define POST_CDR_VERSION 1

 
 #include "CalorimeterHitProcessor.h"
 

@@ -236,7 +236,10 @@

     float radLengthsFromIp = 0.f;
     GetPathLengths(hit, radLengthsFromIp, intLengthsFromIp);
     params.m_nInteractionLengthsFromIp = intLengthsFromIp;

+
+    #ifdef POST_CDR_VERSION

     params.m_nRadiationLengthsFromIp   = radLengthsFromIp;

+    #endif

   
     // Return completed calorimeter parameters.
     return params;
slicPandora/src
DetectorGeometry.cpp 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- DetectorGeometry.cpp	26 Nov 2010 14:52:27 -0000	1.19
+++ DetectorGeometry.cpp	29 Nov 2010 10:29:48 -0000	1.20
@@ -290,10 +290,12 @@

     SimpleBFieldCalculator::m_innerBField = bfield;
 
     // FIXME: Next four are just dummy parameters for the moment.

-//     geom.m_nRadLengthsInZGap      = 0.;
-//     geom.m_nIntLengthsInZGap      = 0.;
-//     geom.m_nRadLengthsInRadialGap = 0.;
-//     geom.m_nIntLengthsInRadialGap = 0.;

+    #ifndef POST_CDR_VERSION 
+    geom.m_nRadLengthsInZGap      = 0.;
+    geom.m_nIntLengthsInZGap      = 0.;
+    geom.m_nRadLengthsInRadialGap = 0.;
+    geom.m_nIntLengthsInRadialGap = 0.;
+    #endif

 
 #ifdef DETECTOR_GEOMETRY_DEBUG
     // Print coil and field.
slicPandora/src
SimpleTrackProcessor.cpp 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- SimpleTrackProcessor.cpp	26 Nov 2010 14:52:27 -0000	1.19
+++ SimpleTrackProcessor.cpp	29 Nov 2010 10:29:48 -0000	1.20
@@ -1,6 +1,6 @@

-// $Id: SimpleTrackProcessor.cpp,v 1.19 2010/11/26 14:52:27 speckmay Exp $

+// $Id: SimpleTrackProcessor.cpp,v 1.20 2010/11/29 10:29:48 speckmay Exp $

 

-#define POST_CDR_VERSION 1

+//#define POST_CDR_VERSION 1

 
 
 #include "SimpleTrackProcessor.h"
CVSspam 0.2.8