7 modified files
slicPandora
diff -u -r1.14 -r1.15
--- Makefile 8 Jun 2010 22:58:01 -0000 1.14
+++ Makefile 16 Aug 2010 17:51:57 -0000 1.15
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.14 2010/06/08 22:58:01 jeremy Exp $
+# $Id: Makefile,v 1.15 2010/08/16 17:51:57 jeremy Exp $
#
# Makefile for the slicPandora project. It requires that
@@ -53,11 +53,6 @@
#CXXFLAGS=-v -Wall -g $(INCLUDES)
CXXFLAGS=-Wall -g $(INCLUDES)
-# Compile for release version.
-ifdef PANDORA_RELEASE
-CXXFLAGS+="-DPANDORA_RELEASE="$(PANDORA_RELEASE)
-endif
-
# Enable debug output for PFO creation.
ifdef PFOPROCESSOR_DEBUG
CXXFLAGS+="-DPFOPROCESSOR_DEBUG=1"
slicPandora
diff -u -r1.5 -r1.6
--- make_setup_script.sh 14 Jun 2010 18:27:38 -0000 1.5
+++ make_setup_script.sh 16 Aug 2010 17:51:57 -0000 1.6
@@ -19,11 +19,6 @@
"#!/bin/bash
export PANDORAPFA=$PANDORAPFA" > mysetup.sh
-if [ -n "$PANDORA_RELEASE" ]; then
- echo "PANDORA_RELEASE=$PANDORA_RELEASE"
- echo "export PANDORA_RELEASE=$PANDORA_RELEASE" >> mysetup.sh
-fi
-
echo -e \
"export LCIO=$LCIO
export LD_LIBRARY_PATH=${PANDORAPFA}/lib:${LCIO}/lib:${PWD}/lib:\$LD_LIBRARY_PATH" >> mysetup.sh
slicPandora/src
diff -u -r1.10 -r1.11
--- CalorimeterHitProcessor.cpp 15 Jun 2010 23:28:12 -0000 1.10
+++ CalorimeterHitProcessor.cpp 16 Aug 2010 17:51:58 -0000 1.11
@@ -1,4 +1,4 @@
-// $Id: CalorimeterHitProcessor.cpp,v 1.10 2010/06/15 23:28:12 jeremy Exp $
+// $Id: CalorimeterHitProcessor.cpp,v 1.11 2010/08/16 17:51:58 jeremy Exp $
#include "CalorimeterHitProcessor.h"
@@ -95,17 +95,26 @@
PandoraApi::GeometryParameters::LayerParametersList* layerList = &(subdet->m_layerParametersList);
int nlayers = layerList->size();
-#if PANDORA_RELEASE >= 1
- // Set isInOuterSamplingLayer if hit is in the last 2 layers.
- if (layer >= nlayers - 3)
+ // Set isInOuterSamplingLayer.
+ if (xsubdet->m_inputHitType().Get() == pandora::HCAL)
+ {
+ if (layers >= nlayers - 3)
+ {
+ params.m_isInOuterSamplingLayer = true;
+ }
+ else
+ {
+ params.m_isInOuterSamplingLayer = false;
+ }
+ }
+ else if (xsubdet->m_inputHitType.Get() == pandora::MUON)
{
params.m_isInOuterSamplingLayer = true;
}
- else
+ else if (xsubdet->m_inputHitType.Get() == pandora::ECAL)
{
params.m_isInOuterSamplingLayer = false;
}
-#endif
// Get layer parameters.
PandoraApi::GeometryParameters::LayerParameters layerParams = (*layerList)[layer];
slicPandora/src
diff -u -r1.14 -r1.15
--- DetectorGeometry.cpp 8 Jun 2010 21:43:02 -0000 1.14
+++ DetectorGeometry.cpp 16 Aug 2010 17:51:58 -0000 1.15
@@ -320,7 +320,6 @@
{
return &(geom.m_hCalEndCapParameters);
}
-#if PANDORA_RELEASE >= 1
else if ( strcmp( subdetType, "MUON_BARREL" ) == 0 )
{
return &(geom.m_muonBarrelParameters);
@@ -329,7 +328,6 @@
{
return &(geom.m_muonEndCapParameters);
}
-#endif
else
{
return 0;
@@ -387,12 +385,10 @@
{
return pandora::HCAL;
}
-#if PANDORA_RELEASE >= 1
else if (calType == "MUON_BARREL" || calType == "MUON_ENDCAP")
{
return pandora::MUON;
}
-#endif
else
{
std::cout << "Unknown CalorimeterType <" << calType << ">." << std::endl;
slicPandora/src
diff -u -r1.3 -r1.4
--- JobConfig.cpp 9 Jun 2010 20:36:42 -0000 1.3
+++ JobConfig.cpp 16 Aug 2010 17:51:58 -0000 1.4
@@ -7,10 +7,8 @@
defaultCalTypes.push_back(std::string("EM_ENDCAP"));
defaultCalTypes.push_back(std::string("HAD_BARREL"));
defaultCalTypes.push_back(std::string("HAD_ENDCAP"));
-#if PANDORA_RELEASE >= 1
defaultCalTypes.push_back(std::string("MUON_BARREL"));
defaultCalTypes.push_back(std::string("MUON_ENDCAP"));
-#endif
return defaultCalTypes;
}
slicPandora/src
diff -u -r1.4 -r1.5
--- PfoConstructionAlgorithm.cpp 30 Jul 2010 16:59:58 -0000 1.4
+++ PfoConstructionAlgorithm.cpp 16 Aug 2010 17:51:58 -0000 1.5
@@ -1,23 +1,3 @@
-/**
- * @file PandoraPFANew/src/Algorithms/PfoConstructionAlgorithm.cc
- *
- * @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
- *
- * Revision 1.2 2010/03/10 20:16:14 jeremy
- * updates to compile against PandoraPFANew svn trunk; update example setup script; a few small changes to JobManagerTest
- *
- * Revision 1.1 2010/01/08 22:55:34 ngraf
- * First working release.
- *
- */
-
#include "PfoConstructionAlgorithm.h"
#include "Api/PandoraApi.h"
slicPandora/src
diff -u -r1.11 -r1.12
--- SimpleTrackProcessor.cpp 2 Aug 2010 22:03:48 -0000 1.11
+++ SimpleTrackProcessor.cpp 16 Aug 2010 17:51:58 -0000 1.12
@@ -62,12 +62,10 @@
trackParameters.m_mass = 0.13957018;
// FIXME Particle Id hard-coded to charged pion.
-#if PANDORA_RELEASE >= 1
if (signedCurvature > 0.)
trackParameters.m_particleId = 211;
else
trackParameters.m_particleId = -211;
-#endif
// FIXME Next three boolean parameters are hard-coded.
trackParameters.m_reachesECal = true;
CVSspam 0.2.8