diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataEfficiency.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataEfficiency.h
index c37c37bb07f75608462738e0231f820f9d7ecd37..fa41bf010837760b793b2a7449d71cca37e08bca 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataEfficiency.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataEfficiency.h
@@ -201,6 +201,8 @@ class RpcLv1RawDataEfficiency: public ManagedMonitorToolBase {
   int m_lumiblock;
   int m_BCID;
 
+  bool m_isMC;
+
   SG::ReadHandleKey<Muon::RpcCoinDataContainer> m_rpcCoinKey{this,"RpcCoinKey","RPC_triggerHits","RPC coincidences"};
   SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{this,"EventInfo","EventInfo","EventInfo"};
   SG::ReadHandleKey<RpcSectorLogicContainer> m_sectorLogicContainerKey{this,"RPCSec","RPC_SECTORLOGIC","RPC sector logic"};
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataSectorLogic.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataSectorLogic.h
index bd4046fce005d869c07ecefa4c023a9d19d2b125..431925a7782696991e18ce4362f5a814dc57743d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataSectorLogic.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/RpcRawDataMonitoring/RpcLv1RawDataSectorLogic.h
@@ -78,6 +78,7 @@ class RpcLv1RawDataSectorLogic: public ManagedMonitorToolBase {
   int m_rpc_event_inarea;  
   
   bool m_lumiblockhist			;
+  bool m_isMC;
   
   // Declare Histograms
   TH1* m_rpclv1_Hits_per_TriggerSector;
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py
index 470887e14fdf131e52222e091e37858b22013721..9529f43b5eae67b35ac9b30e06779e12fca15d14 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py
@@ -37,7 +37,8 @@ rpcLv1SLRawMonMan = AthenaMonManager(name="RpcLv1SLRawMonManager",
                                      OutputLevel         = muonOutputLevel)
 from RpcRawDataMonitoring.RpcRawDataMonitoringConf import RpcLv1RawDataSectorLogic
 rpcLV1RawDataSectorLogic = RpcLv1RawDataSectorLogic(name='rpcLV1RawDataSectorLogic',OutputLevel = OutputMessageLevel)
-
+if globalflags.DataSource() != 'data':
+    rpcLV1RawDataSectorLogic.isMC = True
 ToolSvc += rpcLV1RawDataSectorLogic
 rpcLv1SLRawMonMan.AthenaMonTools += [ rpcLV1RawDataSectorLogic ]
 topSequence += rpcLv1SLRawMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py
index 3085782f7456cfcbadb16167994bc5578a66c03e..e60664aab0a0fbec890e0ebf18bf1fc9ae5015a5 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py
@@ -93,6 +93,8 @@ if not hasattr(topSequence,"RpcClusterBuilderPRD"):
     topSequence += RpcClusterBuilderPRD(ClusterTimeSpread = 10000,
                                         OutputLevel = FATAL)
 rpcLv1RawDataEfficiency = RpcLv1RawDataEfficiency(name='rpcLv1RawDataEfficiency')
+if globalflags.DataSource() != 'data':
+    rpcLv1RawDataEfficiency.isMC = True
 ToolSvc += rpcLv1RawDataEfficiency
 rpcLv1RawEfficiencyMonMan.AthenaMonTools += [ rpcLv1RawDataEfficiency ]
 topSequence += rpcLv1RawEfficiencyMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx
index a2b76ec4247d0ff1365bce5ce04595259f989a61..485fce4accb3a1531e963c6b77291543b008f5b6 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx
@@ -39,7 +39,9 @@ RpcLv1RawDataEfficiency::RpcLv1RawDataEfficiency( const std::string & type,
 						  const std::string & name, 
 						  const IInterface* parent )
   :ManagedMonitorToolBase( type, name, parent )
-{}
+{
+  declareProperty("isMC"                        , m_isMC                       = false  );
+}
 
 //================================================================================================================================
 RpcLv1RawDataEfficiency::~RpcLv1RawDataEfficiency()
@@ -84,7 +86,7 @@ StatusCode RpcLv1RawDataEfficiency::initialize()
 
   ATH_CHECK(m_rpcCoinKey.initialize());
   ATH_CHECK(m_eventInfo.initialize());
-  ATH_CHECK(m_sectorLogicContainerKey.initialize());
+  ATH_CHECK(m_sectorLogicContainerKey.initialize(m_isMC));
 
   // Ignore the checking code
   ManagedMonitorToolBase::initialize().ignore();
@@ -215,34 +217,35 @@ StatusCode RpcLv1RawDataEfficiency::fillHistograms( )
 
   // == Filling the Histograms                                                                                                                               
   //--------------------Sector Hits---------------------------------
-  // Retrieve the Sector Logic container
-  SG::ReadHandle<RpcSectorLogicContainer> sectorLogicContainer(m_sectorLogicContainerKey);
+  if(!m_isMC){
+    // Retrieve the Sector Logic container
+    SG::ReadHandle<RpcSectorLogicContainer> sectorLogicContainer(m_sectorLogicContainerKey);
 
-  RpcSectorLogicContainer::const_iterator it = sectorLogicContainer -> begin();
-  
-  for ( ; it != sectorLogicContainer -> end() ; ++it ) 
-    {
-      int i_sectorid = (*it)->sectorId();
-      // Loop over the trigger hits of each sector
-      RpcSectorLogic::const_iterator ithit = (*it) -> begin();
-      for ( ; ithit != (*it) -> end() ; ++ithit ) 
-	{
-	  bool b_isInput        = (*ithit) -> isInput();
-	  int i_ptid   = (*ithit) -> ptId();
-	  if (b_isInput == true) // fill histograms only if there was a trigger hit
-	    {
-	      for( int iThresholdIndex=0; iThresholdIndex < 6; iThresholdIndex++) {
-		if (i_ptid == (iThresholdIndex + 1))
-		  {
-		    m_rpclv1_sectorhits_all[iThresholdIndex]->Fill(m_lumiblock,i_sectorid);
-		    m_rpclv1_sectorhits_A[iThresholdIndex]->Fill(m_lumiblock,i_sectorid);
-		    m_rpclv1_sectorhits_C[iThresholdIndex]->Fill(m_lumiblock,i_sectorid);
-		  }
+    RpcSectorLogicContainer::const_iterator it = sectorLogicContainer -> begin();
+    
+    for ( ; it != sectorLogicContainer -> end() ; ++it ) 
+      {
+	int i_sectorid = (*it)->sectorId();
+	// Loop over the trigger hits of each sector
+	RpcSectorLogic::const_iterator ithit = (*it) -> begin();
+	for ( ; ithit != (*it) -> end() ; ++ithit ) 
+	  {
+	    bool b_isInput        = (*ithit) -> isInput();
+	    int i_ptid   = (*ithit) -> ptId();
+	    if (b_isInput == true) // fill histograms only if there was a trigger hit
+	      {
+		for( int iThresholdIndex=0; iThresholdIndex < 6; iThresholdIndex++) {
+		  if (i_ptid == (iThresholdIndex + 1))
+		    {
+		      m_rpclv1_sectorhits_all[iThresholdIndex]->Fill(m_lumiblock,i_sectorid);
+		      m_rpclv1_sectorhits_A[iThresholdIndex]->Fill(m_lumiblock,i_sectorid);
+		      m_rpclv1_sectorhits_C[iThresholdIndex]->Fill(m_lumiblock,i_sectorid);
+		    }
+		}
 	      }
-	    }
-	}
-    }
-  
+	  }
+      }
+  }
   return StatusCode::SUCCESS;
 }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx
index b35efef082a7e3bb47580e585a3f2e738f53cc38..c9937e0d2594900dd6f17db75047faafb2aae914 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx
@@ -37,6 +37,7 @@ RpcLv1RawDataSectorLogic::RpcLv1RawDataSectorLogic( const std::string & type,
 {  
   // Declare the properties      
   declareProperty("LumiblockHist" ,      m_lumiblockhist	= false	);   
+  declareProperty("isMC"                        , m_isMC                       = false  );
 }
 
 //***********************************************************************************************************************
@@ -68,7 +69,7 @@ StatusCode RpcLv1RawDataSectorLogic::initialize()
   m_Tower_in = 0 ;
   m_in_sectorid = 0 ;
       
-  ATH_CHECK(m_sectorLogicContainerKey.initialize());
+  ATH_CHECK(m_sectorLogicContainerKey.initialize(m_isMC));
   ATH_CHECK(m_eventInfo.initialize());
 
   // Ignore the checking code
@@ -175,150 +176,153 @@ StatusCode RpcLv1RawDataSectorLogic::fillHistograms( )
     
     m_nTriggerHits = 0;
 
-    // Retrieve the Sector Logic container
-    SG::ReadHandle<RpcSectorLogicContainer> sectorLogicContainer(m_sectorLogicContainerKey);
-    ///////////////////////////////////////////
-    // Loop over the Sector Logic containers //
-    ///////////////////////////////////////////
-    RpcSectorLogicContainer::const_iterator it = sectorLogicContainer -> begin();
-    for ( ; it != sectorLogicContainer -> end() ; ++it ) 
-      {
-	int i_sectorid = (*it)->sectorId();
-	m_nTriggerHitsperSector = 0;
-	
-	// Loop over the trigger hits of each sector
-	RpcSectorLogic::const_iterator ithit = (*it) -> begin();
-	for ( ; ithit != (*it) -> end() ; ++ithit ) 
-          {
-            // from RpcSLTriggerHit
-            bool b_isInput        = (*ithit) -> isInput();
-            int i_rowinBcid      = (*ithit) -> rowinBcid();//readout window BCid
-            int i_padid          = (*ithit) -> padId();//tower
-            int i_ptid           = (*ithit) -> ptId();//threshold
-            int i_roi            = (*ithit) -> roi();//region of interest
-            int i_triggerBcid    = (*ithit) -> triggerBcid();
-
-            m_Diff_triggerBCid = 0;
-            m_in_triggerBCid = 0;
-            m_out_triggerBCid = 0;
-            m_in_rowinBCid = 0;
-            m_out_rowinBCid = 0;
-            m_Tower_in = -1;
-
-            if (b_isInput == true){ 
-              m_nTriggerHits++;
-              m_nTriggerHitsperSector++;
+    if(!m_isMC){
+      // Retrieve the Sector Logic container
+      SG::ReadHandle<RpcSectorLogicContainer> sectorLogicContainer(m_sectorLogicContainerKey);
+      ///////////////////////////////////////////
+      // Loop over the Sector Logic containers //
+      ///////////////////////////////////////////
+      RpcSectorLogicContainer::const_iterator it = sectorLogicContainer -> begin();
+      for ( ; it != sectorLogicContainer -> end() ; ++it ) 
+	{
+	  int i_sectorid = (*it)->sectorId();
+	  m_nTriggerHitsperSector = 0;
+	  
+	  // Loop over the trigger hits of each sector
+	  RpcSectorLogic::const_iterator ithit = (*it) -> begin();
+	  for ( ; ithit != (*it) -> end() ; ++ithit ) 
+	    {
+	      // from RpcSLTriggerHit
+	      bool b_isInput        = (*ithit) -> isInput();
+	      int i_rowinBcid      = (*ithit) -> rowinBcid();//readout window BCid
+	      int i_padid          = (*ithit) -> padId();//tower
+	      int i_ptid           = (*ithit) -> ptId();//threshold
+	      int i_roi            = (*ithit) -> roi();//region of interest
+	      int i_triggerBcid    = (*ithit) -> triggerBcid();
+	      
+	      m_Diff_triggerBCid = 0;
+	      m_in_triggerBCid = 0;
+	      m_out_triggerBCid = 0;
+	      m_in_rowinBCid = 0;
+	      m_out_rowinBCid = 0;
+	      m_Tower_in = -1;
+	      
+	      if (b_isInput == true){ 
+		m_nTriggerHits++;
+		m_nTriggerHitsperSector++;
 		
-              //Fill hits per trigger sector histogram
-              m_rpclv1_Hits_per_TriggerSector -> Fill(float(i_sectorid));
-              //per lumi block
-              if(m_lumiblockhist)m_rpclv1_Hits_per_TriggerSector_LB -> Fill(float(i_sectorid));
-
-              //Fill Pad vs. tigger sector histograms
-              if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-              else m_rpclv1_TriggerSector_vs_Pad -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		//Fill hits per trigger sector histogram
+		m_rpclv1_Hits_per_TriggerSector -> Fill(float(i_sectorid));
+		//per lumi block
+		if(m_lumiblockhist)m_rpclv1_Hits_per_TriggerSector_LB -> Fill(float(i_sectorid));
 		
-              if (i_ptid == 1){
-                if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt1 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-                else m_rpclv1_TriggerSector_vs_Pad_Pt1 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
-              }
-              if (i_ptid == 2){
-                if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt2 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-                else m_rpclv1_TriggerSector_vs_Pad_Pt2 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
-              }
-              if (i_ptid == 3){
-                if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt3 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-                else m_rpclv1_TriggerSector_vs_Pad_Pt3 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
-              }
-              if (i_ptid == 4){
-                if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt4 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-                else m_rpclv1_TriggerSector_vs_Pad_Pt4 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
-              }
-              if (i_ptid == 5){
-                if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt5 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-                else m_rpclv1_TriggerSector_vs_Pad_Pt5 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
-              }
-              if (i_ptid == 6){
-                if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt6 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
-                else m_rpclv1_TriggerSector_vs_Pad_Pt6 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
-              }
+		//Fill Pad vs. tigger sector histograms
+		if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		else m_rpclv1_TriggerSector_vs_Pad -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
 		
-              //Fill trigger sector vs. rowin BCid histogram
-              m_rpclv1_rowinBCid_vs_TriggerSector -> Fill(float(i_sectorid), float(i_rowinBcid));
-
-              //Fill Threshold vs. Pad(Tower) histogram
-              m_rpclv1_ptid_vs_Tower -> Fill(float(i_padid), float(i_ptid));
-
-              //Trigger BCid in
-              m_in_triggerBCid = i_triggerBcid;
-              //ReadOutWindow BCid in
-              m_in_rowinBCid = i_rowinBcid;
-
-              //Tower in
-              m_Tower_in = i_padid;
+		if (i_ptid == 1){
+		  if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt1 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		  else m_rpclv1_TriggerSector_vs_Pad_Pt1 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		}
+		if (i_ptid == 2){
+		  if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt2 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		  else m_rpclv1_TriggerSector_vs_Pad_Pt2 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		}
+		if (i_ptid == 3){
+		  if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt3 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		  else m_rpclv1_TriggerSector_vs_Pad_Pt3 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		}
+		if (i_ptid == 4){
+		  if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt4 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		  else m_rpclv1_TriggerSector_vs_Pad_Pt4 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		}
+		if (i_ptid == 5){
+		  if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt5 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		  else m_rpclv1_TriggerSector_vs_Pad_Pt5 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		}
+		if (i_ptid == 6){
+		  if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_Pt6 -> Fill(float(-(i_padid + 1)), float(i_sectorid));
+		  else m_rpclv1_TriggerSector_vs_Pad_Pt6 -> Fill(float((i_padid + 1)), float(i_sectorid - 32));
+		}
 		
-              m_Tower_out = -1;
-              // Loop over the trigger hits of each sector
-              RpcSectorLogic::const_iterator ithiti = (*it) -> begin();
-              for ( ; ithiti != (*it) -> end() ; ++ithiti ) 
-              {
-                bool b_isInput1        = (*ithiti) -> isInput();
-                int i_roi1            = (*ithiti) -> roi();//region of interest
-                int i_triggerBcid1    = (*ithiti) -> triggerBcid();
-                int i_rowinBcid1      = (*ithiti) -> rowinBcid();
-                if (b_isInput1 == false){ 
-
-                  //Tower out calculated from ROI out
-                  if ( i_roi1 < 4 ) m_Tower_out = 0; 
-                  if ( i_roi1 >= 4 && i_roi < 8 ) m_Tower_out = 1; 
-                  if ( i_roi1 >= 8 && i_roi < 12 ) m_Tower_out = 2; 
-                  if ( i_roi1 >= 12 && i_roi < 16 ) m_Tower_out = 3; 
-                  if ( i_roi1 >= 16 && i_roi < 20 ) m_Tower_out = 4; 
-                  if ( i_roi1 >= 20 && i_roi < 24 ) m_Tower_out = 5; 
-                  if ( i_roi1 >= 24 ) m_Tower_out = 6; 
+		//Fill trigger sector vs. rowin BCid histogram
+		m_rpclv1_rowinBCid_vs_TriggerSector -> Fill(float(i_sectorid), float(i_rowinBcid));
+		
+		//Fill Threshold vs. Pad(Tower) histogram
+		m_rpclv1_ptid_vs_Tower -> Fill(float(i_padid), float(i_ptid));
+		
+		//Trigger BCid in
+		m_in_triggerBCid = i_triggerBcid;
+		//ReadOutWindow BCid in
+		m_in_rowinBCid = i_rowinBcid;
+		
+		//Tower in
+		m_Tower_in = i_padid;
+		
+		m_Tower_out = -1;
+		// Loop over the trigger hits of each sector
+		RpcSectorLogic::const_iterator ithiti = (*it) -> begin();
+		for ( ; ithiti != (*it) -> end() ; ++ithiti ) 
+		  {
+		    bool b_isInput1        = (*ithiti) -> isInput();
+		    int i_roi1            = (*ithiti) -> roi();//region of interest
+		    int i_triggerBcid1    = (*ithiti) -> triggerBcid();
+		    int i_rowinBcid1      = (*ithiti) -> rowinBcid();
+		    if (b_isInput1 == false){ 
+		      
+		      //Tower out calculated from ROI out
+		      if ( i_roi1 < 4 ) m_Tower_out = 0; 
+		      if ( i_roi1 >= 4 && i_roi < 8 ) m_Tower_out = 1; 
+		      if ( i_roi1 >= 8 && i_roi < 12 ) m_Tower_out = 2; 
+		      if ( i_roi1 >= 12 && i_roi < 16 ) m_Tower_out = 3; 
+		      if ( i_roi1 >= 16 && i_roi < 20 ) m_Tower_out = 4; 
+		      if ( i_roi1 >= 20 && i_roi < 24 ) m_Tower_out = 5; 
+		      if ( i_roi1 >= 24 ) m_Tower_out = 6; 
+		      
+		      //Trigger BCid out
+		      m_out_triggerBCid = i_triggerBcid1;
+		      //ReadOutWindow BCid in
+		      m_out_rowinBCid = i_rowinBcid1;
 		      
-                  //Trigger BCid out
-                  m_out_triggerBCid = i_triggerBcid1;
-                  //ReadOutWindow BCid in
-                  m_out_rowinBCid = i_rowinBcid1;
-
-                  //Calculate Timing difference in trigger BCid
-                  if ((m_Tower_out == m_Tower_in) && (m_out_rowinBCid == m_in_rowinBCid)){
-                    if(m_in_triggerBCid - m_out_triggerBCid >= 0) m_Diff_triggerBCid = m_in_triggerBCid - m_out_triggerBCid;
-                    else  m_Diff_triggerBCid = (m_in_triggerBCid - m_out_triggerBCid) + 8;
-                  }
-                }
+		      //Calculate Timing difference in trigger BCid
+		      if ((m_Tower_out == m_Tower_in) && (m_out_rowinBCid == m_in_rowinBCid)){
+			if(m_in_triggerBCid - m_out_triggerBCid >= 0) m_Diff_triggerBCid = m_in_triggerBCid - m_out_triggerBCid;
+			else  m_Diff_triggerBCid = (m_in_triggerBCid - m_out_triggerBCid) + 8;
+		      }
+		    }
 		    
-              }
-            }
+		  }
+	      }
 	      
-
-            //Fill in/out dependent histograms & histograms with timing difference only for IN
-            if (b_isInput == true){ 
-
-              m_rpclv1_triggerBCid_inout_vs_Tower -> Fill(float(m_Tower_out), float(m_Diff_triggerBCid));
-
-              // if (i_padid == 0){ 
-              m_rpclv1_triggerBCid_inout_vs_TriggerSector -> Fill(float(i_sectorid), float(m_Diff_triggerBCid));
-              m_rpclv1_triggerBCid_inout -> Fill(float(m_Diff_triggerBCid));
-              //per lumi block
-              if(m_lumiblockhist)m_rpclv1_triggerBCid_inout_LB -> Fill(float(m_Diff_triggerBCid));
-              // }
-
-              if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> Fill(float(-(i_padid + 1)), float(i_sectorid), float(m_Diff_triggerBCid));
-              else m_rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> Fill(float((i_padid + 1)), float(i_sectorid - 32), float(m_Diff_triggerBCid));
-            }
+	      
+	      //Fill in/out dependent histograms & histograms with timing difference only for IN
+	      if (b_isInput == true){ 
+		
+		m_rpclv1_triggerBCid_inout_vs_Tower -> Fill(float(m_Tower_out), float(m_Diff_triggerBCid));
 		
-          } // End Loop over the trigger hits of each sector	  
+		// if (i_padid == 0){ 
+		m_rpclv1_triggerBCid_inout_vs_TriggerSector -> Fill(float(i_sectorid), float(m_Diff_triggerBCid));
+		m_rpclv1_triggerBCid_inout -> Fill(float(m_Diff_triggerBCid));
+		//per lumi block
+		if(m_lumiblockhist)m_rpclv1_triggerBCid_inout_LB -> Fill(float(m_Diff_triggerBCid));
+		// }
+		
+		if (i_sectorid < 32) m_rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> Fill(float(-(i_padid + 1)), float(i_sectorid), float(m_Diff_triggerBCid));
+		else m_rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> Fill(float((i_padid + 1)), float(i_sectorid - 32), float(m_Diff_triggerBCid));
+	      }
+	      
+	    } // End Loop over the trigger hits of each sector	  
 	  
-	// Fill the trigger hits per event per sector histogram here
-	if (m_nTriggerHitsperSector > 0) {
-	  m_rpclv1_TriggerHitsperEventperTriggerSector -> Fill(float(i_sectorid), float(m_nTriggerHitsperSector));
-	  //per lumi block
-	  if(m_lumiblockhist)m_rpclv1_TriggerHitsperEventperTriggerSector_LB -> Fill(float(i_sectorid), float(m_nTriggerHitsperSector));
-	}
-	
-      } // End Loop over the Sector Logic containers
+	  // Fill the trigger hits per event per sector histogram here
+	  if (m_nTriggerHitsperSector > 0) {
+	    m_rpclv1_TriggerHitsperEventperTriggerSector -> Fill(float(i_sectorid), float(m_nTriggerHitsperSector));
+	    //per lumi block
+	    if(m_lumiblockhist)m_rpclv1_TriggerHitsperEventperTriggerSector_LB -> Fill(float(i_sectorid), float(m_nTriggerHitsperSector));
+	  }
+	  
+	} // End Loop over the Sector Logic containers
+
+    }
     
     // Fill the trigger hits per event histogram here
     m_rpclv1_TriggerHitsperEvent -> Fill(float(m_nTriggerHits));