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

TauConeSize and HLT Script Fixes #3445

Merged
merged 5 commits into from Apr 23, 2014
Merged

TauConeSize and HLT Script Fixes #3445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c16c07
TauConeSize and HLT Script Fixes
Martin-Grunewald Apr 23, 2014
523bca0
Merged refs/pull/3445/head from repository cms-sw
Martin-Grunewald Apr 23, 2014
39524eb
Small Fixes
Martin-Grunewald Apr 23, 2014
e16dd0c
TRemoval of obsolete file
Martin-Grunewald Apr 23, 2014
221417a
Fix
Martin-Grunewald Apr 23, 2014
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 HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_0/HLT/V40 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/HLT/V41 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V40')
tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V41')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -28135,9 +28135,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down Expand Up @@ -31698,9 +31698,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTauReg" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
10 changes: 5 additions & 5 deletions HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/GRun/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/GRun/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms
from FastSimulation.HighLevelTrigger.HLTSetup_cff import *


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V29')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -20948,9 +20948,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
16 changes: 8 additions & 8 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file
Open in desktop
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_0/GRun/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/GRun/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V29')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -26984,9 +26984,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down Expand Up @@ -30547,9 +30547,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTauReg" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Open in desktop
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_0/HIon/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/HIon/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V29')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Open in desktop
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_0/PIon/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/PIon/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V29')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
6 changes: 5 additions & 1 deletion HLTrigger/Configuration/scripts/hltGetConfiguration
View file
Open in desktop
Expand Up @@ -8,7 +8,11 @@ import HLTrigger.Configuration.Tools.confdb as confdb
import HLTrigger.Configuration.Tools.options as options

# define an argparse parser to parse our options
textwidth = int( os.popen("stty size", "r").read().split()[1] )
textwidth = int( 80 )
try:
textwidth = int( os.popen("stty size", "r").read().split()[1] )
except:
pass
formatter = FixedWidthFormatter( HelpFormatterRespectNewlines, width = textwidth )

parser = argparse.ArgumentParser(
Expand Down
6 changes: 5 additions & 1 deletion HLTrigger/Configuration/scripts/hltListPaths
View file
Open in desktop
Expand Up @@ -35,7 +35,11 @@ def getPathList(menu, selection):


# define an argparse parser to parse our options
textwidth = int( os.popen("stty size", "r").read().split()[1] )
textwidth = int( 80 )
try:
textwidth = int( os.popen("stty size", "r").read().split()[1] )
except:
pass
formatter = FixedWidthFormatter( HelpFormatterRespectNewlines, width = textwidth )

parser = argparse.ArgumentParser(
Expand Down
16 changes: 8 additions & 8 deletions HLTrigger/Configuration/test/OnData_HLT_FULL.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/HLT/V40 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/HLT/V41 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTFULL" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V40')
tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V41')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -30779,9 +30779,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down Expand Up @@ -34342,9 +34342,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTauReg" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
16 changes: 8 additions & 8 deletions HLTrigger/Configuration/test/OnData_HLT_GRun.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/GRun/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/GRun/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTGRun" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V29')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -28920,9 +28920,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down Expand Up @@ -32483,9 +32483,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTauReg" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_HIon.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/HIon/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/HIon/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTHIon" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V29')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_PIon.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/PIon/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/PIon/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTPIon" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V29')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
16 changes: 8 additions & 8 deletions HLTrigger/Configuration/test/OnLine_HLT_FULL.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/HLT/V40 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/HLT/V41 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTFULL" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V40')
tableName = cms.string('/dev/CMSSW_7_1_0/HLT/V41')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -30779,9 +30779,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down Expand Up @@ -34342,9 +34342,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTauReg" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
16 changes: 8 additions & 8 deletions HLTrigger/Configuration/test/OnLine_HLT_GRun.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/GRun/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/GRun/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTGRun" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/GRun/V29')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -28920,9 +28920,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTau" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down Expand Up @@ -32483,9 +32483,9 @@
signalConeNeutralHadrons = cms.string( "0.1" ),
name = cms.string( "fixedConeTauReg" ),
plugin = cms.string( "RecoTauBuilderConePlugin" ),
isoConeChargedHadrons = cms.string( "0.4" ),
isoConePiZeros = cms.string( "0.4" ),
isoConeNeutralHadrons = cms.string( "0.4" ),
isoConeChargedHadrons = cms.string( "0.45" ),
isoConePiZeros = cms.string( "0.45" ),
isoConeNeutralHadrons = cms.string( "0.45" ),
matchingCone = cms.string( "0.2" ),
signalConeChargedHadrons = cms.string( "0.15" ),
leadObjectPt = cms.double( 0.5 ),
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/OnLine_HLT_HIon.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/HIon/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/HIon/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTHIon" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/HIon/V29')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/OnLine_HLT_PIon.py
View file
Open in desktop
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_1_0/PIon/V28 (CMSSW_7_1_0_pre6_HLT1)
# /dev/CMSSW_7_1_0/PIon/V29 (CMSSW_7_1_0_pre6_HLT1)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTPIon" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V28')
tableName = cms.string('/dev/CMSSW_7_1_0/PIon/V29')
)

process.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
13 changes: 0 additions & 13 deletions HLTrigger/Configuration/test/hltIntegrationTests.csh
View file
Open in desktop

This file was deleted.