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.

Sign up for GitHub

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

Jump to bottom

Update Pixel gain calibration scheme (for Run3) #492

Merged
merged 1 commit into from
Jul 4, 2020
Merged

Update Pixel gain calibration scheme (for Run3) #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class SiPixelRawToClusterCUDA : public edm::stream::EDProducer<edm::ExternalWork
std::unique_ptr<pixelgpudetails::SiPixelRawToClusterGPUKernel::WordFedAppender> wordFedAppender_;
PixelDataFormatter::Errors errors_;

const bool isRun2_;
const bool includeErrors_;
const bool useQuality_;
const bool usePilotBlade_;
Expand All @@ -84,6 +85,7 @@ SiPixelRawToClusterCUDA::SiPixelRawToClusterCUDA(const edm::ParameterSet& iConfi
gainsToken_(esConsumes<SiPixelGainCalibrationForHLTGPU, SiPixelGainCalibrationForHLTGPURcd>()),
cablingMapToken_(esConsumes<SiPixelFedCablingMap, SiPixelFedCablingMapRcd>(
edm::ESInputTag("", iConfig.getParameter<std::string>("CablingMapLabel")))),
isRun2_(iConfig.getParameter<bool>("isRun2")),
includeErrors_(iConfig.getParameter<bool>("IncludeErrors")),
useQuality_(iConfig.getParameter<bool>("UseQualityInfo")),
usePilotBlade_(iConfig.getParameter<bool>("UsePilotBlade")) // Control the usage of pilot-blade data, FED=40
Expand All @@ -108,6 +110,7 @@ SiPixelRawToClusterCUDA::SiPixelRawToClusterCUDA(const edm::ParameterSet& iConfi

void SiPixelRawToClusterCUDA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<bool>("isRun2", true);
desc.add<bool>("IncludeErrors", true);
desc.add<bool>("UseQualityInfo", false);
desc.add<bool>("UsePilotBlade", false)->setComment("## Use pilot blades");
Expand Down Expand Up @@ -233,7 +236,8 @@ void SiPixelRawToClusterCUDA::acquire(const edm::Event& iEvent,

} // end of for loop

gpuAlgo_.makeClustersAsync(gpuMap,
gpuAlgo_.makeClustersAsync(isRun2_,
gpuMap,
gpuModulesToUnpack,
gpuGains,
*wordFedAppender_,
Expand Down
6 changes: 4 additions & 2 deletions RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,8 @@ namespace pixelgpudetails {
}

// Interface to outside
void SiPixelRawToClusterGPUKernel::makeClustersAsync(const SiPixelFedCablingMapGPU *cablingMap,
void SiPixelRawToClusterGPUKernel::makeClustersAsync(bool isRun2,
const SiPixelFedCablingMapGPU *cablingMap,
const unsigned char *modToUnp,
const SiPixelGainForHLTonGPU *gains,
const WordFedAppender &wordFed,
Expand Down Expand Up @@ -599,7 +600,8 @@ namespace pixelgpudetails {
int blocks =
(std::max(int(wordCounter), int(gpuClustering::MaxNumModules)) + threadsPerBlock - 1) / threadsPerBlock;

gpuCalibPixel::calibDigis<<<blocks, threadsPerBlock, 0, stream>>>(digis_d.moduleInd(),
gpuCalibPixel::calibDigis<<<blocks, threadsPerBlock, 0, stream>>>(isRun2,
digis_d.moduleInd(),
digis_d.c_xx(),
digis_d.c_yy(),
digis_d.adc(),
Expand Down
3 changes: 2 additions & 1 deletion RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ namespace pixelgpudetails {
SiPixelRawToClusterGPUKernel& operator=(const SiPixelRawToClusterGPUKernel&) = delete;
SiPixelRawToClusterGPUKernel& operator=(SiPixelRawToClusterGPUKernel&&) = delete;

void makeClustersAsync(const SiPixelFedCablingMapGPU* cablingMap,
void makeClustersAsync(bool isRun2,
const SiPixelFedCablingMapGPU* cablingMap,
const unsigned char* modToUnp,
const SiPixelGainForHLTonGPU* gains,
const WordFedAppender& wordFed,
Expand Down
8 changes: 5 additions & 3 deletions RecoLocalTracker/SiPixelClusterizer/plugins/gpuCalibPixel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ namespace gpuCalibPixel {

constexpr uint16_t InvId = 9999; // must be > MaxNumModules

// valid for run2
constexpr float VCaltoElectronGain = 47; // L2-4: 47 +- 4.7
constexpr float VCaltoElectronGain_L1 = 50; // L1: 49.6 +- 2.6
constexpr float VCaltoElectronOffset = -60; // L2-4: -60 +- 130
constexpr float VCaltoElectronOffset_L1 = -670; // L1: -670 +- 220

__global__ void calibDigis(uint16_t* id,
__global__ void calibDigis(bool isRun2,
uint16_t* id,
uint16_t const* __restrict__ x,
uint16_t const* __restrict__ y,
uint16_t* adc,
Expand All @@ -41,8 +43,8 @@ namespace gpuCalibPixel {
if (InvId == id[i])
continue;

float conversionFactor = id[i] < 96 ? VCaltoElectronGain_L1 : VCaltoElectronGain;
float offset = id[i] < 96 ? VCaltoElectronOffset_L1 : VCaltoElectronOffset;
float conversionFactor = (isRun2) ? (id[i] < 96 ? VCaltoElectronGain_L1 : VCaltoElectronGain) : 1.f;
float offset = (isRun2) ? (id[i] < 96 ? VCaltoElectronOffset_L1 : VCaltoElectronOffset) : 0;

bool isDeadColumn = false, isNoisyColumn = false;

Expand Down
5 changes: 5 additions & 0 deletions RecoLocalTracker/SiPixelClusterizer/python/siPixelClustersPreSplitting_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
siPixelClustersPreSplittingTask = cms.Task(siPixelClustersPreSplitting)

siPixelClustersCUDAPreSplitting = _siPixelRawToClusterCUDA.clone()
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(siPixelClustersCUDAPreSplitting,
isRun2=False
)

siPixelDigisClustersPreSplitting = _siPixelDigisClustersFromSoA.clone()
siPixelClustersPreSplittingTaskCUDA = cms.Task(
siPixelClustersCUDAPreSplitting,
Expand Down