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

Running code-format for reconstruction #27075

Merged
merged 4 commits into from Jun 6, 2019

Conversation

cmsbuild
Copy link
Contributor

@cmsbuild cmsbuild commented Jun 3, 2019

Applying code-format for CMSSW category reconstruction.
See the build logs here https://cmssdt.cern.ch/jenkins/job/GitHub-refactor-cmssw-module/350//console

cms-bot has successfully run the following:

  • scram build code-checks-all
  • scram build code-format-all
  • scram build

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

please test

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27075/10161

  • This PR adds an extra 8KB to repository

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/716/console Started: 2019/06/03 07:16

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

A new Pull Request was created by @cmsbuild for master.

It involves the following packages:

DataFormats/EgammaTrackReco
EventFilter/DTRawToDigi
EventFilter/HcalRawToDigi
MagneticField/ParametrizedEngine
RecoBTag/MXNet
RecoBTag/PerformanceDB
RecoLocalCalo/HcalRecAlgos
RecoLocalCalo/HcalRecProducers
RecoMuon/GlobalMuonProducer

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@abbiendi, @argiro, @echapon, @battibass, @smoortga, @acaudron, @jhgoh, @HuguesBrun, @hqucms, @ferencek, @trocino, @HeinerTholen, @rociovilar, @rovere, @bellan, @Martin-Grunewald, @namapane, @calderona, @mverzett, @JyothsnaKomaragiri, @folguera, @mariadalfonso, @pvmulder, @bachtis this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 3, 2019

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3210678
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3210343
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

typedef std::vector<std::string> strVec;
typedef std::vector<std::string>::iterator strVecI;

std::vector<std::string>
Copy link
Contributor

Choose a reason for hiding this comment

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

Comments could be reshuffled to avoid this line splitting

Copy link
Contributor

Choose a reason for hiding this comment

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

done

double minFracDiffHBHELaser_; // minimum difference in fractional occupancies between 'good' and 'bad' HBHE regions (i.e., regions whose RBXes receive laser signals and those whose RBXes see no laser) necessary to declare an event as a laser event. In laser events, good fractional occupancy is generally near 1, while bad fractional occupancy is considerably less
edm::InputTag digiLabel_;
edm::EDGetTokenT<HcalCalibDigiCollection> tok_calib_;
std::string
Copy link
Contributor

Choose a reason for hiding this comment

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

same here and the lines below

Copy link
Contributor

Choose a reason for hiding this comment

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

done

std::vector <int> CalibTS_; // time slices used when integrating calib charges
bool filterHBHE_; // Flag to activate laser filter for HBHE
int minCalibChannelsHBHELaser_; // set minimum number of HBHE Calib events that causes an event to be considered a bad (i.e., HBHE laser) event
double
Copy link
Contributor

Choose a reason for hiding this comment

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

again

Copy link
Contributor

Choose a reason for hiding this comment

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

done

//_______________________________________________________________________________
const double BFit3D::C0[360][4] = { //Constant terms, shifted to left
//(since at B_nom = 0 all of them are equal to zero)
{2.02156144404716e+00, 3.51621670097246e+00, 3.81142532261878e+00, 4.01241090152589e+00},
Copy link
Contributor

Choose a reason for hiding this comment

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

Definitely the previous version was much more readable.
This is probably a god place where to forbid clang formatting.

{1.34237684985945e-10, 2.53064579553359e-11, 1.50183540218717e-10, 3.71381437949006e-11},
{3.36871860756778e-10, 2.87290939807854e-10, 6.86524917689277e-10, 1.17431905499043e-09},
{3.66460831436455e-10, 3.66607928682510e-10, 4.46409858543281e-10, 6.58153206569430e-10},
{2.96805661632454e-10, -9.447074
Copy link
Contributor

Choose a reason for hiding this comment

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

(Even more) Definitely the previous version was much more readable.
This is probably a god place where to forbid clang formatting.

{1.34237684985945e-10, 2.53064579553359e-11, 1.50183540218717e-10, 3.71381437949006e-11},
{3.36871860756778e-10, 2.87290939807854e-10, 6.86524917689277e-10, 1.17431905499043e-09},
{3.66460831436455e-10, 3.66607928682510e-10, 4.46409858543281e-10, 6.58153206569430e-10},
{2.96805661632454e-10, -9.447074
Copy link
Contributor

Choose a reason for hiding this comment

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

Definitely the previous version was much more readable.
This is probably a god place where to forbid clang formatting.

Copy link
Contributor

Choose a reason for hiding this comment

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

all done

@perrotta
Copy link
Contributor

perrotta commented Jun 4, 2019

@smuzaffar @fabiocos
You can consider this as signed by reco, but before merging in the IB I would like to check whether it is easier to fix things as in MagneticField/ParametrizedEngine/src/BFit3D_data.h (see comments above) directly here, or just merge this PR and revert it in a subsequent one: please let me know.

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 5, 2019

Pull request #27075 was updated. @perrotta, @cmsbuild, @slava77 can you please check and sign again.

@fabiocos
Copy link
Contributor

fabiocos commented Jun 5, 2019

@smuzaffar @perrotta @slava77 we had a similar case yesterday, see https://github.com/cms-sw/cmssw/pull/27067/files/f667b1b79b88ee35a71999e20052446e8a4228dd#diff-cf19564532634461084a77f9f0fa38e7 , I played a bit with moving comments but did not help. So in case we could exclude also that table from formatting. In general I think that this kind of intiializations could be also stored in some data file, I guess it is simply more efficient to avoid too many file accesses during initialization...

@perrotta
Copy link
Contributor

perrotta commented Jun 5, 2019

Are the code-format suggestions in #27075 (comment) that prevent the tests starting?
I think they can safely get applied, and then proceed with the tests

@fabiocos
Copy link
Contributor

fabiocos commented Jun 5, 2019

please test

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 5, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/781/console Started: 2019/06/05 16:02

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 5, 2019

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 5, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 5, 2019

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3210222
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3209887
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@perrotta
Copy link
Contributor

perrotta commented Jun 5, 2019

+1

  • Technical
  • jenkins tests pass

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 5, 2019

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

fabiocos commented Jun 6, 2019

+1

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