Skip to content
Snippets Groups Projects
Commit 4fca18f9 authored by Christos Anastopoulos's avatar Christos Anastopoulos Committed by Adam Edward Barton
Browse files

Drop EgammaCovarianceCalculation since suppressed in_AOD

parent 192ea0b8
No related branches found
Tags v63r6
29 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77733Draft: add new HLT NN JVT, augmented with additional tracking information,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!76343Draft: MooTrackBuilder: Recalibrate NSW hits in refine method,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74430Draft: Fixing upper bound for Delayed Jet Triggers,!73963Changing the path of the histograms to "Expert" area,!73875updating ID ART reference plots,!73874AtlasCLHEP_RandomGenerators: Fix cppcheck warnings.,!73449Add muon detectors to DarkJetPEBTLA partial event building,!73343Draft: [TrigEgamma] Add photon ringer chains on bootstrap mechanism,!72336Fixed TRT calibration crash,!72176Draft: Improving L1TopoOnline chain that now gets no-empty plots. Activating it by default,!72012Draft: Separate JiveXMLConfig.py into Config files,!71876Fix MET trigger name in MissingETMonitoring,!71820Draft: Adding new TLA End-Of-Fill (EOF) chains and removing obsolete DIPZ chains,!71636Drop EgammaCovarianceCalculation since suppressed in_AOD
......@@ -122,7 +122,6 @@ def createEgammaConfigFlags():
lambda prevFlags: (
prevFlags.Egamma.Keys.Output.ElectronsSuppESD + '.' +
prevFlags.Egamma.Keys.Output.EgammaSuppAOD + '.'
"-EgammaCovarianceMatrix."
"-isEMLHLoose.-isEMLHTight.-isEMLHMedium.-isEMMedium"))
egcf.addFlag("Egamma.Keys.Output.ForwardElectrons", 'ForwardElectrons')
......
......@@ -10,15 +10,6 @@ namespace {
constexpr float el_mass = 0.510998;
constexpr float ph_mass = 0.0;
AmgMatrix(5, 5)
jacobian(const double phi, const int charge, const double momentum) {
AmgMatrix(5, 5) jac;
jac.setIdentity();
jac(3, 3) = -1.* (1. / std::sin(phi)); // deta/dtheta
jac(4, 4) = -1 * charge * (momentum * momentum); // dp/d(q/p)
return jac;
}
void
setFromCluster(xAOD::Egamma& eg)
{
......@@ -51,34 +42,6 @@ setFromTrkCluster(xAOD::Electron& el)
const double pt =
E > el_mass ? sqrt(E * E - el_mass * el_mass) / cosh(eta) : 0;
el.setP4(pt, eta, phi, el_mass);
// Electron with tracks all should have a covariance matrix set
AmgMatrix(4, 4) matrix;
matrix.setZero();
static const eg_resolution eg_resol("run2_pre");
const float sigmaE_over_E = eg_resol.getResolution(el);
matrix(0, 0) =
(sigmaE_over_E * E * sigmaE_over_E * E) / (cosh(eta) * cosh(eta));
// Direction can be filled only when a good track is there
if (goodTrack) {
xAOD::ParametersCovMatrix_t covmat =
trackParticle->definingParametersCovMatrix();
// Start from the d0, z0, phi, theta, q/p
// and make the (Et, eta, phi, M)
AmgMatrix(5, 5) J = jacobian(trackParticle->phi(), trackParticle->charge(),
trackParticle->p4().P());
AmgMatrix(5, 5) m;
m.setZero();
m = J * (covmat * J.transpose());
matrix(1, 1) = m(3, 3);
matrix(2, 2) = m(2, 2);
matrix.fillSymmetric(0, 1, m(4, 3));
matrix.fillSymmetric(0, 2, m(4, 2));
matrix.fillSymmetric(1, 2, m(3, 2));
}
el.setCovMatrix(matrix.cast<float>());
}
void
......@@ -110,7 +73,7 @@ calculate(xAOD::Electron& electron) {
}
}
void
void
calculate(xAOD::Photon& photon) {
if (xAOD::EgammaHelpers::conversionType(&photon) ==
xAOD::EgammaParameters::doubleSi) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment