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 #27350

Merged
merged 1 commit into from Jun 27, 2019

Conversation

cmsbuild
Copy link
Contributor

Applying code-format for CMSSW category reconstruction.
See the build logs here https://cmssdt.cern.ch/jenkins/job/GitHub-refactor-cmssw-module/430//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

please test

@cmsbuild
Copy link
Contributor Author

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor Author

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27350/10614

  • This PR adds an extra 8KB to repository

@cmsbuild
Copy link
Contributor Author

cmsbuild commented Jun 26, 2019

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

@cmsbuild
Copy link
Contributor Author

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

It involves the following packages:

RecoEgamma/EgammaTools
RecoParticleFlow/PFClusterProducer
RecoParticleFlow/PFProducer

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@mmarionncern, @Sam-Harper, @felicepantaleo, @jainshilpi, @cbernet, @rovere, @lgray, @bachtis, @hatakeyamak, @varuns23, @seemasharmafnal 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
Copy link
Contributor Author

Comparison job queued.

@cmsbuild
Copy link
Contributor Author

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-49b57d/1175/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: 3254598
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3254263
  • 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

mutable unsigned ele_idx,pho_idx; // hack here until we figure out why some slimmedPhotons don't have original object ptrs
std::unordered_map<unsigned, edm::Handle<edm::ValueMap<MapType>>> pho_vmaps;
mutable unsigned ele_idx,
pho_idx; // hack here until we figure out why some slimmedPhotons don't have original object ptrs
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

fVals[59] = biphi % 2; //submodule boundary phi symmetry
fVals[60] = (TMath::Abs(bieta) <= 25) * (bieta % 25) +
(TMath::Abs(bieta) > 25) *
((bieta - 25 * TMath::Abs(bieta) / bieta) % 20); //module boundary eta approximate symmetry
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

fVals[33] = biphi % 2; //submodule boundary phi symmetry
fVals[34] = (TMath::Abs(bieta) <= 25) * (bieta % 25) +
(TMath::Abs(bieta) > 25) *
((bieta - 25 * TMath::Abs(bieta) / bieta) % 20); //module boundary eta approximate symmetry
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue; probably

fVals[15] = TMath::Min(1.0, 1.0022 * p.e5x5() / b->energy());

fVals[4] =
fVals[15] * b->energy() / s->rawEnergy(); // compute consistent e5x5()/rawEnergy() after e5x5/eseed resacling
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

fVals[5] = 0.903254 * s->etaWidth() + 0.001346; //etawidth
fVals[6] = 0.99992 * s->phiWidth() + 4.8e-07; //phiwidth
fVals[13] =
TMath::Min(1.0, 1.0022 * b->energy() / s->rawEnergy()); //eseed/rawenergy (practically equivalent to e5x5)
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

double ecalClusterEnergyCalibrated =
sqrt(std::get<1>(ecalSatellite.second).Mag2()) *
std::get<2>(
ecalSatellite.second); // KH: calibrated under the egamma hypothesis (rawEcalClusterEnergy * calibration)
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue


double hoEnergy = hoclusterRef->energy(); // calibration_.energyEm(*hoclusterRef,ps1Ene,ps2Ene,crackCorrection);
double hoEnergy =
hoclusterRef->energy(); // calibration_.energyEm(*hoclusterRef,ps1Ene,ps2Ene,crackCorrection);
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

size_t convkfs_end = std::distance(BeginROskfs, ronotconv);
for (size_t idx = 0; idx < convkfs_end; ++idx) {
auto const& secKFs =
RO.secondaryKFs; //we want the entry at the index but we allocate to secondaryKFs in loop which invalidates all iterators, references and pointers, hence we need to get the entry fresh each time
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

eventFractionCleaning_(getParameter<double>(iConfig, "eventFractionForCleaning", 0.75)),
dzPV_(getParameter<double>(iConfig, "dzPV", 0.2)),
postCleaning_(getParameter<bool>(iConfig, "postMuonCleaning", false)) // disable by default (for HLT)
,
Copy link
Contributor

Choose a reason for hiding this comment

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

comment-related line break issue

pfPunchThroughHadronCleanedCandidates_(std::make_unique<reco::PFCandidateCollection>()),
pfAddedMuonCandidates_(std::make_unique<reco::PFCandidateCollection>())

,
Copy link
Contributor

Choose a reason for hiding this comment

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

this could be moved up to avoid the empty line

@slava77
Copy link
Contributor

slava77 commented Jun 27, 2019

+1

for #27350 5f3babb

  • technical
  • jenkins tests pass

Issues reported in
#27350 (review)
can be addressed in a separate PR

@cmsbuild
Copy link
Contributor Author

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

+1

@cmsbuild cmsbuild merged commit ee2cdd5 into master Jun 27, 2019
@smuzaffar smuzaffar deleted the code-format-reconstruction-673520 branch July 4, 2019 07:53
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

3 participants