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

CSC DQM CSCMonitorModule fix for missing histo labels (10_0_X backport) #22119

Conversation

barvic
Copy link
Contributor

@barvic barvic commented Feb 5, 2018

Backport to 10_0_X of PR #21976
CSC DQM CSCMonitorModule fix for missing histo labels in recent CMSSW/DQM releases

  • Fixes issue with parsing of histograms booking configuration file with 'xml strings with spaces', which caused missing text labels on DQM histograms/plots

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 5, 2018

A new Pull Request was created by @barvic (Victor Barashko) for CMSSW_10_0_X.

It involves the following packages:

DQM/CSCMonitorModule

@vazzolini, @kmaeshima, @dmitrijus, @cmsbuild, @jfernan2, @vanbesien can you please review it and eventually sign? Thanks.
@ptcox 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

@jfernan2
Copy link
Contributor

jfernan2 commented Feb 5, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 5, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25908/console Started: 2018/02/05 18:21

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 5, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 5, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 5, 2018

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-22119/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 26
  • DQMHistoTests: Total histograms compared: 2468773
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2468603
  • DQMHistoTests: Total skipped: 169
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.12000000003 KiB( 22 files compared)
  • Checked 110 log files, 9 edm output root files, 26 DQM output files

@dmitrijus
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2018

This pull request is fully signed and it will be integrated in one of the next CMSSW_10_0_X IBs (tests are also fine) and once validation in the development release cycle CMSSW_10_1_X is complete. 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)

@@ -156,8 +156,7 @@ namespace cscdqm {
const XMLCh *content = element->getTextContent();
XERCES_CPP_NAMESPACE_QUALIFIER TranscodeToStr tc(content, "UTF-8");
std::istringstream buffer((const char*)tc.str());
std::string value;
buffer >> value;
std::string value = buffer.str();
Copy link
Contributor

Choose a reason for hiding this comment

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

question: why?

Or why not just do std::string value((const char*)tc.str()); and skip buffer entirely?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just minimal fix to have working code again, until I figure out how it was actually producing expected output before (which is a real question for me).

Or why not just do std::string value((const char*)tc.str()); and skip buffer entirely?
Should work as well in this case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dmitrijus Now I think I figured it out.
It looks like the following commit on May 27, 2016 from central, related to UTF-8 handling, introduced this issue.
75ebcf5#diff-1d119251269edd210e26561f4a3b2dbd

@fabiocos
Copy link
Contributor

fabiocos commented Feb 6, 2018

+1

@cmsbuild cmsbuild merged commit edc348c into cms-sw:CMSSW_10_0_X Feb 6, 2018
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

5 participants