diff --git a/DQM/BeamMonitor/plugins/AlcaBeamMonitor.cc b/DQM/BeamMonitor/plugins/AlcaBeamMonitor.cc
index 590e27c847323..f77a33549e63e 100644
--- a/DQM/BeamMonitor/plugins/AlcaBeamMonitor.cc
+++ b/DQM/BeamMonitor/plugins/AlcaBeamMonitor.cc
@@ -34,6 +34,7 @@ AlcaBeamMonitor::AlcaBeamMonitor(const ParameterSet& ps)
       trackLabel_(consumes<reco::TrackCollection>(ps.getUntrackedParameter<InputTag>("TrackLabel"))),
       scalerLabel_(consumes<BeamSpot>(ps.getUntrackedParameter<InputTag>("ScalerLabel"))),
       beamSpotToken_(esConsumes<edm::Transition::BeginLuminosityBlock>()),
+      perLSsaving_(ps.getUntrackedParameter<bool>("perLSsaving", false)),
       numberOfValuesToSave_(0) {
   if (!monitorName_.empty())
     monitorName_ = monitorName_ + "/";
@@ -55,23 +56,25 @@ AlcaBeamMonitor::AlcaBeamMonitor(const ParameterSet& ps)
   varNamesV_.push_back("sigmaY");
   varNamesV_.push_back("sigmaZ");
 
-  histoByCategoryNames_.insert(pair<string, string>("run", "Coordinate"));
-  histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex fit-DataBase"));
-  histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex fit-BeamFit"));
-  histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex fit-Scalers"));
-  histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex-DataBase"));
-  histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex-BeamFit"));
-  histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex-Scalers"));
-
-  histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased BeamSpotFit"));
-  histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased PrimaryVertex"));
-  histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased DataBase"));
-  histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased Scalers"));
-  histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased PrimaryVertex-DataBase fit"));
-  histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased PrimaryVertex-Scalers fit"));
-  histoByCategoryNames_.insert(pair<string, string>("validation", "Lumibased Scalers-DataBase fit"));
-  histoByCategoryNames_.insert(pair<string, string>("validation", "Lumibased PrimaryVertex-DataBase"));
-  histoByCategoryNames_.insert(pair<string, string>("validation", "Lumibased PrimaryVertex-Scalers"));
+  if (!perLSsaving_) {
+    histoByCategoryNames_.insert(pair<string, string>("run", "Coordinate"));
+    histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex fit-DataBase"));
+    histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex fit-BeamFit"));
+    histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex fit-Scalers"));
+    histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex-DataBase"));
+    histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex-BeamFit"));
+    histoByCategoryNames_.insert(pair<string, string>("run", "PrimaryVertex-Scalers"));
+
+    histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased BeamSpotFit"));
+    histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased PrimaryVertex"));
+    histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased DataBase"));
+    histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased Scalers"));
+    histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased PrimaryVertex-DataBase fit"));
+    histoByCategoryNames_.insert(pair<string, string>("lumi", "Lumibased PrimaryVertex-Scalers fit"));
+    histoByCategoryNames_.insert(pair<string, string>("validation", "Lumibased Scalers-DataBase fit"));
+    histoByCategoryNames_.insert(pair<string, string>("validation", "Lumibased PrimaryVertex-DataBase"));
+    histoByCategoryNames_.insert(pair<string, string>("validation", "Lumibased PrimaryVertex-Scalers"));
+  }
 
   for (vector<string>::iterator itV = varNamesV_.begin(); itV != varNamesV_.end(); itV++) {
     for (multimap<string, string>::iterator itM = histoByCategoryNames_.begin(); itM != histoByCategoryNames_.end();
@@ -88,6 +91,7 @@ void AlcaBeamMonitor::fillDescriptions(edm::ConfigurationDescriptions& iDesc) {
   ps.addUntracked<edm::InputTag>("PrimaryVertexLabel");
   ps.addUntracked<edm::InputTag>("TrackLabel");
   ps.addUntracked<edm::InputTag>("ScalerLabel");
+  ps.addUntracked<bool>("perLSsaving");
 
   BeamFitter::fillDescription(ps);
   PVFitter::fillDescription(ps);
diff --git a/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h b/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h
index 241a9677ce6cf..0d708d8bcaa51 100644
--- a/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h
+++ b/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h
@@ -59,6 +59,7 @@ class AlcaBeamMonitor : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<alcabe
   const edm::EDGetTokenT<reco::TrackCollection> trackLabel_;
   const edm::EDGetTokenT<reco::BeamSpot> scalerLabel_;
   const edm::ESGetToken<BeamSpotObjects, BeamSpotObjectsRcd> beamSpotToken_;
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
 
   //Service variables
   int numberOfValuesToSave_;
diff --git a/DQM/BeamMonitor/python/AlcaBeamMonitorHeavyIons_cff.py b/DQM/BeamMonitor/python/AlcaBeamMonitorHeavyIons_cff.py
index bb5a9f8ee19ff..fa716749371c4 100644
--- a/DQM/BeamMonitor/python/AlcaBeamMonitorHeavyIons_cff.py
+++ b/DQM/BeamMonitor/python/AlcaBeamMonitorHeavyIons_cff.py
@@ -7,7 +7,10 @@
 AlcaBeamMonitor.BeamFitter.TrackCollection = 'hiGeneralTracks'
 AlcaBeamMonitor.BeamFitter.TrackQuality    = ['highPurity']
 AlcaBeamMonitor.PVFitter.VertexCollection  = 'hiSelectedVertex'
-
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+      AlcaBeamMonitor.perLSsaving=True
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
 scalerBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
 alcaBeamMonitor = cms.Sequence( scalerBeamSpot*AlcaBeamMonitor )
diff --git a/DQM/BeamMonitor/python/AlcaBeamMonitor_cff.py b/DQM/BeamMonitor/python/AlcaBeamMonitor_cff.py
index b4945921bdd60..565bb105604a1 100644
--- a/DQM/BeamMonitor/python/AlcaBeamMonitor_cff.py
+++ b/DQM/BeamMonitor/python/AlcaBeamMonitor_cff.py
@@ -1,7 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQM.BeamMonitor.AlcaBeamMonitor_cfi import *
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+    AlcaBeamMonitor.perLSsaving=True
+
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
 scalerBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
+
 alcaBeamMonitor = cms.Sequence( scalerBeamSpot*AlcaBeamMonitor )
 
+
diff --git a/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py b/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py
index 3e3254fc8aceb..dc2b6be303a75 100644
--- a/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py
+++ b/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py
@@ -4,6 +4,7 @@
 AlcaBeamMonitor = DQMEDAnalyzer('AlcaBeamMonitor',
                                  MonitorName        = cms.untracked.string('AlcaBeamMonitor'),
                                  PrimaryVertexLabel = cms.untracked.InputTag('offlinePrimaryVertices'),
+                                 perLSsaving        = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
                                  #TrackLabel         = cms.untracked.InputTag('ALCARECOTkAlMinBias'),
                                  TrackLabel         = cms.untracked.InputTag('generalTracks'),
                                  ScalerLabel        = cms.untracked.InputTag('scalerBeamSpot'),
diff --git a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
index 7db4a49d9e33f..a281905ce3ce9 100644
--- a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
+++ b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
@@ -52,6 +52,7 @@ class CTPPSCommonDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<s
   const edm::EDGetTokenT<std::vector<reco::ForwardProton>> tokenRecoProtons;
 
   bool makeProtonRecoPlots_;
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
 
   int currentLS;
   int endLS;
@@ -287,7 +288,8 @@ CTPPSCommonDQMSource::CTPPSCommonDQMSource(const edm::ParameterSet &ps)
       ctppsRecordToken(consumes<CTPPSRecord>(ps.getUntrackedParameter<edm::InputTag>("ctppsmetadata"))),
       tokenLocalTrackLite(consumes<vector<CTPPSLocalTrackLite>>(ps.getParameter<edm::InputTag>("tagLocalTrackLite"))),
       tokenRecoProtons(consumes<std::vector<reco::ForwardProton>>(ps.getParameter<InputTag>("tagRecoProtons"))),
-      makeProtonRecoPlots_(ps.getParameter<bool>("makeProtonRecoPlots")) {
+      makeProtonRecoPlots_(ps.getParameter<bool>("makeProtonRecoPlots")),
+      perLSsaving_(ps.getUntrackedParameter<bool>("perLSsaving", false)) {
   currentLS = 0;
   endLS = 0;
   rpstate.clear();
@@ -545,8 +547,10 @@ std::shared_ptr<std::vector<int>> CTPPSCommonDQMSource::globalBeginLuminosityBlo
 void CTPPSCommonDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) {
   auto const &rpstate = *luminosityBlockCache(iLumi.index());
   auto currentLS = iLumi.id().luminosityBlock();
-  for (std::vector<int>::size_type i = 0; i < rpstate.size(); i++)
-    globalPlots.RPState->setBinContent(currentLS, i + 1, rpstate[i]);
+  if (!perLSsaving_) {
+    for (std::vector<int>::size_type i = 0; i < rpstate.size(); i++)
+      globalPlots.RPState->setBinContent(currentLS, i + 1, rpstate[i]);
+  }
 }
 
 //----------------------------------------------------------------------------------------------------
diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
index 82b4cd6406803..adba4530d145e 100644
--- a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
+++ b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
@@ -107,6 +107,7 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<
   edm::ESGetToken<CTPPSGeometry, VeryForwardRealGeometryRecord> ctppsGeometryEventToken_;
 
   bool excludeMultipleHits_;
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
   double horizontalShiftBwDiamondPixels_;
   double horizontalShiftOfDiamond_;
   std::vector<std::pair<edm::EventRange, int>> runParameters_;
@@ -486,6 +487,7 @@ CTPPSDiamondDQMSource::CTPPSDiamondDQMSource(const edm::ParameterSet& ps)
       ctppsGeometryRunToken_(esConsumes<CTPPSGeometry, VeryForwardRealGeometryRecord, edm::Transition::BeginRun>()),
       ctppsGeometryEventToken_(esConsumes<CTPPSGeometry, VeryForwardRealGeometryRecord>()),
       excludeMultipleHits_(ps.getParameter<bool>("excludeMultipleHits")),
+      perLSsaving_(ps.getUntrackedParameter<bool>("perLSsaving", false)),
       centralOOT_(-999),
       verbosity_(ps.getUntrackedParameter<unsigned int>("verbosity", 0)),
       EC_difference_56_(-500),
@@ -554,9 +556,11 @@ std::shared_ptr<dds::Cache> CTPPSDiamondDQMSource::globalBeginLuminosityBlock(co
                                                                               const edm::EventSetup&) const {
   auto d = std::make_shared<dds::Cache>();
   d->hitDistribution2dMap.reserve(potPlots_.size());
-  for (auto& plot : potPlots_)
-    d->hitDistribution2dMap[plot.first] =
-        std::unique_ptr<TH2F>(static_cast<TH2F*>(plot.second.hitDistribution2d_lumisection->getTH2F()->Clone()));
+  if (!perLSsaving_) {
+    for (auto& plot : potPlots_)
+      d->hitDistribution2dMap[plot.first] =
+          std::unique_ptr<TH2F>(static_cast<TH2F*>(plot.second.hitDistribution2d_lumisection->getTH2F()->Clone()));
+  }
   return d;
 }
 
@@ -747,12 +751,14 @@ void CTPPSDiamondDQMSource::analyze(const edm::Event& event, const edm::EventSet
           hitHistoTmp->Fill(detId.plane() + UFSDShift, hitHistoTmpYAxis->GetBinCenter(startBin + i));
         }
 
-        hitHistoTmp = lumiCache->hitDistribution2dMap[detId_pot].get();
-        hitHistoTmpYAxis = hitHistoTmp->GetYaxis();
-        startBin = hitHistoTmpYAxis->FindBin(rechit.x() - horizontalShiftOfDiamond_ - 0.5 * rechit.xWidth());
-        numOfBins = rechit.xWidth() * INV_DISPLAY_RESOLUTION_FOR_HITS_MM;
-        for (int i = 0; i < numOfBins; ++i) {
-          hitHistoTmp->Fill(detId.plane() + UFSDShift, hitHistoTmpYAxis->GetBinCenter(startBin + i));
+        if (!perLSsaving_) {
+          hitHistoTmp = lumiCache->hitDistribution2dMap[detId_pot].get();
+          hitHistoTmpYAxis = hitHistoTmp->GetYaxis();
+          startBin = hitHistoTmpYAxis->FindBin(rechit.x() - horizontalShiftOfDiamond_ - 0.5 * rechit.xWidth());
+          numOfBins = rechit.xWidth() * INV_DISPLAY_RESOLUTION_FOR_HITS_MM;
+          for (int i = 0; i < numOfBins; ++i) {
+            hitHistoTmp->Fill(detId.plane() + UFSDShift, hitHistoTmpYAxis->GetBinCenter(startBin + i));
+          }
         }
       }
 
@@ -1129,71 +1135,74 @@ void CTPPSDiamondDQMSource::analyze(const edm::Event& event, const edm::EventSet
 
 void CTPPSDiamondDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup&) {
   auto lumiCache = luminosityBlockCache(iLumi.index());
-  for (auto& plot : potPlots_) {
-    *(plot.second.hitDistribution2d_lumisection->getTH2F()) = *(lumiCache->hitDistribution2dMap[plot.first]);
-  }
-  for (auto& plot : channelPlots_) {
-    auto hitsCounterPerLumisection = lumiCache->hitsCounterMap[plot.first];
-    if (hitsCounterPerLumisection != 0) {
-      plot.second.hit_rate->Fill((double)hitsCounterPerLumisection / SEC_PER_LUMI_SECTION);
+  if (!perLSsaving_) {
+    for (auto& plot : potPlots_) {
+      *(plot.second.hitDistribution2d_lumisection->getTH2F()) = *(lumiCache->hitDistribution2dMap[plot.first]);
     }
 
-    double HundredOverHitCounter = .0;
-    if (plot.second.HitCounter != 0)
-      HundredOverHitCounter = 100. / plot.second.HitCounter;
-    plot.second.HPTDCErrorFlags->setBinContent(16, HundredOverHitCounter * plot.second.MHCounter);
-    plot.second.leadingWithoutTrailing->setBinContent(1, HundredOverHitCounter * plot.second.LeadingOnlyCounter);
-    plot.second.leadingWithoutTrailing->setBinContent(2, HundredOverHitCounter * plot.second.TrailingOnlyCounter);
-    plot.second.leadingWithoutTrailing->setBinContent(3, HundredOverHitCounter * plot.second.CompleteCounter);
-  }
-
-  for (auto& plot : potPlots_) {
-    double HundredOverHitCounterPot = 0.;
-    if (plot.second.HitCounter != 0)
-      HundredOverHitCounterPot = 100. / plot.second.HitCounter;
-    plot.second.leadingWithoutTrailingCumulativePot->setBinContent(
-        1, HundredOverHitCounterPot * plot.second.LeadingOnlyCounter);
-    plot.second.leadingWithoutTrailingCumulativePot->setBinContent(
-        2, HundredOverHitCounterPot * plot.second.TrailingOnlyCounter);
-    plot.second.leadingWithoutTrailingCumulativePot->setBinContent(
-        3, HundredOverHitCounterPot * plot.second.CompleteCounter);
-
-    plot.second.MHComprensive->Reset();
-    CTPPSDiamondDetId rpId(plot.first);
-    for (auto& chPlot : channelPlots_) {
-      CTPPSDiamondDetId chId(chPlot.first);
-      if (chId.arm() == rpId.arm() && chId.rp() == rpId.rp()) {
-        plot.second.MHComprensive->Fill(chId.plane(), chId.channel(), chPlot.second.HPTDCErrorFlags->getBinContent(16));
+    for (auto& plot : channelPlots_) {
+      auto hitsCounterPerLumisection = lumiCache->hitsCounterMap[plot.first];
+      if (hitsCounterPerLumisection != 0) {
+        plot.second.hit_rate->Fill((double)hitsCounterPerLumisection / SEC_PER_LUMI_SECTION);
       }
+
+      double HundredOverHitCounter = .0;
+      if (plot.second.HitCounter != 0)
+        HundredOverHitCounter = 100. / plot.second.HitCounter;
+      plot.second.HPTDCErrorFlags->setBinContent(16, HundredOverHitCounter * plot.second.MHCounter);
+      plot.second.leadingWithoutTrailing->setBinContent(1, HundredOverHitCounter * plot.second.LeadingOnlyCounter);
+      plot.second.leadingWithoutTrailing->setBinContent(2, HundredOverHitCounter * plot.second.TrailingOnlyCounter);
+      plot.second.leadingWithoutTrailing->setBinContent(3, HundredOverHitCounter * plot.second.CompleteCounter);
     }
-  }
 
-  // Efficiencies of single channels
-  for (auto& plot : potPlots_) {
-    plot.second.EfficiencyOfChannelsInPot->Reset();
-    for (auto& element : plot.second.effTriplecountingChMap) {
-      if (plot.second.effDoublecountingChMap[element.first] > 0) {
-        int plane = element.first / 100;
-        int channel = element.first % 100;
-        double counted = element.second;
-        double total = plot.second.effDoublecountingChMap[element.first];
-        double efficiency = counted / total;
-        //         double error = std::sqrt( efficiency * ( 1 - efficiency ) / total );
-
-        plot.second.EfficiencyOfChannelsInPot->Fill(plane, channel, 100 * efficiency);
+    for (auto& plot : potPlots_) {
+      double HundredOverHitCounterPot = 0.;
+      if (plot.second.HitCounter != 0)
+        HundredOverHitCounterPot = 100. / plot.second.HitCounter;
+      plot.second.leadingWithoutTrailingCumulativePot->setBinContent(
+          1, HundredOverHitCounterPot * plot.second.LeadingOnlyCounter);
+      plot.second.leadingWithoutTrailingCumulativePot->setBinContent(
+          2, HundredOverHitCounterPot * plot.second.TrailingOnlyCounter);
+      plot.second.leadingWithoutTrailingCumulativePot->setBinContent(
+          3, HundredOverHitCounterPot * plot.second.CompleteCounter);
+
+      plot.second.MHComprensive->Reset();
+      CTPPSDiamondDetId rpId(plot.first);
+      for (auto& chPlot : channelPlots_) {
+        CTPPSDiamondDetId chId(chPlot.first);
+        if (chId.arm() == rpId.arm() && chId.rp() == rpId.rp()) {
+          plot.second.MHComprensive->Fill(
+              chId.plane(), chId.channel(), chPlot.second.HPTDCErrorFlags->getBinContent(16));
+        }
+      }
+    }
+    // Efficiencies of single channels
+    for (auto& plot : potPlots_) {
+      plot.second.EfficiencyOfChannelsInPot->Reset();
+      for (auto& element : plot.second.effTriplecountingChMap) {
+        if (plot.second.effDoublecountingChMap[element.first] > 0) {
+          int plane = element.first / 100;
+          int channel = element.first % 100;
+          double counted = element.second;
+          double total = plot.second.effDoublecountingChMap[element.first];
+          double efficiency = counted / total;
+          //         double error = std::sqrt( efficiency * ( 1 - efficiency ) / total );
+
+          plot.second.EfficiencyOfChannelsInPot->Fill(plane, channel, 100 * efficiency);
+        }
       }
     }
-  }
 
-  // Efficeincy wrt pixels  //TODO
-  for (auto& plot : planePlots_) {
-    TH2F* hitHistoTmp = plot.second.EfficiencyWRTPixelsInPlane->getTH2F();
+    // Efficeincy wrt pixels  //TODO
+    for (auto& plot : planePlots_) {
+      TH2F* hitHistoTmp = plot.second.EfficiencyWRTPixelsInPlane->getTH2F();
 
-    CTPPSDiamondDetId detId_pot(plot.first);
-    detId_pot.setPlane(0);
+      CTPPSDiamondDetId detId_pot(plot.first);
+      detId_pot.setPlane(0);
 
-    hitHistoTmp->Divide(&(plot.second.pixelTracksMapWithDiamonds), &(potPlots_[detId_pot].pixelTracksMap));
-  }
+      hitHistoTmp->Divide(&(plot.second.pixelTracksMapWithDiamonds), &(potPlots_[detId_pot].pixelTracksMap));
+    }
+  }  //perLSsaving
 }
 
 //----------------------------------------------------------------------------------------------------
diff --git a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc
index a36b800878f0d..2d618b48e01d2 100644
--- a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc
+++ b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc
@@ -104,6 +104,7 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<t
   double minimumStripAngleForTomography_;
   double maximumStripAngleForTomography_;
   unsigned int samplesForNoise_;
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
   unsigned int verbosity_;
   edm::TimeValue_t timeOfPreviousEvent_;
 
@@ -414,6 +415,7 @@ TotemTimingDQMSource::TotemTimingDQMSource(const edm::ParameterSet &ps)
       minimumStripAngleForTomography_(ps.getParameter<double>("minimumStripAngleForTomography")),
       maximumStripAngleForTomography_(ps.getParameter<double>("maximumStripAngleForTomography")),
       samplesForNoise_(ps.getUntrackedParameter<unsigned int>("samplesForNoise", 5)),
+      perLSsaving_(ps.getUntrackedParameter<bool>("perLSsaving", false)),
       verbosity_(ps.getUntrackedParameter<unsigned int>("verbosity", 0)),
       timeOfPreviousEvent_(0) {}
 
@@ -472,9 +474,11 @@ std::shared_ptr<totemds::Cache> TotemTimingDQMSource::globalBeginLuminosityBlock
                                                                                  const edm::EventSetup &) const {
   auto d = std::make_shared<totemds::Cache>();
   d->hitDistribution2dMap.reserve(potPlots_.size());
-  for (auto &plot : potPlots_)
-    d->hitDistribution2dMap[plot.first] =
-        std::unique_ptr<TH2F>(static_cast<TH2F *>(plot.second.hitDistribution2d_lumisection->getTH2F()->Clone()));
+  if (!perLSsaving_) {
+    for (auto &plot : potPlots_)
+      d->hitDistribution2dMap[plot.first] =
+          std::unique_ptr<TH2F>(static_cast<TH2F *>(plot.second.hitDistribution2d_lumisection->getTH2F()->Clone()));
+  }
   return d;
 }
 
@@ -607,8 +611,9 @@ void TotemTimingDQMSource::analyze(const edm::Event &event, const edm::EventSetu
         for (int i = 0; i < numOfBins; ++i) {
           potPlots_[detId_pot].hitDistribution2d->Fill(detId.plane() + 0.25 * (rechit.x() > 2),
                                                        hitHistoTmpYAxis->GetBinCenter(startBin + i));
-          potPlots_[detId_pot].hitDistribution2d_lumisection->Fill(x_shift,
-                                                                   hitHistoTmpYAxis->GetBinCenter(startBin + i));
+          if (!perLSsaving_)
+            potPlots_[detId_pot].hitDistribution2d_lumisection->Fill(x_shift,
+                                                                     hitHistoTmpYAxis->GetBinCenter(startBin + i));
         }
 
         //All plots with Time
@@ -735,44 +740,46 @@ void TotemTimingDQMSource::analyze(const edm::Event &event, const edm::EventSetu
 
 void TotemTimingDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &) {
   auto lumiCache = luminosityBlockCache(iLumi.index());
-  for (auto &plot : potPlots_) {
-    *(plot.second.hitDistribution2d_lumisection->getTH2F()) = *(lumiCache->hitDistribution2dMap[plot.first]);
-  }
+  if (!perLSsaving_) {
+    for (auto &plot : potPlots_) {
+      *(plot.second.hitDistribution2d_lumisection->getTH2F()) = *(lumiCache->hitDistribution2dMap[plot.first]);
+    }
 
-  globalPlot_.digiSentPercentage->Reset();
-  TH2F *hitHistoGlobalTmp = globalPlot_.digiSentPercentage->getTH2F();
-  for (auto &plot : potPlots_) {
-    TH2F *hitHistoTmp = plot.second.digiSentPercentage->getTH2F();
-    TH2F *histoSent = plot.second.digiSent->getTH2F();
-    TH2F *histoAll = plot.second.digiAll->getTH2F();
-
-    hitHistoTmp->Divide(histoSent, histoAll);
-    hitHistoTmp->Scale(100);
-    hitHistoGlobalTmp->Add(hitHistoTmp, 1);
-
-    plot.second.baseline->Reset();
-    plot.second.noiseRMS->Reset();
-    plot.second.meanAmplitude->Reset();
-    plot.second.cellOfMax->Reset();
-    plot.second.hitRate->Reset();
-    TotemTimingDetId rpId(plot.first);
-    for (auto &chPlot : channelPlots_) {
-      TotemTimingDetId chId(chPlot.first);
-      if (chId.arm() == rpId.arm() && chId.rp() == rpId.rp()) {
-        plot.second.baseline->Fill(chId.plane(), chId.channel(), chPlot.second.noiseSamples->getTH1F()->GetMean());
-        plot.second.noiseRMS->Fill(chId.plane(), chId.channel(), chPlot.second.noiseSamples->getTH1F()->GetRMS());
-        plot.second.meanAmplitude->Fill(chId.plane(), chId.channel(), chPlot.second.amplitude->getTH1F()->GetMean());
-        plot.second.cellOfMax->Fill(chId.plane(), chId.channel(), chPlot.second.cellOfMax->getTH1F()->GetMean());
-        auto hitsCounterPerLumisection = lumiCache->hitsCounterMap[chPlot.first];
-        plot.second.hitRate->Fill(chId.plane(), chId.channel(), (double)hitsCounterPerLumisection * HIT_RATE_FACTOR);
+    globalPlot_.digiSentPercentage->Reset();
+    TH2F *hitHistoGlobalTmp = globalPlot_.digiSentPercentage->getTH2F();
+    for (auto &plot : potPlots_) {
+      TH2F *hitHistoTmp = plot.second.digiSentPercentage->getTH2F();
+      TH2F *histoSent = plot.second.digiSent->getTH2F();
+      TH2F *histoAll = plot.second.digiAll->getTH2F();
+
+      hitHistoTmp->Divide(histoSent, histoAll);
+      hitHistoTmp->Scale(100);
+      hitHistoGlobalTmp->Add(hitHistoTmp, 1);
+
+      plot.second.baseline->Reset();
+      plot.second.noiseRMS->Reset();
+      plot.second.meanAmplitude->Reset();
+      plot.second.cellOfMax->Reset();
+      plot.second.hitRate->Reset();
+      TotemTimingDetId rpId(plot.first);
+      for (auto &chPlot : channelPlots_) {
+        TotemTimingDetId chId(chPlot.first);
+        if (chId.arm() == rpId.arm() && chId.rp() == rpId.rp()) {
+          plot.second.baseline->Fill(chId.plane(), chId.channel(), chPlot.second.noiseSamples->getTH1F()->GetMean());
+          plot.second.noiseRMS->Fill(chId.plane(), chId.channel(), chPlot.second.noiseSamples->getTH1F()->GetRMS());
+          plot.second.meanAmplitude->Fill(chId.plane(), chId.channel(), chPlot.second.amplitude->getTH1F()->GetMean());
+          plot.second.cellOfMax->Fill(chId.plane(), chId.channel(), chPlot.second.cellOfMax->getTH1F()->GetMean());
+          auto hitsCounterPerLumisection = lumiCache->hitsCounterMap[chPlot.first];
+          plot.second.hitRate->Fill(chId.plane(), chId.channel(), (double)hitsCounterPerLumisection * HIT_RATE_FACTOR);
+        }
       }
     }
-  }
 
-  for (auto &plot : channelPlots_) {
-    auto hitsCounterPerLumisection = lumiCache->hitsCounterMap[plot.first];
-    if (hitsCounterPerLumisection != 0) {
-      plot.second.hitRate->Fill((double)hitsCounterPerLumisection * HIT_RATE_FACTOR);
+    for (auto &plot : channelPlots_) {
+      auto hitsCounterPerLumisection = lumiCache->hitsCounterMap[plot.first];
+      if (hitsCounterPerLumisection != 0) {
+        plot.second.hitRate->Fill((double)hitsCounterPerLumisection * HIT_RATE_FACTOR);
+      }
     }
   }
 }
diff --git a/DQM/CTPPS/python/ctppsCommonDQMSource_cfi.py b/DQM/CTPPS/python/ctppsCommonDQMSource_cfi.py
index fa4fc95c65773..d05e70d2d807b 100644
--- a/DQM/CTPPS/python/ctppsCommonDQMSource_cfi.py
+++ b/DQM/CTPPS/python/ctppsCommonDQMSource_cfi.py
@@ -9,5 +9,7 @@
 
     makeProtonRecoPlots = cms.bool(True),
 
+    perLSsaving = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
+
     verbosity = cms.untracked.uint32(0),
 )
diff --git a/DQM/CTPPS/python/ctppsDQM_cff.py b/DQM/CTPPS/python/ctppsDQM_cff.py
index 64ecae982a47a..a5ce31e654d9f 100644
--- a/DQM/CTPPS/python/ctppsDQM_cff.py
+++ b/DQM/CTPPS/python/ctppsDQM_cff.py
@@ -49,6 +49,13 @@
   makeProtonRecoPlots = True
 )
 
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+    ctppsDiamondDQMSource.perLSsaving=True
+    totemTimingDQMSource.perLSsaving=True
+    ctppsCommonDQMSourceOffline.perLSsaving=True
+
 _ctppsDQMOfflineSource = cms.Sequence(
   ctppsPixelDQMOfflineSource
   + ctppsDiamondDQMSource
diff --git a/DQM/CTPPS/python/ctppsDiamondDQMSource_cfi.py b/DQM/CTPPS/python/ctppsDiamondDQMSource_cfi.py
index 989fbcc29a307..7611902ba1a6c 100644
--- a/DQM/CTPPS/python/ctppsDiamondDQMSource_cfi.py
+++ b/DQM/CTPPS/python/ctppsDiamondDQMSource_cfi.py
@@ -33,6 +33,8 @@
             centralOOT = cms.int32(0),
         ),
     ),
+
+    perLSsaving = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
   
     verbosity = cms.untracked.uint32(10),
 )
diff --git a/DQM/CTPPS/python/totemTimingDQMSource_cfi.py b/DQM/CTPPS/python/totemTimingDQMSource_cfi.py
index 9df4f5bd33797..cc6bc9876d62d 100644
--- a/DQM/CTPPS/python/totemTimingDQMSource_cfi.py
+++ b/DQM/CTPPS/python/totemTimingDQMSource_cfi.py
@@ -12,5 +12,7 @@
     maximumStripAngleForTomography = cms.double(1),
     samplesForNoise = cms.untracked.uint32(6),
 
+    perLSsaving = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
+
     verbosity = cms.untracked.uint32(10),
-)
\ No newline at end of file
+)
diff --git a/DQM/EcalPreshowerMonitorModule/python/es_dqm_source_offline_cff.py b/DQM/EcalPreshowerMonitorModule/python/es_dqm_source_offline_cff.py
index 1c5f6ed5b58dc..32ecb00341484 100644
--- a/DQM/EcalPreshowerMonitorModule/python/es_dqm_source_offline_cff.py
+++ b/DQM/EcalPreshowerMonitorModule/python/es_dqm_source_offline_cff.py
@@ -2,7 +2,10 @@
 
 from DQM.EcalPreshowerMonitorModule.ESRawDataTask_cfi import *
 from DQM.EcalPreshowerMonitorModule.ESIntegrityTask_cfi import *
-ecalPreshowerIntegrityTask.DoLumiAnalysis = True
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(not DQMStore.saveByLumi):
+    ecalPreshowerIntegrityTask.DoLumiAnalysis = True
 from DQM.EcalPreshowerMonitorModule.ESFEDIntegrityTask_cfi import *
 from DQM.EcalPreshowerMonitorModule.ESOccupancyTask_cfi import *
 from DQM.EcalPreshowerMonitorModule.ESTrendTask_cfi import *
diff --git a/DQM/L1TMonitor/interface/L1TdeRCT.h b/DQM/L1TMonitor/interface/L1TdeRCT.h
index 3e76b10c7b000..fccf91d9f1c04 100644
--- a/DQM/L1TMonitor/interface/L1TdeRCT.h
+++ b/DQM/L1TMonitor/interface/L1TdeRCT.h
@@ -257,6 +257,7 @@ class L1TdeRCT : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<l1tderct::Emp
   std::string histFolder_;  // base dqm folder
   bool verbose_;
   bool singlechannelhistos_;
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
 
   edm::EDGetTokenT<L1CaloRegionCollection> rctSourceEmul_rgnEmul_;
   edm::EDGetTokenT<L1CaloEmCollection> rctSourceEmul_emEmul_;
diff --git a/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py b/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py
index a3f334b5291c7..1612961a4ee12 100644
--- a/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py
+++ b/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py
@@ -37,6 +37,11 @@
 from DQM.L1TMonitor.L1TdeStage1Layer2_cfi import *
 
 from DQM.L1TMonitor.L1TdeRCT_cfi import *
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+    l1TdeRCT.perLSsaving=True
+
 l1TdeRCTRun1 = l1TdeRCT.clone()
 l1TdeRCT.rctSourceData = 'caloStage1Digis'
 #l1TdeRCT.gctSourceData = 'caloStage1Digis'
diff --git a/DQM/L1TMonitor/python/L1TdeRCT_cfi.py b/DQM/L1TMonitor/python/L1TdeRCT_cfi.py
index 4838b110b5f42..b797135a7860b 100644
--- a/DQM/L1TMonitor/python/L1TdeRCT_cfi.py
+++ b/DQM/L1TMonitor/python/L1TdeRCT_cfi.py
@@ -6,6 +6,7 @@
     HistFolder = cms.untracked.string('L1TEMU/L1TdeRCT'),
     verbose = cms.untracked.bool(False),
     DQMStore = cms.untracked.bool(True),
+    perLSsaving = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
     singlechannelhistos = cms.untracked.bool(False),
     ecalTPGData = cms.InputTag("ecalDigis","EcalTriggerPrimitives"),
     rctSourceEmul = cms.InputTag("valRctDigis"),
diff --git a/DQM/L1TMonitor/src/L1TdeRCT.cc b/DQM/L1TMonitor/src/L1TdeRCT.cc
index bcf3f4cbd7540..740a105b6d51c 100644
--- a/DQM/L1TMonitor/src/L1TdeRCT.cc
+++ b/DQM/L1TMonitor/src/L1TdeRCT.cc
@@ -94,6 +94,8 @@ L1TdeRCT::L1TdeRCT(const ParameterSet& ps)
       dataInputTagName_(ps.getParameter<InputTag>("rctSourceData").label()) {
   singlechannelhistos_ = ps.getUntrackedParameter<bool>("singlechannelhistos", false);
 
+  perLSsaving_ = (ps.getUntrackedParameter<bool>("perLSsaving", false));
+
   if (singlechannelhistos_)
     if (verbose_)
       std::cout << "L1TdeRCT: single channels histos ON" << std::endl;
@@ -1961,18 +1963,22 @@ void L1TdeRCT::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run& run, c
 
   ibooker.setCurrentFolder(histFolder_ + "/DBData");
   fedVectorMonitorRUN_ = ibooker.book2D("rctFedVectorMonitorRUN", "FED Vector Monitor Per Run", 108, 0, 108, 2, 0, 2);
-  fedVectorMonitorLS_ = ibooker.book2D("rctFedVectorMonitorLS", "FED Vector Monitor Per LS", 108, 0, 108, 2, 0, 2);
+  if (!perLSsaving_)
+    fedVectorMonitorLS_ = ibooker.book2D("rctFedVectorMonitorLS", "FED Vector Monitor Per LS", 108, 0, 108, 2, 0, 2);
 
   for (unsigned int i = 0; i < 108; ++i) {
     char fed[10];
     sprintf(fed, "%d", crateFED[i]);
     fedVectorMonitorRUN_->setBinLabel(i + 1, fed);
-    fedVectorMonitorLS_->setBinLabel(i + 1, fed);
+    if (!perLSsaving_)
+      fedVectorMonitorLS_->setBinLabel(i + 1, fed);
   }
   fedVectorMonitorRUN_->getTH2F()->GetYaxis()->SetBinLabel(1, "OUT");
   fedVectorMonitorRUN_->getTH2F()->GetYaxis()->SetBinLabel(2, "IN");
-  fedVectorMonitorLS_->getTH2F()->GetYaxis()->SetBinLabel(1, "OUT");
-  fedVectorMonitorLS_->getTH2F()->GetYaxis()->SetBinLabel(2, "IN");
+  if (!perLSsaving_) {
+    fedVectorMonitorLS_->getTH2F()->GetYaxis()->SetBinLabel(1, "OUT");
+    fedVectorMonitorLS_->getTH2F()->GetYaxis()->SetBinLabel(2, "IN");
+  }
 
   // for single channels
 
@@ -2083,7 +2089,8 @@ void L1TdeRCT::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run& run, c
 
 std::shared_ptr<l1tderct::Empty> L1TdeRCT::globalBeginLuminosityBlock(const edm::LuminosityBlock& ls,
                                                                       const edm::EventSetup& es) const {
-  readFEDVector(fedVectorMonitorLS_, es);
+  if (!perLSsaving_)
+    readFEDVector(fedVectorMonitorLS_, es);
   return std::shared_ptr<l1tderct::Empty>();
 }
 
diff --git a/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py b/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py
index 671e8083d47a1..9816b631a0c11 100644
--- a/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py
+++ b/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py
@@ -115,6 +115,11 @@
     subSystemFolder = cms.untracked.string('Pixel')
 )
 
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+    SiPixelDigiSource.perLSsaving=True
+
 #FED integrity
 from DQM.SiPixelMonitorRawData.SiPixelMonitorHLT_cfi import *
 
diff --git a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h
index 99c1eb5c4f9cd..8afe3be8cde82 100644
--- a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h
+++ b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h
@@ -57,6 +57,7 @@ class SiPixelDigiSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<bool
   bool isPIB;
   bool slowDown;
   bool modOn;
+  bool perLSsaving;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
   bool twoDimOn;
   bool twoDimModOn;
   bool twoDimOnlyLayDisk;
diff --git a/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py b/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py
index 2ba07984faae9..7bf7ed499237b 100644
--- a/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py
+++ b/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py
@@ -13,6 +13,7 @@
     isPIB = cms.untracked.bool(False),
     slowDown = cms.untracked.bool(False),
     modOn = cms.untracked.bool(True),
+    perLSsaving = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
     twoDimOn = cms.untracked.bool(True),	
     twoDimModOn = cms.untracked.bool(True),     
     #allows to have no twoD plots on Mod level (but possibly on other levels),
diff --git a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc
index 400225c3d45bf..e8f3903623e19 100644
--- a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc
+++ b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc
@@ -50,6 +50,7 @@ SiPixelDigiSource::SiPixelDigiSource(const edm::ParameterSet& iConfig)
       isPIB(conf_.getUntrackedParameter<bool>("isPIB", false)),
       slowDown(conf_.getUntrackedParameter<bool>("slowDown", false)),
       modOn(conf_.getUntrackedParameter<bool>("modOn", true)),
+      perLSsaving(conf_.getUntrackedParameter<bool>("perLSsaving", false)),
       twoDimOn(conf_.getUntrackedParameter<bool>("twoDimOn", true)),
       twoDimModOn(conf_.getUntrackedParameter<bool>("twoDimModOn", true)),
       twoDimOnlyLayDisk(conf_.getUntrackedParameter<bool>("twoDimOnlyLayDisk", false)),
@@ -1254,7 +1255,7 @@ void SiPixelDigiSource::bookMEs(DQMStore::IBooker& iBooker, const edm::EventSetu
         0.,
         3200.);
   }
-  if (!modOn) {
+  if (!modOn && !perLSsaving) {
     averageDigiOccupancy = iBooker.book1D(
         "averageDigiOccupancy", title7, 40, -0.5, 39.5);  //Book as TH1 for offline to ensure thread-safe behaviour
     avgfedDigiOccvsLumi = iBooker.book2D("avgfedDigiOccvsLumi", title8, 3200, 0., 3200., 40, -0.5, 39.5);
diff --git a/DQMOffline/CalibCalo/python/MonitorAlCaHcalPhisym_cfi.py b/DQMOffline/CalibCalo/python/MonitorAlCaHcalPhisym_cfi.py
index 23decabb8c0f6..4e3503e8d89f6 100644
--- a/DQMOffline/CalibCalo/python/MonitorAlCaHcalPhisym_cfi.py
+++ b/DQMOffline/CalibCalo/python/MonitorAlCaHcalPhisym_cfi.py
@@ -22,6 +22,8 @@
     # File to save 
     SaveToFile = cms.untracked.bool(False),
     FileName = cms.untracked.string('MonitorAlCaHcalPhiSym.root'),
+    #driven by DQMServices/Core/python/DQMStore_cfi.py
+    perLSsaving = cms.untracked.bool(False), 
     # DQM folder to write to
     FolderName = cms.untracked.string('AlCaReco/HcalPhiSym')
 )
diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc
index 934a69acf4e09..712bfee58744d 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc
+++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc
@@ -62,6 +62,8 @@ DQMHcalPhiSymAlCaReco::DQMHcalPhiSymAlCaReco(const edm::ParameterSet &ps) : even
   saveToFile_ = ps.getUntrackedParameter<bool>("SaveToFile", false);
   fileName_ = ps.getUntrackedParameter<string>("FileName", "MonitorAlCaHcalPhiSym.root");
 
+  perLSsaving_ = (ps.getUntrackedParameter<bool>("perLSsaving", false));
+
   // histogram parameters
 
   // Distribution of rechits in iPhi, iEta
@@ -441,7 +443,7 @@ void DQMHcalPhiSymAlCaReco::analyze(const Event &iEvent, const EventSetup &iSetu
 //--------------------------------------------------------
 void DQMHcalPhiSymAlCaReco::dqmEndRun(const Run &r, const EventSetup &context) {
   // Keep Variances
-  if (eventCounter_ > 0) {
+  if (eventCounter_ > 0 && !perLSsaving_) {
     for (int k = 0; k <= hiDistr_x_nbin_; k++) {
       for (int j = 0; j <= hiDistr_y_nbin_; j++) {
         // First moment
diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h
index 29e91e3b9ec45..378a3bcbfc420 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h
+++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h
@@ -69,6 +69,8 @@ class DQMHcalPhiSymAlCaReco : public DQMOneEDAnalyzer<> {
   double ihbhe_size_;
   double ihf_size_;
 
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
+
   /// object to monitor
 
   edm::EDGetTokenT<HBHERecHitCollection> hbherecoMB;
diff --git a/DQMOffline/Configuration/python/ALCARECOHcalCalDQMHI_cff.py b/DQMOffline/Configuration/python/ALCARECOHcalCalDQMHI_cff.py
index 5167950cb0079..bbb3f142757aa 100644
--- a/DQMOffline/Configuration/python/ALCARECOHcalCalDQMHI_cff.py
+++ b/DQMOffline/Configuration/python/ALCARECOHcalCalDQMHI_cff.py
@@ -6,6 +6,10 @@
 import DQMOffline.CalibCalo.MonitorHcalIsolatedBunchAlCaReco_cfi
 import DQMOffline.CalibCalo.MonitorHOAlCaRecoStream_cfi
 
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+    DQMOffline.CalibCalo.MonitorAlCaHcalPhisym_cfi.HcalPhiSymMon.perLSsaving=True
 
 ALCARECOHcalCalPhisymDQM =  DQMOffline.CalibCalo.MonitorAlCaHcalPhisym_cfi.HcalPhiSymMon.clone()
 
diff --git a/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py b/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py
index 0924c4e3c7970..1273fb3424662 100644
--- a/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py
+++ b/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py
@@ -6,6 +6,10 @@
 import DQMOffline.CalibCalo.MonitorHcalIsolatedBunchAlCaReco_cfi
 import DQMOffline.CalibCalo.MonitorHOAlCaRecoStream_cfi
 
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+    DQMOffline.CalibCalo.MonitorAlCaHcalPhisym_cfi.HcalPhiSymMon.perLSsaving=True
 
 ALCARECOHcalCalPhisymDQM =  DQMOffline.CalibCalo.MonitorAlCaHcalPhisym_cfi.HcalPhiSymMon.clone()
 
diff --git a/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc b/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc
index 533c737e6e587..f9d5608d0c7b6 100644
--- a/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc
+++ b/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc
@@ -61,6 +61,7 @@ class HigPhotonJetHLTOfflineSource : public DQMOneEDAnalyzer<> {
   std::string dirname_;
   bool verbose_;
   bool triggerAccept_;
+  bool perLSsaving_;  //to avoid nanoDQMIO crashing, driven by  DQMServices/Core/python/DQMStore_cfi.py
 
   edm::EDGetTokenT<edm::TriggerResults> triggerResultsToken_;
   edm::EDGetTokenT<reco::VertexCollection> pvToken_;
@@ -109,6 +110,7 @@ HigPhotonJetHLTOfflineSource::HigPhotonJetHLTOfflineSource(const edm::ParameterS
   hltProcessName_ = pset.getParameter<std::string>("hltProcessName");
   hltPathsToCheck_ = pset.getParameter<std::vector<std::string>>("hltPathsToCheck");
   verbose_ = pset.getUntrackedParameter<bool>("verbose", false);
+  perLSsaving_ = pset.getUntrackedParameter<bool>("perLSsaving", false);
   triggerAccept_ = pset.getUntrackedParameter<bool>("triggerAccept", true);
   triggerResultsToken_ = consumes<edm::TriggerResults>(pset.getParameter<edm::InputTag>("triggerResultsToken"));
   dirname_ = pset.getUntrackedParameter<std::string>("dirname", std::string("HLT/Higgs/PhotonJet/"));
@@ -327,13 +329,15 @@ void HigPhotonJetHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::
 
 void HigPhotonJetHLTOfflineSource::dqmEndRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
   // Normalize to the total number of events in the run
-  TH2F* h = trigvsnvtx_->getTH2F();
-  double integral = h->Integral();
-  double norm = (integral > 0.) ? evtsrun_ * hltPathsToCheck_.size() / integral : 1.;
-  h->Scale(norm);
-  if (verbose_) {
-    std::cout << "xshi:: endRun total number of events: " << evtsrun_ << ", integral = " << h->Integral()
-              << ", norm = " << norm << std::endl;
+  if (!perLSsaving_) {
+    TH2F* h = trigvsnvtx_->getTH2F();
+    double integral = h->Integral();
+    double norm = (integral > 0.) ? evtsrun_ * hltPathsToCheck_.size() / integral : 1.;
+    h->Scale(norm);
+    if (verbose_) {
+      std::cout << "xshi:: endRun total number of events: " << evtsrun_ << ", integral = " << h->Integral()
+                << ", norm = " << norm << std::endl;
+    }
   }
 }
 
diff --git a/DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py b/DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py
index ecda8358b0448..0d8c18513d65e 100644
--- a/DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py
+++ b/DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py
@@ -71,7 +71,10 @@
 from DQMOffline.Trigger.HiggsMonitoring_cff import *
 # photon jet
 from DQMOffline.Trigger.HigPhotonJetHLTOfflineSource_cfi import * # ?!?!?!
-
+#Check if perLSsaving is enabled to mask MEs vs LS
+from DQMServices.Core.DQMStore_cfi import DQMStore
+if(DQMStore.saveByLumi):
+   higPhotonJetHLTOfflineSource.perLSsaving=True
 # SMP
 from DQMOffline.Trigger.StandardModelMonitoring_cff import *
 
diff --git a/DQMOffline/Trigger/python/HigPhotonJetHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/HigPhotonJetHLTOfflineSource_cfi.py
index eac20c6296127..fd5aa36543f59 100644
--- a/DQMOffline/Trigger/python/HigPhotonJetHLTOfflineSource_cfi.py
+++ b/DQMOffline/Trigger/python/HigPhotonJetHLTOfflineSource_cfi.py
@@ -29,6 +29,7 @@
 #    dirname = cms.untracked.string("HLT/Higgs/PhotonJet"), 
     dirname = cms.untracked.string("HLT/HIG/PhotonJet"), 
     verbose = cms.untracked.bool(False), # default: False
+    perLSsaving = cms.untracked.bool(False), #driven by DQMServices/Core/python/DQMStore_cfi.py
     triggerAccept = cms.untracked.bool(True), # default: True 
     triggerResultsToken = cms.InputTag("TriggerResults","","HLT"),
     pvToken = cms.InputTag("offlinePrimaryVertices"),