diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 023b5c236ba7b..5ca80eac75e9e 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -239,8 +239,6 @@ def customiseForPR24339HybridFormatSiStripZS(process): # Adding some parameters to the pixel clusterizer def customiseFor24329(process): for producer in producers_by_type(process, "SiPixelClusterProducer"): - producer.AdcFullScaleStack = cms.int32(255) - producer.FirstStackLayer = cms.int32(5) producer.ElectronPerADCGain = cms.double(135.) producer.Phase2Calibration = cms.bool(False) producer.Phase2ReadoutMode = cms.int32(-1) diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc index d7e384fbabc5f..99a7c792cc527 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc @@ -51,8 +51,6 @@ PixelThresholdClusterizer::PixelThresholdClusterizer theConversionFactor_L1( conf.getParameter("VCaltoElectronGain_L1") ), theOffset( conf.getParameter("VCaltoElectronOffset") ), theOffset_L1( conf.getParameter("VCaltoElectronOffset_L1") ), - theStackADC( conf.getParameter("AdcFullScaleStack") ), - theFirstStack( conf.getParameter("FirstStackLayer") ), theElectronPerADCGain( conf.getParameter("ElectronPerADCGain") ), doPhase2Calibration( conf.getParameter("Phase2Calibration") ), thePhase2ReadoutMode( conf.getParameter("Phase2ReadoutMode") ), @@ -87,8 +85,6 @@ PixelThresholdClusterizer::fillDescriptions(edm::ConfigurationDescriptions& desc desc.add("ClusterThreshold_L1", 4000); desc.add("ClusterThreshold", 4000); desc.add("maxNumberOfClusters", -1); - desc.add("AdcFullScaleStack", 255); - desc.add("FirstStackLayer", 5); desc.add("ElectronPerADCGain", 135.); desc.add("Phase2Calibration", false); desc.add("Phase2ReadoutMode", -1); @@ -261,19 +257,10 @@ void PixelThresholdClusterizer::copy_to_buffer( DigiIterator begin, DigiIterator } else { int i=0; const float gain = theElectronPerADCGain; // default: 1 ADC = 135 electrons - const int maxADC8bitVal_ = 255; for(DigiIterator di = begin; di != end; ++di) { auto adc = di->adc(); const float pedestal = 0.; // electron[i] = int(adc * gain + pedestal); - if (theLayer>=theFirstStack) { - if (theStackADC==1&&adc==1) { - electron[i] = int(maxADC8bitVal_*gain); // Arbitrarily use overflow value. - } - if (theStackADC>1&&theStackADC!=maxADC8bitVal_&&adc>=1){ - electron[i] = int((adc-1) * gain * maxADC8bitVal_/float(theStackADC-1)); - } - } ++i; } assert(i==(end-begin)); @@ -414,18 +401,7 @@ int PixelThresholdClusterizer::calibrate(int adc, int col, int row) // Simple (default) linear gain const float gain = theElectronPerADCGain; // default: 1 ADC = 135 electrons const float pedestal = 0.; // - const int maxADC8bitVal_ = 255; electrons = int(adc * gain + pedestal); - if (theLayer>=theFirstStack) { - if (theStackADC==1&&adc==1) - { - electrons = int(maxADC8bitVal_*gain); // Arbitrarily use overflow value. - } - if (theStackADC>1&&theStackADC!=maxADC8bitVal_&&adc>=1) - { - electrons = int((adc-1) * gain * maxADC8bitVal_/float(theStackADC-1)); - } - } } return electrons; diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.h b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.h index 92cce8892a3f0..f699ae9bc301e 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.h +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.h @@ -104,8 +104,6 @@ class dso_hidden PixelThresholdClusterizer final : public PixelClusterizerBase { const int theOffset; // adc to electron conversion offset const int theOffset_L1; // adc to electron conversion offset for Layer 1 - const int theStackADC; // The maximum ADC count for the stack layers - const int theFirstStack; // The index of the first stack layer const double theElectronPerADCGain; // ADC to electrons conversion const bool doPhase2Calibration; // The ADC --> electrons calibration is for phase-2 tracker diff --git a/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py index cfa9ad7e34fcd..bf0bda3b4c013 100644 --- a/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py +++ b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py @@ -26,8 +26,6 @@ # ************************************** maxNumberOfClusters = cms.int32(-1), # -1 means no limit. ElectronPerADCGain = cms.double(135.0), - AdcFullScaleStack = cms.int32(255), - FirstStackLayer = cms.int32(5), Phase2Calibration = cms.bool(False), Phase2ReadoutMode = cms.int32(-1), Phase2DigiBaseline = cms.double(1200.), diff --git a/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py b/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py index d82b49bf9f394..f097248d5f157 100644 --- a/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py +++ b/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py @@ -77,8 +77,6 @@ def _modifyPixelDigitizerForPhase1Pixel( digitizer ) : ElectronPerAdc = cms.double(135.0), TofUpperCut = cms.double(12.5), AdcFullScale = cms.int32(255), - AdcFullScaleStack = cms.int32(255), - FirstStackLayer = cms.int32(5), TofLowerCut = cms.double(-12.5), TanLorentzAnglePerTesla_FPix = cms.double(0.106), TanLorentzAnglePerTesla_BPix = cms.double(0.106), diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc index 28843550d1748..f1c19ea7c1b11 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc @@ -189,7 +189,6 @@ SiPixelDigitizerAlgorithm::SiPixelDigitizerAlgorithm(const edm::ParameterSet& co // ADC saturation value, 255(8bit adc. //theAdcFullScale(conf.getUntrackedParameter("AdcFullScale",255)), theAdcFullScale(conf.getParameter("AdcFullScale")), - theAdcFullScaleStack(conf.exists("AdcFullScaleStack")?conf.getParameter("AdcFullScaleStack"):255), // Noise in electrons: // Pixel cell noise, relevant for generating noisy pixels @@ -1414,15 +1413,6 @@ void SiPixelDigitizerAlgorithm::make_digis(float thePixelThresholdInE, adc = int( signalInElectrons / theElectronPerADC ); // calibrate gain } adc = std::min(adc, theAdcFullScale); // Check maximum value -// Calculate layerIndex - if (theAdcFullScale!=theAdcFullScaleStack){ - if(pixdet->subDetector() == GeomDetEnumerators::SubDetector::P2OTB) { // Phase 2 OT Barrel only - // Set to 1 if over the threshold - if (theAdcFullScaleStack==1) {adc=1;} - // Make it a linear fit to the full scale of the normal adc count. Start new adc from 1 not zero. - if (theAdcFullScaleStack!=1&&theAdcFullScaleStack!=theAdcFullScale) {adc = int (1 + adc * (theAdcFullScaleStack-1)/float(theAdcFullScale) );} - } - } // Only enter this if the Adc changes for the outer layers #ifdef TP_DEBUG LogDebug ("Pixel Digitizer") << (*i).first << " " << (*i).second << " " << signalInElectrons diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.h b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.h index 9103e4e72f9aa..9afd731c839f9 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.h +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.h @@ -341,7 +341,6 @@ class SiPixelDigitizerAlgorithm { //-- make_digis const float theElectronPerADC; // Gain, number of electrons per adc count. const int theAdcFullScale; // Saturation count, 255=8bit. - const int theAdcFullScaleStack; // Saturation count for stack layers, 1=1bit. const float theNoiseInElectrons; // Noise (RMS) in units of electrons. const float theReadoutNoise; // Noise of the readount chain in elec, //inludes DCOL-Amp,TBM-Amp, Alt, AOH,OptRec.