From ee6a72c599eb34602bcbce3461087ad95c51595f Mon Sep 17 00:00:00 2001
From: Jessy Daniel <jessy@lxplus732.cern.ch>
Date: Mon, 26 Sep 2022 11:39:59 +0200
Subject: [PATCH] Correct Merge conflict markers

---
 .../Lb02D0DsmP_strip21_filter_mDST.py         | 52 +-----------------
 .../Lb02D0DsmP_strip21r1_filter_mDST.py       | 53 +-----------------
 .../Lb02D0DsmP_strip24r2_filter_mDST.py       | 55 +------------------
 .../Lb02D0DsmP_strip28r2_filter_mDST.py       | 51 +----------------
 .../Lb02D0DsmP_strip29r2_filter_mDST.py       | 55 +------------------
 .../Lb02D0DsmP_strip34_filter_mDST.py         | 55 +------------------
 6 files changed, 7 insertions(+), 314 deletions(-)

diff --git a/options/MCFiltering/Lb02D0DsmP_strip21_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip21_filter_mDST.py
index cc57e11..d145f10 100644
--- a/options/MCFiltering/Lb02D0DsmP_strip21_filter_mDST.py
+++ b/options/MCFiltering/Lb02D0DsmP_strip21_filter_mDST.py
@@ -1,21 +1,7 @@
 """
-Stripping filtering Template for B2OC filtering requests
-<<<<<<< HEAD
-<<<<<<< HEAD
-stripping for Lb02D0DsmP in mDST
+Stripping for Lb02D0DsmP in mDST
 @author Linxuan Zhu
 @date   2022-09-06
-=======
-This example is a functional copy of  B02DHH_strip34_Filtering.py with extra dummy comments
-and extra commented sections for mDST output and testing
-@author Arnau Brossa Gonzalo
-@date   2020-01-09
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-stripping for Lb02D0DsmP in mDST
-@author Linxuan Zhu
-@date   2022-09-06
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 """
 ##################################################################
 # ONLY THESE SECTIONS NEED TO BE MODIFIED FOR STANDARD FILTERING
@@ -55,19 +41,7 @@ streams = buildStreams(stripping = config, archive = archive)
 # Select my lines
 #OUTPUT STREAM NAME
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
-=======
-AllStreams = StrippingStream("Lb2D0DsmP.Strip")			 
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb2D0DsmP2012.Strip")			 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-=======
 AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
->>>>>>> 3ac701c (modify2_Lb02D0DsmP_lzhu_filter_scripts)
 ##################################################################
 linesToAdd = []
 
@@ -100,14 +74,7 @@ AllStreams.sequence().IgnoreFilterPassed = False # so that we do not get all eve
  
 # Configuration of SelDSTWriter
 #
-<<<<<<< HEAD
-<<<<<<< HEAD
 '''
-=======
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-'''
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR FULL DST OUTPUT 
 #(change this for the following commented section for mDST output)
 ##################################################################
