4 modified files
slicPandora/src
diff -u -r1.18 -r1.19
--- CalorimeterHitProcessor.cpp 1 Feb 2011 23:23:48 -0000 1.18
+++ CalorimeterHitProcessor.cpp 4 Feb 2011 14:49:20 -0000 1.19
@@ -1,12 +1,10 @@
-// $Id: CalorimeterHitProcessor.cpp,v 1.18 2011/02/01 23:23:48 jeremy Exp $
+// $Id: CalorimeterHitProcessor.cpp,v 1.19 2011/02/04 14:49:20 stanitzk 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 CALO_PARAMS_DEBUG 1
#include "CalorimeterHitProcessor.h"
@@ -149,10 +147,8 @@
// Position in mm.
params.m_positionVector = pandora::CartesianVector(pos[0], pos[1], pos[2]);
-
-//#ifdef POST_CDR_VERSION
params.m_expectedDirection = pandora::CartesianVector(pos[0], pos[1], pos[2]).GetUnitVector();
-// #endif
+
// Digital calorimeter setting.
params.m_isDigital = xsubdet->m_isDigital;
@@ -239,9 +235,9 @@
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
diff -u -r1.23 -r1.24
--- DetectorGeometry.cpp 1 Feb 2011 23:23:48 -0000 1.23
+++ DetectorGeometry.cpp 4 Feb 2011 14:49:20 -0000 1.24
@@ -237,7 +237,7 @@
if (subdetTypeStr == "EM_BARREL" || subdetTypeStr == "HAD_BARREL" || subdetTypeStr == "MUON_BARREL")
{
//std::cout << "setting innerZ to 0" << std::endl;
- subdet->m_innerZCoordinate = 0;
+ subdet->m_innerZCoordinate = 0; //FIXME once this is in GeomConverter
}
extras.m_mipEnergy = mipEnergy;
@@ -326,13 +326,6 @@
SimpleBFieldCalculator::m_innerBField = bfield;
- // FIXME: Next four are just dummy parameters for the moment.
-// #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
diff -u -r1.23 -r1.24
--- SimCalorimeterHitProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.23
+++ SimCalorimeterHitProcessor.cpp 4 Feb 2011 14:49:20 -0000 1.24
@@ -94,7 +94,6 @@
LCCollection* calHits = new LCCollectionVec(EVENT::LCIO::CALORIMETERHIT);
- float mipSigma = xsubdet.m_mipSigma.Get(); // FIXME: Unused variable.
float mipCut = xsubdet.m_mipCut.Get();
float timeCut = xsubdet.m_timeCut.Get();
slicPandora/src
diff -u -r1.23 -r1.24
--- SimpleTrackProcessor.cpp 3 Feb 2011 16:31:12 -0000 1.23
+++ SimpleTrackProcessor.cpp 4 Feb 2011 14:49:20 -0000 1.24
@@ -1,4 +1,4 @@
-// $Id: SimpleTrackProcessor.cpp,v 1.23 2011/02/03 16:31:12 stanitzk Exp $
+// $Id: SimpleTrackProcessor.cpp,v 1.24 2011/02/04 14:49:20 stanitzk Exp $
//#define POST_CDR_VERSION 1
@@ -115,13 +115,9 @@
else
trackParameters.m_particleId = -211;
- // FIXME: Next three boolean parameters are hard-coded.
-// trackParameters.m_reachesCalorimeter = true;
-// trackParameters.m_canFormPfo = true;
-// trackParameters.m_canFormClusterlessPfo = false;
-// #ifdef POST_CDR_VERSION
+ // per default all tracks are in the barrel
trackParameters.m_isProjectedToEndCap = false; // FIXME
-// #endif
+
// Setup track states from GenericObject collections, assuming that the ordering matches that in the "Tracks" collection.
setupTrackStatesFromGenericObjects(trackParameters, event, i);
@@ -314,8 +310,9 @@
// figure out, whether this one goes to the endcap using the StateAtECal fields
const float innerZ=pandora::GeometryHelper::GetECalEndCapParameters().GetInnerZCoordinate();
float trackZ=fabs(trackParameters.m_trackStateAtCalorimeter.Get().GetPosition().GetZ());
-
- if (trackZ-innerZ>-1.5) // it is close to the endcap, hard-coded for now
+
+ //FIXME hard-coded for now!!!
+ if (trackZ-innerZ>-1.5) // it is close to the endcap,
{
trackParameters.m_isProjectedToEndCap=true; //it is in the endcap
CVSspam 0.2.8