change flags default and remove print out

Author: carolinecollard

SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py

@@ -159,7 +159,18 @@
 (runDependentForPixel & premix_stage2).toModify(mixData.workers.pixel,
          UseReweighting=False,
          applyLateReweighting=True,
-         store_SimHitEntryExitPoints=False
+         usePixelExtraLiteFormat = False,
+         store_SimHitEntryExitPoints=False,
+         store_SimHitEntryExitPointsLite = False
+)
+
+from Configuration.ProcessModifiers.runDependentForPixelVal_cff import runDependentForPixelVal
+(runDependentForPixelVal & premix_stage2).toModify(mixData.workers.pixel,
+         UseReweighting=False,
+         applyLateReweighting=True,
+         usePixelExtraLiteFormat = True,
+         store_SimHitEntryExitPoints=False,
+         store_SimHitEntryExitPointsLite = False
 )
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim

SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h

@@ -785,7 +785,7 @@ bool SiPixelChargeReweightingAlgorithm::lateSignalReweight(const PixelGeomDetUni
   }
   ierr = PixelTempRewgt2D(ID0, ID1, pixrewgt);
   if (ierr != 0) {
-    edm::LogError("SiPixelChargeReweightingAlgorithm") << "Cluster Charge Reweighting did not work properly.";
+    LogDebug("SiPixelChargeReweightingAlgorithm ") << "Cluster Charge Reweighting did not work properly.";
     return false;
   }
   if (PrintClusters) {

SimTracker/SiPixelDigitizer/plugins/PreMixingSiPixelWorker.cc

@@ -107,8 +107,8 @@ PreMixingSiPixelWorker::PreMixingSiPixelWorker(const edm::ParameterSet& ps,
   LogDebug("PreMixingSiPixelWorker") << "applyLateReweighting_ in PreMixingSiPixelWorker  " << applyLateReweighting_;
 
 
-  std::cout << " applyLateReweighting_ in PreMixingSiPixelWorker " << applyLateReweighting_ << std::endl;
-  std::cout << " usePixelExtraLiteFormat_ in PreMixingSiPixelWorker " << usePixelExtraLiteFormat_ << std::endl;
+  LogDebug("PreMixingSiPixelWorker")  << " applyLateReweighting_ in PreMixingSiPixelWorker " << applyLateReweighting_ ;
+  LogDebug("PreMixingSiPixelWorker")  << " usePixelExtraLiteFormat_ in PreMixingSiPixelWorker " << usePixelExtraLiteFormat_ ;
 
   PixelDigiToken_ = iC.consumes<edm::DetSetVector<PixelDigi>>(pixeldigi_collectionSig_);
   PixelDigiPToken_ = iC.consumes<edm::DetSetVector<PixelDigi>>(pixeldigi_collectionPile_);
@@ -273,7 +273,6 @@ void PreMixingSiPixelWorker::addPileups(PileUpEventPrincipal const& pep, edm::Ev
           if (iu->type().isTrackerPixel()) {
             uint32_t detIDinLoop = iu->geographicalId().rawId();
             if (detIDinLoop == detID) {
-		     std::cout << " lateSignalReweight with Extra " << std::endl;
               digitizer_.lateSignalReweight(
                   dynamic_cast<const PixelGeomDetUnit*>(iu), TempDigis, TempSimExtra, tTopo, engine);
               break;
@@ -294,7 +293,6 @@ void PreMixingSiPixelWorker::addPileups(PileUpEventPrincipal const& pep, edm::Ev
           if (iu->type().isTrackerPixel()) {
             uint32_t detIDinLoop = iu->geographicalId().rawId();
             if (detIDinLoop == detID) {
-		     std::cout << " lateSignalReweight with Extra Lite " << std::endl;
               digitizer_.lateSignalReweight(
                   dynamic_cast<const PixelGeomDetUnit*>(iu), TempDigis, TempSimExtra, tTopo, engine);
               break;