@@ -126,18 +93,8 @@ SelDSTWriterConf = {
     'default'               : stripDSTStreamConf(pack=enablePacking)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
 '''
 
-=======
-
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-'''
-
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR MDST OUTPUT
 ##################################################################
 enablePacking = True
@@ -158,13 +115,6 @@ SelDSTWriterConf = {
     'default'               : stripMicroDSTStreamConf(pack=enablePacking, isMC=True)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 
 
 #Items that might get lost when running the CALO+PROTO ReProcessing in DV
diff --git a/options/MCFiltering/Lb02D0DsmP_strip21r1_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip21r1_filter_mDST.py
index 79d2d9c..e7b80ee 100644
--- a/options/MCFiltering/Lb02D0DsmP_strip21r1_filter_mDST.py
+++ b/options/MCFiltering/Lb02D0DsmP_strip21r1_filter_mDST.py
@@ -1,21 +1,7 @@
 """
-Stripping filtering Template for B2OC filtering requests
-<<<<<<< HEAD
-<<<<<<< HEAD
-stripping for Lb02D0DsmP in mDST
+Stripping for Lb02D0DsmP in mDST
 @author Linxuan Zhu
 @date   2022-09-06
-=======
-This example is a functional copy of  B02DHH_strip34_Filtering.py with extra dummy comments
-and extra commented sections for mDST output and testing
-@author Arnau Brossa Gonzalo
-@date   2020-01-09
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-stripping for Lb02D0DsmP in mDST
-@author Linxuan Zhu
-@date   2022-09-06
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 """
 ##################################################################
 # ONLY THESE SECTIONS NEED TO BE MODIFIED FOR STANDARD FILTERING
@@ -55,19 +41,7 @@ streams = buildStreams(stripping = config, archive = archive)
 # Select my lines
 #OUTPUT STREAM NAME
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
-=======
-AllStreams = StrippingStream("Lb2D0DsmP.Strip")			 
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb2D0DsmP2011.Strip")			 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
->>>>>>> 3ac701c (modify2_Lb02D0DsmP_lzhu_filter_scripts)
 ##################################################################
 linesToAdd = []
 
@@ -100,14 +74,7 @@ AllStreams.sequence().IgnoreFilterPassed = False # so that we do not get all eve
  
 # Configuration of SelDSTWriter
 #
-<<<<<<< HEAD
-<<<<<<< HEAD
-"""
-=======
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
 """
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR FULL DST OUTPUT 
 #(change this for the following commented section for mDST output)
 ##################################################################
@@ -126,18 +93,8 @@ SelDSTWriterConf = {
     'default'               : stripDSTStreamConf(pack=enablePacking)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
 """
 
-=======
-
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-"""
-
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR MDST OUTPUT
 ##################################################################
 enablePacking = True
@@ -158,14 +115,6 @@ SelDSTWriterConf = {
     'default'               : stripMicroDSTStreamConf(pack=enablePacking, isMC=True)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-
 
 #Items that might get lost when running the CALO+PROTO ReProcessing in DV
 caloProtoReprocessLocs = [ "/Event/pRec/ProtoP#99", "/Event/pRec/Calo#99" ]
diff --git a/options/MCFiltering/Lb02D0DsmP_strip24r2_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip24r2_filter_mDST.py
index 352ea20..5caa3b7 100644
--- a/options/MCFiltering/Lb02D0DsmP_strip24r2_filter_mDST.py
+++ b/options/MCFiltering/Lb02D0DsmP_strip24r2_filter_mDST.py
@@ -1,21 +1,7 @@
 """
-Stripping filtering Template for B2OC filtering requests
-<<<<<<< HEAD
-<<<<<<< HEAD
-stripping for Lb02D0DsmP in mDST
+Stripping for Lb02D0DsmP in mDST
 @author Linxuan Zhu
 @date   2022-09-06
-=======
-This example is a functional copy of  B02DHH_strip34_Filtering.py with extra dummy comments
-and extra commented sections for mDST output and testing
-@author Arnau Brossa Gonzalo
-@date   2020-01-09
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-stripping for Lb02D0DsmP in mDST
-@author Linxuan Zhu
-@date   2022-09-06
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 """
 ##################################################################
 # ONLY THESE SECTIONS NEED TO BE MODIFIED FOR STANDARD FILTERING
@@ -55,19 +41,7 @@ streams = buildStreams(stripping = config, archive = archive)
 # Select my lines
 #OUTPUT STREAM NAME
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
-=======
-AllStreams = StrippingStream("Lb2D0DsmP.Strip")			 
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb2D0DsmP2015.Strip")			 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-=======
 AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
->>>>>>> 3ac701c (modify2_Lb02D0DsmP_lzhu_filter_scripts)
 ##################################################################
 linesToAdd = []
 
@@ -101,14 +75,7 @@ AllStreams.sequence().IgnoreFilterPassed = False # so that we do not get all eve
 #
  
 # Configuration of SelDSTWriter
-<<<<<<< HEAD
-<<<<<<< HEAD
 '''
-=======
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-'''
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #
 #STANDARD CONFIGURATION FOR FULL DST OUTPUT 
 #(change this for the following commented section for mDST output)
@@ -128,18 +95,8 @@ SelDSTWriterConf = {
     'default'               : stripDSTStreamConf(pack=enablePacking)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-'''
-
-=======
-
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
 '''
 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR MDST OUTPUT
 ##################################################################
 enablePacking = True
@@ -160,16 +117,6 @@ SelDSTWriterConf = {
     'default'               : stripMicroDSTStreamConf(pack=enablePacking, isMC=True)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-
 
 #Items that might get lost when running the CALO+PROTO ReProcessing in DV
 caloProtoReprocessLocs = [ "/Event/pRec/ProtoP#99", "/Event/pRec/Calo#99" ]
diff --git a/options/MCFiltering/Lb02D0DsmP_strip28r2_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip28r2_filter_mDST.py
index c1aa2e3..92df6e7 100644
--- a/options/MCFiltering/Lb02D0DsmP_strip28r2_filter_mDST.py
+++ b/options/MCFiltering/Lb02D0DsmP_strip28r2_filter_mDST.py
@@ -1,21 +1,7 @@
 """
-Stripping filtering Template for B2OC filtering requests
-<<<<<<< HEAD
-<<<<<<< HEAD
-stripping for Lb02D0DsmP in mDST
+Stripping for Lb02D0DsmP in mDST
 @author Linxuan Zhu
 @date   2022-09-06
-=======
-This example is a functional copy of  B02DHH_strip34_Filtering.py with extra dummy comments
-and extra commented sections for mDST output and testing
-@author Arnau Brossa Gonzalo
-@date   2020-01-09
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-stripping for Lb02D0DsmP in mDST
-@author Linxuan Zhu
-@date   2022-09-06
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 """
 ##################################################################
 # ONLY THESE SECTIONS NEED TO BE MODIFIED FOR STANDARD FILTERING
@@ -55,19 +41,7 @@ streams = buildStreams(stripping = config, archive = archive)
 # Select my lines
 #OUTPUT STREAM NAME
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
-=======
-AllStreams = StrippingStream("Lb2D0DsmP.Strip")			 
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb2D0DsmP2016.Strip")			 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
->>>>>>> 3ac701c (modify2_Lb02D0DsmP_lzhu_filter_scripts)
 ##################################################################
 linesToAdd = []
 
@@ -102,14 +76,7 @@ AllStreams.sequence().IgnoreFilterPassed = False # so that we do not get all eve
  
 # Configuration of SelDSTWriter
 #
-<<<<<<< HEAD
-<<<<<<< HEAD
-'''
-=======
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
 '''
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR FULL DST OUTPUT 
 #(change this for the following commented section for mDST output)
 ##################################################################
@@ -128,14 +95,8 @@ SelDSTWriterConf = {
     'default'               : stripDSTStreamConf(pack=enablePacking)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 '''
+
 #STANDARD CONFIGURATION FOR MDST OUTPUT
 ##################################################################
 enablePacking = True
@@ -156,14 +117,6 @@ SelDSTWriterConf = {
     'default'               : stripMicroDSTStreamConf(pack=enablePacking, isMC=True)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-
 
 #Items that might get lost when running the CALO+PROTO ReProcessing in DV
 caloProtoReprocessLocs = [ "/Event/pRec/ProtoP#99", "/Event/pRec/Calo#99" ]
diff --git a/options/MCFiltering/Lb02D0DsmP_strip29r2_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip29r2_filter_mDST.py
index 159772e..df347cc 100644
--- a/options/MCFiltering/Lb02D0DsmP_strip29r2_filter_mDST.py
+++ b/options/MCFiltering/Lb02D0DsmP_strip29r2_filter_mDST.py
@@ -1,21 +1,7 @@
 """
-Stripping filtering Template for B2OC filtering requests
-<<<<<<< HEAD
-<<<<<<< HEAD
-stripping for Lb02D0DsmP in mDST
+Stripping for Lb02D0DsmP in mDST
 @author Linxuan Zhu
 @date   2022-09-06
-=======
-This example is a functional copy of  B02DHH_strip34_Filtering.py with extra dummy comments
-and extra commented sections for mDST output and testing
-@author Arnau Brossa Gonzalo
-@date   2020-01-09
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-stripping for Lb02D0DsmP in mDST
-@author Linxuan Zhu
-@date   2022-09-06
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 """
 ##################################################################
 # ONLY THESE SECTIONS NEED TO BE MODIFIED FOR STANDARD FILTERING
@@ -55,19 +41,7 @@ streams = buildStreams(stripping = config, archive = archive)
 # Select my lines
 #OUTPUT STREAM NAME
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
-=======
-AllStreams = StrippingStream("Lb2D0DsmP.Strip")			 
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb2D0DsmP2017.Strip")			 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-=======
 AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
->>>>>>> 3ac701c (modify2_Lb02D0DsmP_lzhu_filter_scripts)
 ##################################################################
 linesToAdd = []
 
@@ -102,14 +76,7 @@ AllStreams.sequence().IgnoreFilterPassed = False # so that we do not get all eve
  
 # Configuration of SelDSTWriter
 #
-<<<<<<< HEAD
-<<<<<<< HEAD
 '''
-=======
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-'''
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR FULL DST OUTPUT 
 #(change this for the following commented section for mDST output)
 ##################################################################
@@ -128,18 +95,8 @@ SelDSTWriterConf = {
     'default'               : stripDSTStreamConf(pack=enablePacking)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-'''
-
-=======
-
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
 '''
 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR MDST OUTPUT
 ##################################################################
 enablePacking = True
@@ -160,16 +117,6 @@ SelDSTWriterConf = {
     'default'               : stripMicroDSTStreamConf(pack=enablePacking, isMC=True)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-
 
 #Items that might get lost when running the CALO+PROTO ReProcessing in DV
 caloProtoReprocessLocs = [ "/Event/pRec/ProtoP#99", "/Event/pRec/Calo#99" ]
diff --git a/options/MCFiltering/Lb02D0DsmP_strip34_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip34_filter_mDST.py
index 2093da4..2be8ffb 100644
--- a/options/MCFiltering/Lb02D0DsmP_strip34_filter_mDST.py
+++ b/options/MCFiltering/Lb02D0DsmP_strip34_filter_mDST.py
@@ -1,21 +1,7 @@
 """
-Stripping filtering Template for B2OC filtering requests
-<<<<<<< HEAD
-<<<<<<< HEAD
-stripping for Lb02D0DsmP in mDST
+Stripping for Lb02D0DsmP in mDST
 @author Linxuan Zhu
 @date   2022-09-06
-=======
-This example is a functional copy of  B02DHH_strip34_Filtering.py with extra dummy comments
-and extra commented sections for mDST output and testing
-@author Arnau Brossa Gonzalo
-@date   2020-01-09
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-stripping for Lb02D0DsmP in mDST
-@author Linxuan Zhu
-@date   2022-09-06
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 """
 ##################################################################
 # ONLY THESE SECTIONS NEED TO BE MODIFIED FOR STANDARD FILTERING
@@ -55,19 +41,7 @@ streams = buildStreams(stripping = config, archive = archive)
 # Select my lines
 #OUTPUT STREAM NAME
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
-=======
-AllStreams = StrippingStream("Lb2D0DsmP.Strip")			 
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-AllStreams = StrippingStream("Lb2D0DsmP2018.Strip")			 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-=======
 AllStreams = StrippingStream("Lb02D0DsmP.Strip")			 
->>>>>>> 3ac701c (modify2_Lb02D0DsmP_lzhu_filter_scripts)
 ##################################################################
 linesToAdd = []
 
@@ -102,14 +76,7 @@ AllStreams.sequence().IgnoreFilterPassed = False # so that we do not get all eve
  
 # Configuration of SelDSTWriter
 #
-<<<<<<< HEAD
-<<<<<<< HEAD
 '''
-=======
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-'''
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR FULL DST OUTPUT 
 #(change this for the following commented section for mDST output)
 ##################################################################
@@ -128,18 +95,8 @@ SelDSTWriterConf = {
     'default'               : stripDSTStreamConf(pack=enablePacking)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-'''
-
-=======
-
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
 '''
 
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
 #STANDARD CONFIGURATION FOR MDST OUTPUT
 ##################################################################
 enablePacking = True
@@ -160,16 +117,6 @@ SelDSTWriterConf = {
     'default'               : stripMicroDSTStreamConf(pack=enablePacking, isMC=True)
     }
 ##################################################################
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-'''
->>>>>>> 4db189c (Lb02D0DsmP_lzhu_filter_scripts)
-=======
-
->>>>>>> 91e6be1 (modify1_Lb02D0DsmP_lzhu_filter_scripts)
-
 
 #Items that might get lost when running the CALO+PROTO ReProcessing in DV
 caloProtoReprocessLocs = [ "/Event/pRec/ProtoP#99", "/Event/pRec/Calo#99" ]
-- 
GitLab