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.

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

62X SLHC GEMGeometryBuilder cleanup #4201

Merged
merged 5 commits into from
Jun 12, 2014
Merged

62X SLHC GEMGeometryBuilder cleanup #4201

merged 5 commits into from
Jun 12, 2014

Conversation

dildick
Copy link
Contributor

@dildick dildick commented Jun 10, 2014

EDIT:

  • comp11 is an unused parameter in GEMGeometryBuilder. It is present and used in the RPCGeometryBuilder though. Since the GEMGeometryBuilder package is pretty much a copy-paste of RPCGeometryBuilder, we inherited that param. I deleted it.
  • useDDD is now a tracked parameter.
  • GEMGeometryParsFromDD.cc and GEMGeometryParsFromDD.h have never been used (we only need ...FromDDD and ...FromCondDB). Also these files were probably copied straight from the RPC code. I deleted them as well.
  • Finally, I made some aesthetic changes to the ME0GeometryAnalyzer code and configs.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @dildick (Sven Dildick) for CMSSW_6_2_X_SLHC.

62X SLHC GEMGeometryBuilder cleanup

It involves the following packages:

Configuration/Geometry
Geometry/GEMGeometry

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@fratnikov, @mark-grimes you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@ianna
Copy link
Contributor

ianna commented Jun 11, 2014

@dildick - you need to update the new (2 years old) python fragments in GEMGeometryBuilder so that they would match the old ones in GEMGeometry. Yana

@dildick
Copy link
Contributor Author

dildick commented Jun 11, 2014

If you are referring to the parameter "compatibiltyWith11". That one is untracked and true in https://github.com/cms-sw/cmssw/blob/CMSSW_6_2_X_SLHC/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc and https://github.com/cms-sw/cmssw/blob/CMSSW_6_2_X_SLHC/Geometry/GEMGeometryBuilder/plugins/ME0GeometryESModule.cc. The configs in https://github.com/cms-sw/cmssw/tree/CMSSW_6_2_X_SLHC/Geometry/GEMGeometry/python never reinitialized compatibiltyWith11, so compatibiltyWith11 was (and is) always true. In all, there is no net change.

@ianna
Copy link
Contributor

ianna commented Jun 11, 2014

@dildick - yes. Could you, please, remove it from python fragments? Thanks.

@dildick
Copy link
Contributor Author

dildick commented Jun 11, 2014

Ok. Done. Actually, I would like to go even 1 step further, namely remove it all together from the code. AFAICT, that parameter is not even used... (do a search for theComp11Flag in https://github.com/cms-sw/cmssw/blob/CMSSW_6_2_X_SLHC/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilderFromDDD.cc)

@cmsbuild
Copy link
Contributor

Pull request #4201 was updated. @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #4201 was updated. @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #4201 was updated. @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please check and sign again.

@ianna
Copy link
Contributor

ianna commented Jun 12, 2014

+1

@mark-grimes
Copy link

GEMGeometryParsFromDD is used in CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc. It either needs to be put back or taken out of GEMRecoIdealDBLoader.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_6_2_X_SLHC IBs unless changes or unless it breaks tests. @fratnikov, @mark-grimes can you please take care of it?

@mark-grimes
Copy link

merge

Just tested with 4 muons. Initially, besides the expected failures:

12000 failed in step 3 with a root error I've seen before which is intermittent:

----- Begin Fatal Exception 12-Jun-2014 16:32:25 CEST-----------------------
An exception of category 'FatalRootError' occurred while
   [0] Calling EventProcessor::runToCompletion (which does almost everything after beginJob and before endJob)
   Additional Info:
      [a] Fatal Root Error: @SUB=TTree::SetEntries
Tree branches have different numbers of entries, with 10 maximum.

----- End Fatal Exception -------------------------------------------------

11400 failed in step 4:

#5  0x00002b7c997bd52a in std::local_Rb_tree_decrement (__x=0x2b7cb1fbb568) at ../../../../../libstdc++-v3/src/c++98/tree.cc:97
#6  0x00002b7cb21a35d6 in DQMDcsInfoClient::endRun(edm::Run const&, edm::EventSetup const&) () from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_X_SLHC_2014-06-08-0200/lib/slc5_amd64_gcc472/libDQMServicesComponents.so
#7  0x00002b7c963b0330 in edm::EDAnalyzer::doEndRun(edm::RunPrincipal const&, edm::EventSetup const&, edm::CurrentProcessingContext const*) () from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_X_SLHC_2014-06-08-0200/lib/slc5_amd64_gcc472/libFWCoreFramework.so

Reran both tests and they passed. No idea what the original problems were but they look unrelated to the pull request. Something to look out for.

@cmsbuild
Copy link
Contributor

Pull request #4201 was updated. @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please check and sign again.

cmsbuild added a commit that referenced this pull request Jun 12, 2014
@cmsbuild cmsbuild merged commit 7595f63 into cms-sw:CMSSW_6_2_X_SLHC Jun 12, 2014
@dildick dildick deleted the 62XSLHC-GEMGeometryBuilder-cleanup branch June 30, 2014 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants