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

Hip mitigation #15114

Merged
merged 11 commits into from
Jul 12, 2016
Merged

Hip mitigation #15114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
20ceb22
tib1,2mtob1,2 always inactive
VinInn Jun 3, 2016
d16dce0
only TOB1
VinInn Jun 3, 2016
98899d9
collect crap in case of no match
VinInn Jun 4, 2016
89ca319
stereo as well
VinInn Jun 7, 2016
9e09d7f
only for 900 MeV
VinInn Jun 8, 2016
8ac0ec6
add tib as well
VinInn Jun 10, 2016
6dab5b6
extend mitigation to endcaps
VinInn Jun 15, 2016
b7adf32
Merged HipMitigation from repository VinInn
VinInn Jun 21, 2016
d5168db
mitigate inactive (or instead of and)
VinInn Jul 4, 2016
a5bf87e
Update doubleMatch.icc
VinInn Jul 6, 2016
ce75214
Update TkGluedMeasurementDet.cc
VinInn Jul 6, 2016
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: 15 additions & 1 deletion RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc
View file
Open in desktop
Expand Up @@ -16,6 +16,9 @@

#include <typeinfo>

#include "DataFormats/SiStripDetId/interface/TOBDetId.h"


namespace {
inline
std::pair<LocalPoint,LocalError> projectedPos(const TrackingRecHit& hit,
Expand Down Expand Up @@ -130,6 +133,16 @@ bool TkGluedMeasurementDet::measurements( const TrajectoryStateOnSurface& stateO

if (result.size()>oldSize) return true;

auto id = geomDet().geographicalId().subdetId()-3;
auto l = TOBDetId(geomDet().geographicalId()).layer();
bool killHIP = (1==l) && (2==id); //TOB1
killHIP &= stateOnThisDet.globalMomentum().perp2()>0.81f;
if (killHIP) {
result.add(theInactiveHit, 0.F);
return true;
}


//LogDebug("TkStripMeasurementDet") << "No hit found on TkGlued. Testing strips... ";
const BoundPlane &gluedPlane = geomDet().surface();
if ( // sorry for the big IF, but I want to exploit short-circuiting of logic
Expand All @@ -139,7 +152,8 @@ bool TkGluedMeasurementDet::measurements( const TrajectoryStateOnSurface& stateO
(theMonoDet->hasAllGoodChannels() ||
testStrips(stateOnThisDet,gluedPlane,*theMonoDet)
)
) /*Mono OK*/ ||
) /*Mono OK*/
&& // was ||
(theStereoDet->isActive(data) &&
(theStereoDet->hasAllGoodChannels() ||
testStrips(stateOnThisDet,gluedPlane,*theStereoDet)
Expand Down
13 changes: 7 additions & 6 deletions RecoTracker/MeasurementDet/plugins/doubleMatch.icc
View file
Open in desktop
Expand Up @@ -149,12 +149,13 @@ void TkGluedMeasurementDet::doubleMatch(const TrajectoryStateOnSurface& ts, cons
gluedDet, trdir, chelper);
}

// if no match found try add mon than try to add stereo...
// if (0==collector.size())
// projectOnGluedDet( collector, monoHits, glbDir);
// if (0==collector.size())
// projectOnGluedDet( collector, stereoHits, glbDir);

if (ts.globalMomentum().perp2()>0.81f) {
Copy link
Contributor

Choose a reason for hiding this comment

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

should something similar be added in the DOUBLE_MATCH false case of TkGluedMeasurementDet::collectRecHits
https://github.com/VinInn/cmssw/blob/d5168db349792cf8631723bdfcb924d55d81e6b9/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc#L186
?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

DOUBLE_MATCH false is NOT for production.
cannot be deleted because it is used in some bizzarre architecture we keep testing.

Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't 0.9 be made configurable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not in this iteration

// if no match found try add mon than try to add stereo...
if (0==collector.size())
projectOnGluedDet( collector, monoHits, glbDir);
if (0==collector.size())
projectOnGluedDet( collector, stereoHits, glbDir);
}
/*
// recover hits outside
if ( collector.filter() && 0==collector.size()) {
Expand Down