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

Hcal upgrade tdc fixes #1155

Merged
merged 4 commits into from Nov 25, 2013
Merged

Conversation

andersonjacob
Copy link
Contributor

These changes affect the TDC simulation used in the upgrade. They have negligible effects on the non upgrade simulation and reconstruction. This pull request also corrects problems found in request #1140.

@andersonjacob
Copy link
Contributor Author

I'm sorry that is #1138 not #1140

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @andersonjacob for CMSSW_7_0_X.

Hcal upgrade tdc fixes

It involves the following packages:

CalibCalorimetry/HcalAlgos
SimCalorimetry/HcalSimProducers
RecoLocalCalo/HcalRecProducers
RecoLocalCalo/HcalRecAlgos
CalibFormats/CaloObjects
SimCalorimetry/HcalSimAlgos

@smuzaffar, @civanch, @nclopezo, @demattia, @mdhildreth, @thspeer, @rcastello, @giamman, @slava77 can you please review it and eventually sign? Thanks.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@ktf you are the release manager for this.

@civanch
Copy link
Contributor

civanch commented Oct 23, 2013

+1

@nclopezo
Copy link
Contributor

-1
When I ran the RelVals I found an error in the following worklfows:
5.1
25.0
8.0
1306.0
101.0
401.0
4.22
1001.0

you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/993/summary.html

@cmsbuild
Copy link
Contributor

Pull request #1155 was updated. @smuzaffar, @civanch, @thspeer, @demattia, @mdhildreth, @nclopezo, @rcastello, @giamman, @slava77 can you please check and sign again.

@nclopezo
Copy link
Contributor

@civanch
Copy link
Contributor

civanch commented Oct 25, 2013

+1

@slava77
Copy link
Contributor

slava77 commented Oct 27, 2013

@andersonjacob
Hi Jake,
which workflows will run this code?
I see there are quite a few changes in the code and no diffs in the comparisons for the standard Run-1 processing.
From the code changes I'd expect differences, assuming the code is actually run.
Visually, the code diffs seem OK,
but before I sign off, I'd like to confirm that it actually runs OK.
(I'm looking either for a matrix workflow number, or a cmsDriver-based command, or just a test python file)

Please advise

Thanks

Slava

@davidlange6
Copy link
Contributor

Slava

None of the run 1/2 workflows will - so you need 62xSLHCx to test. Maybe easiest to wait for us to integrate and then accept into 70x as you have confirmed that there are no changes to the run 1/2 results.

-----Original Message-----
From: slava77 [notifications@github.commailto:notifications@github.com]
Sent: Sunday, October 27, 2013 06:27 AM Pacific Standard Time
To: cms-sw/cmssw
Subject: Re: [cmssw] Hcal upgrade tdc fixes (#1155)

@andersonjacobhttps://github.com/andersonjacob
Hi Jake,
which workflows will run this code?
I see there are quite a few changes in the code and no diffs in the comparisons for the standard Run-1 processing.
From the code changes I'd expect differences, assuming the code is actually run.
Visually, the code diffs seem OK,
but before I sign off, I'd like to confirm that it actually runs OK.
(I'm looking either for a matrix workflow number, or a cmsDriver-based command, or just a test python file)

Please advise

Thanks

Slava


Reply to this email directly or view it on GitHubhttps://github.com//pull/1155#issuecomment-27169025.

@andersonjacob
Copy link
Contributor Author

@slava77
Hi Slava,

I will take it as completely successful that there aren't differences when running standard workflows. These improvements are targeted specifically at the upgrade and shouldn't disrupt existing Hcal workflows. We want to keep them in the main CMSSW branch so that the Hcal upgrade branch doesn't diverge too much from the main branch and make merging a problem down the road.

As David pointed said it is probably good to see what the results of the SLHC integration is and then make a final decision from there.

Jake

@slava77
Copy link
Contributor

slava77 commented Oct 28, 2013

Hi Jake

I understand the situation.
What is the PR number for SLHC release?
I can sign off on this one once it's clear the code works in SLHC.

Cheers

Slava

@andersonjacob
Copy link
Contributor Author

It is #1140

@slava77
Copy link
Contributor

slava77 commented Oct 29, 2013

Thanks
In #1155 I see "13 changed files with 370 additions and 124 deletions"
In #1140 I see "13 changed files with 369 additions and 123 deletions"
Simple diff wasn't too obvious. Could you clarify which change differs?

@andersonjacob
Copy link
Contributor Author

There is a change that has already been put into 70X that is for the HO upgrade to SiPM's it is in the python file SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py. The SLHC release doesn't have the same version of this file so the changes differ by a 1 line or two in this file. All of the other files are identical.

@slava77
Copy link
Contributor

slava77 commented Nov 5, 2013

+1

checked 9675962 for compilation in CMSSW_7_0_X_2013-11-04-0200
checked the equivalent #1140 6a0d78d wrt CMSSW_6_2_X_SLHC2 using
runTheMatrix.py -w upgrade -l 3300,3400,4100,4400

validate.C check shows no diffs (added DataFramesSorted size check to look at least at anything in the UPG2023 scenarios: these run only up to _sim*Digis)

@rcastello
Copy link

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next IBs unless changes or unless it breaks tests. @ktf can you please take care of it?

@@ -286,19 +286,145 @@ void HcalPulseShapes::computeHFShape() {

void HcalPulseShapes::computeSiPMShape()
{
unsigned int nbin = 100; // to avoid big drop of integral for previous 512
// due to negative afterpulse (May 6, 2013. S.Abdullin)

Copy link
Contributor

Choose a reason for hiding this comment

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

This can probably be made into a const static.

ktf added a commit that referenced this pull request Nov 25, 2013
Upgrade changes -- HCal upgrade TDC fixes.
@ktf ktf merged commit 6e3df06 into cms-sw:CMSSW_7_0_X Nov 25, 2013
@andersonjacob andersonjacob deleted the HcalUpgradeTDCFixes branch May 21, 2014 18:25
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

8 participants