Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed asserts preventing fast re-recoes a la ECALELF #6625

Merged
merged 1 commit into from Jan 29, 2015
Merged

Removed asserts preventing fast re-recoes a la ECALELF #6625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions DataFormats/EgammaCandidates/src/GsfElectron.cc
View file
Open in desktop
Expand Up @@ -42,8 +42,8 @@ GsfElectron::GsfElectron
setVertex(math::XYZPoint(te.positionAtVtx.x(),te.positionAtVtx.y(),te.positionAtVtx.z())) ;
setPdgId(-11*charge) ;
/*if (ecalDrivenSeed())*/ corrections_.correctedEcalEnergy = superCluster()->energy() ;
assert(ctfInfo.ctfTrack==(GsfElectron::core()->ctfTrack())) ;
assert(ctfInfo.shFracInnerHits==(GsfElectron::core()->ctfGsfOverlap())) ;
// assert(ctfInfo.ctfTrack==(GsfElectron::core()->ctfTrack())) ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better remove ctfInfo from the arguments list completely, these lines will then naturally go away.
This appears to be a fake variable preserved at some point to avoid the interface changes.

// assert(ctfInfo.shFracInnerHits==(GsfElectron::core()->ctfGsfOverlap())) ;
}
GsfElectron::GsfElectron
( int charge, const ChargeInfo & chargeInfo,
Expand All @@ -66,8 +66,8 @@ GsfElectron::GsfElectron
setVertex(math::XYZPoint(te.positionAtVtx.x(),te.positionAtVtx.y(),te.positionAtVtx.z())) ;
setPdgId(-11*charge) ;
/*if (ecalDrivenSeed())*/ corrections_.correctedEcalEnergy = superCluster()->energy() ;
assert(ctfInfo.ctfTrack==(GsfElectron::core()->ctfTrack())) ;
assert(ctfInfo.shFracInnerHits==(GsfElectron::core()->ctfGsfOverlap())) ;
//assert(ctfInfo.ctfTrack==(GsfElectron::core()->ctfTrack())) ;
//assert(ctfInfo.shFracInnerHits==(GsfElectron::core()->ctfGsfOverlap())) ;
}

GsfElectron::GsfElectron
Expand Down Expand Up @@ -96,8 +96,8 @@ GsfElectron::GsfElectron
corrections_(electron.corrections_),
pixelMatchVariables_(electron.pixelMatchVariables_)
{
assert(electron.core()->ctfTrack()==core->ctfTrack()) ;
assert(electron.core()->ctfGsfOverlap()==core->ctfGsfOverlap()) ;
//assert(electron.core()->ctfTrack()==core->ctfTrack()) ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should probably stay

//assert(electron.core()->ctfGsfOverlap()==core->ctfGsfOverlap()) ;
}

GsfElectron::GsfElectron
Expand Down Expand Up @@ -135,8 +135,8 @@ GsfElectron::GsfElectron
trackClusterMatching_.electronCluster = electronCluster ;
//closestCtfTrack_.ctfTrack = closestCtfTrack ;
conversionRejection_.partner = conversionPartner ;
assert(closestCtfTrack==core->ctfTrack()) ;
assert(electron.core()->ctfGsfOverlap()==core->ctfGsfOverlap()) ;
//assert(closestCtfTrack==core->ctfTrack()) ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

closestCtfTrack can be removed from the arguments

//assert(electron.core()->ctfGsfOverlap()==core->ctfGsfOverlap()) ;
// TO BE DONE
// Check that the new edm references are really
// the clones of the former references, and therefore other attributes
Expand Down