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

gem geometry to DB writer #21307

Merged
merged 6 commits into from Nov 25, 2017
Merged

gem geometry to DB writer #21307

merged 6 commits into from Nov 25, 2017

Conversation

jshlee
Copy link
Contributor

@jshlee jshlee commented Nov 14, 2017

  • adds correct dimensions for gem super chamber and chamber
  • adds correct dimensions for me0 chamber and layers

@ianna

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21307/1994

Code check has found code style and quality issues which could be resolved by applying a patch in https://cmssdt.cern.ch/SDT/code-checks/PR-21307/1994/git-diff.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/PR-21307/1994/git-diff.patch | patch -p1

You can run scram build code-checks to apply code checks directly

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21307/1995

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @jshlee (Jason Lee) for master.

It involves the following packages:

CondTools/Geometry
Geometry/GEMGeometryBuilder

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88, @ggovi can you please review it and eventually sign? Thanks.
@ghellwig, @mmusich this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

if (DDfetch( *is, numbOfPads)) nPads = numbOfPads.doubles()[0];
}
LogDebug("GEMGeometryParsFromDD")
<< ((nStrips == 0. ) ? ("No nStrips found!!") : ("Number of strips: " + boost::lexical_cast<std::string>(nStrips)));
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use std::to_string

LogDebug("GEMGeometryParsFromDD")
<< ((nStrips == 0. ) ? ("No nStrips found!!") : ("Number of strips: " + boost::lexical_cast<std::string>(nStrips)));
LogDebug("GEMGeometryParsFromDD")
<< ((nPads == 0. ) ? ("No nPads found!!") : ("Number of pads: " + boost::lexical_cast<std::string>(nPads)));
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use std::to_string

@@ -20,6 +20,7 @@

#include <iostream>
#include <algorithm>
#include <boost/lexical_cast.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, remove dependency on boost, prefer to use the standard library instead.

@@ -1,8 +1,8 @@
import FWCore.ParameterSet.Config as cms
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - this one suppose to test ME0 only. The test for GEM is this one: https://cmssdt.cern.ch/lxr/source/CondTools/Geometry/test/gemgeometrywriter.py, but the actual DB writers are in test/writehelpers directory. I suggest, you revert modifications of this file, e.g. it is not needed in this PR. Thanks.

std::string name = fv.logicalPart().name().name();
strpars.emplace_back(name);

std::vector<double> pars;
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use list initialization:

-  std::vector<double> pars;  
-  pars.emplace_back(dx1); //b/2; bottom width is along local X
-  pars.emplace_back(dx2); //B/2; top width is along local X
-  pars.emplace_back(dy); //h/2; length is along local Y
-  pars.emplace_back(dz); // thickness is long local Z
+  std::vector<double> pars {dx1, dx2, dy, dz};

std::string name = fv.logicalPart().name().name();
strpars.emplace_back(name);

std::vector<double> pars;
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use list initialization here

std::string name = fv.logicalPart().name().name();
strpars.emplace_back(name);

std::vector<double> pars;
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use list initialization here

vtra[0]=(float) 1.0 * (tran.x());
vtra[1]=(float) 1.0 * (tran.y());
vtra[2]=(float) 1.0 * (tran.z());
return vtra;
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use list initialization in return statement here

vrot[6]=(float) 1.0 * z.X();
vrot[7]=(float) 1.0 * z.Y();
vrot[8]=(float) 1.0 * z.Z();
return vrot;
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use list initialization in return statement here

}
LogDebug("ME0GeometryParsFromDD")
<< ((nStrips == 0. ) ? ("No nStrips found!!") : ("Number of strips: " + boost::lexical_cast<std::string>(nStrips)));
Copy link
Contributor

Choose a reason for hiding this comment

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

@jshlee - please, use std::to_string

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21307/2009

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@ianna
Copy link
Contributor

ianna commented Nov 22, 2017

please test

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21307/2149

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 22, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/24610/console Started: 2017/11/22 15:16

@cmsbuild
Copy link
Contributor

Pull request #21307 was updated. @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88, @ggovi can you please check and sign again.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21307/24610/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2833444
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2833265
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.36999999994 KiB( 23 files compared)
  • Checked 111 log files, 8 edm output root files, 27 DQM output files

@kpedro88
Copy link
Contributor

+1

@ianna
Copy link
Contributor

ianna commented Nov 23, 2017

+1

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 2f0caec into cms-sw:master Nov 25, 2017
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

6 participants