From 20531c151f91c6e883c77e2135baca8f7b7a59be Mon Sep 17 00:00:00 2001 From: Alicia Date: Thu, 26 Jan 2017 15:54:14 +0100 Subject: [PATCH 1/3] added calderona-newVariables --- python/common_variables_cff.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python/common_variables_cff.py b/python/common_variables_cff.py index a72810d7860..8bb3a53e460 100644 --- a/python/common_variables_cff.py +++ b/python/common_variables_cff.py @@ -74,6 +74,7 @@ # tkExpHitOut = cms.string("? track.isNull ? 0 : track.trackerExpectedHitsOuter().numberOfLostHits"), tkExpHitIn = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')"), #reco::HitPattern:: tkExpHitOut = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS')"), #reco::HitPattern:: + tkLostHits = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfLostHits('TRACK_HITS')+track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')+ track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS')"), # tkHitFract = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfValidHits/(track.hitPattern.numberOfValidHits+track.hitPattern.numberOfLostHits+track.trackerExpectedHitsInner().numberOfLostHits+track.trackerExpectedHitsOuter().numberOfLostHits)"), tkHitFract = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfValidHits/(track.hitPattern.numberOfValidHits+track.hitPattern.numberOfLostHits('TRACK_HITS')+track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')+ track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS') )"), tkChi2 = cms.string("? track.isNull ? -1 : track.normalizedChi2"), @@ -169,6 +170,8 @@ " innerTrack.hitPattern.numberOfValidPixelHits > 0 && " + " abs(track.ptError / pt) < 0.10 )"), MuIDForOutsideInTk = cms.string("isStandAloneMuon && outerTrack.pt > 10 && outerTrack.hitPattern.muonStationsWithValidHits() >= 2"), + TMArbitrated = cms.string("isTrackerMuon && numberOfMatchedStations > 0"), + TMArbitratedTrackQual = cms.string("isTrackerMuon && numberOfMatchedStations > 0 && (track.numberOfValidHits >= 10 || (track.numberOfValidHits >= 7 && (track.hitPattern.numberOfLostHits('TRACK_HITS')+track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')+ track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS')) == 0 ) )"), ) HighPtTriggerFlags = cms.PSet( From 287a4a453eea2db64f464fe4296de9aa2c93f7cd Mon Sep 17 00:00:00 2001 From: Alicia Date: Thu, 26 Jan 2017 18:21:16 +0100 Subject: [PATCH 2/3] updated variable tkLostHits --- python/common_variables_cff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/common_variables_cff.py b/python/common_variables_cff.py index 8bb3a53e460..3162735763d 100644 --- a/python/common_variables_cff.py +++ b/python/common_variables_cff.py @@ -74,7 +74,7 @@ # tkExpHitOut = cms.string("? track.isNull ? 0 : track.trackerExpectedHitsOuter().numberOfLostHits"), tkExpHitIn = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')"), #reco::HitPattern:: tkExpHitOut = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS')"), #reco::HitPattern:: - tkLostHits = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfLostHits('TRACK_HITS')+track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')+ track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS')"), + tkLostHits = cms.string("? innerTrack.isNull ? 0 : innerTrack.numberOfLostHits"), # tkHitFract = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfValidHits/(track.hitPattern.numberOfValidHits+track.hitPattern.numberOfLostHits+track.trackerExpectedHitsInner().numberOfLostHits+track.trackerExpectedHitsOuter().numberOfLostHits)"), tkHitFract = cms.string("? track.isNull ? 0 : track.hitPattern.numberOfValidHits/(track.hitPattern.numberOfValidHits+track.hitPattern.numberOfLostHits('TRACK_HITS')+track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')+ track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS') )"), tkChi2 = cms.string("? track.isNull ? -1 : track.normalizedChi2"), @@ -171,7 +171,7 @@ " abs(track.ptError / pt) < 0.10 )"), MuIDForOutsideInTk = cms.string("isStandAloneMuon && outerTrack.pt > 10 && outerTrack.hitPattern.muonStationsWithValidHits() >= 2"), TMArbitrated = cms.string("isTrackerMuon && numberOfMatchedStations > 0"), - TMArbitratedTrackQual = cms.string("isTrackerMuon && numberOfMatchedStations > 0 && (track.numberOfValidHits >= 10 || (track.numberOfValidHits >= 7 && (track.hitPattern.numberOfLostHits('TRACK_HITS')+track.hitPattern.numberOfLostHits('MISSING_INNER_HITS')+ track.hitPattern.numberOfLostHits('MISSING_OUTER_HITS')) == 0 ) )"), + TMArbitratedTrackQual = cms.string("isTrackerMuon && numberOfMatchedStations > 0 && (track.numberOfValidHits >= 10 || (track.numberOfValidHits >= 7 && innerTrack.numberOfLostHits == 0))"), ) HighPtTriggerFlags = cms.PSet( From bd9916a55abcbee70d1f26d626d458ed39ff0be7 Mon Sep 17 00:00:00 2001 From: Alicia Date: Tue, 21 Feb 2017 17:38:10 +0100 Subject: [PATCH 3/3] remove TMArbitrated --- python/common_variables_cff.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/common_variables_cff.py b/python/common_variables_cff.py index 3162735763d..fd651cf68dd 100644 --- a/python/common_variables_cff.py +++ b/python/common_variables_cff.py @@ -170,7 +170,6 @@ " innerTrack.hitPattern.numberOfValidPixelHits > 0 && " + " abs(track.ptError / pt) < 0.10 )"), MuIDForOutsideInTk = cms.string("isStandAloneMuon && outerTrack.pt > 10 && outerTrack.hitPattern.muonStationsWithValidHits() >= 2"), - TMArbitrated = cms.string("isTrackerMuon && numberOfMatchedStations > 0"), TMArbitratedTrackQual = cms.string("isTrackerMuon && numberOfMatchedStations > 0 && (track.numberOfValidHits >= 10 || (track.numberOfValidHits >= 7 && innerTrack.numberOfLostHits == 0))"), )