diff --git a/Event/xAOD/xAODTrigger/Root/EmTauRoI_v2.cxx b/Event/xAOD/xAODTrigger/Root/EmTauRoI_v2.cxx
index b4f7f73387fb6f620ef4059cdaf535dfbb3a0d2a..1fff78fcfa25e47659b1d31f7c46f6832446ad49 100644
--- a/Event/xAOD/xAODTrigger/Root/EmTauRoI_v2.cxx
+++ b/Event/xAOD/xAODTrigger/Root/EmTauRoI_v2.cxx
@@ -70,12 +70,6 @@ namespace xAOD {
setHadIsol )
AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( EmTauRoI_v2, float, hadCore,
setHadCore )
- AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( EmTauRoI_v2, float, clusEnergyTDR,
- setClusEnergyTDR )
- AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( EmTauRoI_v2, float, eFEXIsoTDR,
- seteFEXIsoTDR )
- AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( EmTauRoI_v2, bool, IseFEXTDRIso,
- setIseFEXTDRIso )
/// Get cluster ET from the RoI word
float EmTauRoI_v2::eT() const {
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/EmTauRoI_v2.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/EmTauRoI_v2.h
index 34862038b4cccfacd3d55c7c12c91fb712ab9410..8a93715e08500ddf803429ef27d4d598d40aab33 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/EmTauRoI_v2.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/EmTauRoI_v2.h
@@ -129,22 +129,6 @@ namespace xAOD {
const std::vector< std::string >& thrNames() const;
/// The values of the thresholds (in MeV) passed by the jet candidate
const std::vector< float >& thrValues() const;
-
- /// clustering option proposed in TDR
- float clusEnergyTDR() const;
- /// set clustering option proposed in TDR
- void setClusEnergyTDR( float value );
-
- /// isolation option proposed in TDR
- float eFEXIsoTDR() const;
- /// set isolation option proposed in TDR
- void seteFEXIsoTDR( float value );
-
- /// boolian for isolation proposed in TDR
- bool IseFEXTDRIso() const;
- /// set boolian for isolation proposed in TDR
- void setIseFEXTDRIso( bool value );
-
/// @}
}; // class EmTauRoI_v2
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx
index f781ede21435c275fbdc5913b3ac1edff6f56651..68726707e49863c39443e8c09dcd7d0361efd5ce 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx
@@ -77,7 +77,7 @@ StatusCode TrigT1CaloEFex::execute(){
return StatusCode::SUCCESS;
}
- // Simply check cells which are above a given threshold (3GeV) // 3GeV ok?
+ // Simply check cells which are above a given threshold (3GeV)
findCellsAbove(scells,3e3,m_cellsAboveThr);
// Prepare output containers (with all xAOD annoying features)
xAOD::TrigEMClusterContainer* clusters = new xAOD::TrigEMClusterContainer();
@@ -98,7 +98,6 @@ StatusCode TrigT1CaloEFex::execute(){
// builds a vector with all the cells around the seed cell
// with the size (deta,dphi)=(0.08,0.21)
findCellsAround(scells, cellAbove, m_cellsAround,0.08,0.21); // large window
- //std::cout<<"Debug_Esumi,"<<"m_cellsAround.size,"<<m_cellsAround.size()<<std::endl;
float etaCluster, phiCluster; // Cluster baricenter
// Find cluster center (eta/phiCluster) based on the
// energy weighted scell position
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.cxx
index 7cb47ce925719db64589ac679dacabde9c01f563..1491745b2dd5a004f1534bfe884ebebe71fbb2da 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.cxx
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.cxx
@@ -24,14 +24,27 @@
#include "xAODTrigger/EmTauRoIAuxContainer.h"
#include "xAODTrigger/EmTauRoI.h"
-TrigT1CaloRun3TauFex::TrigT1CaloRun3TauFex( const std::string& name, ISvcLocator* pSvcLocator ) : TrigT1CaloBaseFex (name, pSvcLocator) {
+TrigT1CaloRun3TauFex::TrigT1CaloRun3TauFex( const std::string& name, ISvcLocator* pSvcLocator ) :
+ TrigT1CaloBaseFex (name, pSvcLocator),
+ acc_score(0),
+ acc_newScore(0)
+{
declareProperty("EnableMonitoring", m_enableMon=false);
declareProperty("OutputClusterName", m_outputClusterName = "SCluster" );
declareProperty("TimeThreshold", m_timeThr = 200 );
}
+/*
+TrigT1CaloRun3TauFex::TrigT1CaloRun3TauFex( const std::string& name, ISvcLocator* pSvcLocator ) : TrigT1CaloBaseFex (name, pSvcLocator) {
+ declareProperty("EnableMonitoring", m_enableMon=false);
+ declareProperty("OutputClusterName", m_outputClusterName = "SCluster" );
+ declareProperty("TimeThreshold", m_timeThr = 200 );
+}
+*/
TrigT1CaloRun3TauFex::~TrigT1CaloRun3TauFex(){
// finish base class
+ delete acc_clusterET;
+ delete acc_clusterIso;
}
StatusCode TrigT1CaloRun3TauFex::initialize(){
@@ -58,6 +71,12 @@ StatusCode TrigT1CaloRun3TauFex::initialize(){
m_SupercellMapEM2 = new TH2F("SupercellMapEM2","Supercell map of EM2",392,-4.9,4.9,64,0,2*M_PI);
m_SupercellMapEM3 = new TH2F("SupercellMapEM3","Supercell map of EM3",98,-4.9,4.9,64,0,2*M_PI);
m_SupercellMapHAD = new TH2F("SupercellMapHAD","Supercell map of HAD",98,-4.9,4.9,64,0,2*M_PI);
+
+ // Hard-code variable names - we don't want them to be configurable for now
+ // Feel free to change the names
+ // Also, note that you should not use the 'ConstAccessor' as this one can't write to the object
+ acc_clusterET = new SG::AuxElement::Accessor<float>("R3ClusterET");
+ acc_clusterIso = new SG::AuxElement::Accessor<float>("R3ClusterIso");
return StatusCode::SUCCESS;
}
@@ -252,16 +271,26 @@ StatusCode TrigT1CaloRun3TauFex::execute(){
float eFEXTDRIso = eFEXIsoTDR(EM2Supercells33,seedPlace);
bool iseFEXTDRIso = TrigT1CaloBaseFex::IseFEXIsoTDR (EM2Supercells33,seedPlace,0.6) ;
+
// build cluster for tau
//xAOD::EmTauRoI_v2* clForTau = new xAOD::EmTauRoI_v2();
xAOD::EmTauRoI* clForTau = new xAOD::EmTauRoI();
clustersForTau->push_back( clForTau );
clForTau->setEta( cellAbove->eta() );
clForTau->setPhi( cellAbove->phi() );
+
+ (*acc_clusterET)(*clForTau) = eFEXTDRcluser;
+ (*acc_clusterIso)(*clForTau) = eFEXTDRIso;
+
+ // Retrieve tau properties
+ //double score = (*acc_score)(clForTau);
+ //msg << MSG::INFO << "Esumi score = "<<score<< endreq;
+
+/*
clForTau->setClusEnergyTDR( eFEXTDRcluser );
clForTau->seteFEXIsoTDR( eFEXTDRIso );
clForTau->setIseFEXTDRIso( iseFEXTDRIso );
-
+*/
}
// avoid memory leak
if ( scells ) {scells->clear(); delete scells;}
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.h b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.h
index 8249d2545b931f14e442f2868dad210af6e5d58d..05aa5d74903012be2606107e60218fcb0b67f46b 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.h
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloRun3TauFex.h
@@ -50,6 +50,14 @@ private :
TH2F* m_SupercellMapEM3;
TH2F* m_SupercellMapHAD;
+ std::string m_scoreName;
+ std::string m_newScoreName;
+ SG::AuxElement::ConstAccessor<float>* acc_score;
+ SG::AuxElement::Accessor<float>* acc_newScore;
+
+ SG::AuxElement::Accessor<float>* acc_clusterET;
+ SG::AuxElement::Accessor<float>* acc_clusterIso;
+
/** output name */
std::string m_outputClusterName;
/** cut for time measurement */