Merge pull request #16906 from boudoul/HIPkiller_90X

put in failsafe to not run PreMixing and HIP simulation simultaneously
cms-sw · Dec 8, 2016 · 462afba · 462afba
2 parents 9de2611 + 68cb96a
commit 462afba
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc
@@ -77,6 +77,7 @@ SiStripDigitizerAlgorithm::SiStripDigitizerAlgorithm(const edm::ParameterSet& co
   else LogDebug("SiStripDigitizerAlgorithm")<<" SingleStripNoise: OFF";
   if(CommonModeNoise) LogDebug("SiStripDigitizerAlgorithm")<<" CommonModeNoise: ON";
   else LogDebug("SiStripDigitizerAlgorithm")<<" CommonModeNoise: OFF";
+  if(PreMixing_ && APVSaturationFromHIP) throw cms::Exception("PreMixing does not work with HIP loss simulation yet");
   if(APVSaturationFromHIP){  
     std::string line; 
     APVProbaFile.open((APVProbabilityFile.fullPath()).c_str());