diff --git a/options/MCFiltering/Lb02D0DsmP_strip21_filter_mDST.py b/options/MCFiltering/Lb02D0DsmP_strip21_filter_mDST.py index cc57e113885acfa121820c0e1d1dc70685118562..d145f100af1951ae13fd038ba7a45d5a6a0f5bef 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 79d2d9c0415513c44d46cc8ab37736c7ab0ac891..e7b80ee320fba8042c6a0ce5dad2520f7980f506 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 352ea20c5e0a5f9a8d75b5aefdd64f149b70bec2..5caa3b7d681f1511cd2045d43b447f2a08e202b3 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 c1aa2e3dd91563103e1efc0c0a0c686a7533a7ee..92df6e7ef00502298f810fb34eb3f97f2a925c78 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 159772ead4e0017adf683c6601812d54aaf09bb5..df347cc6effeb597fab4b46a8b28bcb695e82995 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 2093da4a25cc321d2629e10d2bebe6bca194ad98..2be8ffb25de5ae8b297bef5ebf2a3e6ccfe7fc9b 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" ]