diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.cxx
index 09821d43d08ed0e840bed3adb9beb83c0a7df221..8c76c37add3a5f16fb9ba7b43f0638cf2dc51d28 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -34,7 +34,6 @@ StatusCode TileClusterFillerTool::initialize(){
ATH_MSG_DEBUG("TileClusterFillerTool::initialize");
CHECK( D3PD::BlockFillerTool<xAOD::CaloCluster>::initialize() );
- //CHECK( service("StoreGateSvc",m_storeGate));
return StatusCode::SUCCESS;
} // TileClusterFillerTool::initialize
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.h b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.h
index f4d8166c9417d957bd35ac47b85bd381e9e5ff6f..288304b5c769cfe9bd5915afd2f043ebbb7c56b0 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileClusterFillerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -61,9 +61,6 @@ namespace D3PD {
std::vector<float> *m_eSample;
std::vector<float> *m_etaSample;
std::vector<float> *m_phiSample;
-
- StoreGateSvc *m_storeGate;
-
};
}
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx
index c4d4952895fd64c55762e50fb2fa9efd054a15b9..b3ef4178543538ae50a78ca679a68d835906eefc 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -103,7 +103,6 @@ StatusCode TileMuonFillerTool::book(){
CHECK( addVariable("charge", m_charge, "", m_defaultValue));
CHECK( addVariable("eta", m_eta, "", m_defaultValue));
CHECK( addVariable("phi", m_phi, "", m_defaultValue));
- //CHECK( addVariable("beta", m_beta, "", m_defaultValue));
} // IF
@@ -164,33 +163,6 @@ StatusCode TileMuonFillerTool::book2()
CHECK( addVariable("ptcone20", m_ptcone20, "", m_defaultValue));
CHECK( addVariable("ptcone30", m_ptcone30, "", m_defaultValue));
CHECK( addVariable("ptcone40", m_ptcone40, "", m_defaultValue));
-
-/*
- // ENERGY ISOLATION VARIABLES
- CHECK( addVariable("E_Tile_cone05", m_Tile_cone05, "", m_defaultValue));
- CHECK( addVariable("E_Tile_cone10", m_Tile_cone10, "", m_defaultValue));
- CHECK( addVariable("E_Tile_cone20", m_Tile_cone20, "", m_defaultValue));
- CHECK( addVariable("E_Tile_cone30", m_Tile_cone30, "", m_defaultValue));
- CHECK( addVariable("E_Tile_cone40", m_Tile_cone40, "", m_defaultValue));
-
- CHECK( addVariable("E_LAr_cone05", m_LAr_cone05, "", m_defaultValue));
- CHECK( addVariable("E_LAr_cone10", m_LAr_cone10, "", m_defaultValue));
- CHECK( addVariable("E_LAr_cone20", m_LAr_cone20, "", m_defaultValue));
- CHECK( addVariable("E_LAr_cone30", m_LAr_cone30, "", m_defaultValue));
- CHECK( addVariable("E_LAr_cone40", m_LAr_cone40, "", m_defaultValue));
-
- CHECK( addVariable("E_Tile_iso_cone05", m_Tile_iso_cone05, "", m_defaultValue));
- CHECK( addVariable("E_Tile_iso_cone10", m_Tile_iso_cone10, "", m_defaultValue));
- CHECK( addVariable("E_Tile_iso_cone20", m_Tile_iso_cone20, "", m_defaultValue));
- CHECK( addVariable("E_Tile_iso_cone30", m_Tile_iso_cone30, "", m_defaultValue));
- CHECK( addVariable("E_Tile_iso_cone40", m_Tile_iso_cone40, "", m_defaultValue));
-
- CHECK( addVariable("E_LAr_iso_cone05", m_LAr_iso_cone05, "", m_defaultValue));
- CHECK( addVariable("E_LAr_iso_cone10", m_LAr_iso_cone10, "", m_defaultValue));
- CHECK( addVariable("E_LAr_iso_cone20", m_LAr_iso_cone20, "", m_defaultValue));
- CHECK( addVariable("E_LAr_iso_cone30", m_LAr_iso_cone30, "", m_defaultValue));
- CHECK( addVariable("E_LAr_iso_cone40", m_LAr_iso_cone40, "", m_defaultValue));
-*/
} // IF
@@ -268,7 +240,6 @@ StatusCode TileMuonFillerTool::fill(const xAOD::Muon& p){
*m_charge = muonPointer->charge();
*m_eta = muonPointer->eta();
*m_phi = muonPointer->phi();
- //*m_beta = muonPointer->beta();
*m_muonAuthor = muonPointer->author();
*m_muonType = muonPointer->muonType();
*m_muonQuality = muonPointer->quality();
@@ -284,32 +255,6 @@ StatusCode TileMuonFillerTool::fill(const xAOD::Muon& p){
if ( !muonPointer->isolation((*m_ptcone20), Iso::IsolationType::ptcone20 ) ) ATH_MSG_WARNING("No ptcone20 defined");
if ( !muonPointer->isolation((*m_ptcone30), Iso::IsolationType::ptcone30 ) ) ATH_MSG_WARNING("No ptcone30 defined");
if ( !muonPointer->isolation((*m_ptcone40), Iso::IsolationType::ptcone40 ) ) ATH_MSG_WARNING("No ptcone40 defined");
-
-/*
- *m_LAr_iso_cone05 = m_inCalo->getIsolationEnergy(muon_trk,0.05,em1,em3,false);
- *m_LAr_iso_cone10 = m_inCalo->getIsolationEnergy(muon_trk,0.10,em1,em3,false);
- *m_LAr_iso_cone20 = m_inCalo->getIsolationEnergy(muon_trk,0.20,em1,em3,false);
- *m_LAr_iso_cone30 = m_inCalo->getIsolationEnergy(muon_trk,0.30,em1,em3,false);
- *m_LAr_iso_cone40 = m_inCalo->getIsolationEnergy(muon_trk,0.40,em1,em3,false);
-
- *m_Tile_iso_cone05 = m_inCalo->getIsolationEnergy(muon_trk,0.05,tile1,tile3,false);
- *m_Tile_iso_cone10 = m_inCalo->getIsolationEnergy(muon_trk,0.10,tile1,tile3,false);
- *m_Tile_iso_cone20 = m_inCalo->getIsolationEnergy(muon_trk,0.20,tile1,tile3,false);
- *m_Tile_iso_cone30 = m_inCalo->getIsolationEnergy(muon_trk,0.30,tile1,tile3,false);
- *m_Tile_iso_cone40 = m_inCalo->getIsolationEnergy(muon_trk,0.40,tile1,tile3,false);
-
- *m_LAr_cone05 = m_inCalo->getMeasuredEnergy(muon_trk,0.05,em1,em3,false,false);
- *m_LAr_cone10 = m_inCalo->getMeasuredEnergy(muon_trk,0.10,em1,em3,false,false);
- *m_LAr_cone20 = m_inCalo->getMeasuredEnergy(muon_trk,0.20,em1,em3,false,false);
- *m_LAr_cone30 = m_inCalo->getMeasuredEnergy(muon_trk,0.30,em1,em3,false,false);
- *m_LAr_cone40 = m_inCalo->getMeasuredEnergy(muon_trk,0.40,em1,em3,false,false);
-
- *m_Tile_cone05 = m_inCalo->getMeasuredEnergy(muon_trk,0.05,tile1,tile3,false,true);
- *m_Tile_cone10 = m_inCalo->getMeasuredEnergy(muon_trk,0.10,tile1,tile3,false,true);
- *m_Tile_cone20 = m_inCalo->getMeasuredEnergy(muon_trk,0.20,tile1,tile3,false,true);
- *m_Tile_cone30 = m_inCalo->getMeasuredEnergy(muon_trk,0.30,tile1,tile3,false,true);
- *m_Tile_cone40 = m_inCalo->getMeasuredEnergy(muon_trk,0.40,tile1,tile3,false,true);
-*/
} // IF
if(m_LevelOfDetails > 1){
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.h b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.h
index f536d405601d104d73bfeb5509e593e223725ff7..9bb70da5dd2ee20e652f2986ea37f8226fbc53ce 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -100,7 +100,6 @@ class TileMuonFillerTool:public D3PD::BlockFillerTool<xAOD::Muon>{
float *m_charge;
float *m_eta;
float *m_phi;
- float *m_beta;
// MUON QUALITY INFORMATION
float *m_matchChi2;
@@ -133,28 +132,6 @@ class TileMuonFillerTool:public D3PD::BlockFillerTool<xAOD::Muon>{
float *m_theta;
float *m_qOverP;
- // ISOLATION ENERGY VARIABLES
- float *m_LAr_iso_cone05;
- float *m_LAr_iso_cone10;
- float *m_LAr_iso_cone20;
- float *m_LAr_iso_cone30;
- float *m_LAr_iso_cone40;
- float *m_Tile_iso_cone05;
- float *m_Tile_iso_cone10;
- float *m_Tile_iso_cone20;
- float *m_Tile_iso_cone30;
- float *m_Tile_iso_cone40;
- float *m_LAr_cone05;
- float *m_LAr_cone10;
- float *m_LAr_cone20;
- float *m_LAr_cone30;
- float *m_LAr_cone40;
- float *m_Tile_cone05;
- float *m_Tile_cone10;
- float *m_Tile_cone20;
- float *m_Tile_cone30;
- float *m_Tile_cone40;
-
// MONTE CARLO TRUTH VARIABLES
StatusCode m_truthRetrieved;
float *m_truth_deltaR;
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.h b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.h
index 3ce71c5a93fd717a195de5c830bd9079fbd4830f..a8a06201c55a8c07d037b403cf189ed8dfb77956 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -50,7 +50,6 @@ class TileTrackFillerTool:public D3PD::BlockFillerTool<xAOD::TrackParticle>{
float m_defaultValue; // DEFAULT PARAMETER VALUE
int m_trkParType;
std::string m_standalone;
- const CaloCellContainer* m_calocellContainer;
// LEVEL OF DETAILS
short m_LevelOfDetails;
@@ -77,7 +76,6 @@ class TileTrackFillerTool:public D3PD::BlockFillerTool<xAOD::TrackParticle>{
int *m_numberOfGangedPixels;
int *m_numberOfOutliersOnTrack;
int *m_numberOfTrackSummaryTypes;
- int *m_numberOfFriendTracks;
float *m_ptcone10;
@@ -112,7 +110,6 @@ class TileTrackFillerTool:public D3PD::BlockFillerTool<xAOD::TrackParticle>{
ToolHandle<Reco::ITrackToVertex> m_trackToVertexTool;
std::string m_calocellContainerName; // INPUT CELL CONTAINER
std::string m_MCeventCollection;
- const McEventCollection* m_MCtruth;
}; // class TrkTrackParametersAtBLFillerTool
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx
index d4ada077bf01d01c29d2e24301b278bc0de0033a..be58958f18cecd3c348fa9d0dc00132c405f8b83 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx
@@ -27,21 +27,15 @@ namespace RCU
testInvariant () const
{
//RCU_INVARIANT (this != 0);
- RCU_INVARIANT (m_file != 0);
- RCU_INVARIANT (m_line != 0);
RCU_INVARIANT (!m_message.empty());
}
ExceptionMsg ::
- ExceptionMsg (const char *const val_file, const unsigned val_line,
+ ExceptionMsg (const char *const /*val_file*/, const unsigned /*val_line*/,
const std::string& val_message)
- : m_file ((RCU_REQUIRE (val_file != 0),
- RCU_REQUIRE (val_line != 0),
- RCU_REQUIRE (!val_message.empty()),
- val_file)),
- m_line (val_line), m_message (val_message)
+ : m_message (val_message)
{
RCU_NEW_INVARIANT (this);
}
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h
index bedce0906afa1721469dce60bc7a850f4349e6b8..eecd4406d40364162d91d5bd749790a12bb85e91 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h
@@ -70,12 +70,6 @@ namespace RCU
// private interface
//
- /// description: the location where the message occured
- private:
- const char *m_file;
- private:
- unsigned m_line;
-
/// description: the actual message
private:
std::string m_message;