put in failsafe to not run PreMixing and HIP simulation simultaneously

cms-sw · Dec 7, 2016 · ef931f1 · ef931f1
1 parent c02ee0e
commit ef931f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py b/SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py
@@ -75,7 +75,7 @@
     SingleStripNoise           = cms.bool(True), #The noise RMS is read from the Db. If false it is considered the central strip noise
     CommonModeNoise            = cms.bool(True),
     BaselineShift              = cms.bool(True),
-    APVSaturationFromHIP       = cms.bool(True),
+    APVSaturationFromHIP       = cms.bool(False),
     APVSaturationProbScaling   = cms.double(1.0),
     APVProbabilityFile         = cms.FileInPath("SimTracker/SiStripDigitizer/data/APVProbaList.txt"),
     cmnRMStib                  = cms.double(5.92),

diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc
@@ -71,6 +71,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");
 }
 
 SiStripDigitizerAlgorithm::~SiStripDigitizerAlgorithm(){