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

Initial push for LumiZCounting #18899

Merged
merged 11 commits into from Jul 9, 2017
Merged

Conversation

xmniu
Copy link
Contributor

@xmniu xmniu commented May 23, 2017

This is the initial push for DQM LumiZCounting.
14 2D histograms are booked in order to calculate Z yields and efficiencies, for a certain time window, say a couple of lumi-sections.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @xmniu (Xinmei Niu) for master.

It involves the following packages:

DQMOffline/LumiZCounting

The following packages do not have a category, yet:

DQMOffline/LumiZCounting
Please create a PR for https://github.com/cms-sw/cms-bot/blob/master/categories.py to assign category

@cmsbuild, @davidlange6 can you please review it and eventually sign? Thanks.
@rociovilar this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

<use name="TrackingTools/IPTools"/>
<use name="boost"/>
<use name="root"/>
<flags CXXFLAGS="-g -Wall"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove this. If you want to use "-g" or other flags locally, please use export USER_CXXFLAGS="-ggdb".
But don't put them into module scope!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do

<use name="DQMServices/Core"/>
<use name="DataFormats/CLHEP"/>
<use name="DQMOffline/LumiZCounting"/>
<flags CXXFLAGS="-g -Wall"/>
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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do

@@ -0,0 +1,98 @@
// SingleMu
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not put these files into python configuration file?
I think it would cleaner that way (and less ways in which things can break: no file discovery, etc.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The files in data/ and the data/ subfolder will be removed. Actually the trigger menu is not needed, since we plan to use one same trigger over entire data taking period.

typedef std::pair<unsigned int, unsigned int> RunLumiPairType;
typedef std::map<unsigned int, std::vector<RunLumiPairType>> MapType;

RunLumiRangeMap(){}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this code used? If not, please remove it or move to "test/" subdirectory (if for some reason you want/need to preserve it).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not for now, will remove to test/ since it might be used if we decide to do a lumi mask in the future.

//
void ZCounting::setTriggers()
{
std::string cmssw_base_src = getenv("CMSSW_BASE"); cmssw_base_src+="/src/";
Copy link
Contributor

Choose a reason for hiding this comment

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

This will most likely fail in any production environment. That is why it would be for the best to put those files into python configuration (PSet() and friends).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will be removed together with data/.

edm::EDGetTokenT<reco::TrackCollection> fTrackName_token;

// bacon fillers
baconhep::TTrigger *fTrigger;
Copy link
Contributor

Choose a reason for hiding this comment

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

Please use std::unique_ptr<baconhep::TTrigger>.

@dmitrijus
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 24, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20055/console Started: 2017/05/24 13:34

@dmitrijus
Copy link
Contributor

I have added few comments / questions. The most important issue is the use of "data/" files, I am sure they are broken :)

@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-18899/20055/summary.html

Comparison Summary:

  • You potentially added 192 lines to the logs
  • Reco comparison results: 3394 differences found in the comparisons
  • DQMHistoTests: Total files compared: 24
  • DQMHistoTests: Total histograms compared: 1833058
  • DQMHistoTests: Total failures: 34440
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1798438
  • DQMHistoTests: Total skipped: 180
  • DQMHistoTests: Total Missing objects: 0
  • Checked 98 log files, 14 edm output root files, 24 DQM output files

@cmsbuild
Copy link
Contributor

Pull request #18899 was updated. @ghellwig, @arunhep, @cerminar, @cmsbuild, @franzoni, @davidlange6 can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #18899 was updated. @cmsbuild, @davidlange6 can you please check and sign again.

@xmniu
Copy link
Contributor Author

xmniu commented May 31, 2017

@dmitrijus your comments have been implemented, please check again. thanks.

{//Muon isolation selection, up-to-date with MUO POG recommendation

if(isoType == TrackerIso && muon.isolationR03().sumPt < isoCut) return true;
else if(isoType == PFIso && muon.pfIsolationR04().sumChargedHadronPt + TMath::Max(0.,muon.pfIsolationR04().sumNeutralHadronEt + muon.pfIsolationR04().sumPhotonEt - 0.5*muon.pfIsolationR04().sumPUPt) < isoCut) return true;
Copy link
Contributor

Choose a reason for hiding this comment

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

hi @xmniu - sorry missed this - TMath::Max can just be std::max (then you can remove all the TMath.h includes


// Mass window
TLorentzVector vDilep = vTag + vProbe;
if((vDilep.M() < MassMin_) || (vDilep.M() > MassMax_)) continue;
Copy link
Contributor

Choose a reason for hiding this comment

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

please make a variable for vDilep.M() to avoid redundant calculations- you use it many times.

class TriggerRecord
{
public:
TriggerRecord(const std::string name="", const unsigned int value=0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

one more const std::string &

@davidlange6
Copy link
Contributor

otherwise looks ready to me

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2017

Pull request #18899 was updated. @vazzolini, @dmitrijus, @kmaeshima, @kpedro88, @fabozzi, @cmsbuild, @kkousour, @GurpreetSinghChahal, @vanbesien, @davidlange6 can you please check and sign again.

@davidlange6
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/21261/console Started: 2017/07/07 18:56

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 8, 2017

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

Comparison Summary:

  • You potentially added 5 lines to the logs
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 23
  • DQMHistoTests: Total histograms compared: 1790682
  • DQMHistoTests: Total failures: 29469
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1761047
  • DQMHistoTests: Total skipped: 166
  • DQMHistoTests: Total Missing objects: 0
  • Checked 93 log files, 14 edm output root files, 23 DQM output files

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 0619998 into cms-sw:master Jul 9, 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

10 participants