Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1155 from andersonjacob/HcalUpgradeTDCFixes
Upgrade changes -- HCal upgrade TDC fixes.
- Loading branch information
Showing
13 changed files
with
370 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,57 @@ | ||
| #include "RecoLocalCalo/HcalRecAlgos/src/HcalTDCReco.h" | ||
| #include "DataFormats/HcalDigi/interface/HcalUpgradeDataFrame.h" | ||
| #include "DataFormats/HcalRecHit/interface/HBHERecHit.h" | ||
|
|
||
| HcalTDCReco::HcalTDCReco() | ||
| {} | ||
|
|
||
| void HcalTDCReco::reconstruct(const HcalUpgradeDataFrame & digi, | ||
| HBHERecHit & recHit) const | ||
| { | ||
| int n = digi.size(); | ||
| double risingTime = -999.; | ||
| double fallingTime = -999.; | ||
| int signalBX = 5; // NB: HARDWIRED !!! | ||
| int nbins = 50; // as in HcalTDCParameters.h (SimCalorimetry/HcalSimAlgos) | ||
| // start at bunch crossing 3 by default | ||
| for(int i = 3; i < n; ++i) | ||
| { | ||
| unsigned tdc = digi.tdc(i); | ||
|
|
||
| /* | ||
| unsigned rising = tdc & 0x7F; | ||
| unsigned falling = (tdc >> 7) & 0x7F; | ||
| */ | ||
| // temporary "unpacking" instead, which directly corresponds to | ||
| // SimCalorimetry/HcalSimAlgos/src/HcalTDC.cc (nibs = 50...) | ||
| // packedTDC = TDC_RisingEdge + (tdcBins*2) * TDC_FallingEdge; | ||
| unsigned rising = tdc%100; | ||
| unsigned falling = tdc/100; | ||
|
|
||
| // only set the first time, avoiding "special" codes | ||
| if(risingTime < -998. && rising != 62 && rising != 63) { | ||
| risingTime = rising*25./nbins + (i-signalBX)*25.; | ||
| } | ||
| if(fallingTime < -998. && falling != 62 && falling != 63) { | ||
| fallingTime = falling*25./nbins + (i-signalBX)*25.; | ||
| } | ||
|
|
||
| /* | ||
| std::cout << " digi.tdc[" << i << "] = " << tdc | ||
| << " rising = " << rising << " falling = " << falling | ||
| << " Rt = " << risingTime | ||
| << " Ft = " << fallingTime | ||
| << std::endl; | ||
| */ | ||
| } | ||
| recHit = HBHERecHit(recHit.id(), recHit.energy(), risingTime, fallingTime); | ||
| } | ||
| #include "RecoLocalCalo/HcalRecAlgos/src/HcalTDCReco.h" | ||
| #include "DataFormats/HcalDigi/interface/HcalUpgradeDataFrame.h" | ||
| #include "DataFormats/HcalRecHit/interface/HBHERecHit.h" | ||
|
|
||
| HcalTDCReco::HcalTDCReco() | ||
| {} | ||
|
|
||
| void HcalTDCReco::reconstruct(const HcalUpgradeDataFrame & digi, | ||
| HBHERecHit & recHit) const | ||
| { | ||
| int n = digi.size(); | ||
| double risingTime = -999.; | ||
| double fallingTime = -999.; | ||
| int signalBX = 4; // NB: HARDWIRED !!! | ||
| int nbins = 50; // as in HcalTDCParameters.h (SimCalorimetry/HcalSimAlgos) | ||
| int direction(-1), stepSize(1); // where to go after signalBX | ||
| // start at bunch crossing 3 by default | ||
| int i(signalBX); | ||
|
|
||
| // for(int i = 3; i < n; ++i) | ||
| while ((i > 2) && (i < 8) && (i < n) && | ||
| ((risingTime < -998.) || (fallingTime < 998.))) | ||
| { | ||
| unsigned tdc = digi.tdc(i); | ||
|
|
||
| /* | ||
| unsigned rising = tdc & 0x7F; | ||
| unsigned falling = (tdc >> 7) & 0x7F; | ||
| */ | ||
| // temporary "unpacking" instead, which directly corresponds to | ||
| // SimCalorimetry/HcalSimAlgos/src/HcalTDC.cc (nibs = 50...) | ||
| // packedTDC = TDC_RisingEdge + (tdcBins*2) * TDC_FallingEdge; | ||
| unsigned rising = tdc%100; | ||
| unsigned falling = tdc/100; | ||
|
|
||
| // only set the first time, avoiding "special" codes | ||
| if(risingTime < -998. && rising != 62 && rising != 63) { | ||
| risingTime = rising*25./nbins + (i-signalBX)*25.; | ||
| } | ||
| if(((fallingTime < -998.) || (fallingTime < risingTime)) && | ||
| (falling != 62) && (falling != 63)) { | ||
| fallingTime = falling*25./nbins + (i-signalBX)*25.; | ||
| } | ||
|
|
||
| i += direction*stepSize; | ||
| ++stepSize; | ||
| direction *= -1; | ||
| /* | ||
| std::cout << " digi.tdc[" << i << "] = " << tdc | ||
| << " rising = " << rising << " falling = " << falling | ||
| << " Rt = " << risingTime | ||
| << " Ft = " << fallingTime | ||
| << std::endl; | ||
| */ | ||
| } | ||
| recHit = HBHERecHit(recHit.id(), recHit.energy(), risingTime, fallingTime); | ||
| } |
28 changes: 14 additions & 14 deletions
28
RecoLocalCalo/HcalRecProducers/python/HBHEUpgradeReconstructor_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| hbheUpgradeReco = cms.EDProducer("HcalSimpleReconstructor", | ||
| correctionPhaseNS = cms.double(-5.0), | ||
| digiLabel = cms.InputTag("simHcalUnsuppressedDigis","HBHEUpgradeDigiCollection"), | ||
| Subdetector = cms.string('upgradeHBHE'), | ||
| correctForPhaseContainment = cms.bool(True), | ||
| correctForTimeslew = cms.bool(True), | ||
| dropZSmarkedPassed = cms.bool(True), | ||
| firstSample = cms.int32(4), | ||
| samplesToAdd = cms.int32(2), | ||
| tsFromDB = cms.bool(True) | ||
| ) | ||
|
|
||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| hbheUpgradeReco = cms.EDProducer("HcalSimpleReconstructor", | ||
| correctionPhaseNS = cms.double(5.0), | ||
| digiLabel = cms.InputTag("simHcalUnsuppressedDigis","HBHEUpgradeDigiCollection"), | ||
| Subdetector = cms.string('upgradeHBHE'), | ||
| correctForPhaseContainment = cms.bool(True), | ||
| correctForTimeslew = cms.bool(False), | ||
| dropZSmarkedPassed = cms.bool(True), | ||
| firstSample = cms.int32(4), | ||
| samplesToAdd = cms.int32(2), | ||
| tsFromDB = cms.bool(True) | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.