Changes to prepare the integration of the Tracker upgrade geometries #6947
Conversation
…ate GeometriDet tree and GeometricSearchTracker tree modified accordingly. More configurable tracker numbering builder and new classes for upgade subdetectors
…_readyforupgrade-73x
…erTopologyEP and cleanup of the customization and reco Geometry configurations to profit of this
Synchronize CMSSW_7_4_X
Merge cms-sw CMSSW_7_4_X into my trackergeo_readyforupgrade-74x
…of the components to decide the endcap side
…d new static methods to discriminate according to the enumerators and use of these new static methods in the GeomDetType class
…ted a map between GeometricDet and GeomDetEnumerators enumerators and added ethods to TrackerGeometry to retrieve the subdetector type and the number of layers per subdetector
…between inner pixel and phase 2 outer tracker
…d schemas and updates of the configuration files to use them
…erent subdetector
…le for upgrade geometries
…eparation between inner pixel and phase 2 outer tracker
…detunits in TrackerGeometry
…1 and phase2 GeomDetEnumerators
cmsbuild
added
alca-pending
analysis-pending
comparison-available
dqm-approved
geometry-approved
pending-signatures
reconstruction-approved
simulation-approved
tests-approved
and removed
analysis-pending
comparison-available
dqm-approved
geometry-pending
pending-signatures
reconstruction-approved
simulation-pending
tests-approved
labels
|
by-passing remaining signatures as changes there are small. Please complain if not ok. |
Changes to prepare the integration of the Tracker upgrade geometries
| @@ -24,9 +24,30 @@ using namespace edm; | |||
|
|
|||
| TrackerGeometricDetESModule::TrackerGeometricDetESModule( const edm::ParameterSet & p ) | |||
| : fromDDD_( p.getParameter<bool>( "fromDDD" )), | |||
| layerNumberPXB_( p.exists( "layerNumberPXB" ) ? p.getParameter<unsigned int>( "layerNumberPXB" ) : 16U ),// 16 for current, 18 for SLHC | |||
| totalBlade_( p.exists( "totalBlade" ) ? p.getParameter<unsigned int>( "totalBlade" ) : 24U ) // 24 for current, 56 for SLHC | |||
There was a problem hiding this comment.
Removing these two lines, plus fillDescriptions checks, now break HLT:
----- Begin Fatal Exception 06-Jan-2015 07:29:23 CET-----------------------
An exception of category 'Configuration' occurred while
[0] Constructing the EventProcessor
[1] Validating configuration of ESProducer or ESSource of type TrackerGeome\
tricDetESModule with label: 'TrackerGeometricDetESModule'
Exception Message:
Illegal parameters found in configuration. The parameters are named:
'layerNumberPXB'
'totalBlade'
You could be trying to use parameter names that are not
allowed for this plugin or they could be misspelled.
----- End Fatal Exception -------------------------------------------------
I wonder why this was not flagged by jenkins tests.
There was a problem hiding this comment.
Because it is not tested --- sigh! I make a PR....
There was a problem hiding this comment.
by "break the HLT" - what test do you mean exactly? We certainly do not have a mass failure in the IBs.
On Jan 6, 2015, at 8:04 AM, Martin Grunewald notifications@github.com
wrote:
In Geometry/TrackerNumberingBuilder/plugins/TrackerGeometricDetESModule.cc:
@@ -24,9 +24,30 @@ using namespace edm;
TrackerGeometricDetESModule::TrackerGeometricDetESModule( const edm::ParameterSet & p )
: fromDDD_( p.getParameter( "fromDDD" )),
- layerNumberPXB_( p.exists( "layerNumberPXB" ) ? p.getParameter( "layerNumberPXB" ) : 16U ),// 16 for current, 18 for SLHC
- totalBlade_( p.exists( "totalBlade" ) ? p.getParameter( "totalBlade" ) : 24U ) // 24 for current, 56 for SLHC
Because it is not tested --- sigh! I make a PR....
—
Reply to this email directly or view it on GitHub.
There was a problem hiding this comment.
The HLT tests running the HLT the "online" way (fully self-contained cfg from ConfDB).
This is tested as part of the special HLT addOn tests, but not in the normal cmsDriver-
based IB tests.
There was a problem hiding this comment.
Though I wionder why jenkins/github does not flag this as RED on
https://cmssdt.cern.ch/SDT/html/showIB.html for today's 2Am IB build.
There was a problem hiding this comment.
In any case the fix should be such not to use those two parameters in the configurations anymore. I thought fixing the configurations in fillDescriptions was enough. Were are those parameters still used?
|
In any case the fix should be such not to use those two parameters in the configurations anymore. I thought fixing the configurations in fillDescriptions was enough. Were are those parameters still used? |
|
In ConfDB :) Indeed I'll remove these two, which should work both in 73X and 74X |
|
fillDescriptions still will complain about "unknown" parameters; |
|
... so it is bettter I remove them in ConfDb and make new HLT dumps! |
|
#7045 fixes the issue for HLT. |
…oduleFIX Fix HLT cfg dumps for TrackerGeometricDetESModule (fallout of #6947)
New GeomDetEnumerators and GeometricDet enumerators have been added to host the tracker upgrade subdetectors.
The building of the TrackerGeometry object is less hardcoded and depends on the enumerator values
New methods added to the TrackerGeometry object to provide, for each DetId subdetector index, the subdetector type (through the GeomDetEnumerators) and the number of layers in the subdetector. In addition the method "isThere" has been added to allow to check if a specific subdetector is in the geometry. This should allow to get rid of the several ad hoc configuration parameters to deal with the upgrade geometries.
The rules to code and decode the DetId schema are now completely configurable. Different detid schemas have been introduced for phase 1 and phase 2 geometries (in preparation for the integration of the upgrade geometries).
Added new CmsTracker…Builder's to ease the modularity with respect to the upgrade geometries. Now all the branching is based on the value of the GeometricDet enumerators.
The same approach has been followed for the construction of the TkDetLayers tree.
Replacement in many places of the checks on the DetId subset with checks on the GeomDetEnumerators (but the work is not finished…). Migration from the static DetId classes to the TrackerTopology class (but the work is FAR from being finished). Added useful static methods to discriminate on the GeomDetEnumerators: isTrackerPixel, isTrackerStrip, … and modified the implementation of the corresponding methods in GeomDetType to profit of them (the GeomDetType is not always available).
The present tag is expect not to change ANYTHING in the workflow output as the corresponding (still) unpublished changes for CMSSW_6_2_X_SLHC are expected not to change anything in the upgrade workflow (unless the version with the new phase 2 detid is used).