diff --git a/.flake8 b/.flake8
index b9a430c9c3d354cab2bd67ade7784b4818291142..075325b6ee7c80ea191f9ad36c71132526c5b4bd 100644
--- a/.flake8
+++ b/.flake8
@@ -1,7 +1,13 @@
 [flake8]
 extend-ignore = E501
 exclude =
-    Phys/CommonParticlesArchive/*
+    Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/*
+    Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/*
+    Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/*
+    Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/*
+    Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/*
+# 35r3 is almost "flaked" but commented out to avoid the CI going red until work is fully done
+    Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/*
     Phys/StrippingSettings/*
     Phys/StrippingArchive/*
     Phys/StrippingSelections/*
diff --git a/Phys/CommonParticlesArchive/doc/release.notes b/Phys/CommonParticlesArchive/doc/release.notes
index f198fa795f9ce8b0c4dc629c71fc763b654167b5..38ebfd0ebe5a05a056cad888858be9bab1448e39 100644
--- a/Phys/CommonParticlesArchive/doc/release.notes
+++ b/Phys/CommonParticlesArchive/doc/release.notes
@@ -31,11 +31,11 @@
 
 ! 2017-08-21 - Michael Alexander
  - Fix archives by moving .py files into CommonParticles directory for S20r3 -> S29.
-   Previously the redirection of CommonParticles to the archive wasn't actually 
+   Previously the redirection of CommonParticles to the archive wasn't actually
    working for these. This isn't a problem for any productions though, as the archive
    only exists to facilitate running the stripping with a different version of DaVinci
    to the one that's deployed for productions.
- - Update create_common_particles_archive method to copy files into CommonParticles 
+ - Update create_common_particles_archive method to copy files into CommonParticles
    directory.
  - Update CommonParticlesArchiveConf.redirect so it can be called more than once, so #
    long as the redirect destination is the same.
@@ -44,7 +44,7 @@
 !========================= CommonParticlesArchive v1r13 2017-06-07 ====================
 
 ! 2017-06-08 - Michael Alexander
- - Bugfix in Stripping29/StdLooseDalitzPi0.py 
+ - Bugfix in Stripping29/StdLooseDalitzPi0.py
 
 ! 2017-06-07 - Stefanie Reichert
  - Add Archive for S29.
@@ -54,14 +54,14 @@
 ! 2017-04-21 - Michael Alexander
  - Add Archive for S24r0p1.
  - Remove Archive for S26r1.
- - Add function to automatically create an Archive from the current version of 
+ - Add function to automatically create an Archive from the current version of
    CommonParticles.
- - Added dependency on StrippingArchive to get duplicate strippings dict. 
+ - Added dependency on StrippingArchive to get duplicate strippings dict.
 
 !========================= CommonParticlesArchive v1r11 2017-01-31 ====================
 
 ! 2017-01-10 - Ricardo Vazquez Gomez
- - Add Archive for S28 
+ - Add Archive for S28
 
 !========================= CommonParticlesArchive v1r10 2016-12-19 ====================
 
@@ -102,12 +102,12 @@
 ! 2015-07-31 - Ricardo Vazquez Gomez
  - Added archive for S23
 
-!========================= CommonParticlesArchive v1r4 2015-06-15 
+!========================= CommonParticlesArchive v1r4 2015-06-15
 =========================
 ! 2015-06-09 - Ricardo Vazquez Gomez
  - Added archive for S22
 
-!========================= CommonParticlesArchive v1r3 2015-04-30 
+!========================= CommonParticlesArchive v1r3 2015-04-30
 =========================
 
 ! 2015-04-08 - Chris Jones
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsDownElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsDownElectrons.py
index 9711e902e929fe3ecf27037fea1c76be74b16847..9f363caa138918cf8901ae9401dea83fffdf0bc7 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsDownElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsDownElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,49 +10,46 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'NoBrem NoPIDs Electrons with downstram tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+
 __all__ = (
-    'NoBremNoPIDsDownElectrons' ,
+    'NoBremNoPIDsDownElectrons',
     'locations'
     )
 # =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'NoBremNoPIDsDownElectrons'  ,
-                                   DecayDescriptor = 'Electron' ,
-                                   Particle = 'electron'  )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('NoBremNoPIDsDownElectrons',
+                                DecayDescriptor='Electron',
+                                Particle='electron')
 
-algorithm.AddBremPhotonTo = [] 
+algorithm.AddBremPhotonTo = []
 
 # configure the track selector
-selector = trackSelector ( algorithm , trackTypes = [ "Downstream" ]) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm, trackTypes=["Downstream"])
 
-## finally: define the symbol 
-NoBremNoPIDsDownElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+NoBremNoPIDsDownElectrons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsElectrons.py
index 02d43768eba939a4e974a0138d98a589b5397c81..c09edfecfe1e05b63a77523267f7bd4db0025fa2 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,49 +10,45 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Electrons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Electrons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'No Brem NoPIDs Electrons wioth loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg "
+
 __all__ = (
-    'NoBremNoPIDsElectrons' ,
+    'NoBremNoPIDsElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import NoPIDsParticleMaker 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'NoBremNoPIDsElectrons'    ,
-                                   DecayDescriptor = 'Electron' ,
-                                   Particle = 'electron'  )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('NoBremNoPIDsElectrons',
+                                DecayDescriptor='Electron',
+                                Particle='electron')
 
-selector = trackSelector ( algorithm , trackTypes = [ "Long" ])
+selector = trackSelector(algorithm, trackTypes=["Long"])
 
 algorithm.AddBremPhotonTo = []
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
-
-## finally: define the symbol 
-NoBremNoPIDsElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+NoBremNoPIDsElectrons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsTtrackElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsTtrackElectrons.py
index 7bce503018b5e690c01719b82a69799ab0b3e2a3..69c81d0efdd8e1fa5c74f19e2bb33b30370158d2 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsTtrackElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsTtrackElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,50 +10,44 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'NoBrem NoPIDs Electrons with Ttrack tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+
 __all__ = (
-    'NoBremNoPIDsTtrackElectrons' ,
+    'NoBremNoPIDsTtrackElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
 
-from CommonParticles.Utils import *
+# create the algorithm
+algorithm = NoPIDsParticleMaker('NoBremNoPIDsTtrackElectrons',
+                                DecayDescriptor='Electron',
+                                Particle='electron')
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'NoBremNoPIDsTtrackElectrons',
-                                   DecayDescriptor = 'Electron' ,
-                                   Particle = 'electron'  )
-
-algorithm.AddBremPhotonTo = [] 
+algorithm.AddBremPhotonTo = []
 
 # configure the track selector
-selector = trackSelector ( algorithm,trackTypes = [ "Ttrack" ]  ) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm, trackTypes=["Ttrack"])
 
-## finally: define the symbol 
-NoBremNoPIDsTtrackElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+NoBremNoPIDsTtrackElectrons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsUpElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsUpElectrons.py
index 01fefe3b8c69f9249cd6e55c764140da3c3ffe0b..4e6aefaf5c60affd2ab1c2a2d91546ecbc337a14 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsUpElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsUpElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,47 +11,44 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'NoBrem NoPIDs Electrons with Upstream tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+
 __all__ = (
-    'NoBremNoPIDsUpElectrons' ,
+    'NoBremNoPIDsUpElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'NoBremNoPIDsUpElectrons'    ,
-                                   DecayDescriptor = 'Electron' ,
-                                   Particle = 'electron'  )
-algorithm.AddBremPhotonTo = [] 
+# create the algorithm
+algorithm = NoPIDsParticleMaker('NoBremNoPIDsUpElectrons',
+                                DecayDescriptor='Electron',
+                                Particle='electron')
+algorithm.AddBremPhotonTo = []
 
 # configure the track selector
-selector = trackSelector ( algorithm, trackTypes = [ "Upstream" ] ) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm, trackTypes=["Upstream"])
 
-## finally: define the symbol 
-NoBremNoPIDsUpElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+NoBremNoPIDsUpElectrons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsVeloElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsVeloElectrons.py
index cab7eabe892ea4283f938661606827ca4269d0a1..cad29af86eef997c4c5537f646752367489b809b 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsVeloElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/NoBremNoPIDsVeloElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,43 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/NoBremNoPIDsVeloElectrons.py
+# configuration file for 'No bremsstrahlung NoPIDs VELO electrons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Electrons with VELO tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+
 __all__ = (
-    'StdNoPIDsElectrons' ,
+    'NoBremNoPIDsVeloElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsVeloElectrons'         ,
-                                DecayDescriptor = 'Electron' , Particle = 'electron'  )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('NoBremNoPIDsVeloElectrons',
+                                DecayDescriptor='Electron', Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm,trackTypes = [ "Velo" ]  ) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm, trackTypes=["Velo"])
 
-## finally: define the symbol 
-StdNoPIDsVeloElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+NoBremNoPIDsVeloElectrons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseANNDownProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseANNDownProtons.py
index 07cc16a986d1c1fe5b19d15ff237cda7c9649c1d..e42598b4df2fab6c4213e9176bb58a0a55803169 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseANNDownProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseANNDownProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -18,7 +18,7 @@
 """
 Configuration file for 'Standard Loose Downstream Protons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
 # =============================================================================
 __all__ = (
     'StdLooseANNDownProtons' ,
@@ -26,8 +26,8 @@ __all__ = (
     )
 # =============================================================================
 from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
+from Configurables import CombinedParticleMaker 
+from Configurables import ProtoParticleCALOFilter
 from CommonParticles.Utils import *
 
 ## create the algorithm 
@@ -45,18 +45,14 @@ fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' )
 fltr.Selection = [ "ProbNNp>'0.04'" ]
 
 ## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+locations = updateDoD(algorithm)
 
 ## finally: define the symbol 
 StdLooseANNDownProtons = algorithm 
 
 ## ============================================================================
-if '__main__' == __name__ :
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py
index 15a07fe7494ad776baa98591b2e11f4e72893525..33deb4be6b74f379bda56ac05a3cd740d8e84d04 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -17,10 +17,8 @@ __author__ = 'Jibo He'
 __date__ = '22/01/2012'
 
 
-from Gaudi.Configuration import *
-from Configurables import CombineParticles # , OfflineVertexFitter, OnOfflineTool
-from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD
 
 ###########################
 # StdDetachetKst2Kpi      #
@@ -34,5 +32,3 @@ StdLooseDetachedKpi.CombinationCut = "(AM<2.2*GeV) & (ADOCACHI2CUT(30, ''))"
 StdLooseDetachedKpi.MotherCut = "(VFASPF(VCHI2)<25)"
 
 locations = updateDoD(StdLooseDetachedKpi)
-
-
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py
index e51c1bed8d4b2e0eabd0f822233f2af366409fb2..be18605fe62ee8b1f35de8d22909e31ad054ff77 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,23 +11,19 @@
 """
 Configuration file for Standard Loose Kstar2Kpi
 """
+from Configurables import FilterDesktop
+from CommonParticles.Utils import updateDoD
+
 
 __author__ = 'Diego Martinez Santos, P. Koppenburg'
 __date__ = '29/06/2009'
 
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop
-from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
-
 ###########################
 # StdLooseDetachetKst2Kpi #
 ###########################
-
 StdLooseDetachedKst2Kpi = FilterDesktop("StdLooseDetachedKst2Kpi")
 StdLooseDetachedKst2Kpi.Inputs = ["Phys/StdVeryLooseDetachedKst2Kpi/Particles"]
 StdLooseDetachedKst2Kpi.Code = "(MIPCHI2DV(PRIMARY)> 2.25)"
-locations = updateDoD(StdLooseDetachedKst2Kpi)
-
 
+locations = updateDoD(StdLooseDetachedKst2Kpi)
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2MuMu.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2MuMu.py
index 739b7dab4595828a88faa2db8321ea93a49cf93f..a22d7bb28f1ed19d97e95db4eea7c592abdd73c0 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2MuMu.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2MuMu.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,40 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseJpsi2MuMu.py
-#  configuration file for 'Standard Loose Jpsi2MuMu'
-#  @author Greig Cowan
-#  @date 2009-06-23
+# @file  CommonParticles/StdLooseJpsi2MuMu.py
+# configuration file for 'Standard Loose Jpsi2MuMu'
+# @author Greig Cowan
+# @date 2009-06-23
 # =============================================================================
 """
 Configuration file for 'Standard Loose Jpsi2MuMu'. Lifetime unbiased.
 """
-__author__  = "Greig Cowan"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Greig Cowan"
+
 __all__ = (
-    'StdLooseJpsi2MuMu' ,
+    'StdLooseJpsi2MuMu',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm
-StdLooseJpsi2MuMu = CombineParticles ("StdLooseJpsi2MuMu")
+# ============================================================================
+# create the algorithm
+StdLooseJpsi2MuMu = CombineParticles("StdLooseJpsi2MuMu")
 StdLooseJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"]
 StdLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-"
 StdLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30,''))"
 StdLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdLooseJpsi2MuMu    )
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseJpsi2MuMu)
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2ee.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2ee.py
index 60434913e690c17293ce1878f7a9dbd7ad9b6d6a..542212543b1d236bdd6e2ba40860e2920b67e195 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2ee.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseJpsi2ee.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,45 +10,41 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseJpsi2ee.py
-#  configuration file for 'Standard Loose Jpsi2ee'
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseJpsi2ee.py
+# configuration file for 'Standard Loose Jpsi2ee'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Jpsi2ee'. Lieftime unbiased.
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseJpsi2ee' ,
+    'StdLooseJpsi2ee',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
-
-## ============================================================================
-## create the algorithm
-StdLooseJpsi2ee = CombineParticles ( 'StdLooseJpsi2ee' )
-StdLooseJpsi2ee.Inputs = [ "Phys/StdAllLooseElectrons/Particles" ]
+
+# ============================================================================
+# create the algorithm
+StdLooseJpsi2ee = CombineParticles('StdLooseJpsi2ee')
+StdLooseJpsi2ee.Inputs = ["Phys/StdAllLooseElectrons/Particles"]
 StdLooseJpsi2ee.DecayDescriptor = "J/psi(1S) -> e+ e-"
 
 StdLooseJpsi2ee.CombinationCut = "(AM>2000*MeV) & (AM<3800*MeV) & (ADOCACHI2CUT(30,''))"
 StdLooseJpsi2ee.MotherCut = "(VFASPF(VCHI2)<25)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdLooseJpsi2ee )
-
-## ============================================================================
-if '__main__' == __name__ :
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseJpsi2ee)
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKaons.py
index 89b338fe98a1e83f15f30340534c9b069270f856..f903bc0870f8b6251c0d65d91985e6f6829ff4db 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,45 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdLooseKaons.py
-#  configuration file for 'Standard Loose Kaons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdLooseKaons.py
+# configuration file for 'Standard Loose Kaons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Kaons'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
-__all__ = (
-    'StdLooseKaons' ,
-    'locations'
-    )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
 
 
-from CommonParticles.Utils import *
+__author__ = "Patrick Koppenburg"
 
-## create the algorithm 
-algorithm = FilterDesktop( 'StdLooseKaons',
-                           Inputs = ["Phys/StdAllLooseKaons/Particles"],
-                           Code = defaultCuts() )
+__all__ = (
+    'StdLooseKaons',
+    'locations'
+    )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdLooseKaons',
+                          Inputs=["Phys/StdAllLooseKaons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdLooseKaons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdLooseKaons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKs.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKs.py
index e3e9e161c30d5c79a59cd7fab7cc38da13570c5d..447023ff2eaea64f18776be718c00378aedbecc4 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKs.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,94 +10,91 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseKs.py
-#  configuration file for 'Standard Loose ' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseKs.py
+# configuration file for 'Standard Loose KS'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Ks'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles, FilterDesktop
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseKsLL' ,
-    'StdLooseKsDD' ,
-    'StdLooseKsLD' ,
+    'StdLooseKsLL',
+    'StdLooseKsDD',
+    'StdLooseKsLD',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles, FilterDesktop
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm 
-StdLooseKsLL = CombineParticles ( 'StdLooseKsLL' )
+# ============================================================================
+# create the algorithm
+StdLooseKsLL = CombineParticles('StdLooseKsLL')
 
-StdLooseKsLL.Inputs = [ "Phys/StdLoosePions/Particles" ]
-StdLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" 
+StdLooseKsLL.Inputs = ["Phys/StdLoosePions/Particles"]
+StdLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-"
 
-StdLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)" } 
+StdLooseKsLL.DaughtersCuts = {"pi+": "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)"}
 StdLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(25, '')) "
 StdLooseKsLL.MotherCut = "(ADMASS('KS0') < 35.*MeV) & (VFASPF(VCHI2) < 25.)"
 
-## configure Data-On-Demand service 
-locations = updateDoD ( StdLooseKsLL )
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseKsLL)
+
 
-## ============================================================================
-#  configuration file for 'Standard Loose Downstream ' 
-#  @author Greig Cowan
-#  @date 2009-04-27
-# ============================================================================= 
-StdLooseKsDD = CombineParticles ( 'StdLooseKsDD' )
+# =============================================================================
+# configuration file for 'Standard Loose Downstream'
+# @author Greig Cowan
+# @date 2009-04-27
+# =============================================================================
+StdLooseKsDD = CombineParticles('StdLooseKsDD')
 DDPionCuts = "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 4.)"
-StdLooseKsDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles" ]
-StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-" 
+StdLooseKsDD.Inputs = ["Phys/StdNoPIDsDownPions/Particles"]
+StdLooseKsDD.DecayDescriptor = "KS0 -> pi+ pi-"
 
-StdLooseKsDD.DaughtersCuts = { "pi+" : DDPionCuts } 
+StdLooseKsDD.DaughtersCuts = {"pi+": DDPionCuts}
 StdLooseKsDD.CombinationCut = "(ADAMASS('KS0') < 80.*MeV) & (ADOCACHI2CUT(25, ''))"
 StdLooseKsDD.MotherCut = "(ADMASS('KS0') < 64.*MeV) & (VFASPF(VCHI2) < 25.)"
 
-## configure Data-On-Demand service 
-locations.update( updateDoD ( StdLooseKsDD ))
+# configure Data-On-Demand service
+locations.update(updateDoD(StdLooseKsDD))
 
-## ============================================================================
-#  configuration file for 'Standard Loose Long-Downstream '
-#  Please be aware that this is mostly background
-#  @author Patrick Koppenburg
-#  @date 2012-01-26
+# =============================================================================
+# configuration file for 'Standard Loose Long-Downstream '
+# please be aware that this is mostly background
+# @author Patrick Koppenburg
+# @date 2012-01-26
 # =============================================================================
 # The one with a long pi+
-StdLooseKsLD_PosLong = StdLooseKsDD.clone( 'StdLooseKsLD_PosLong' )
+StdLooseKsLD_PosLong = StdLooseKsDD.clone('StdLooseKsLD_PosLong')
 
-StdLooseKsLD_PosLong.Inputs = [ "Phys/StdNoPIDsDownPions/Particles",
-                                "Phys/StdLoosePions/Particles" ]
-StdLooseKsLD_PosLong.DaughtersCuts = { "pi+" : "(ISLONG) & "+DDPionCuts,
-                                       "pi-" : "(ISDOWN) & "+DDPionCuts } 
+StdLooseKsLD_PosLong.Inputs = ["Phys/StdNoPIDsDownPions/Particles",
+                               "Phys/StdLoosePions/Particles"]
+StdLooseKsLD_PosLong.DaughtersCuts = {"pi+": "(ISLONG) & "+DDPionCuts,
+                                      "pi-": "(ISDOWN) & "+DDPionCuts}
 
 # The one with a long pi-
-StdLooseKsLD_NegLong = StdLooseKsLD_PosLong.clone( 'StdLooseKsLD_NegLong')
-StdLooseKsLD_NegLong.DaughtersCuts = { "pi-" : "(ISLONG) & "+DDPionCuts,
-                                       "pi+" : "(ISDOWN) & "+DDPionCuts } 
+StdLooseKsLD_NegLong = StdLooseKsLD_PosLong.clone('StdLooseKsLD_NegLong')
+StdLooseKsLD_NegLong.DaughtersCuts = {"pi-": "(ISLONG) & "+DDPionCuts,
+                                      "pi+": "(ISDOWN) & "+DDPionCuts}
 # The combination of them
-StdLooseKsLD = FilterDesktop("StdLooseKsLD", Code = "ALL")
-StdLooseKsLD.Inputs = [ "Phys/StdLooseKsLD_PosLong/Particles",
-                        "Phys/StdLooseKsLD_NegLong/Particles" ]
+StdLooseKsLD = FilterDesktop("StdLooseKsLD", Code="ALL")
+StdLooseKsLD.Inputs = ["Phys/StdLooseKsLD_PosLong/Particles",
+                       "Phys/StdLooseKsLD_NegLong/Particles"]
 
-## configure Data-On-Demand service 
-locations.update( updateDoD ( StdLooseKsLD_PosLong ))
-locations.update( updateDoD ( StdLooseKsLD_NegLong ))
-locations.update( updateDoD ( StdLooseKsLD ))
+# configure Data-On-Demand service
+locations.update(updateDoD(StdLooseKsLD_PosLong))
+locations.update(updateDoD(StdLooseKsLD_NegLong))
+locations.update(updateDoD(StdLooseKsLD))
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKstar.py
index eea51c81e414bf5b92f19b893fb691eb4dfac3ab..63a336d181508195f8605fc87340473724ad0263 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseKstar.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,43 +10,42 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseKstar.py
-#  configuration file for 'Standard Loose Kstar'
-#  (based on lifetime unbiased JpsiK* requirements)
-#  @author Greig Cowan
-#  @date 2009-06-23
+# @file  CommonParticles/StdLooseKstar.py
+# configuration file for 'Standard Loose Kstar'
+# (based on lifetime unbiased JpsiK* requirements)
+# @author Greig Cowan
+# @date 2009-06-23
 # =============================================================================
 """
 Configuration file for 'Standard Loose Kstar'. Lieftime unbiased.
 """
-__author__  = "Greig Cowan"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Greig Cowan"
+
 __all__ = (
-    'StdLooseKstar2Kpi' ,
+    'StdLooseKstar2Kpi',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm
-StdLooseKstar2Kpi = CombineParticles ("StdLooseKstar2Kpi")
+# ============================================================================
+# create the algorithm
+StdLooseKstar2Kpi = CombineParticles("StdLooseKstar2Kpi")
 StdLooseKstar2Kpi.Inputs = ["Phys/StdAllLooseKaons/Particles",
                             "Phys/StdAllLoosePions/Particles"]
 StdLooseKstar2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc"
 StdLooseKstar2Kpi.CombinationCut = "(APT > 500.*MeV) & (ADAMASS('K*(892)0') < 300.*MeV) & (ADOCACHI2CUT(30, ''))"
 StdLooseKstar2Kpi.MotherCut = "(VFASPF(VCHI2) < 25.)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdLooseKstar2Kpi )
-
-## ============================================================================
-if '__main__' == __name__ :
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseKstar2Kpi)
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+# ============================================================================
+if '__main__' == __name__:
 
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambda.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambda.py
index 79dbcb02932806e000ba3d4be92c1b83c439b4cb..16209b51e07572942d0266875095c0dd2eb1cd14 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambda.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambda.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,113 +10,100 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseLambda.py
-#  configuration file for 'Standard Loose ' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseLambda.py
+# configuration file for 'Standard Loose Lambda'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Lambda'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles, FilterDesktop
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseLambdaLL' ,
-    'StdLooseLambdaDD' ,
-    'StdLooseLambdaLD' ,
+    'StdLooseLambdaLL',
+    'StdLooseLambdaDD',
+    'StdLooseLambdaLD',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles, FilterDesktop
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm 
-StdLooseLambdaLL = CombineParticles ( 'StdLooseLambdaLL' )
+# ============================================================================
+# create the algorithm
+StdLooseLambdaLL = CombineParticles('StdLooseLambdaLL')
 
-StdLooseLambdaLL.Inputs = [ "Phys/StdLoosePions/Particles",
-                            "Phys/StdLooseProtons/Particles" ]
-StdLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc" 
+StdLooseLambdaLL.Inputs = ["Phys/StdLoosePions/Particles",
+                           "Phys/StdLooseProtons/Particles"]
+StdLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc"
 
 StdLooseLambdaLL.DaughtersCuts = {
-    "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)",
-    "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"
-    } 
+    "pi+": "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)",
+    "p+": "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"
+    }
 
 StdLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(30, ''))"
 StdLooseLambdaLL.MotherCut = "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30)"
 
-## configure Data-On-Demand service 
-locations = updateDoD ( StdLooseLambdaLL )
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseLambdaLL)
+
 
-## ============================================================================
-#  configuration file for 'Standard Loose Downstream ' 
-#  @author Greig Cowan
-#  @date 2009-04-27
-# ============================================================================= 
-StdLooseLambdaDD = StdLooseLambdaLL.clone( 'StdLooseLambdaDD' )
+StdLooseLambdaDD = StdLooseLambdaLL.clone('StdLooseLambdaDD')
 
-StdLooseLambdaDD.Inputs = [ "Phys/StdNoPIDsDownPions/Particles",
-                            "Phys/StdNoPIDsDownProtons/Particles" ]
+StdLooseLambdaDD.Inputs = ["Phys/StdNoPIDsDownPions/Particles",
+                           "Phys/StdNoPIDsDownProtons/Particles"]
 
 StdLooseLambdaDD.DaughtersCuts = {
-    "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)",
-    "p+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"
-    } 
+    "pi+": "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)",
+    "p+": "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"
+    }
 
 StdLooseLambdaDD.CombinationCut = "(ADAMASS('Lambda0')<80*MeV) & (ADOCACHI2CUT(25, ''))"
 StdLooseLambdaDD.MotherCut = "(ADMASS('Lambda0')<64*MeV) & (VFASPF(VCHI2)<25)"
 
-## configure Data-On-Demand service 
-locations.update( updateDoD ( StdLooseLambdaDD ) )
+# configure Data-On-Demand service
+locations.update(updateDoD(StdLooseLambdaDD))
 
-## ============================================================================
-#  configuration file for 'Standard Loose Long-Downstream ' 
-#  @author Daniel O'Hanlon
-#  @date 2014-08-18
-# ============================================================================= 
 
 # p +/- long
 
-StdLooseLambdaLDpLong = StdLooseLambdaDD.clone( 'StdLooseLambdaLDpLong' )
+StdLooseLambdaLDpLong = StdLooseLambdaDD.clone('StdLooseLambdaLDpLong')
 
-StdLooseLambdaLDpLong.Inputs = [ "Phys/StdLooseProtons/Particles",
-                                 "Phys/StdNoPIDsDownPions/Particles"]
+StdLooseLambdaLDpLong.Inputs = ["Phys/StdLooseProtons/Particles",
+                                "Phys/StdNoPIDsDownPions/Particles"]
 
-StdLooseLambdaLDpLong.DaughtersCuts = { "p+"  : "(ISLONG) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)",
-                                        "pi-" : "(ISDOWN) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"}
+StdLooseLambdaLDpLong.DaughtersCuts = {"p+": "(ISLONG) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)",
+                                       "pi-": "(ISDOWN) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)"}
 
 # p +/- down
 
-StdLooseLambdaLDpDown = StdLooseLambdaDD.clone( 'StdLooseLambdaLDpDown' )
+StdLooseLambdaLDpDown = StdLooseLambdaDD.clone('StdLooseLambdaLDpDown')
 
-StdLooseLambdaLDpDown.Inputs = [ "Phys/StdNoPIDsDownProtons/Particles",
-                                 "Phys/StdLoosePions/Particles" ]
+StdLooseLambdaLDpDown.Inputs = ["Phys/StdNoPIDsDownProtons/Particles",
+                                "Phys/StdLoosePions/Particles"]
 
-StdLooseLambdaLDpDown.DaughtersCuts = { "p+"  : "(ISDOWN) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)",
-                                        "pi-" : "(ISLONG) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"}
+StdLooseLambdaLDpDown.DaughtersCuts = {"p+": "(ISDOWN) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>4)",
+                                       "pi-": "(ISLONG) & (P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"}
 
 # Combination
 
-StdLooseLambdaLD = FilterDesktop("StdLooseLambdaLD", Code = "ALL")
-
-StdLooseLambdaLD.Inputs = [ "Phys/StdLooseLambdaLDpLong/Particles",
-                            "Phys/StdLooseLambdaLDpDown/Particles" ]
+StdLooseLambdaLD = FilterDesktop("StdLooseLambdaLD", Code="ALL")
 
-locations.update( updateDoD (StdLooseLambdaLDpLong) )
-locations.update( updateDoD (StdLooseLambdaLDpDown) )
+StdLooseLambdaLD.Inputs = ["Phys/StdLooseLambdaLDpLong/Particles",
+                           "Phys/StdLooseLambdaLDpDown/Particles"]
 
-locations.update( updateDoD (StdLooseLambdaLD) )
+locations.update(updateDoD(StdLooseLambdaLDpLong))
+locations.update(updateDoD(StdLooseLambdaLDpDown))
 
-## ============================================================================
-if '__main__' == __name__ :
+locations.update(updateDoD(StdLooseLambdaLD))
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambdac.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambdac.py
index 5ce7c3b34ecdfb504f3cecbe25eb7c33a44dfff8..e9039a4954531e5a64f320cb2ba499bf95c20757 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambdac.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseLambdac.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,46 +11,43 @@
 """
 Configuration file for 'Standard Loose Lambda_c+'
 """
-__author__  = "Liming Zhang"
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Liming Zhang"
 __date__ = '09/12/2009'
-# =============================================================================
+
 __all__ = (
-    'StdLooseLambdac2PKPi' ,
+    'StdLooseLambdac2PKPi',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm 
-StdLooseLambdac2PKPi = CombineParticles ( 'StdLooseLambdac2PKPi' )
+# ============================================================================
+# create the algorithm
+StdLooseLambdac2PKPi = CombineParticles('StdLooseLambdac2PKPi')
 
-StdLooseLambdac2PKPi.Inputs = [ "Phys/StdLooseKaons/Particles",
-                                "Phys/StdLoosePions/Particles",
-                                "Phys/StdLooseProtons/Particles" ]
+StdLooseLambdac2PKPi.Inputs = ["Phys/StdLooseKaons/Particles",
+                               "Phys/StdLoosePions/Particles",
+                               "Phys/StdLooseProtons/Particles"]
 
-StdLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc" 
+StdLooseLambdac2PKPi.DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc"
 StdLooseLambdac2PKPi.DaughtersCuts = {
-    "K+"  : "(P > 2*GeV)", 
-    "pi+" : "(P > 2*GeV)",
-    "p+"  : "(P > 2*GeV)"
+    "K+": "(P > 2*GeV)",
+    "pi+": "(P > 2*GeV)",
+    "p+": "(P > 2*GeV)"
     }
 
 StdLooseLambdac2PKPi.CombinationCut = "((ADAMASS('Lambda_c+')<110*MeV) & (APT>1.*GeV) & (ADOCAMAX('')<0.5*mm))"
-StdLooseLambdac2PKPi.MotherCut = "((VFASPF(VCHI2) < 30) & (ADMASS('Lambda_c+')<100*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( StdLooseLambdac2PKPi )
+StdLooseLambdac2PKPi.MotherCut = "((VFASPF(VCHI2) < 30) & (ADMASS('Lambda_c+')<100*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))"
 
-## ============================================================================
-if '__main__' == __name__ :
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseLambdac2PKPi)
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMergedPi0.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMergedPi0.py
index 77c68eca8930a610258da17386fd1ba1afbbc378..7455f2c00168ec1f833cda503904646156d9dd48 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMergedPi0.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMergedPi0.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,42 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseMergedPi0.py
-#  configuration file for 'Standard Loose Pions' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseMergedPi0.py
+# configuration file for 'Standard Loose Pions'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose MergedPi0'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import MergedPi0Maker
+from GaudiKernel.SystemOfUnits import MeV
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseMergedPi0' ,
+    'StdLooseMergedPi0',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import MergedPi0Maker 
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm =  MergedPi0Maker ( 'StdLooseMergedPi0'         ,
-                              DecayDescriptor = 'Pi0' ,
-                              MassWindow = 60.* MeV)
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = MergedPi0Maker('StdLooseMergedPi0',
+                           DecayDescriptor='Pi0',
+                           MassWindow=60.*MeV)
 
-## finally: define the symbol 
-StdLooseMergedPi0 = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdLooseMergedPi0 = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMuons.py
index 6f763e62c3beabf290c9a5b057c0e694cfbde653..3872eba6ef941c269c031d49de5bf9fef3bc310f 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,45 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseMuons.py
-#  configuration file for 'Standard Loose Muons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdLooseMuons.py
+# configuration file for 'Standard Loose Muons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Muons wioth loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseMuons' ,
+    'StdLooseMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdLooseMuons',
-                            Inputs = ["Phys/StdAllLooseMuons/Particles"],
-                            Code = defaultCuts() )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdLooseMuons',
+                          Inputs=["Phys/StdAllLooseMuons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdLooseMuons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdLooseMuons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhi.py
index c35f92c0408bd105e0e49bf9f6e9ea8d6b28af84..a5ce6f78406c04bd9bc5a9d15f46a544326939a1 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhi.py
@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,42 +9,41 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-##!/usr/bin/env python
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLoosePhi2KK.py
-#  configuration file for 'Standard Loose Phi -> KK'
-#  @author Greig Cowan
-#  @date 2009-06-23
+# @file  CommonParticles/StdLoosePhi2KK.py
+# configuration file for 'Standard Loose Phi -> KK'
+# @author Greig Cowan
+# @date 2009-06-23
 # =============================================================================
 """
 Configuration file for 'Standard Loose Phi2KK'. Lieftime unbiased.
 """
-__author__  = "Greig Cowan"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Greig Cowan"
+
 __all__ = (
-    'StdLoosePhi2KK' ,
+    'StdLoosePhi2KK',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm
+# ============================================================================
+# create the algorithm
 StdLoosePhi2KK = CombineParticles("StdLoosePhi2KK")
 StdLoosePhi2KK.Inputs = ["Phys/StdAllLooseKaons/Particles"]
 StdLoosePhi2KK.DecayDescriptor = "phi(1020) -> K+ K-"
 StdLoosePhi2KK.CombinationCut = "(AM < 1100.*MeV) & (ADOCACHI2CUT(30, ''))"
 StdLoosePhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdLoosePhi2KK )
+# configure Data-On-Demand service
+locations = updateDoD(StdLoosePhi2KK)
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhotons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhotons.py
index 226b59a09e9be62e8d5b641da24e2ddccb8fd722..df8898840506d3eb96cb3a4fed33769ae3c8fd0a 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhotons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePhotons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,51 +10,47 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLoosePhotons.py
-#  configuration file for 'Standard Loose Photons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdLoosePhotons.py
+# configuration file for 'Standard Loose Photons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Loose Photons'
 """
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
+from __future__ import print_function
+from Configurables import PhotonMakerAlg
+from Configurables import PhotonMaker
+from GaudiKernel.SystemOfUnits import MeV
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
 __all__ = (
-    'StdLoosePhotons' ,
+    'StdLoosePhotons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import PhotonMakerAlg
-from Configurables       import PhotonMaker
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  PhotonMakerAlg ( 'StdLoosePhotons'         ,
-                              DecayDescriptor = 'Gamma' )
+# create the algorithm
+algorithm = PhotonMakerAlg('StdLoosePhotons',
+                           DecayDescriptor='Gamma')
 
-algorithm.addTool ( PhotonMaker , name = 'PhotonMaker' )
+algorithm.addTool(PhotonMaker, name='PhotonMaker')
 photon = algorithm.PhotonMaker
-photon.ConvertedPhotons   = False
-photon.UnconvertedPhotons = True 
-photon.PtCut              = 200 * MeV 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+photon.ConvertedPhotons = False
+photon.UnconvertedPhotons = True
+photon.PtCut = 200 * MeV
 
-## finally: define the symbol 
-StdLoosePhotons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdLoosePhotons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePions.py
index 4f4d84b54389238ae9f36b88d7521ad3348835c2..bf8635966d87e2caadaa48847871e327484c24a9 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLoosePions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,44 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLoosePions.py
-#  configuration file for 'Standard Loose Pions' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdLoosePions.py
+# configuration file for 'Standard Loose Pions'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Pions wioth loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLoosePions' ,
+    'StdLoosePions',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm = FilterDesktop( 'StdLoosePions',
-                           Inputs = ["Phys/StdAllLoosePions/Particles"],
-                           Code = defaultCuts() )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdLoosePions',
+                          Inputs=["Phys/StdAllLoosePions/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdLoosePions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdLoosePions = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseProtons.py
index 7d893c4ef5a7dc1c18be2e30b8dbcd03b07623cf..60bbee60419eac06ce54b06c529b6190b34a228e 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,43 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdLooseProtons.py
-#  configuration file for 'Standard Loose Protons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdLooseProtons.py
+# configuration file for 'Standard Loose Protons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Protons with loose cuts'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseProtons' ,
+    'StdLooseProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdLooseProtons',
-                            Inputs = ["Phys/StdAllLooseProtons/Particles"],
-                            Code = defaultCuts() )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdLooseProtons',
+                          Inputs=["Phys/StdAllLooseProtons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdLooseProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdLooseProtons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedEta.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedEta.py
index 5d384538bce5063069eb6dce4f1ffcbcca0bd263..beb2cd08b4fea34068c6847f190b8a9ebcb225a8 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedEta.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedEta.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,66 +10,58 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseResolvedEta.py
-#  configuration file for 'Standard Loose Resolved Etas' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseResolvedEta.py
+# configuration file for 'Standard Loose Resolved Etas'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose ResolvedEta'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from GaudiKernel.SystemOfUnits import MeV
+from Configurables import FilterDesktop
+from Configurables import ResolvedPi0Maker, PhotonMaker
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseEta2gg'      ,  
-    'StdLooseResolvedEta' ,
+    'StdLooseEta2gg',
+    'StdLooseResolvedEta',
     'locations'
     )
-# =============================================================================
-from CommonParticles.Utils     import *
-from GaudiKernel.SystemOfUnits import MeV
 
-# ===========================================================
-## create the algorithm, eta in wide mass-window  
-from Configurables       import ResolvedPi0Maker, PhotonMaker
-wide =  ResolvedPi0Maker (
-    'StdLooseEta2gg'            ,
-    DecayDescriptor = 'Eta'     ,
-    MassWindow      = 105 * MeV ,
-    Particle        = 'eta'     )
+# create the algorithm, eta in wide mass-window
+wide = ResolvedPi0Maker('StdLooseEta2gg',
+                        DecayDescriptor='Eta',
+                        MassWindow=105*MeV,
+                        Particle='eta')
 
 wide.addTool(PhotonMaker)
-wide.PhotonMaker.PtCut  = 200 * MeV
+wide.PhotonMaker.PtCut = 200*MeV
 
-## configure Data-On-Demand service 
-locations = updateDoD ( wide )
-## finally: define the symbol 
-StdLooseEta2gg          = wide 
+# configure Data-On-Demand service
+locations = updateDoD(wide)
+# finally: define the symbol
+StdLooseEta2gg = wide
 
 # ============================================================================
-## filter the ``standard''-mass window 
-from Configurables       import FilterDesktop 
-fltr       =  FilterDesktop (
-    'StdLooseResolvedEta'                   ,
-    Code   = "ADMASS('eta') < 50 * MeV "    ,
-    Inputs = [
-    'Phys/%s/Particles'  % wide.name() 
-    ]
-    )
+# filter the ``standard''-mass window
+fltr = FilterDesktop('StdLooseResolvedEta',
+                     Code="ADMASS('eta') < 50 * MeV",
+                     Inputs=['Phys/%s/Particles' % wide.name()])
 
-## finally: define the symbol 
+# finally: define the symbol
 StdLooseResolvedEta = fltr
-## configure Data-On-Demand service 
-locations.update ( updateDoD ( fltr ) ) 
 
-## ============================================================================
-if '__main__' == __name__ :
-    
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# configure Data-On-Demand service
+locations.update(updateDoD(fltr))
 
-# =============================================================================
-# The END 
-# =============================================================================
+# ============================================================================
+if '__main__' == __name__:
+
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedPi0.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedPi0.py
index 478e7e5b208807443244acde84345656845e4b84..678bc539c7d4b79c120a3ed706f36a68d08c2177 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedPi0.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseResolvedPi0.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,57 +10,56 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseResolvedPi0.py
-#  configuration file for 'Standard Loose Resolved Pi0s' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseResolvedPi0.py
+# configuration file for 'Standard Loose Resolved Pi0s'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose ResolvedPi0'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from GaudiKernel.SystemOfUnits import MeV
+from CommonParticles.Utils import updateDoD, locationsDoD
+from Configurables import ResolvedPi0Maker, PhotonMaker
+from Configurables import FilterDesktop
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLoosePi02gg'      ,
-    'StdLooseResolvedPi0' ,
+    'StdLoosePi02gg',
+    'StdLooseResolvedPi0',
     'locations'
     )
-# =============================================================================
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils     import *
 
-## create the algorithm 
-from Configurables       import ResolvedPi0Maker, PhotonMaker
-wide =  ResolvedPi0Maker ( 'StdLoosePi02gg'           ,
-                           DecayDescriptor = 'Pi0'    ,
-                           MassWindow      = 60.* MeV )
+# create the algorithm
+wide = ResolvedPi0Maker('StdLoosePi02gg',
+                        DecayDescriptor='Pi0',
+                        MassWindow=60*MeV)
 wide.addTool(PhotonMaker)
 wide.PhotonMaker.PtCut = 200.*MeV
 
-## configure Data-On-Demand service 
-locations      = updateDoD ( wide  )
-## define the symbol:
-StdLoosePi02gg = wide 
+# configure Data-On-Demand service
+locations = updateDoD(wide)
+# define the symbol:
+StdLoosePi02gg = wide
 
 # ============================================================================
-## filter the ``standard''-mass window 
-from Configurables       import FilterDesktop 
-fltr       =  FilterDesktop (
-    'StdLooseResolvedPi0'                   ,
-    Code   = "ADMASS('pi0') < 30 * MeV "    ,
-    Inputs = [
-    'Phys/%s/Particles'  % wide.name() 
-    ]
-    )
-## configure Data-On-Demand service 
-locations.update ( updateDoD ( fltr ) ) 
-## finally: define the symbol 
-StdLooseResolvedPi0 = fltr 
+# filter the ``standard''-mass window
+fltr = FilterDesktop('StdLooseResolvedPi0',
+                     Code="ADMASS('pi0') < 30 * MeV ",
+                     Inputs=['Phys/%s/Particles' % wide.name()]
+                     )
 
-## ============================================================================
-if '__main__' == __name__ :
+# configure Data-On-Demand service
+locations.update(updateDoD(fltr))
+# finally: define the symbol
+StdLooseResolvedPi0 = fltr
+
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRho0.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRho0.py
index b2229b34b719dbeedb0acba64b8fb008f90e8ea5..96b829e2b17d645a98d08c9b8bda0022ffb81095 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRho0.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRho0.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,46 +10,43 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseRho0.py
-#  configuration file for 'Standard Loose Rho0'
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseRho0.py
+# configuration file for 'Standard Loose Rho0'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
-Configuration file for 'Standard Loose '
+Configuration file for 'Standard Loose'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdLooseRho0' ,
+    'StdLooseRho0',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm
-StdLooseRho0 = CombineParticles ( 'StdLooseRho0' )
 
-StdLooseRho0.Inputs  = [ "Phys/StdLoosePions/Particles" ]
+# ============================================================================
+# create the algorithm
+StdLooseRho0 = CombineParticles('StdLooseRho0')
+
+StdLooseRho0.Inputs = ["Phys/StdLoosePions/Particles"]
 StdLooseRho0.DecayDescriptor = "rho(770)0 -> pi+ pi-"
 StdLooseRho0.CombinationCut = "(ADAMASS('rho(770)0')<100*MeV)& (ADOCACHI2CUT(15, ''))"
 StdLooseRho0.MotherCut = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdLooseRho0 )
-
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseRho0)
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRhoPlus.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRhoPlus.py
index 2d3307a97a814988220f67c3f13d920c9fb5cb3e..54c645b688433b298bf976e8659056e0874c6dfc 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRhoPlus.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseRhoPlus.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,55 +10,53 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdLooseRhoPlus.py
-#  configuration file for 'Standard Loose RhoPlus' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseRhoPlus.py
+# configuration file for 'Standard Loose RhoPlus'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose RhoPlus'
 """
-__author__  = "Yasmine Amhis"
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Yasmine Amhis"
 # =============================================================================
 __all__ = (
-    'StdLooseRhoPlus' ,
+    'StdLooseRhoPlus',
     'locations'
     )
 # =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm 
-StdLooseRhoPlus = CombineParticles ( 'StdLooseRhoPlus' )
+
+# ============================================================================
+# create the algorithm
+StdLooseRhoPlus = CombineParticles('StdLooseRhoPlus')
 
 StdLooseRhoPlus = CombineParticles("StdLooseRhoPlus")
-StdLooseRhoPlus.Inputs = [ "Phys/StdLooseMergedPi0/Particles",
-                           "Phys/StdLooseResolvedPi0/Particles",
-                           "Phys/StdLoosePions/Particles",
-                           "Phys/StdLooseKaons/Particles"]		 
+StdLooseRhoPlus.Inputs = ["Phys/StdLooseMergedPi0/Particles",
+                          "Phys/StdLooseResolvedPi0/Particles",
+                          "Phys/StdLoosePions/Particles",
+                          "Phys/StdLooseKaons/Particles"]
 StdLooseRhoPlus.DecayDescriptor = "[rho(770)- -> pi- pi0]cc"
-StdLooseRhoPlus.DaughtersCuts = {"pi+" : "ALL", "K+" : "ALL",
-                                 "pi0" :  "(PT>1000*MeV)  & (P> 1500*MeV)"}
-#Note
-#The cut of 550 MeV around the K*(892)+ is NOT a typo, is motivated
-#by the requirements of the B2DVec HLT2 selection
+StdLooseRhoPlus.DaughtersCuts = {"pi+": "ALL", "K+": "ALL",
+                                 "pi0": "(PT>1000*MeV)  & (P> 1500*MeV)"}
+# Note
+# The cut of 550 MeV around the K*(892)+ is NOT a typo, is motivated
+# by the requirements of the B2DVec HLT2 selection
 StdLooseRhoPlus.CombinationCut = "(ADAMASS('K*(892)+')<550*MeV)"
-StdLooseRhoPlus.MotherCut =  "ALL"
+StdLooseRhoPlus.MotherCut = "ALL"
 
-## configure Data-On-Demand service 
-locations = updateDoD ( StdLooseRhoPlus )
+# configure Data-On-Demand service
+locations = updateDoD(StdLooseRhoPlus)
 
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdMassConstrainedJpsi2MuMu.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdMassConstrainedJpsi2MuMu.py
index cd695d8f4c2865120310d1cc379e4aa094142801..4057d7b92638a3d9b19455f2eba991f00e9e3e2d 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdMassConstrainedJpsi2MuMu.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdMassConstrainedJpsi2MuMu.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,40 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdMassConstrainedJpsi2MuMu.py
-#  configuration file for 'Standard mass constrained Jpsi2MuMu'
-#  @author Roel Aaij
-#  @date 2010-08-31
+# @file  CommonParticles/StdMassConstrainedJpsi2MuMu.py
+# configuration file for 'Standard mass constrained Jpsi2MuMu'
+# @author Roel Aaij
+# @date 2010-08-31
 # =============================================================================
 """
 Configuration file for 'Standard mass constrained Jpsi2MuMu'
 """
-__author__  = "Roel Aaij"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Roel Aaij"
+
 __all__ = (
-    'StdMassConstrainedJpsi2MuMu' ,
+    'StdMassConstrainedJpsi2MuMu',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
+# ============================================================================
 StdMassConstrainedJpsi2MuMu = CombineParticles("StdMassConstrainedJpsi2MuMu")
 StdMassConstrainedJpsi2MuMu.Inputs = ["Phys/StdAllLooseMuons/Particles"]
 StdMassConstrainedJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-"
-StdMassConstrainedJpsi2MuMu.DaughtersCuts = { 'mu+' : '(PIDmu > 0) & (PT > 0.5*GeV)' }
+StdMassConstrainedJpsi2MuMu.DaughtersCuts = {'mu+': '(PIDmu > 0) & (PT > 0.5*GeV)'}
 StdMassConstrainedJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 150.*MeV) & (ADOCACHI2CUT(20, ''))"
 StdMassConstrainedJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 16.) & (MFIT)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdMassConstrainedJpsi2MuMu )
+# configure Data-On-Demand service
+locations = updateDoD(StdMassConstrainedJpsi2MuMu)
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownElectrons.py
index f536c97905620116aaa4576b161c85e655b3948c..aff03c070f91b742cbfb5ffafdfbb1570eccf81f 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,48 +10,42 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Electrons with downstram tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
-# =============================================================================
+
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+
 __all__ = (
-    'StdNoPIDsDownElectrons' ,
+    'StdNoPIDsDownElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
-
-from CommonParticles.Utils import *
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsDownElectrons'  ,
-                                   DecayDescriptor = 'Electron' ,
-                                   Particle = 'electron'  )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsDownElectrons',
+                                DecayDescriptor='Electron',
+                                Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm , trackTypes = [ "Downstream" ]) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm, trackTypes=["Downstream"])
 
-## finally: define the symbol 
-StdNoPIDsDownElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdNoPIDsDownElectrons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownKaons.py
index a599ecb7fb5f71b5a8ba37db8594ce7e96c0f1e9..6697d54cc61c1b8677fab92362bd349c2126a9dd 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,50 +10,46 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsDownKaons.py
-#  configuration file for 'Standard NoPIDs Downstream Kaons' 
-#  @author Olli LUPTON oliver.lupton@cern.ch
-#  @date 2016-11-03
+# @file  CommonParticles/StdNoPIDsDownKaons.py
+# configuration file for 'Standard NoPIDs Downstream Kaons'
+# @author Olli LUPTON oliver.lupton@cern.ch
+# @date 2016-11-03
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Downstream Kaons'
 """
-__author__  = "Olli Lupton <oliver.lupton@cern.ch>"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Olli Lupton <oliver.lupton@cern.ch>"
+
 __all__ = (
-    'StdNoPIDsDownKaons' ,
+    'StdNoPIDsDownKaons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsDownKaons'  ,
-                                DecayDescriptor = 'Kaon' ,
-                                Particle = 'kaon' )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsDownKaons',
+                                DecayDescriptor='Kaon',
+                                Particle='kaon')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
-## finally: define the symbol 
-StdNoPIDsDownKaons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdNoPIDsDownKaons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownPions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownPions.py
index ef30087f3ec33c5996873c6d0cf81d4fce11c2fa..1aaf03424326c7cd224130acae7e736b85034457 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownPions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownPions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,50 +10,45 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsDownPions.py
-#  configuration file for 'Standard NoPIDs Downstream Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsDownPions.py
+# configuration file for 'Standard NoPIDs Downstream Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Downstream Pions'
 """
-__author__  = "Alessio Sarti <Alessio.Sarti@lnf.infn.it>"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Alessio Sarti <Alessio.Sarti@lnf.infn.it>"
+
 __all__ = (
-    'StdNoPIDsDownPions' ,
+    'StdNoPIDsDownPions',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
-
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsDownPions'  ,
-                                DecayDescriptor = 'Pion' ,
-                                Particle = 'pion' )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsDownPions',
+                                DecayDescriptor='Pion',
+                                Particle='pion')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
-## finally: define the symbol 
-StdNoPIDsDownPions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdNoPIDsDownPions = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownProtons.py
index c46138a748ad6830fb16889284a9b87cbb5617a6..5f445f7bf67b8b9d99847703b2853d3d5b31c2ff 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsDownProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,50 +10,46 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsDownProtons.py
-#  configuration file for 'Standard NoPIDs Downstream Protons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsDownProtons.py
+# configuration file for 'Standard NoPIDs Downstream Protons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Downstream Protons'
 """
-__author__  = "Alessio Sarti <Alessio.Sarti@lnf.infn.it>"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Alessio Sarti <Alessio.Sarti@lnf.infn.it>"
+
 __all__ = (
-    'StdNoPIDsDownProtons' ,
+    'StdNoPIDsDownProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsDownProtons'         ,
-                                   DecayDescriptor = 'Proton' ,
-                                   Particle = 'proton')
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsDownProtons',
+                                DecayDescriptor='Proton',
+                                Particle='proton')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } ) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
-## finally: define the symbol 
-StdNoPIDsDownProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdNoPIDsDownProtons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsElectrons.py
index 694d1e675cda7d994a86a3727490c05de9e40c13..5e399dd188a4baec6edf433ebe5357fcee530490 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,41 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Electrons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Electrons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Electrons with loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
-__all__ = (
-    'StdNoPIDsElectrons' ,
-    'locations'
-    )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
 
 
-from CommonParticles.Utils import *
+__author__ = "Patrick Koppenburg"
 
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdNoPIDsElectrons',
-                            Inputs = ["Phys/StdAllNoPIDsElectrons/Particles"],
-                            Code = defaultCuts() )
+__all__ = (
+    'StdNoPIDsElectrons',
+    'locations'
+    )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdNoPIDsElectrons',
+                          Inputs=["Phys/StdAllNoPIDsElectrons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdNoPIDsElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdNoPIDsElectrons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsKaons.py
index 1cfb66565ed052b5e3c6195dd9e7f2eb77e37826..b412d1638480bbe865893773ca53ff6b995d2e93 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsKaons.py
@@ -10,47 +10,41 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsKaons.py
-#  configuration file for 'Standard NoPIDs Kaons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdNoPIDsKaons.py
+# configuration file for 'Standard NoPIDs Kaons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Kaons with loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
-__all__ = (
-    'StdNoPIDsKaons' ,
-    'locations'
-    )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
+from __future__ import print_function
 
 
-from CommonParticles.Utils import *
+__author__ = "Patrick Koppenburg"
 
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdNoPIDsKaons',
-                            Inputs = ["Phys/StdAllNoPIDsKaons/Particles"],
-                            Code = defaultCuts() )
+__all__ = (
+    'StdNoPIDsKaons',
+    'locations'
+    )
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdNoPIDsKaons',
+                          Inputs=["Phys/StdAllNoPIDsKaons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdNoPIDsKaons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdNoPIDsKaons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsMuons.py
index 56b18476978a8e8c3489b0936bb19e59af28076b..c0c17666e4586968f356dbdd82967ac6b503e870 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,42 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsMuons.py
-#  configuration file for 'Standard NoPIDs Muons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdNoPIDsMuons.py
+# configuration file for 'Standard NoPIDs Muons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Muons with loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'StdNoPIDsMuons' ,
+    'StdNoPIDsMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
-
-
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdNoPIDsMuons',
-                            Inputs = ["Phys/StdAllNoPIDsMuons/Particles"],
-                            Code = defaultCuts() )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdNoPIDsMuons',
+                          Inputs=["Phys/StdAllNoPIDsMuons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdNoPIDsMuons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdNoPIDsMuons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsPions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsPions.py
index ae0678a3d0ba691c5bdd61b241509e6b1360c4fa..144608301f0ddd8ac6a8aabf69d18ec627a8e0af 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsPions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsPions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,42 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsPions.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdNoPIDsPions.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Pions with loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
+
+
 __all__ = (
-    'StdNoPIDsPions' ,
+    'StdNoPIDsPions',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
-
 
-from CommonParticles.Utils import *
+__author__ = "Patrick Koppenburg"
 
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdNoPIDsPions',
-                            Inputs = ["Phys/StdAllNoPIDsPions/Particles"],
-                            Code = defaultCuts() )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdNoPIDsPions',
+                          Inputs=["Phys/StdAllNoPIDsPions/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdNoPIDsPions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdNoPIDsPions = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsProtons.py
index f749625a2cb295cf548c825967d77e1ceae554ad..71e0039813cdca424a60ab918f546a992d9f4a86 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,42 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsProtons.py
-#  configuration file for 'Standard NoPIDs Protons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdNoPIDsProtons.py
+# configuration file for 'Standard NoPIDs Protons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Protons wioth loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import defaultCuts, updateDoD, locationsDoD
+
+
+__author__ = "Patrick Koppenburg "
+
 __all__ = (
-    'StdNoPIDsProtons' ,
+    'StdNoPIDsProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
-
-
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdNoPIDsProtons',
-                            Inputs = ["Phys/StdAllNoPIDsProtons/Particles"],
-                            Code = defaultCuts() )
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# create the algorithm
+algorithm = FilterDesktop('StdNoPIDsProtons',
+                          Inputs=["Phys/StdAllNoPIDsProtons/Particles"],
+                          Code=defaultCuts())
 
-## finally: define the symbol 
-StdNoPIDsProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdNoPIDsProtons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpElectrons.py
index 0cfac4e58041b3201f464ff5bf273602b0c23b20..476bda26a8dd3f31523845399d45ce7657ef21d7 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,43 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Electrons with Upstream tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+
 __all__ = (
-    'StdNoPIDsUpElectrons' ,
+    'StdNoPIDsUpElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsUpElectrons'         ,
-                                DecayDescriptor = 'Electron' , Particle = 'electron'  )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsUpElectrons',
+                                DecayDescriptor='Electron', Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm, trackTypes = [ "Upstream" ] ) 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+selector = trackSelector(algorithm, trackTypes=["Upstream"])
 
-## finally: define the symbol 
-StdNoPIDsUpElectrons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdNoPIDsUpElectrons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpKaons.py
index 3fdc4e25b8f4fbe89ff3825917cf46faaf3b6be0..f56cddc7271d624a87de4aed80cd8d7de53b98ca 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsUpKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,46 +10,42 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdNoPIDsUpKaons.py
-#  configuration file for No PID Upstream Kaons
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdNoPIDsUpKaons.py
+# configuration file for No PID Upstream Kaons
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for No PID Upstream Kaons
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdNoPIDsUpKaons' ,
+    'StdNoPIDsUpKaons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = NoPIDsParticleMaker ( 'StdNoPIDsUpKaons',
-                                  DecayDescriptor = 'Kaon' ,
-                                  Particle = 'kaon' )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsUpKaons',
+                                DecayDescriptor='Kaon',
+                                Particle='kaon')
 
 # configure the track selector
-selector = trackSelector ( algorithm, trackTypes = ['Upstream'] )
+selector = trackSelector(algorithm, trackTypes=['Upstream'])
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdNoPIDsUpKaons = algorithm 
+# finally: define the symbol
+StdNoPIDsUpKaons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsVeloElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsVeloElectrons.py
index cab7eabe892ea4283f938661606827ca4269d0a1..4e40b3e02f3fcb860ca3e4094d455c70aa94d512 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsVeloElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdNoPIDsVeloElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,47 +10,43 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdNoPIDsElectrons.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdNoPIDsElectrons.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard NoPIDs Electrons with VELO tracks'
 """
-__author__  = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
+from __future__ import print_function
+from Configurables import NoPIDsParticleMaker
+from CommonParticles.Utils import trackSelector, updateDoD, locationsDoD
+
+
+__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
 # =============================================================================
 __all__ = (
-    'StdNoPIDsElectrons' ,
+    'StdNoPIDsVeloElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import NoPIDsParticleMaker 
 
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  NoPIDsParticleMaker ( 'StdNoPIDsVeloElectrons'         ,
-                                DecayDescriptor = 'Electron' , Particle = 'electron'  )
+# create the algorithm
+algorithm = NoPIDsParticleMaker('StdNoPIDsVeloElectrons',
+                                DecayDescriptor='Electron', Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm,trackTypes = [ "Velo" ]  ) 
+selector = trackSelector(algorithm, trackTypes=["Velo"])
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdNoPIDsVeloElectrons = algorithm 
+# finally: define the symbol
+StdNoPIDsVeloElectrons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdParticleFlow.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdParticleFlow.py
index cfb2b937fdbc97fc5fa47882e8a7c6fe0eba9028..5f3f5583cb8d4742a31bd6b6b4342531f065b660 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdParticleFlow.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdParticleFlow.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -9,44 +9,39 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-# =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdAllNoPIDsPions.py
-#  configuration file for 'Standard NoPIDs Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
-# =============================================================================
-"""
-Configuration file for 'Standard NoPIDs Pions'
-"""
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
-__all__ = (
-    'StdParticleFlow' ,
-    'locations'
-    )
-# =============================================================================
-from Gaudi.Configuration   import *
-from CommonParticles.Utils import *
-
-
-from JetAccessories.ParticleFlow_Config import ParticleFlowConf
-algorithm = ParticleFlowConf("PF" , _MCCor = False ).PFSeq
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
-
-
-## finally: define the symbol 
-StdParticleFlow = algorithm 
-
-## ============================================================================
-if '__main__' == __name__ :
-
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+# =============================================================================
+# @file  CommonParticles/StdAllNoPIDsPions.py
+# configuration file for 'Standard NoPIDs Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
+# =============================================================================
+"""
+Configuration file for 'Standard NoPIDs Pions'
+"""
+from __future__ import print_function
+from JetAccessories.ParticleFlow_Config import ParticleFlowConf
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
+__all__ = (
+    'StdParticleFlow',
+    'locations'
+    )
+
+
+algorithm = ParticleFlowConf("PF", _MCCor=False).PFSeq
+
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
+
+
+# finally: define the symbol
+StdParticleFlow = algorithm
+
+# ============================================================================
+if '__main__' == __name__:
+
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownKaons.py
index 991704d72730a20a2e628380fb298e4ab5f26ab2..6204498f16568992442f40a099f3a13c9828fbae 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,50 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNDownKaons.py
-#  configuration file for 'Standard Tight ANN Downstream Kaons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNDownKaons.py
+# configuration file for 'Standard Tight ANN Downstream Kaons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Downstream Kaons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNDownKaons' ,
+    'StdTightANNDownKaons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNDownKaons' ,
-                                    Particle = 'kaon' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNDownKaons',
+                                  Particle='kaon')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ]
-fltr.Selection = [ "ProbNNk>'0.15'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Kaon')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNk>'0.2'"]
+fltr.Selection = ["ProbNNk>'0.15'"]
 
-## finally: define the symbol 
-StdTightANNDownKaons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNDownKaons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownMuons.py
index 8ef6397f2f43b4f9d64237a80ec8b7d04f0582db..351d87f8cd83726986bcd618d112ebae06a29659 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,49 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNDownMuons.py
-#  configuration file for 'Standard Tight ANN Downstream Muons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNDownMuons.py
+# configuration file for 'Standard Tight ANN Downstream Muons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Loose Downstream Muons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleMUONFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNDownMuons' ,
+    'StdTightANNDownMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleMUONFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNDownMuons' ,
-                                    Particle = 'muons' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNDownMuons',
+                                  Particle='muons')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' )
-#fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ]
-fltr.Selection = [ "ProbNNmu>'0.1'" ]
+fltr = protoFilter(algorithm, ProtoParticleMUONFilter, 'Muon')
+# fltr.Selection = ["RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'"]
+fltr.Selection = ["ProbNNmu>'0.1'"]
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdTightANNDownMuons = algorithm 
+# finally: define the symbol
+StdTightANNDownMuons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownPions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownPions.py
index b0f7899591cdbe6711ce35455ff957a54276c626..d431eaf2296dacc12afe4a71ae7b6eeb863c42dc 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownPions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownPions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,51 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNDownPions.py
-#  configuration file for 'Standard Tight ANN Downstream Pions' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNDownPions.py
+# configuration file for 'Standard Tight ANN Downstream Pions'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Downstream Pions using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNDownPions' ,
+    'StdTightANNDownPions',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNDownPions' ,
-                                    Particle = 'pion' )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNDownPions',
+                                  Particle='pion')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ]
-fltr.Selection = [ "ProbNNpi>'0.07'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Pion')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNpi>'0.2'"]
+fltr.Selection = ["ProbNNpi>'0.07'"]
 
-## finally: define the symbol 
-StdTightANNDownPions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNDownPions = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownProtons.py
index 61d2033a9a73cfcf6c495283660534e52a132335..5ef0cebc3c6444899bc29272e6b927157da65ac4 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNDownProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,51 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNDownProtons.py
-#  configuration file for 'Standard Tight ANN Downstream Protons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNDownProtons.py
+# configuration file for 'Standard Tight ANN Downstream Protons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Downstream Protons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNDownProtons' ,
+    'StdTightANNDownProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNDownProtons' ,
-                                    Particle = 'proton' )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNDownProtons',
+                                  Particle='proton')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Downstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Downstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ]
-fltr.Selection = [ "ProbNNp>'0.1'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Proton')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNp>'0.2'"]
+fltr.Selection = ["ProbNNp>'0.1'"]
 
-## finally: define the symbol 
-StdTightANNDownProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNDownProtons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNElectrons.py
index 68f3421a637909e4026cfed576fdc1adee6d0938..7950c68fbd33361965882afce67e8a60c74b4fd5 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,52 +11,50 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdTightANNElectrons.py
-#  configuration file for 'Standard Loose Electrons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNElectrons.py
+# configuration file for 'Standard Loose Electrons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight ANN Electrons'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNElectrons' ,
+    'StdTightANNElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNElectrons',
-                                    Particle = 'electron'  )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNElectrons',
+                                  Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' )
-#fltr.Selection = [ "RequiresDet='CALO' ProbNNe>'0.2'" ]
-#fltr.Selection = [ "ProbNNe>'0.2'" ]
-fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.16'" ]
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Electron')
+# fltr.Selection = ["RequiresDet='CALO' ProbNNe>'0.2'"]
+# fltr.Selection = ["ProbNNe>'0.2'"]
+fltr.Selection = ["RequiresDet='RICHORCALO' ProbNNe>'0.16'"]
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdTightANNElectrons = algorithm 
+# finally: define the symbol
+StdTightANNElectrons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
-    
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNKaons.py
index 5f55309f58d00070ba1ca26697066292391bfcbb..feebaa57507a5de1b9a500c14701f73da9a13ec2 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,51 +10,48 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNKaons.py
-#  configuration file for 'Standard Tight Kaons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNKaons.py
+# configuration file for 'Standard Tight Kaons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Kaons'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNKaons' ,
+    'StdTightANNKaons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import ProtoParticleCALOFilter, CombinedParticleMaker
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  CombinedParticleMaker ( 'StdTightANNKaons',
-                                     Particle = 'kaon'  )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNKaons',
+                                  Particle='kaon')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.15'" ]
-fltr.Selection = [ "ProbNNk>'0.05'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Kaon')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNk>'0.15'"]
+fltr.Selection = ["ProbNNk>'0.05'"]
 
-## finally: define the symbol 
-StdTightANNKaons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNKaons = algorithm
 
-    print __doc__
-    print __author__
-    
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNMuons.py
index 0a04c3fc9dc646b8db262c0aa66427e958f0513f..60f94a494fece09e8a479c1296f653cb55c4c9af 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,47 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdTightANNMuons.py
-#  configuration file for 'Standard Tight Muons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNMuons.py
+# configuration file for 'Standard Tight Muons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Muons'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleMUONFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNMuons' ,
+    'StdTightANNMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleMUONFilter
 
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNMuons' ,
-                                    Particle = 'muon'  )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNMuons',
+                                  Particle='muon')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' )
-#fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'" ]
-fltr.Selection = [ "ProbNNmu>'0.01'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleMUONFilter, 'Muon')
+# fltr.Selection = [ "RequiresDet='MUON' IsMuon=True ProbNNmu>'0.1'"]
+fltr.Selection = ["ProbNNmu>'0.01'"]
 
-## finally: define the symbol 
-StdTightANNMuons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNMuons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNPions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNPions.py
index 4ae2fb547f5ffcc7b0f33b938e42a3e8b8aabb78..a642b95c3c259399a75fcb97101bb825df2a42da 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNPions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNPions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,51 +10,47 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNPions.py
-#  configuration file for 'Standard Tight Pions' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNPions.py
+# configuration file for 'Standard Tight Pions'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight ANN Pions'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNPions' ,
+    'StdTightANNPions',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNPions',
-                                    Particle = 'pion'  )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNPions',
+                                  Particle='pion')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' )
-fltr.Selection = [ "ProbNNpi>'0.6'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Pion')
+fltr.Selection = ["ProbNNpi>'0.6'"]
 
-## finally: define the symbol 
-StdTightANNPions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNPions = algorithm
 
-    print __doc__
-    print __author__
-    
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNProtons.py
index 829da5fc28d4b9f8ecc28142b8df170f1bd25620..bb455ccd66a9f385a293ccf7645ad12d61ecbda7 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,52 +10,49 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdTightANNProtons.py
-#  configuration file for 'Standard Tight ANN Protons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNProtons.py
+# configuration file for 'Standard Tight ANN Protons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight ANN Protons'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNProtons' ,
+    'StdTightANNProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNProtons',
-                                    Particle = 'proton'  )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNProtons',
+                                  Particle='proton')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.125'" ]
-fltr.Selection = [ "ProbNNp>'0.02'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Proton')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNp>'0.125'"]
+fltr.Selection = ["ProbNNp>'0.02'"]
 
-## finally: define the symbol 
-StdTightANNProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNProtons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpElectrons.py
index 1f5aed4f02db5a66e30898e9b64c389e459d5a12..1779d9b0ba464c1c841ded3d9c54b9f9b0b10a90 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,49 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNUpElectrons.py
-#  configuration file for 'Standard Tight ANN Upstream Electrons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNUpElectrons.py
+# configuration file for 'Standard Tight ANN Upstream Electrons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Upstream Electrons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNUpElectrons' ,
+    'StdTightANNUpElectrons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNUpElectrons' ,
-                                    Particle = 'electron' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNUpElectrons',
+                                  Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Upstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Upstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNe>'0.2'" ]
-fltr.Selection = [ "RequiresDet='RICHORCALO' ProbNNe>'0.1'" ]
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Electron')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNe>'0.2'"]
+fltr.Selection = ["RequiresDet='RICHORCALO' ProbNNe>'0.1'"]
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdTightANNUpElectrons = algorithm 
+# finally: define the symbol
+StdTightANNUpElectrons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpKaons.py
index 37c26475f0dc298e8ef4214e4b22f529b59c162f..fedf603a2c921cd7f72810f08a104268381e47f8 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,50 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNUpKaons.py
-#  configuration file for 'Standard Tight ANN Upstream Kaons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNUpKaons.py
+# configuration file for 'Standard Tight ANN Upstream Kaons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Upstream Kaons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
 # =============================================================================
 __all__ = (
-    'StdTightANNUpKaons' ,
+    'StdTightANNUpKaons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNUpKaons' ,
-                                    Particle = 'kaon' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNUpKaons',
+                                  Particle='kaon')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Upstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Upstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNk>'0.2'" ]
-fltr.Selection = [ "ProbNNk>'0.09'" ]
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Kaon')
+# fltr.Selection = ["RequiresDet='RICH' ProbNNk>'0.2'"]
+fltr.Selection = ["ProbNNk>'0.09'"]
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdTightANNUpKaons = algorithm 
+# finally: define the symbol
+StdTightANNUpKaons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpMuons.py
index ca409dcbf4b37c40290061f87ad0b0cf7c92a2dc..5f6ff6a4c96ff38e0470c2f91283e0bbff54201e 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,50 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNUpMuons.py
-#  configuration file for 'Standard Loose ANN Upstream Muons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNUpMuons.py
+# configuration file for 'Standard Loose ANN Upstream Muons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Loose Upstream Muons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleMUONFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNUpMuons' ,
+    'StdTightANNUpMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleMUONFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNUpMuons' ,
-                                    Particle = 'muons' )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNUpMuons',
+                                  Particle='muons')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Upstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Upstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNmu>'0.1'" ]
-fltr.Selection = [ "ProbNNmu>'0.1'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleMUONFilter, 'Muon')
+# fltr.Selection = [ "RequiresDet='RICH' ProbNNmu>'0.1'" ]
+fltr.Selection = ["ProbNNmu>'0.1'"]
 
-## finally: define the symbol 
-StdTightANNUpMuons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNUpMuons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpPions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpPions.py
index a10abbac7fe7483e682c877e6bef89b751d71580..ef5cf6aed46022e7a7220ce027637fd3e7c6a1d1 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpPions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpPions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,51 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNUpPions.py
-#  configuration file for 'Standard Tight ANN Upstream Pions' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNUpPions.py
+# configuration file for 'Standard Tight ANN Upstream Pions'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Upstream Pions using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
 # =============================================================================
 __all__ = (
-    'StdTightANNUpPions' ,
+    'StdTightANNUpPions',
     'locations'
     )
 # =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNUpPions' ,
-                                    Particle = 'pion' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNUpPions',
+                                  Particle='pion')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Upstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Upstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ]
-fltr.Selection = [ "ProbNNpi>'0.1'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Pion')
+# fltr.Selection = [ "RequiresDet='RICH' ProbNNpi>'0.2'" ]
+fltr.Selection = ["ProbNNpi>'0.1'"]
 
-## finally: define the symbol 
-StdTightANNUpPions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNUpPions = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpProtons.py
index 21a672a5642c5f1424010955060cc8631abaac03..1ac6dfac44da033ed8182a462d28d56246ed843d 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightANNUpProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,53 +10,51 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightANNUpProtons.py
-#  configuration file for 'Standard Tight ANN Upstream Protons' 
-#  @author Chris Jones christopher.rob.jones@cern.ch
-#  @date 20/01/2012
+# @file  CommonParticles/StdTightANNUpProtons.py
+# configuration file for 'Standard Tight ANN Upstream Protons'
+# @author Chris Jones christopher.rob.jones@cern.ch
+# @date 20/01/2012
 # =============================================================================
 """
 Configuration file for 'Standard Tight Upstream Protons using ANN PID'
 """
-__author__  = "Chris Jones christopher.rob.jones@cern.ch"
-# =============================================================================
+
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Chris Jones christopher.rob.jones@cern.ch"
+
 __all__ = (
-    'StdTightANNUpProtons' ,
+    'StdTightANNUpProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightANNUpProtons' ,
-                                    Particle = 'proton' )
+
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightANNUpProtons',
+                                  Particle='proton')
 
 # configure the track selector
-selector = trackSelector ( algorithm,
-                           trackTypes = ['Upstream'],
-                           cuts = { "Chi2Cut" : [0,10] } )
+selector = trackSelector(algorithm,
+                         trackTypes=['Upstream'],
+                         cuts={"Chi2Cut": [0, 10]})
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' )
-#fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ]
-fltr.Selection = [ "ProbNNp>'0.075'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Proton')
+# fltr.Selection = [ "RequiresDet='RICH' ProbNNp>'0.2'" ]
+fltr.Selection = ["ProbNNp>'0.075'"]
 
-## finally: define the symbol 
-StdTightANNUpProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightANNUpProtons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDetachedTau.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDetachedTau.py
index a9e35aa058fb6ac9efa44c3771e699a72b9b4a34..0eded8fc0bc2a6bb095b789c20cfb52c318561c5 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDetachedTau.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDetachedTau.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,11 +10,11 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/StdTightDetachedTau.py
-#  configuration file for 'Standard Tight Detached Tau' 
-#  @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli
-#  @date 2012-12-02
+# @file  CommonParticles/StdTightDetachedTau.py
+# configuration file for 'Standard Tight Detached Tau'
+# @author Donal Hill, Conor Fitzpatrick, Christian Elsasser, Giampiero Mancinelli
+# @date 2012-12-02
+#
 # Strongly modified 2012-14-01 by Giampiero Mancinelli
 # Used to make the StdLooseDetachedTau3pi in Stripping20r0p3
 # Renamed tight afterward (in view of Stripping 21), in order to restore the
@@ -23,47 +23,40 @@
 """
 Configuration file for 'Standard Tight Detached Tau'
 """
-__author__  = "Donal Hill, Conor Fitzpatrick, Christian Elsasser"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Donal Hill, Conor Fitzpatrick, Christian Elsasser"
+
 __all__ = (
            'StdTightDetachedTau3pi',
            'locations'
-           
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm - physical tau+ -> pi+ pi- pi+
-StdTightDetachedTau3pi = CombineParticles ( 'StdTightDetachedTau3pi' )
+# create the algorithm - physical tau+ -> pi+ pi- pi+
+StdTightDetachedTau3pi = CombineParticles('StdTightDetachedTau3pi')
 
-StdTightDetachedTau3pi.Inputs = [ "Phys/StdLoosePions/Particles" ]
+StdTightDetachedTau3pi.Inputs = ["Phys/StdLoosePions/Particles"]
 
-#Build physical tau and tau+++
+# Build physical tau and tau+++
 StdTightDetachedTau3pi.DecayDescriptors = ["[tau+ -> pi+ pi- pi+]cc"]
 StdTightDetachedTau3pi.DaughtersCuts = {
-    "pi+"        : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PROBNNpi > 0.55)",
-    "pi-"        : "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PROBNNpi > 0.55)"
-    
+    "pi+": "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PROBNNpi > 0.55)",
+    "pi-": "(PT>250.*MeV) & (P>2000.*MeV) & (MIPCHI2DV(PRIMARY) > 16.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PROBNNpi > 0.55)"
     }
 
-
 StdTightDetachedTau3pi.CombinationCut = "(APT>800.*MeV) & ((AM>400.*MeV) & (AM<2100.*MeV)) & (AMAXDOCA('')<0.2*mm) & (ANUM(PT > 800*MeV) >= 1) "
 StdTightDetachedTau3pi.MotherCut = "(PT>1000.*MeV) & (M>500.*MeV) & (M<2000.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 16) & (BPVVDCHI2>16) & (BPVVDRHO>0.1*mm) & (BPVVDRHO<7.0*mm) & (BPVVDZ>5.0*mm)"
 
-## configure Data-On-Demand service 
-locations = updateDoD ( StdTightDetachedTau3pi )
-
+# configure Data-On-Demand service
+locations = updateDoD(StdTightDetachedTau3pi)
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDplus.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDplus.py
index bbaf27ab60230df8b97641e06823d7ff55ffc92d..b7de66a71f2e852b4b61a113c9be84d480fee374 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDplus.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightDplus.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -9,71 +9,72 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-## @file  CommonParticles/StdTightDplus.py
-#  configuration file for 'Standard Tight Dplus' 
-#  @author Sandra Amato
-#  @date 2011-08-26# =============================================================================
-"""
-Configuration file for 'Standard Tight Dplus'"""
-__author__  = "Sandra Amato"
+# @file  CommonParticles/StdTightDplus.py
+# configuration file for 'Standard Tight Dplus'
+# @author Sandra Amato
+# @date 2011-08-26
 # =============================================================================
-__all__ = ( 
-    'StdTightDplus2KPiPiOppSignPi' ,
+"""
+Configuration file for 'Standard Tight Dplus'
+"""
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+from StdLooseDplus import StdLooseDplus2KPiPi
+
+
+__author__ = "Sandra Amato"
+
+__all__ = (
+    'StdTightDplus2KPiPiOppSignPi',
     'StdVeryTightDsplus2KKPi',
     'locations'
     )
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
+
 
 locations = {}
 
-## ============================================================================
-StdTightDplus2KPiPiOppSignPi = CombineParticles ( 'StdTightDplus2KPiPiOppSignPi')
-StdTightDplus2KPiPiOppSignPi.Inputs = [ "Phys/StdLooseKaons/Particles",
-                               "Phys/StdLoosePions/Particles" ]
+
+# ============================================================================
+StdTightDplus2KPiPiOppSignPi = CombineParticles('StdTightDplus2KPiPiOppSignPi')
+StdTightDplus2KPiPiOppSignPi.Inputs = ["Phys/StdLooseKaons/Particles",
+                                       "Phys/StdLoosePions/Particles"]
 
 StdTightDplus2KPiPiOppSignPi.DecayDescriptor = "[D+ -> pi- pi+ K+]cc"
 StdTightDplus2KPiPiOppSignPi.DaughtersCuts = {
-    "K+"  : "(P > 2*GeV) & ((PIDK-PIDpi) > 7.)",
-    "pi+" : "(P > 2*GeV)  & ((PIDK-PIDpi) < 3.)"
+    "K+": "(P > 2*GeV) & ((PIDK-PIDpi) > 7.)",
+    "pi+": "(P > 2*GeV)  & ((PIDK-PIDpi) < 3.)"
     }
 StdTightDplus2KPiPiOppSignPi.CombinationCut = "((AM>1760.*MeV) & (AM<2080.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))"
 StdTightDplus2KPiPiOppSignPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1770.*MeV) & (M < 2070.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))"
 
-locations.update(updateDoD ( StdTightDplus2KPiPiOppSignPi ))
+locations.update(updateDoD(StdTightDplus2KPiPiOppSignPi))
 
-## ===========================================================================
-StdVeryTightDsplus2KKPi = CombineParticles( 'StdVeryTightDsplus2KKPi' )
-StdVeryTightDsplus2KKPi.Inputs = [ "Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles" ]
+# ===========================================================================
+StdVeryTightDsplus2KKPi = CombineParticles('StdVeryTightDsplus2KKPi')
+StdVeryTightDsplus2KKPi.Inputs = ["Phys/StdLooseKaons/Particles", "Phys/StdLoosePions/Particles"]
 StdVeryTightDsplus2KKPi.DecayDescriptor = "[D_s+ -> K- K+ pi+]cc"
 StdVeryTightDsplus2KKPi.DaughtersCuts = {
-    "K+"  : "(P > 2*GeV) & ((PIDK-PIDpi) > 5.)",
-    "pi+" : "(P > 2*GeV)  & ((PIDK-PIDpi) < 5.)"
+    "K+": "(P > 2*GeV) & ((PIDK-PIDpi) > 5.)",
+    "pi+": "(P > 2*GeV)  & ((PIDK-PIDpi) < 5.)"
     }
 StdVeryTightDsplus2KKPi.CombinationCut = "((AM>1900.*MeV) & (AM<2040.*MeV) & ((APT>1.*GeV) | (ASUM(PT)>1.*GeV)) & (ADOCAMAX('')<0.5*mm))"
-StdVeryTightDsplus2KKPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1920.*MeV) & (M < 2020.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))" 
-locations.update(updateDoD ( StdVeryTightDsplus2KKPi ))
+StdVeryTightDsplus2KKPi.MotherCut = "((VFASPF(VCHI2) < 30 ) & (M>1920.*MeV) & (M < 2020.*MeV) & (BPVVDCHI2>36) & (BPVDIRA>0.98))"
+locations.update(updateDoD(StdVeryTightDsplus2KKPi))
 
 ##########################################################################################
-# D+ -> 3 pi is a clone of D+ -> K Pi Pi 
+# D+ -> 3 pi is a clone of D+ -> K Pi Pi
 #
-from StdLooseDplus import StdLooseDplus2KPiPi
 StdTightDplus2PiPiPi = StdLooseDplus2KPiPi.clone("StdTightDplus2PiPiPi")
-StdTightDplus2PiPiPi.Inputs = [ "Phys/StdLoosePions/Particles" ]
+StdTightDplus2PiPiPi.Inputs = ["Phys/StdLoosePions/Particles"]
 StdTightDplus2PiPiPi.DecayDescriptor = "[D+ -> pi- pi+ pi+]cc"
-StdTightDplus2PiPiPi.DaughtersCuts = {"pi+" : "(P > 2*GeV)  & ((PIDK-PIDpi) < 3.) & ((MIPCHI2DV(PRIMARY)) > 6.0 )"}
-locations.update(updateDoD ( StdTightDplus2PiPiPi ))
+StdTightDplus2PiPiPi.DaughtersCuts = {"pi+": "(P > 2*GeV)  & ((PIDK-PIDpi) < 3.) & ((MIPCHI2DV(PRIMARY)) > 6.0 )"}
+locations.update(updateDoD(StdTightDplus2PiPiPi))
 ##########################################################################################
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
-
-# =============================================================================
-# The END 
-# =============================================================================
-                                                                                            
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightElectrons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightElectrons.py
index 0422627f7aab1c9aa381293d5f1c87dbff2397eb..9dfbdef58f2f78cb9206b0504da8c293a050ebbf 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightElectrons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightElectrons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,57 +10,53 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightElectrons.py
-#  configuration file for 'Standard Loose Electrons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdTightElectrons.py
+# configuration file for 'Standard Loose Electrons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Tight Electrons'
 """
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+# from Configurables import BremAdder
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
 __all__ = (
-    'StdTightElectrons' ,
+    'StdTightElectrons',
     'locations'
-    )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from Configurables       import BremAdder
-
-from CommonParticles.Utils import *
+)
 
-## create the algorithm 
-algorithm =  CombinedParticleMaker ( 'StdTightElectrons',
-                                     Particle =  'electron'  )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightElectrons',
+                                  Particle='electron')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter , 'Electron' )
-fltr.Selection = [ "RequiresDet='CALO' CombDLL(e-pi)>'0.0'" ]
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Electron')
+fltr.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'0.0'"]
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## finally: define the symbol 
-StdTightElectrons = algorithm 
+# finally: define the symbol
+StdTightElectrons = algorithm
 
-## temporary:
-#algorithm.addTool ( BremAdder )
-#brem = algorithm.BremAdder 
-#brem.BremCor = 1.0
+# temporary:
+# algorithm.addTool (BremAdder)
+# brem = algorithm.BremAdder
+# brem.BremCor = 1.0
 
-## ============================================================================
-if '__main__' == __name__ :
-    
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightKaons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightKaons.py
index 52877b3cad6b3ec62e7f7ae6eb28d1b8ec2cb591..7910a8ad47c81561101584b8d8a0a4b1ff325d3f 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightKaons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightKaons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,50 +10,46 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightKaons.py
-#  configuration file for 'Standard Tight Kaons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdTightKaons.py
+# configuration file for 'Standard Tight Kaons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Tight Kaons'
 """
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
+from __future__ import print_function
+from Configurables import ProtoParticleCALOFilter, CombinedParticleMaker
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
 __all__ = (
-    'StdTightKaons' ,
+    'StdTightKaons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import ProtoParticleCALOFilter, CombinedParticleMaker
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  CombinedParticleMaker ( 'StdTightKaons',
-                                     Particle =  'kaon'  )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightKaons',
+                                  Particle='kaon')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Kaon' )
-fltr.Selection = [ "RequiresDet='RICH' CombDLL(k-pi)>'0.0'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Kaon')
+fltr.Selection = ["RequiresDet='RICH' CombDLL(k-pi)>'0.0'"]
 
-## finally: define the symbol 
-StdTightKaons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdTightKaons = algorithm
 
-    print __doc__
-    print __author__
-    
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightMuons.py
index 7326bd2c0487d33bf1311c8899073c0105e7298e..5ec87ea728d50a409cde22e796b52e6d4d9d0843 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,52 +11,48 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdTightMuons.py
-#  configuration file for 'Standard Tight Muons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdTightMuons.py
+# configuration file for 'Standard Tight Muons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Tight Muons'
 """
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleMUONFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
 __all__ = (
-    'StdTightMuons' ,
+    'StdTightMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleMUONFilter
 
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightMuons'   ,
-                                    Particle = 'muon' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightMuons',
+                                  Particle='muon')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleMUONFilter, 'Muon' )
-fltr.Selection = [ "RequiresDet='MUON' IsMuon=True CombDLL(mu-pi)>'-3.0'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleMUONFilter, 'Muon')
+fltr.Selection = ["RequiresDet='MUON' IsMuon=True CombDLL(mu-pi)>'-3.0'"]
 
-## finally: define the symbol 
-StdTightMuons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdTightMuons = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPhi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPhi.py
index f424bf4605bbce1140a6ec9f28c689360c41331c..aec7804448a068d76e2801f0dfaf1fe39ec3e29b 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPhi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPhi.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -12,34 +12,36 @@
 """
 Configuration file for 'Standard Tight Phi2KK'. Lieftime unbiased.
 """
-__author__  = "Jibo He"
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Jibo He"
 __date__ = "3/2/2012"
 
-# =============================================================================
 __all__ = (
-    'StdTightPhi2KK' ,
+    'StdTightPhi2KK',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables import CombineParticles
-from CommonParticles.Utils import *
+# ============================================================================
+
 
-## ============================================================================
-## create the algorithm
+# ============================================================================
+# create the algorithm
 StdTightPhi2KK = CombineParticles("StdTightPhi2KK")
 StdTightPhi2KK.Inputs = ["Phys/StdTightKaons/Particles"]
 StdTightPhi2KK.DecayDescriptor = "phi(1020) -> K+ K-"
-StdTightPhi2KK.DaughtersCuts = { "K+" : "(PT>500*MeV)" }
+StdTightPhi2KK.DaughtersCuts = {"K+": "(PT>500*MeV)"}
 StdTightPhi2KK.CombinationCut = "(ADAMASS('phi(1020)')<30*MeV) & (ADOCACHI2CUT(30, ''))"
 StdTightPhi2KK.MotherCut = "(VFASPF(VCHI2) < 25.0)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdTightPhi2KK )
+# configure Data-On-Demand service
+locations = updateDoD(StdTightPhi2KK)
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPions.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPions.py
index 5ad638f795ab03351eee2f661294cbd3882c9538..62e4639883165872ba1008b2fada570dccc5a371 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPions.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightPions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,54 +10,48 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightPions.py
-#  configuration file for 'Standard Tight Pions' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdTightPions.py
+# configuration file for 'Standard Tight Pions'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Tight Pions'
 """
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
 __all__ = (
-    'StdTightPions' ,
+    'StdTightPions',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
 
-from CommonParticles.Utils import *
-
-## create the algorithm 
-algorithm = CombinedParticleMaker ( 'StdTightPions',
-                                    Particle = 'pion' )
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightPions',
+                                  Particle='pion')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Pion' )
-fltr.Selection = [ "RequiresDet='RICH' CombDLL(pi-k)>'-5.0'" ]
-
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Pion')
+fltr.Selection = ["RequiresDet='RICH' CombDLL(pi-k)>'-5.0'"]
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
 
-## finally: define the symbol 
-StdTightPions = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
+# finally: define the symbol
+StdTightPions = algorithm
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightProtons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightProtons.py
index 621ea9d4b424285869d04c2741ceb5d2fe5705bb..7fe0f5441d5d7529946ed44b6502e240b4d919f8 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightProtons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdTightProtons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,49 +10,47 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-## @file  CommonParticles/StdTightProtons.py
-#  configuration file for 'Standard Tight Protons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdTightProtons.py
+# configuration file for 'Standard Tight Protons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Tight Protons'
 """
-__author__  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombinedParticleMaker
+from Configurables import ProtoParticleCALOFilter
+from CommonParticles.Utils import trackSelector, protoFilter, updateDoD, locationsDoD
+
+
+__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+
 __all__ = (
-    'StdTightProtons' ,
+    'StdTightProtons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombinedParticleMaker 
-from Configurables       import ProtoParticleCALOFilter
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  CombinedParticleMaker ( 'StdTightProtons', Particle = 'proton'  )
+# =============================================================================
+# create the algorithm
+algorithm = CombinedParticleMaker('StdTightProtons', Particle='proton')
 
 # configure the track selector
-selector = trackSelector ( algorithm ) 
+selector = trackSelector(algorithm)
 
 # protoparticle filter:
-fltr = protoFilter ( algorithm , ProtoParticleCALOFilter, 'Proton' )
-fltr.Selection = [ "RequiresDet='RICH' CombDLL(p-pi)>'0.0'" ]
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+fltr = protoFilter(algorithm, ProtoParticleCALOFilter, 'Proton')
+fltr.Selection = ["RequiresDet='RICH' CombDLL(p-pi)>'0.0'"]
 
-## finally: define the symbol 
-StdTightProtons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the
+StdTightProtons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdV0FromBrunel.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdV0FromBrunel.py
index 58eabbdc119777e1077e17346d2359bcf04b1c36..b683e6354d32a564f6b0abe711320c1793dc4e7d 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdV0FromBrunel.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdV0FromBrunel.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,49 +11,48 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdV0FromBrunel.py
-#  configuration file for 'Standard Loose ' 
-#  @author Patrick Koppenburg
-#  @date 2012-06-08
+# @file  CommonParticles/StdV0FromBrunel.py
+# configuration file for 'Standard Loose '
+# @author Patrick Koppenburg
+# @date 2012-06-08
 # =============================================================================
 """
 Configuration file for 'Standard Loose Ks'
 """
-__author__  = "Patrick Koppenburg"
-# =============================================================================
+from __future__ import print_function
+from Configurables import DataOnDemandSvc, V0FromDstMaker
+from CommonParticles.Utils import locationsDoD
+
+
+__author__ = "Patrick Koppenburg"
+
 __all__ = (
-    'V0Maker' ,
+    'V0Maker',
     'locations'
     )
 # =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import DataOnDemandSvc, V0FromDstMaker
-from CommonParticles.Utils import *
+
 locations = {}
 
 # One algorithm does all V0
-v0locations = [ "StdKs2PiPiLL" ,
-                "StdKs2PiPiDD" ,
-                "StdLambda2PPiLL" ,
-                "StdLambda2PPiDD"  ]
+v0locations = ["StdKs2PiPiLL",
+               "StdKs2PiPiDD",
+               "StdLambda2PPiLL",
+               "StdLambda2PPiDD"]
 hat = "Phys/"
 V0Maker = V0FromDstMaker()
 
 dod = DataOnDemandSvc()
 
 for v0 in v0locations:
-    p1 = { hat + v0 + '/Particles' : V0Maker.getFullName() }
-    p2 = { hat + v0 + '/Particles' : V0Maker               }
-    dod.AlgMap.update( p1 )
-    locations.update ( p2 )
-        
-## ============================================================================
-if '__main__' == __name__ :
-
-    print __doc__
-    print __author__
-    print  locationsDoD ( locations ) 
+    p1 = {hat + v0 + '/Particles': V0Maker.getFullName()}
+    p2 = {hat + v0 + '/Particles': V0Maker}
+    dod.AlgMap.update(p1)
+    locations.update(p2)
 
-# =============================================================================
-# The END 
-# =============================================================================
+# ============================================================================
+if '__main__' == __name__:
+
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseAllPhotons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseAllPhotons.py
index 373576808991d6b4d964e313af4807d7beb59d2c..e6b0c01fe6d3ed911fa6e2ab645318a65a547048 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseAllPhotons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseAllPhotons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,51 +11,48 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdLooseAllPhotons.py
-#  configuration file for 'Standard Loose All Photons' 
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/StdLooseAllPhotons.py
+# configuration file for 'Standard Loose All Photons'
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Configuration file for 'Standard Very Loose All Photons'
 """
-__author__  = "Olivier Deschamps odescham@in2p3.fr"
-# =============================================================================
+from __future__ import print_function
+from Configurables import PhotonMakerAlg
+from Configurables import PhotonMaker
+from GaudiKernel.SystemOfUnits import MeV
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Olivier Deschamps odescham@in2p3.fr"
+
 __all__ = (
-    'StdVeryLooseAllPhotons' ,
+    'StdVeryLooseAllPhotons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import PhotonMakerAlg 
-from Configurables       import PhotonMaker
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils import *
 
-## create the algorithm 
-algorithm =  PhotonMakerAlg ( 'StdVeryLooseAllPhotons'         ,
-                                DecayDescriptor = 'Gamma' )
+# create the algorithm
+algorithm = PhotonMakerAlg('StdVeryLooseAllPhotons',
+                           DecayDescriptor='Gamma')
 
-# configure desktop&particle maker: 
-algorithm.addTool ( PhotonMaker , name = 'PhotonMaker' )
+# configure desktop&particle maker:
+algorithm.addTool(PhotonMaker, name='PhotonMaker')
 photon = algorithm.PhotonMaker
-photon.ConvertedPhotons   = True
-photon.UnconvertedPhotons = True 
-photon.PtCut              = 75 * MeV 
-
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+photon.ConvertedPhotons = True
+photon.UnconvertedPhotons = True
+photon.PtCut = 75 * MeV
 
-## finally: define the symbol 
-StdVeryLooseAllPhotons = algorithm 
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## ============================================================================
-if '__main__' == __name__ :
+# finally: define the symbol
+StdVeryLooseAllPhotons = algorithm
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py
index 30f0aaf5d9c64ff047317ef311eed1fd177a8d9c..69cd75ba88797ea8fda76f69ca78bee696ac8d42 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -16,10 +16,8 @@ __author__ = 'P. Koppenburg'
 __date__ = '22/01/2010'
 
 
-from Gaudi.Configuration import *
-from Configurables import CombineParticles # , OfflineVertexFitter, OnOfflineTool
-from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
@@ -30,15 +28,7 @@ StdVeryLooseDetachedKst2Kpi.DecayDescriptor = "[K*(892)0 -> K+ pi-]cc"
 StdVeryLooseDetachedKst2Kpi.Inputs = ["Phys/StdLooseKaons/Particles",
                                       "Phys/StdLoosePions/Particles"]
 
-## # IPCHI2>4 already applied on StdLoose{Kaons,Pions} 
-## StdVeryLooseDetachedKst2Kpi.DaughtersCuts = {
-##     "K+" :"(MIPCHI2DV(PRIMARY)>2.25)",
-##     "pi-":"(MIPCHI2DV(PRIMARY)>2.25)"
-##     }
-
 StdVeryLooseDetachedKst2Kpi.CombinationCut = "(ADAMASS('K*(892)0')<300*MeV) & (ADOCACHI2CUT(30, ''))"
 StdVeryLooseDetachedKst2Kpi.MotherCut = "(VFASPF(VCHI2)<25)"
 
 locations = updateDoD(StdVeryLooseDetachedKst2Kpi)
-
-
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDiMuon.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDiMuon.py
index 832c6ebaf1503b6311e324d4eedad9db14a08f70..2819fb1a3f89df30731224a320c547b225924efd 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDiMuon.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDiMuon.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,16 +11,14 @@
 """
 Configuration file for Standard Loose DiMuon, very loose for penguins (and other small animals).
 """
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
 
 __author__ = 'Rob Lambert'
 __date__ = '07/07/2009'
 
-
-from Gaudi.Configuration import *
-from Configurables import CombineParticles
-from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
-
 ###########################
 # StdLooseDiMuon #
 ###########################
@@ -30,13 +28,12 @@ StdVeryLooseDiMuon.DecayDescriptor = "J/psi(1S) -> mu+ mu-"
 StdVeryLooseDiMuon.Inputs = ["Phys/StdAllVeryLooseMuons/Particles"]
 StdVeryLooseDiMuon.CombinationCut = "(ADAMASS('J/psi(1S)') < 3000.*MeV) & (ADOCACHI2CUT(30, ''))"
 StdVeryLooseDiMuon.MotherCut = "(VFASPF(VCHI2) < 25.)"
-locations = updateDoD(StdVeryLooseDiMuon)
 
-## ============================================================================
-if '__main__' == __name__ :
-
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+locations = updateDoD(StdVeryLooseDiMuon)
 
+# ============================================================================
+if '__main__' == __name__:
 
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseJpsi2MuMu.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseJpsi2MuMu.py
index e98fdc9da4286371ee02fb1aaceead05e9bd0bc1..b5d14fec4d608b7440bf3ff3fb63a31bdf4702a2 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseJpsi2MuMu.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseJpsi2MuMu.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,39 +11,39 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdVeryLooseJpsi2MuMu.py
-#  configuration file for 'Standard Very Loose Jpsi2MuMu'
-#  @author Greig Cowan
-#  @date 2009-06-23
+# @file  CommonParticles/StdVeryLooseJpsi2MuMu.py
+# configuration file for 'Standard Very Loose Jpsi2MuMu'
+# @author Greig Cowan
+# @date 2009-06-23
 # =============================================================================
 """
 Configuration file for 'Standard Very Loose Jpsi2MuMu'
 """
-__author__  = "Greig Cowan"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+__author__ = "Greig Cowan"
+
 __all__ = (
-    'StdVeryLooseJpsi2MuMu' ,
+    'StdVeryLooseJpsi2MuMu',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration   import *
-from Configurables         import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm
-StdVeryLooseJpsi2MuMu = CombineParticles ("StdVeryLooseJpsi2MuMu")
+# ============================================================================
+# create the algorithm
+StdVeryLooseJpsi2MuMu = CombineParticles("StdVeryLooseJpsi2MuMu")
 StdVeryLooseJpsi2MuMu.Inputs = ["Phys/StdVeryLooseMuons/Particles"]
 StdVeryLooseJpsi2MuMu.DecayDescriptor = "J/psi(1S) -> mu+ mu-"
 StdVeryLooseJpsi2MuMu.CombinationCut = "(ADAMASS('J/psi(1S)') < 100.*MeV) & (ADOCACHI2CUT(30, ''))"
 StdVeryLooseJpsi2MuMu.MotherCut = "(VFASPF(VCHI2) < 25.)"
 
-## configure Data-On-Demand service
-locations = updateDoD ( StdVeryLooseJpsi2MuMu    )
+# configure Data-On-Demand service
+locations = updateDoD(StdVeryLooseJpsi2MuMu)
 
-## ============================================================================
-if '__main__' == __name__ :
+# ============================================================================
+if '__main__' == __name__:
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations )
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseKs.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseKs.py
index dbe75de44af06fcba52bb1656800f6ef1792c667..5094b814b3798d65afd6eacbf6fa39af843a9a48 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseKs.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseKs.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -14,38 +14,36 @@ These Very Loose Ks candidates do not have a cut on the pT of the pion
 by loading NoPIDsPions instead of LoosePions.
 This increases the yield of LL Ks's by about 20 to 30%.
 """
-__author__  = "Mick Mulder"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Mick Mulder"
+
 __all__ = (
-    'StdVeryLooseKsLL' ,
+    'StdVeryLooseKsLL',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles, FilterDesktop
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm 
-StdVeryLooseKsLL = CombineParticles ( 'StdVeryLooseKsLL' )
 
-StdVeryLooseKsLL.Inputs = [ "Phys/StdAllNoPIDsPions/Particles" ]
-StdVeryLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-" 
+# ============================================================================
+# create the algorithm
+StdVeryLooseKsLL = CombineParticles('StdVeryLooseKsLL')
 
-StdVeryLooseKsLL.DaughtersCuts = { "pi+" : "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)" } 
-StdVeryLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(30, '')) "
-StdVeryLooseKsLL.MotherCut = "(ADMASS('KS0') < 35.*MeV) & (CHI2VX < 30.) & (BPVVDCHI2>4.)"
+StdVeryLooseKsLL.Inputs = ["Phys/StdAllNoPIDsPions/Particles"]
+StdVeryLooseKsLL.DecayDescriptor = "KS0 -> pi+ pi-"
 
-## configure Data-On-Demand service 
-locations = updateDoD ( StdVeryLooseKsLL )
+StdVeryLooseKsLL.DaughtersCuts = {"pi+": "(P > 2.*GeV) & (MIPCHI2DV(PRIMARY) > 9.)"}
+StdVeryLooseKsLL.CombinationCut = "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(30, ''))"
+StdVeryLooseKsLL.MotherCut = "(ADMASS('KS0') < 35.*MeV) & (CHI2VX < 30.) & (BPVVDCHI2>4.)"
 
-## ============================================================================
-if '__main__' == __name__ :
+# configure Data-On-Demand service
+locations = updateDoD(StdVeryLooseKsLL)
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseLambda.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseLambda.py
index 005e857a384e26efb8fb556224b698ef4aa0d9b8..4b7d8eb6a68fa1eb58990f995c8638e9d0b3740a 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseLambda.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseLambda.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,54 +11,51 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdLooseLambda.py
-#  configuration file for 'Standard Loose ' 
-#  @author Patrick Koppenburg
-#  @date 2009-02-18
+# @file  CommonParticles/StdLooseLambda.py
+# configuration file for 'Standard Loose'
+# @author Patrick Koppenburg
+# @date 2009-02-18
 # =============================================================================
 """
 Configuration file for 'Standard Very Loose Lambda'
 """
-__author__  = "Thomas Blake"
-# =============================================================================
+from __future__ import print_function
+from Configurables import CombineParticles
+from CommonParticles.Utils import updateDoD, locationsDoD
+
+
+__author__ = "Thomas Blake"
+
 __all__ = (
-    'StdVeryLooseLambdaLL' ,
+    'StdVeryLooseLambdaLL',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import CombineParticles
-from CommonParticles.Utils import *
 
-## ============================================================================
-## create the algorithm 
-StdVeryLooseLambdaLL = CombineParticles ( 'StdVeryLooseLambdaLL' )
 
+# create the algorithm
+StdVeryLooseLambdaLL = CombineParticles('StdVeryLooseLambdaLL')
 
-StdVeryLooseLambdaLL.Inputs = [ "Phys/StdAllNoPIDsPions/Particles",
-                                "Phys/StdAllNoPIDsProtons/Particles" ]
 
-StdVeryLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc" 
+StdVeryLooseLambdaLL.Inputs = ["Phys/StdAllNoPIDsPions/Particles",
+                               "Phys/StdAllNoPIDsProtons/Particles"]
+
+StdVeryLooseLambdaLL.DecayDescriptor = "[Lambda0 -> p+ pi-]cc"
 
 StdVeryLooseLambdaLL.DaughtersCuts = {
-    "pi+" : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)",
-    "p+"  : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"
-    } 
+    "pi+": "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)",
+    "p+": "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"
+    }
 
 StdVeryLooseLambdaLL.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(30, ''))"
-StdVeryLooseLambdaLL.MotherCut      =  "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30) & (BPVVDCHI2 > 4.)"
-
-## configure Data-On-Demand service 
-locations = updateDoD ( StdVeryLooseLambdaLL )
+StdVeryLooseLambdaLL.MotherCut = "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30) & (BPVVDCHI2 > 4.)"
 
+# configure Data-On-Demand service
+locations = updateDoD(StdVeryLooseLambdaLL)
 
-## ============================================================================
-if '__main__' == __name__ :
 
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
+# ============================================================================
+if '__main__' == __name__:
 
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseMuons.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseMuons.py
index 24eeef4f8a23ff1a75fd9deba06425b98c966853..188ac441b11fe4b6f1bca7a1c522659f1fb30ba9 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseMuons.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseMuons.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -11,46 +11,42 @@
 ###############################################################################
 # =============================================================================
 # =============================================================================
-## @file  CommonParticles/StdVeryLooseMuons.py
-#  configuration file for 'Standard Very Loose Muons' 
-#  @author Patrick Koppenburg 
-#  @date 2011-07-18
+# @file  CommonParticles/StdVeryLooseMuons.py
+# configuration file for 'Standard Very Loose Muons'
+# @author Patrick Koppenburg
+# @date 2011-07-18
 # =============================================================================
 """
 Configuration file for 'Standard Loose Muons with very loose cuts'
 """
-__author__  = "Patrick Koppenburg "
-# =============================================================================
+from __future__ import print_function
+from Configurables import FilterDesktop
+from CommonParticles.Utils import updateDoD, locationsDoD, defaultCuts
+
+__author__ = "Patrick Koppenburg"
+
+
 __all__ = (
-    'StdVeryLooseMuons' ,
+    'StdVeryLooseMuons',
     'locations'
     )
-# =============================================================================
-from Gaudi.Configuration import *
-from Configurables       import FilterDesktop
 
 
-from CommonParticles.Utils import *
+# create the algorithm
+algorithm = FilterDesktop('StdVeryLooseMuons',
+                          Inputs=["Phys/StdAllVeryLooseMuons/Particles"],
+                          Code=defaultCuts())
 
-## create the algorithm 
-algorithm =  FilterDesktop( 'StdVeryLooseMuons',
-                            Inputs = ["Phys/StdAllVeryLooseMuons/Particles"],
-                            Code = defaultCuts() )
+# configure Data-On-Demand service
+locations = updateDoD(algorithm)
 
-## configure Data-On-Demand service 
-locations = updateDoD ( algorithm )
+# finally: define the symbol
+StdVeryLooseMuons = algorithm
 
-## finally: define the symbol 
-StdVeryLooseMuons = algorithm 
 
+# ============================================================================
+if '__main__' == __name__:
 
-## ============================================================================
-if '__main__' == __name__ :
-
-    print __doc__
-    print __author__
-    print locationsDoD ( locations ) 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    print(__doc__)
+    print(__author__)
+    print(locationsDoD(locations))
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py
old mode 100755
new mode 100644
index cf4234c842ffb17c88f12f18eb1b7617eb03cc7f..7a217fcff18327a482e3383aa051dd383d722953
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -10,40 +10,40 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # =============================================================================
-# =============================================================================
-## @file  CommonParticles/Utils.py
-#  helper file for configuration of "standard particles"
-#  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
-#  @date 2009-01-14
+# @file  CommonParticles/Utils.py
+# helper file for configuration of "standard particles"
+# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
+# @date 2009-01-14
 # =============================================================================
 """
 Helper file for configuration of 'standard particles'
 """
-author  = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
+from Configurables import DataOnDemandSvc
+from Configurables import TrackSelector
+from Configurables import LHCbConfigurableUser
+
+
+author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
 __all__ = (
     # general:
-    'updateDoD'     , ## update data-on-demand service  
-    'locationsDoD'  , ## print locations, known for data-on-demand service 
-    'particles'     , ## locations, known for data-on-demand service
-    'trackSelector' , ## get the track selector
-    'protoFilter'   , ## filter for (charged) protoparticles
-    'defaultCuts'   , ## Default PT and IP cuts
+    'updateDoD',  # update data-on-demand service
+    'locationsDoD',  # print locations, known for data-on-demand service
+    'particles',  # locations, known for data-on-demand service
+    'trackSelector',  # get the track selector
+    'protoFilter',  # filter for (charged) protoparticles
+    'defaultCuts',  # Default PT and IP cuts
     )
 # =============================================================================
 
-from Gaudi.Configuration      import *
-from Configurables            import DataOnDemandSvc
-from Configurables            import TrackSelector
-from Configurables            import LHCbConfigurableUser
-
-# local storage of data-on-demand actions 
+# local storage of data-on-demand actions
 _particles = {}
 
 # Default cuts
 _defaultCuts = "(PT>250*MeV) & (MIPCHI2DV(PRIMARY) > 4.)"
 
+
 # =============================================================================
 #  Default Cuts
 def defaultCuts():
@@ -52,102 +52,106 @@ def defaultCuts():
     """
     return _defaultCuts
 
+
 # =============================================================================
 # =============================================================================
-## @class DefaultTrackingCuts
-#  Little class to hold default track selection criteria
-class DefaultTrackingCuts(LHCbConfigurableUser) :
-    ## Configuration slots
-    __slots__ = { "Cuts"  :  { "Chi2Cut" : [ 0, 5 ],
-                               "CloneDistCut" : [5000, 9e+99 ] }, ## The cuts to apply
-                  "Types" :  ["Long"]  ## The track types to include
-                  }
+# @class DefaultTrackingCuts
+# Little class to hold default track selection criteria
+class DefaultTrackingCuts(LHCbConfigurableUser):
+    # Configuration slots
+    __slots__ = {"Cuts": {"Chi2Cut": [0, 5],
+                          "CloneDistCut": [5000, 9e+99]},  # The cuts to apply
+                 "Types": ["Long"]  # The track types to include
+                 }
+
 
 # =============================================================================
-## Return the locations known for data-on-demand service 
-def particles () :
+# Return the locations known for data-on-demand service
+def particles():
     """
-    Return the locations known for data-oon-demand service 
+    Return the locations known for data-oon-demand service
     """
     return _particles
 
 
 # =============================================================================
-# Update Data-On-Demand Service 
-def updateDoD ( alg , hat = 'Phys/', name = None ) :
+# Update Data-On-Demand Service
+def updateDoD(alg, hat='Phys/', name=None):
     """
     Update Data-On-Demand service
     """
-    if name: _name = name
-    else:    _name = alg.name()
+    if name:
+        _name = name
+    else:
+        _name = alg.name()
+
+    _parts = {hat+_name+'/Particles': alg}
+    _particles.update(_parts)
 
-    _parts = { hat+_name+'/Particles' : alg } 
-    _particles.update ( _parts ) 
-    
     dod = DataOnDemandSvc()
     dod.AlgMap.update(
-        { hat + _name + '/Particles' : alg.getFullName() }
+        {hat + _name + '/Particles': alg.getFullName()}
         )
-    return _parts 
-    
-## get the track selector 
-def trackSelector ( alg ,
-                    tracks     = TrackSelector,
-                    trackTypes = [],
-                    cuts       = {}
-                    ) :
+    return _parts
+
+
+# get the track selector
+def trackSelector(alg,
+                  tracks=TrackSelector,
+                  trackTypes=[],
+                  cuts={}
+                  ):
     """
-    Get the track selector for maker 
+    Get the track selector for maker
     """
-    alg.addTool ( tracks )
+    alg.addTool(tracks)
 
-    selector = getattr ( alg , tracks.getType() )
+    selector = getattr(alg, tracks.getType())
 
     # selection cuts
     # Ugly but works ...
-    if 0 == len(trackTypes) :
+    if 0 == len(trackTypes):
         trackTypes = DefaultTrackingCuts().Types
-    if 0 == len(cuts) :
-        cuts       = DefaultTrackingCuts().Cuts
+    if 0 == len(cuts):
+        cuts = DefaultTrackingCuts().Cuts
     selector.TrackTypes = trackTypes
-    for name,cut in cuts.iteritems() :
-        selector.setProp("Min"+name,cut[0])
-        selector.setProp("Max"+name,cut[1])
-        if ( "CloneDistCut"==name): selector.setProp("AcceptClones",False)
-#    selector.MinPtCut = 100000000
-        
+    for name, cut in cuts.iteritems():
+        selector.setProp("Min"+name, cut[0])
+        selector.setProp("Max"+name, cut[1])
+        if name == "CloneDistCut":
+            selector.setProp("AcceptClones", False)
+
     return selector
 
-## get the protoparticle filter
-def protoFilter ( alg , fltr , name ) :
+
+# get the protoparticle filter
+def protoFilter(alg, fltr, name):
     """
-    Get the protoparticle filter 
+    Get the protoparticle filter
     """
-    alg.addTool ( fltr , name )
-    return getattr ( alg , name )
+    alg.addTool(fltr, name)
+    return getattr(alg, name)
+
 
-    
 # =============================================================================
-## nice prinout for the input locations, known for Data-On-Demand Service 
-def locationsDoD ( particles = _particles ) :
+# nice prinout for the input locations, known for Data-On-Demand Service
+def locationsDoD(particles=_particles):
     """
     Nice printout of the known algorithm for 'standard particles'
     """
     line = ' +' + 100*'-' + '+ '
-    result  = line 
-    result += '\n | %-45.45s : %-50.50s |' % ( 'Input Location for DVAlgorithm' ,
-                                               'Data-On-Demand creator' )        
+    result = line
+    result += '\n | %-45.45s : %-50.50s |' % ('Input Location for DVAlgorithm',
+                                              'Data-On-Demand creator')
     result += '\n' + line
     locs = particles.keys()
-    locs.sort() 
-    for l in locs :
-        a = particles[l]
-        if a.name() == a.getType() : a = a.name()
-        else : a = a.getFullName()
-        result += '\n | %-45.45s : %-50.50s |' % ( l , a )        
-    result += '\n' + line 
-    return result 
-
-# =============================================================================
-# The END 
-# =============================================================================
+    locs.sort()
+    for loc in locs:
+        a = particles[loc]
+        if a.name() == a.getType():
+            a = a.name()
+        else:
+            a = a.getFullName()
+        result += '\n | %-45.45s : %-50.50s |' % (loc, a)
+    result += '\n' + line
+    return result
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/__init__.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/__init__.py
index 6a34483116518c2b9159c6e710d799e809966ba3..5f2834e1ee178ceeb3f69467f6ad0a4150794863 100755
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/__init__.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/__init__.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,9 +8,3 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-# =============================================================================
-
-
-# =============================================================================
-# The END 
-# =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/__init__.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/__init__.py
index 918703363943f6c659217735f733c0ee7784f51c..00ad373eb039aee5009eb020cccbbfd759766d89 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/__init__.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/__init__.py
@@ -1,5 +1,5 @@
 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -9,67 +9,62 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
+from Gaudi.Configuration import log
 from StrippingUtils.Utils import create_archive
 from StrippingArchive import _duplicate_strippings as duplicate_strippings
 import os
+import sys
 
-class CommonParticlesArchiveConf ( object ) :
-    
-    def isdir( self, z, name ):
+
+class CommonParticlesArchiveConf(object):
+    def isdir(self, z, name):
         return any(x.startswith("%s/" % name.rstrip("/")) for x in z.namelist())
 
-    def isValidArchive(self,path):
+    def isValidArchive(self, path):
 
         zipname = "python.zip"
 
-        if not zipname in path :
-
+        if zipname not in path:
             # Standard file system
-            import os
             return os.path.exists(path)
-
-        else :
-
+        else:
             # Python zip file. So manually handle this ..
             import zipfile
             splits = path.split(zipname+"/")
             zfile = splits[0] + zipname
             entry = splits[1]
-            z = zipfile.ZipFile( zfile, 'r' )
-            status = self.isdir(z,entry)
+            z = zipfile.ZipFile(zfile, 'r')
+            status = self.isdir(z, entry)
             z.close()
             return status
 
-    def redirect(self,stripping):
-
-        import os, sys
-
+    def redirect(self, stripping):
         # Handle 'alias' strippings
         stripName = stripping.capitalize()
-        if stripName in duplicate_strippings.keys() :
+        if stripName in duplicate_strippings.keys():
             stripName = duplicate_strippings[stripName]
 
         # Construct the archive python path from this modules path
-        pth = os.path.sep.join( __file__.split(os.path.sep)[0:-1] + [stripName] )
+        pth = os.path.sep.join(__file__.split(os.path.sep)[0:-1] + [stripName])
 
         # Check to see if CommonParticles has already been loaded.
         # If it has, throw an exception, as this method must be called
         # prior to any import of CommonParticles
-        if 'CommonParticles' in sys.modules.keys() and not sys.modules['CommonParticles'].__file__.startswith(pth) :
-            raise Exception( "Can't redirect CommonParticles to " + pth + ". Module " + str(sys.modules['CommonParticles']) +
-                             " already loaded. " + 
-                             "redirectCommonParticles must be called *BEFORE* any imports from CommonParticles" )
+        if 'CommonParticles' in sys.modules.keys() and not sys.modules['CommonParticles'].__file__.startswith(pth):
+            raise Exception("Can't redirect CommonParticles to " + pth + ". Module " + str(sys.modules['CommonParticles']) +
+                            " already loaded. " +
+                            "redirectCommonParticles must be called *BEFORE* any imports from CommonParticles")
 
         # Check this is a known archived version
-        if not self.isValidArchive(pth) :
-            raise Exception( "CommonParticles archive '"+pth+"' is missing" )
+        if not self.isValidArchive(pth):
+            raise Exception("CommonParticles archive '"+pth+"' is missing")
 
         # Append the archive path, so it is picked up first
-        log.info( "Redirecting CommonParticles to '" + pth + "'" )
-        sys.path.insert(0,pth)
+        log.info("Redirecting CommonParticles to '" + pth + "'")
+        sys.path.insert(0, pth)
+
 
-def create_common_particles_archive(stripping) :
+def create_common_particles_archive(stripping):
     source = os.path.join(os.environ['COMMONPARTICLESROOT'], 'python', 'CommonParticles')
     dest = os.path.join(os.environ['COMMONPARTICLESARCHIVEROOT'], 'python', 'CommonParticlesArchive', stripping, 'CommonParticles')
     return create_archive(source, dest)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py
index 08e33f6da699d9cd59918d56f4fc1c1d42f8b68e..d8568faa392e60827a86ed0a7fa3a5e5b1850afa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py
@@ -12,7 +12,7 @@
 (1) Bd,s->Jpsi h+ h-, h=pi or K with biased selection
 (2) Bd->Jpsi K*(892) similar selection for decay time acceptance
 (3) prompt Jpsi h+h- for time resolution [prescaled]
-(4) Lb->Jpsi Lambda(1520)0 (p+ K-/pi-) for pentaquark 
+(4) Lb->Jpsi Lambda(1520)0 (p+ K-/pi-) for pentaquark
 '''
 
 __author__ = ['Liming Zhang', 'Xuesong Liu']
@@ -66,7 +66,7 @@ default_config = {
             'StrippingB2JpsiHHBs2Jpsif0KaonLine',
             'StrippingB2JpsiHHBs2Jpsif0wsLine'
             ]
-    } 
+    }
     }
 
 ### Lines stored in this file:
@@ -79,11 +79,11 @@ class B2JpsiHHConf(LineBuilder) :
       LineBuilder.__init__(self, name, config)
       self.name = name
       self.config = config
-    
+
         #### Input selections:
 
         # ------------------------------------------------------------ J/Psi:
-        
+
       self.WideJpsiList = DataOnDemand(Location = "Phys/StdMassConstrainedJpsi2MuMu/Particles")
 
       self.DetachedJpsiList = self.createSubSel( OutputList = 'NarrowDetachedJpsiForJpsiHH' + self.name,
@@ -91,30 +91,30 @@ class B2JpsiHHConf(LineBuilder) :
                                                  Cuts       = "(PFUNA(ADAMASS('J/psi(1S)')) < %(JpsiMassWindow)s * MeV) " %self.config)
 
         # ------------------------------------------------------------ Hardons:
-       
+
       self.NoIPKaonList = self.createSubSel( OutputList = "PIDKaonsForJpsipK" + self.name,
                                              InputList  = DataOnDemand(Location = "Phys/StdAllLooseKaons/Particles"),
                                              Cuts       = "(TRCHI2DOF < %(TRCHI2DOF)s ) & (((PIDK > %(PIDKforKaon)s ) & ((PIDK-PIDp) > %(PIDKpforKaon)s )) | (PROBNNk > %(PROBNNk)s ))  & (PT > 250.*MeV) & (TRGHOSTPROB < 0.5)" % self.config )
-      
+
       self.NoIPProtonList = self.createSubSel( OutputList = "PIDprotonsForJpsipK" + self.name,
                                                InputList  = DataOnDemand(Location = "Phys/StdAllLooseProtons/Particles"),
                                                Cuts       = "(TRCHI2DOF < %(TRCHI2DOF)s ) &  ( ((PIDp > %(PIDpforProton)s ) & ((PIDp-PIDK) > %(PIDpKforProton)s )) | (PROBNNp > %(PROBNNp)s ) )  & (PT > 250.*MeV) & (TRGHOSTPROB < 0.5)" % self.config )
-      
+
       self.NoIPPionList = self.createSubSel( OutputList = "PIDpionsForJpsippi" + self.name,
                                              InputList  = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles"),
                                              Cuts       = "(TRCHI2DOF < %(TRCHI2DOF)s ) & ( (PIDK < %(PIDKforPion)s ) | (PROBNNpi > %(PROBNNpi)s ) )  & (PT > 250.*MeV) & (TRGHOSTPROB < 0.5)" % self.config )
 
-      # -------------------------------------------------------------- Kstar:     
+      # -------------------------------------------------------------- Kstar:
 
       self.DetachedKstarList = self.createCombinationSel( OutputList      = "DetachedKstarListForJpsiHH" + self.name,
                                                           DaughterLists   = [ self.NoIPKaonList, self.NoIPPionList ],
                                                           DecayDescriptor =  "[K*(892)0 -> K+ pi-]cc" ,
                                                           PreVertexCuts   = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (AM < 2700 *MeV) & (ADOCACHI2CUT(20., ''))",
 #                                                          PreVertexCuts   = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (ADAMASS('K*(892)0') < 200 *MeV) & (ADOCACHI2CUT(20., ''))",
-                                                          PostVertexCuts  = "(VFASPF(VCHI2) < 16)",   
+                                                          PostVertexCuts  = "(VFASPF(VCHI2) < 16)",
                                                           ReFitPVs         = False ) # Note that this is false to save CPU time, for the future check with Liming if the kaon list is fine
 
-      # -------------------------------------------------------------- f0:     
+      # -------------------------------------------------------------- f0:
 
       self.Detachedf0pipiList = self.createCombinationsSel( OutputList       = "Detachedf02pipiForJpsiHH" + self.name,
                                                         DaughterLists    = [ self.NoIPKaonList, self.NoIPPionList ],
@@ -124,18 +124,18 @@ class B2JpsiHHConf(LineBuilder) :
 #                                                                   "K+"  : " (MIPCHI2DV(PRIMARY)>9) " % self.config },
                                                         PreVertexCuts    = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (AM < 2700 *MeV) & (ADOCACHI2CUT(20., ''))",
                                                         PostVertexCuts   = "(VFASPF(VCHI2) < 16) ",
-                                                        ReFitPVs         = False ) 
+                                                        ReFitPVs         = False )
 
-      # -------------------------------------------------------------- f0:     
+      # -------------------------------------------------------------- f0:
 
       self.Detachedf0KKList = self.createCombinationsSel( OutputList       = "Detachedf02KKForJpsiHH" + self.name,
                                                         DaughterLists    = [ self.NoIPKaonList, self.NoIPPionList ],
                                                         DecayDescriptors = [ "f_0(980) -> K+ K-"],
                                                         PreVertexCuts    = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (AM < 2700 *MeV) & (ADOCACHI2CUT(20., ''))",
                                                         PostVertexCuts   = "(VFASPF(VCHI2) < 16) ",
-                                                        ReFitPVs         = False ) 
+                                                        ReFitPVs         = False )
 
-      # -------------------------------------------------------------- f0:     
+      # -------------------------------------------------------------- f0:
 
       self.Detachedf0wspipiList = self.createCombinationsSel( OutputList       = "Detachedf02wspipiForJpsiHH" + self.name,
                                                         DaughterLists    = [ self.NoIPKaonList, self.NoIPPionList ],
@@ -143,16 +143,16 @@ class B2JpsiHHConf(LineBuilder) :
                                                         DaughterCuts     = { "pi+" : " (MIPCHI2DV(PRIMARY)>4) " },
                                                         PreVertexCuts    = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (AM < 2700 *MeV) & (ADOCACHI2CUT(20., ''))",
                                                         PostVertexCuts   = "(VFASPF(VCHI2) < 16) ",
-                                                        ReFitPVs         = False ) 
+                                                        ReFitPVs         = False )
 
       self.Unbiasedf0List = self.createCombinationsSel( OutputList       = "Unbiasedf02HHForJpsiHH" + self.name,
                                                         DaughterLists    = [ self.NoIPKaonList, self.NoIPPionList ],
                                                         DecayDescriptors = ["f_0(980) -> pi+ pi-", "f_0(980) -> K+ K-"],
                                                         PreVertexCuts    = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (AM < 2700 *MeV) & (ADOCACHI2CUT(20., ''))",
                                                         PostVertexCuts   = "(VFASPF(VCHI2) < 16)",
-                                                        ReFitPVs         = False ) 
+                                                        ReFitPVs         = False )
 
-      # -------------------------------------------------------------- Lambda0:     
+      # -------------------------------------------------------------- Lambda0:
 
       self.Lambda0List = self.createCombinationsSel( OutputList       = "Lambda02pHForJpsiHH" + self.name,
                                                      DaughterLists    = [ self.NoIPKaonList, self.NoIPPionList, self.NoIPProtonList ],
@@ -161,7 +161,7 @@ class B2JpsiHHConf(LineBuilder) :
                                                      DaughterCuts     = { "p+" : " (MIPCHI2DV(PRIMARY)>4) ", "K-" : " (MIPCHI2DV(PRIMARY)>4) ", "pi-" : " (MIPCHI2DV(PRIMARY)>4) " },
                                                      PreVertexCuts    = "(ACHILD(PT,1)+ACHILD(PT,2) > 900.*MeV) & (AM < 3100 *MeV) & (ADOCACHI2CUT(20., ''))",
                                                      PostVertexCuts   = "(VFASPF(VCHI2) < 16)",
-                                                     ReFitPVs         = False )  
+                                                     ReFitPVs         = False )
 
       # -------------------------------------------------------------- Training variables:
 
@@ -174,7 +174,7 @@ class B2JpsiHHConf(LineBuilder) :
         }
 
       self.makeBs2Jpsif0()
-      self.makeBs2JpsiKstar()  
+      self.makeBs2JpsiKstar()
       self.makeLb2JpsipH()
 
     ### Stripping lines:
@@ -188,44 +188,44 @@ class B2JpsiHHConf(LineBuilder) :
                                              PreVertexCuts   = "in_range(5100,AM,5720)",
                                              PostVertexCuts  = "in_range(5150,M,5670) & (VFASPF(VCHI2PDOF) < %(VCHI2PDOF)s ) & (BPVIPCHI2()<25.0) & (DTF_CTAU(0,True) > %(DTF_CTAU)s ) & (BPVDIRA >0.999) " % self.config ) # for the other particles is 10.
 #                                             PostVertexCuts  = "in_range(5150,M,5670) & (VFASPF(VCHI2PDOF) < %(VCHI2PDOF)s ) & (BPVIPCHI2()<25.0) & (BPVLTIME() > 0.2*ps) & (BPVDIRA >0.999) & (BPVVD > 1.5 *mm)" % self.config ) # for the other particles is 10.
-      
+
       MvaBs2Jpsif0 = self.applyMVA( "MvaBs2Jpsif0" + self.name,
                                     SelB            = Bs2Jpsif0,
                                     MVAVars         = self.Vars,
-                                    MVACutValue     = "%(MVACut)s" % self.config, 
+                                    MVACutValue     = "%(MVACut)s" % self.config,
                                     MVAxmlFile      = "%(XmlFile)s" % self.config )
 
       Bs2Jpsif0Line  = StrippingLine( self.name + "Bs2Jpsif0Line", algos = [ MvaBs2Jpsif0 ])
-        
+
       Bs2Jpsif0KK = self.createCombinationSel( OutputList      = "Bs2Jpsif0KK" + self.name,
                                              DecayDescriptor = "B_s0 -> J/psi(1S) f_0(980)",
                                              DaughterLists   = [ self.DetachedJpsiList, self.Detachedf0KKList],
                                              PreVertexCuts   = "in_range(5100,AM,5720)",
                                              PostVertexCuts  = "in_range(5150,M,5670) & (VFASPF(VCHI2PDOF) < %(VCHI2PDOF)s ) & (BPVIPCHI2()<25.0) & (DTF_CTAU(0,True) > %(DTF_CTAU)s ) & (BPVDIRA >0.999)" % self.config ) # for the other particles is 10.
-      
+
       MvaBs2Jpsif0KK = self.applyMVA( "MvaBs2Jpsif0KK" + self.name,
                                     SelB            = Bs2Jpsif0KK,
                                     MVAVars         = self.Vars,
-                                    MVACutValue     = "%(MVACut)s" % self.config, 
+                                    MVACutValue     = "%(MVACut)s" % self.config,
                                     MVAxmlFile      = "%(XmlFile)s" % self.config )
 
       Bs2Jpsif0KaonLine  = StrippingLine( self.name + "Bs2Jpsif0KaonLine", algos = [ MvaBs2Jpsif0KK ])
-        
+
       Bs2Jpsif0ws = self.createCombinationSel( OutputList      = "Bs2Jpsif0ws" + self.name,
                                              DecayDescriptor = "B_s0 -> J/psi(1S) f_0(980)",
                                              DaughterLists   = [ self.DetachedJpsiList, self.Detachedf0wspipiList],
                                              PreVertexCuts   = "in_range(5100,AM,5720)",
                                              PostVertexCuts  = "in_range(5150,M,5670) & (VFASPF(VCHI2PDOF) < %(VCHI2PDOF)s ) & (BPVIPCHI2()<25.0) & (DTF_CTAU(0,True) > %(DTF_CTAU)s ) & (BPVDIRA >0.999) " % self.config ) # for the other particles is 10.
 #                                             PostVertexCuts  = "in_range(5150,M,5670) & (VFASPF(VCHI2PDOF) < %(VCHI2PDOF)s ) & (BPVIPCHI2()<25.0) & (BPVLTIME() > 0.2*ps) & (BPVDIRA >0.999) & (BPVVD > 1.5 *mm)" % self.config ) # for the other particles is 10.
-      
+
       MvaBs2Jpsif0ws = self.applyMVA( "MvaBs2Jpsif0ws" + self.name,
                                     SelB            = Bs2Jpsif0ws,
                                     MVAVars         = self.Vars,
-                                    MVACutValue     = "%(MVACut)s" % self.config, 
+                                    MVACutValue     = "%(MVACut)s" % self.config,
                                     MVAxmlFile      = "%(XmlFile)s" % self.config )
 
       Bs2Jpsif0wsLine  = StrippingLine( self.name + "Bs2Jpsif0wsLine", algos = [ MvaBs2Jpsif0ws ])
-        
+
       Bs2Jpsif0Prescaled = self.createCombinationSel( OutputList      = "Bs2Jpsif0Prescale" + self.name,
                                                       DecayDescriptor = "B_s0 -> J/psi(1S) f_0(980)",
                                                       DaughterLists   = [ self.WideJpsiList, self.Unbiasedf0List ],
@@ -251,7 +251,7 @@ class B2JpsiHHConf(LineBuilder) :
         MvaBs2JpsiKstar = self.applyMVA( "MvaBs2JpsiKstar" + self.name,
                                          SelB            = Bs2JpsiKstar,
                                          MVAVars         = self.Vars,
-                                         MVACutValue     = "%(MVACut)s" % self.config, 
+                                         MVACutValue     = "%(MVACut)s" % self.config,
                                          MVAxmlFile      = "%(XmlFile)s" % self.config )
 
         Bs2JpsiKstarLine = StrippingLine( self.name + "Bs2JpsiKstarLine", algos = [ MvaBs2JpsiKstar ], EnableFlavourTagging = True )
@@ -270,7 +270,7 @@ class B2JpsiHHConf(LineBuilder) :
         MvaLb2JpsipH = self.applyMVA( "MvaLb2JpsiLambda" + self.name,
                                           SelB            = Lb2JpsipH,
                                           MVAVars         = self.Vars,
-                                          MVACutValue     = "%(MVACut)s" % self.config, 
+                                          MVACutValue     = "%(MVACut)s" % self.config,
                                           MVAxmlFile      = "%(XmlFile)s" % self.config )
 
         Lb2JpsipHLine = StrippingLine( self.name + "Lb2JpsipHLine", algos = [ MvaLb2JpsipH ], EnableFlavourTagging = True )
@@ -302,7 +302,7 @@ class B2JpsiHHConf(LineBuilder) :
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def createCombinationsSel( self, OutputList,
                           DecayDescriptors,
                           DaughterLists,
@@ -342,17 +342,16 @@ class B2JpsiHHConf(LineBuilder) :
 
     def filterTisTos( self, name, DiMuonInput, myTisTosSpecs ) :
         from Configurables import TisTosParticleTagger
-    
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system:
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
         myTagger.CaloClustForNeutral = False
         myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-        
+
         return Selection(name + "_SelTisTos",
                      Algorithm = myTagger,
                      RequiredSelections = [ DiMuonInput ] )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py
index deb5a5e3dd3212f00002aea8df6c7a4a5a591a95..40c0d76522f4d1d308056ada21052ddb3be1280a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -57,7 +57,7 @@ class B2JpsiPi0Conf(LineBuilder) :
         self.SelPi0R = self.createSubSel( OutputList = self.name + "ResolvedPi0ForBetaS",
                                           InputList = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles"),
                                           Cuts = "(PT > 1000.*MeV) & (MINTREE('gamma'==ABSID, CL) > 0.05 )")
-                  
+
         self.SelBd2JpsiPi0R = self.createCombinationSel( OutputList = self.name + "Bd2JpsiPi0R",
                                                          DecayDescriptor = "B0 -> J/psi(1S) pi0",
                                                          DaughterLists  = [ self.SelJpsi, self.SelPi0R ],
@@ -69,7 +69,7 @@ class B2JpsiPi0Conf(LineBuilder) :
             "log(J_psi_1S_PT*1e-3)"                : "log( CHILD(PT,1) *1e-3)",
             "-log(J_psi_1S_IP_OWNPV)"              : "-log(CHILD(MIPDV(PRIMARY),1))",
             "log(1/B0_IP_OWNPV-5)"                 : "log(1/(CHILD(MIPDV(PRIMARY),0)) - 5)",
-            "log(1/(1-fabs(B0_DIRA_OWNPV))-400)"   : "log(1/(1-abs( CHILD(BPVDIRA,0)  ))-400)"            
+            "log(1/(1-fabs(B0_DIRA_OWNPV))-400)"   : "log(1/(1-abs( CHILD(BPVDIRA,0)  ))-400)"
             }
 
         self.MvaBd2JpsiPi0R = self.applyMVA(self.name + "MvaBd2JpsiPi0",
@@ -81,7 +81,7 @@ class B2JpsiPi0Conf(LineBuilder) :
 
         self.Bd2JpsiPi0DetachedLine  = StrippingLine( self.name + "Bd2JpsiPi0DetachedLine",
                                                       algos = [ self.MvaBd2JpsiPi0R ] )
-        
+
         self.registerLine(self.Bd2JpsiPi0DetachedLine)
 
     ### Generic tools:
@@ -119,16 +119,15 @@ class B2JpsiPi0Conf(LineBuilder) :
                   ):
         from MVADictHelpers import addTMVAclassifierValue
         from Configurables import FilterDesktop as MVAFilterDesktop
-        
+
         _FilterB = MVAFilterDesktop( name + "Filter",
                                      Code = "VALUE('LoKi::Hybrid::DictValue/" + name + "')>" + MVACutValue  )
-        
+
         addTMVAclassifierValue( Component = _FilterB,
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 5bfb3538ae8975e858cc5c8706cb3717e0b889c1..e90f2684bf38956cc7294f1959b7d5158d6fd12b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -56,7 +56,7 @@ class B2JpsiPi0Conf_RI(LineBuilder) :
         self.SelPi0R = self.createSubSel( OutputList = self.name + "ResolvedPi0ForBetaS",
                                           InputList = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles"),
                                           Cuts = "(PT > 1000.*MeV) & (MINTREE('gamma'==ABSID, CL) > 0.05 )")
-                  
+
         self.SelBd2JpsiPi0R = self.createCombinationSel( OutputList = self.name + "Bd2JpsiPi0R",
                                                          DecayDescriptor = "B0 -> J/psi(1S) pi0",
                                                          DaughterLists  = [ self.SelJpsi, self.SelPi0R ],
@@ -68,7 +68,7 @@ class B2JpsiPi0Conf_RI(LineBuilder) :
             "log(J_psi_1S_PT*1e-3)"                : "log( CHILD(PT,1) *1e-3)",
             "-log(J_psi_1S_IP_OWNPV)"              : "-log(CHILD(MIPDV(PRIMARY),1))",
             "log(1/B0_IP_OWNPV-5)"                 : "log(1/(CHILD(MIPDV(PRIMARY),0)) - 5)",
-            "log(1/(1-fabs(B0_DIRA_OWNPV))-400)"   : "log(1/(1-abs( CHILD(BPVDIRA,0)  ))-400)"            
+            "log(1/(1-fabs(B0_DIRA_OWNPV))-400)"   : "log(1/(1-abs( CHILD(BPVDIRA,0)  ))-400)"
             }
 
         self.MvaBd2JpsiPi0R = self.applyMVA(self.name + "MvaBd2JpsiPi0",
@@ -82,7 +82,7 @@ class B2JpsiPi0Conf_RI(LineBuilder) :
                                                       algos = [ self.MvaBd2JpsiPi0R ],
                                                       MDSTFlag = True,
                                                       EnableFlavourTagging = True )
-        
+
         self.registerLine(self.Bd2JpsiPi0DetachedLine)
 
     ### Generic tools:
@@ -120,16 +120,15 @@ class B2JpsiPi0Conf_RI(LineBuilder) :
                   ):
         from MVADictHelpers import addTMVAclassifierValue
         from Configurables import FilterDesktop as MVAFilterDesktop
-        
+
         _FilterB = MVAFilterDesktop( name + "Filter",
                                      Code = "VALUE('LoKi::Hybrid::DictValue/" + name + "')>" + MVACutValue  )
-        
+
         addTMVAclassifierValue( Component = _FilterB,
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py
index 85753f50013a5cea69171f3b7cdaf35deade921b..2a516aae2cbfe7a5f46d3a3e34d75cfb24d91750 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py
@@ -61,7 +61,7 @@ default_config = {
 
     'PrescaleBs2JpsiEtap2RhoGamma'   : 1,
     'PrescaleBs2JpsiEtap2EtaPiPi'    : 1,
-    
+
     'B02JpsiPi0RMVACut'      : "-0.56",
     'B02JpsiPi0RXmlFile'     :  "$TMVAWEIGHTSROOT/data/B2JpsiX0/B02JpsiPi0R_fisher_run2_v1r1.xml",
 
@@ -85,12 +85,12 @@ class B2JpsiX0Conf(LineBuilder) :
         LineBuilder.__init__(self, name, config)
         self.name = name
         self.config = config
-        
+
         self.WideJpsiList = DataOnDemand(Location = "Phys/StdMassConstrainedJpsi2MuMu/Particles")
         self.DetachedJpsiList = self.createSubSel( OutputList = 'DetachedJpsi' + self.name,
                                                    InputList  = self.WideJpsiList,
                                                    Cuts       = "(PFUNA(ADAMASS('J/psi(1S)')) < %(JpsiMassWindow)s * MeV) & (BPVLTIME() > %(LTimeCut)s *ps)" %self.config)
-        
+
         self.GammaList = DataOnDemand(Location = "Phys/StdLooseAllPhotons/Particles")
         self.Pi0RList = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")
         self.Pi0MList = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
@@ -120,12 +120,12 @@ class B2JpsiX0Conf(LineBuilder) :
                                             MVAVars = self.B02JpsiPi0RVars,
                                             MVACutValue = config['B02JpsiPi0RMVACut'],
                                             MVAxmlFile  = config['B02JpsiPi0RXmlFile'])
-        
+
         B02JpsiPi0RLine  = StrippingLine( self.name + "B02JpsiPi0RLine",
                                           prescale  = config['PrescaleB02JpsiPi0R'],
                                           algos = [ self.MvaB02JpsiPi0R ],
                                           RequiredRawEvents = ["Calo"])
-        
+
         self.registerLine(B02JpsiPi0RLine)
 
         #-------------
@@ -139,12 +139,12 @@ class B2JpsiX0Conf(LineBuilder) :
         B02JpsiPi0MLine  = StrippingLine( self.name + "B02JpsiPi0MLine",
                                           prescale  = config['PrescaleB02JpsiPi0M'],
                                           algos = [ B02JpsiPi0M ],
-                                          RequiredRawEvents = ["Calo"])                                          
+                                          RequiredRawEvents = ["Calo"])
 
         self.registerLine(B02JpsiPi0MLine)
 
         #-------------
-        
+
         self.Kst2KPi0R = self.createCombinationSel( OutputList      = "Kst2KPi0R" + self.name,
                                                     DecayDescriptor = "[K*(892)+ -> K+ pi0]cc",
                                                     DaughterLists   = [ self.KaonList, self.Pi0RList],
@@ -173,12 +173,12 @@ class B2JpsiX0Conf(LineBuilder) :
                                             MVAVars = self.Bu2JpsiKstRVars,
                                             MVACutValue = config['Bu2JpsiKstRMVACut'],
                                             MVAxmlFile  = config['Bu2JpsiKstRXmlFile'])
-        
+
         Bu2JpsiKstRLine  = StrippingLine(self.name + "Bu2JpsiKstRLine",
                                          prescale  = config['PrescaleBu2JpsiKstR'],
                                          algos = [ self.MvaBu2JpsiKstR ],
                                          RequiredRawEvents = ["Calo"])
-        
+
         self.registerLine(Bu2JpsiKstRLine)
 
         #-------------
@@ -233,13 +233,13 @@ class B2JpsiX0Conf(LineBuilder) :
                                 "log(1-fabs(Bs_DIRA_OWNPV))"      : "log(1-abs(BPVDIRA))",
                                 "log(Bs_IP_OWNPV)"                : "log(BPVIP())",
                                 "log(Bs_ENDVERTEX_CHI2)"          : "log(VFASPF(VCHI2))"}
-        
+
         self.MvaBs2JpsiEtaR = self.applyMVA(self.name + "MvaBs2JpsiEtaR",
                                             SelB = Bs2JpsiEtaR,
                                             MVAVars = self.Bs2JpsiEtaRVars,
                                             MVACutValue = config['Bs2JpsiEtaRMVACut'],
                                             MVAxmlFile  = config['Bs2JpsiEtaRXmlFile'])
-        
+
         Bs2JpsiEtaRLine  = StrippingLine( self.name + "Bs2JpsiEtaRLine",
                                           prescale  = config['PrescaleBs2JpsiEtaR'],
                                           algos = [ self.MvaBs2JpsiEtaR ],
@@ -348,7 +348,7 @@ class B2JpsiX0Conf(LineBuilder) :
                                                        DaughterCuts    = { "eta" : "(CHILD(CL,1)>0.05) & (CHILD(CL,2)>0.05) & (PT>1000*MeV)" },
                                                        PreVertexCuts   = "(ADAMASS('eta_prime')<100*MeV) & (APT>1500*MeV)",
                                                        PostVertexCuts  = "(BPVVDZ>0) & (VFASPF(VCHI2)<9) & (BPVDIRA>0.95) & (BPVVDCHI2>25)" )
-        
+
         Bs2JpsiEtap2EtaPiPi = self.createCombinationSel( OutputList      = "Bs2JpsiEtap2EtaPiPi" + self.name,
                                                          DecayDescriptor = "B_s0 -> J/psi(1S) eta_prime",
                                                          DaughterLists   = [ self.DetachedJpsiList, self.Etap2EtaPiPi],
@@ -387,8 +387,8 @@ class B2JpsiX0Conf(LineBuilder) :
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
-    def applyMVA( self, name, 
+
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -399,7 +399,7 @@ class B2JpsiX0Conf(LineBuilder) :
 
         _FilterB = MVAFilterDesktop( name + "Filter",
                                      Code = "VALUE('LoKi::Hybrid::DictValue/" + name + "')>" + MVACutValue  )
-        
+
         addTMVAclassifierValue( Component = _FilterB,
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index de6b1bfe5e7199ffc69757ba675a7f1072bb7bc5..2e508cebd9361e5bc3307c66c885ec3268b9c82e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -10,10 +10,10 @@
 ###############################################################################
 # $Id: StrippingB2JpsiXforBeta_s.py,v 1.3 2010-09-05 21:31:13 wouter Exp $
 '''
-Module for construction of B->JpsiX roadmap lifetime unbiased 
+Module for construction of B->JpsiX roadmap lifetime unbiased
 stripping Selections and StrippingLine.
 Provides functions to build Bs, Jpsi, Phi selections.
-Provides class Bs2JpsiPhiConf, which constructs the Selections and 
+Provides class Bs2JpsiPhiConf, which constructs the Selections and
 StrippingLines given a configuration dictionary.
 Exported symbols (use python help!):
    B2JpsiXLines
@@ -103,7 +103,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
         #### Input selections:
 
         # ------------------------------------------------------------ J/Psi:
-        
+
         self.WideJpsiList = DataOnDemand(Location = "Phys/StdMassConstrainedJpsi2MuMu/Particles")
 
         self.JpsiList = self.createSubSel( OutputList = 'NarrowJpsiForBetaS' + self.name,
@@ -111,10 +111,10 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                            Cuts = "(PFUNA(ADAMASS('J/psi(1S)')) < %(JpsiMassWindow)s * MeV)" % self.config)
 
         # ------------------------------------------------------------ Kaons:
-       
+
         self.KaonList = self.createSubSel( OutputList = "KaonsForBetaS" + self.name,
                                            InputList = DataOnDemand(Location = "Phys/StdLooseKaons/Particles"),
-                                           Cuts = "(TRCHI2DOF < %(TRCHI2DOF)s ) & (PIDK > %(PIDKCuts)s )" % self.config )  
+                                           Cuts = "(TRCHI2DOF < %(TRCHI2DOF)s ) & (PIDK > %(PIDKCuts)s )" % self.config )
 
         self.NoIPKaonList = self.createSubSel( OutputList = "NoIPKaonsForBetaS" + self.name,
                                                InputList = DataOnDemand(Location = "Phys/StdAllLooseKaons/Particles"),
@@ -131,7 +131,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                           "& (MINTREE('K+'==ABSID, PIDK) > %(PIDKCuts)s )" % self.config)
 
         # ------------------------------------------------------------ Kstar:
-        
+
         self.KstarList = self.createSubSel( OutputList = "Kstar2KpiForBetaS" + self.name,
                                             InputList = DataOnDemand(Location = "Phys/StdLooseKstar2Kpi/Particles"),
                                             Cuts = "(in_range(826,M,966))" \
@@ -152,7 +152,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                                                  ReFitPVs = False )
 
         # --------------------------------------------------------------- KS:
-        
+
         self.KsListLoose = MergedSelection("StdLooseKsMergedForBetaS" + self.name,
                                            RequiredSelections = [DataOnDemand(Location = "Phys/StdLooseKsDD/Particles"),
                                                                  DataOnDemand(Location = "Phys/StdLooseKsLL/Particles")] )
@@ -193,7 +193,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                                            "K+"  : " (PT > 500 *MeV) & (PIDK > %(PIDKCuts)s ) & (TRGHOSTPROB < 0.8)" % self.config},
                                           PreVertexCuts = " (in_range(1900.*MeV,AWM('K+','pi+','K-'),2050*MeV)) & (AHASCHILD((ISBASIC & HASTRACK & (TRCHI2DOF<4.) & (PT > 500*MeV) & (P > 5000*MeV))|((ABSID=='KS0') & (PT > 500*MeV) & (P > 5000*MeV) & (BPVVDCHI2 > 1000)))) & (ADOCA(1,3)<0.5*mm) & (ADOCA(2,3)<0.5*mm)",
                                           PostVertexCuts = "(VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36) & (BPVDIRA>0) & (VFASPF(VCHI2) < 25)",
-                                          ReFitPVs = False ) # 
+                                          ReFitPVs = False ) #
 
         # -------------------------------------------------------------------
 
@@ -234,7 +234,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                               "(MINTREE('K+'==ABSID, PT) > 500.*MeV)" % self.config )
 
         Bu2JpsiKDetachedLine  = StrippingLine( self.name + "Bu2JpsiKDetachedLine", algos = [ Bu2JpsiKDetached ], EnableFlavourTagging = False )
-    
+
         self.registerLine(Bu2JpsiKDetachedLine)
         self.registerLine(Bu2JpsiKPrescaledLine)
 
@@ -246,7 +246,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                    DaughterLists  = [ self.WideJpsiList, self.PhiList ],
                                    PreVertexCuts = "in_range(5050,AM,5650)",
                                    PostVertexCuts = "in_range(5150,M,5550) & (VFASPF(VCHI2PDOF) < 20)" % self.config ) # for the other particles is 10.
-  
+
         Bs2JpsiPhiPrescaledLine = StrippingLine( self.name + "Bs2JpsiPhiPrescaledLine", algos = [ Bs2JpsiPhi ] , HLT2 = self.config['HLTCuts'], prescale = self.config['Bs2JpsiPhiPrescale'], EnableFlavourTagging = True )#, MDSTFlag = True )
 
         Bs2JpsiPhiDetached = self.createSubSel( InputList = Bs2JpsiPhi,
@@ -255,7 +255,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                                 "(DTF_CTAU(0,True) > %(DTF_CTAU)s )" % self.config )
 
         Bs2JpsiPhiDetachedLine  = StrippingLine( self.name + "Bs2JpsiPhiDetachedLine", algos = [ Bs2JpsiPhiDetached ], EnableFlavourTagging = False )
-        
+
         self.registerLine(Bs2JpsiPhiPrescaledLine)
         self.registerLine(Bs2JpsiPhiDetachedLine)
 
@@ -312,7 +312,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                   PreVertexCuts = "in_range(5000,AM,5650)",
                                   PostVertexCuts = "in_range(5150,M,5550) & (VFASPF(VCHI2PDOF) < %(VCHI2PDOF)s)" % self.config
                                   )
-        
+
 
         Bd2JpsiKsLDDetached = self.createSubSel( InputList = Bd2JpsiKsLD,
                                     OutputList = Bd2JpsiKsLD.name() + "Detached" + self.name,
@@ -324,7 +324,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
         self.registerLine(Bd2JpsiKsLDDetachedLine)
 
     # -------------------------- Bs->J/PsiK*:
-   
+
     def makeBs2JpsiKstarWide( self ):
         Bs2JpsiKstarWide      = self.createCombinationSel( OutputList = "Bs2JpsiKstarWide" + self.name,
                                 DecayDescriptor = "[B_s~0 -> J/psi(1S) K*(892)0]cc",
@@ -337,7 +337,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
         self.registerLine(Bs2JpsiKstarWideLine)
 
     # -------------------------- Lb->J/PsiLb:
-        
+
     def makeLambdab2JpsiLambda( self ):
         Lambdab2JpsiLambda = self.createCombinationSel( OutputList = "Lambdab2JpsiLambda" + self.name,
                                     DecayDescriptor = "[Lambda_b0 -> Lambda0 J/psi(1S) ]cc",
@@ -347,7 +347,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                     )
 
         Lambdab2JpsiLambdaUnbiasedLine = StrippingLine( self.name + "Lambdab2JpsiLambdaUnbiasedLine", algos = [ Lambdab2JpsiLambda ] )
-    
+
         self.registerLine(Lambdab2JpsiLambdaUnbiasedLine)
 
     # ------------------------- Bs->DsPi:
@@ -359,7 +359,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
                                    PreVertexCuts = "in_range(5000,AM,6000) &  (ASUM(SUMTREE(PT,(ISBASIC | (ID=='gamma')),0.0))>5000*MeV)",
                                    PostVertexCuts = "(VFASPF(VCHI2/VDOF)<10) & (INTREE(HASTRACK & (TRCHI2DOF<4.) & (MIPCHI2DV(PRIMARY)>16) & (MIPDV(PRIMARY)>0.1*mm))) & (NINTREE((ISBASIC & HASTRACK & (TRCHI2DOF<4.) & (PT > 500*MeV) & (P > 5000*MeV))|((ABSID=='KS0') & (PT > 500*MeV) & (P > 5000*MeV) & (BPVVDCHI2 > 1000))) > 1) & (DTF_CTAU(0,True) > %(DTF_CTAU)s ) & (BPVIPCHI2()<25) & (BPVDIRA>0.999)" % self.config )
 
-        Bs2DsPiDetachedLine = StrippingLine( self.name + "Bs2DsPiDetachedLine", algos = [ Bs2DsPi ], EnableFlavourTagging = False     )    
+        Bs2DsPiDetachedLine = StrippingLine( self.name + "Bs2DsPiDetachedLine", algos = [ Bs2DsPi ], EnableFlavourTagging = False     )
 
         self.registerLine(Bs2DsPiDetachedLine)
 
@@ -390,7 +390,7 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def createCombinationsSel( self, OutputList,
                           DecayDescriptors,
                           DaughterLists,
@@ -410,17 +410,16 @@ class B2JpsiXforBeta_sConf(LineBuilder) :
 
     def filterTisTos( self, name, DiMuonInput, myTisTosSpecs ) :
         from Configurables import TisTosParticleTagger
-    
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system:
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
         myTagger.CaloClustForNeutral = False
         myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-        
+
         return Selection(name + "_SelTisTos",
                      Algorithm = myTagger,
                      RequiredSelections = [ DiMuonInput ] )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py
index 2acfeac6f9c23f6c3a5d4f3beb685814f707fd1a..ca5ca0107c4532cdd5eeefc9e1155d34933e5ffb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -87,10 +87,10 @@ class Bd2JpsieeKSConf(LineBuilder):
     def __init__(self, name, config) :
         LineBuilder.__init__(self, name, config)
 
-        # if name not set outside, set it to empty 
+        # if name not set outside, set it to empty
         if name == None:
-            name = ""        
-        
+            name = ""
+
         self.name   = name
         self.config = config
 
@@ -134,7 +134,7 @@ class Bd2JpsieeKSConf(LineBuilder):
         self.Jpsi = Selection( "SelJpsi2eeFor" + self.name,
                                Algorithm = self._jpsi,
                                RequiredSelections = [DiElectrons] )
-    
+
 
         self.JpsiFromTracks = Selection( "SelJpsi2eeFromTracksFor" + self.name,
                                          Algorithm = self._jpsi,
@@ -180,7 +180,7 @@ class Bd2JpsieeKSConf(LineBuilder):
                                                  DaughterLists  = [ self.Jpsi, self.KSList ],
                                                  PreVertexCuts = "in_range(%(BdMassMin)s,AM,%(BdMassMax)s)" % self.config,
                                                  PostVertexCuts = "(VFASPF(VCHI2/VDOF) < %(BdVertexCHI2pDOF)s)" % self.config )
-        
+
         Bd2JpsieeKSFromTracks = self.createCombinationSel( OutputList = "Bd2JpsiKSFromTracks",
                                                            DecayDescriptor = "B0 -> J/psi(1S) KS0",
                                                            DaughterLists  = [ self.JpsiFromTracks, self.KSList ],
@@ -205,9 +205,9 @@ class Bd2JpsieeKSConf(LineBuilder):
                                                  Cuts = "(BPVLTIME() > %(BPVLTIME)s*ps)" % self.config )
 
         Bd2JpsieeKSDetachedLine = StrippingLine( self.name + "Bd2JpsieeKSDetachedLine",
-                                                 algos = [ Bd2JpsieeKSDetached ], 
+                                                 algos = [ Bd2JpsieeKSDetached ],
                                                  EnableFlavourTagging = True )#, MDSTFlag = True )
-        
+
         self.registerLine(Bd2JpsieeKSFromTracksPrescaledLine)
         self.registerLine(Bd2JpsieeKSFromTracksDetachedLine)
         self.registerLine(Bd2JpsieeKSDetachedLine)
@@ -250,7 +250,7 @@ class Bd2JpsieeKSConf(LineBuilder):
                                                           DaughterCuts  = {"K+": "(PT > %(KplusPT)s *MeV)" % self.config },
                                                           PreVertexCuts   = "in_range(%(BdMassMin)s,AM,%(BdMassMax)s)" % self.config,
                                                           PostVertexCuts = "(VFASPF(VCHI2PDOF) < %(BdVertexCHI2pDOF)s)" % self.config )
-     
+
 
         Bu2JpsieeKFromTracksDetached = self.createSubSel( InputList = Bu2JpsieeKFromTracks,
                                                           OutputList = Bu2JpsieeKFromTracks.name() + "Detached" + self.name,
@@ -261,6 +261,5 @@ class Bd2JpsieeKSConf(LineBuilder):
                                                           algos = [ Bu2JpsieeKFromTracksDetached ],
                                                           prescale = 0.18 )
                                                           #, EnableFlavourTagging = True )#, MDSTFlag = True )
-    
-        self.registerLine(Bu2JpsieeKFromTracksDetachedLine)
 
+        self.registerLine(Bu2JpsieeKFromTracksDetachedLine)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 09e4ccdacab481a86de3214bad759a0c2cb94fd6..a1c89e53667cfe0a6e8cf94163b74d91eaaf0662 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -87,9 +87,9 @@ class Bd2JpsieeKstarConf(LineBuilder):
     def __init__(self, name, config) :
         LineBuilder.__init__(self, name, config)
 
-        # if name not set outside, set it to empty 
+        # if name not set outside, set it to empty
         if name == None:
-            name = ""        
+            name = ""
         self.name = name
         DiElectrons           = DataOnDemand(Location = "Phys/StdLooseDiElectron/Particles")
         self.Bd2JpsieeKstarLine      = self._Bd2JpsieeKstarLine( DiElectrons, name, config )
@@ -156,7 +156,7 @@ class Bd2JpsieeKstarConf(LineBuilder):
 
 
     def _Bd2JpsieeKstarDetachedLine( self, dielectron, name, config ) :
-        
+
         _jpsi = FilterDesktop("FilterJpsi2eeFor"+name,
                               Code = "   (MM > %(JpsiMassMinLoose)s *MeV)" \
                                      " & (MM < %(JpsiMassMaxLoose)s *MeV)" \
@@ -169,7 +169,7 @@ class Bd2JpsieeKstarConf(LineBuilder):
         Jpsi = Selection("SelJpsi2eeFor"+name,
                          Algorithm = _jpsi,
                          RequiredSelections = [dielectron])
-    
+
         _stdKst = DataOnDemand(Location="Phys/StdLooseKstar2Kpi/Particles")
         _kst = FilterDesktop("FilterKst2KpiFor"+name,
                              Code = \
@@ -189,7 +189,7 @@ class Bd2JpsieeKstarConf(LineBuilder):
         MC = "(VFASPF(VCHI2/VDOF) < %(BdVertexCHI2pDOFLoose)s)" % config
         _Bd = CombineParticles("CombineBdFor"+name,
                                DecayDescriptor = "B0 -> J/psi(1S) K*(892)0",
-                               CombinationCut = CC , 
+                               CombinationCut = CC ,
                                MotherCut = MC + config['LifetimeCut'],
                                ReFitPVs = True
                                )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index 5d74c12c9fad30dd4974b52a148b0189320fd1bc..6c07a2d5bcb6390026d92fe4cc2d6ea019ce790b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -49,8 +49,8 @@ default_config = {
         'BsMomCuts'     : "(VFASPF(VCHI2/VDOF) < 25.) & (BPVDIRA> 0.99) & (BPVIPCHI2()<25) & (BPVDLS>0)",
 
         'Bs2EtacPhiMVACut'   :  "-0.1",
-        'Bs2EtacPhiXmlFile'  :  "$TMVAWEIGHTSROOT/data/Bs2EtacPhi_BDT_v1r0.xml", 
-        
+        'Bs2EtacPhiXmlFile'  :  "$TMVAWEIGHTSROOT/data/Bs2EtacPhi_BDT_v1r0.xml",
+
         'Prescale'      : 1.
         },
     'STREAMS'           : ['Bhadron' ],
@@ -59,30 +59,30 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class Bs2EtacPhiBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         self.SelKaons = self.createSubSel( OutputList = self.name + "SelKaons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ),
                                            Cuts = config['KaonCuts']
                                            )
 
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ),
                                            Cuts = config['PionCuts']
                                            )
 
@@ -93,7 +93,7 @@ class Bs2EtacPhiBDTConf(LineBuilder):
                                                     DaughterLists = [ self.SelKaons, self.SelPions ],
                                                     DecayDescriptor = "eta_c(1S) -> K+ K- pi+ pi-",
                                                     ComAMCuts      = config['EtacComAMCuts'],
-                                                    PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                    PreVertexCuts  = config['EtacComN4Cuts'],
                                                     PostVertexCuts = config['EtacMomN4Cuts']
                                                     )
 
@@ -104,11 +104,11 @@ class Bs2EtacPhiBDTConf(LineBuilder):
                                                   DaughterLists = [ self.SelKaons ],
                                                   DecayDescriptor = "eta_c(1S) -> K+ K- K+ K-",
                                                   ComAMCuts      = config['EtacComAMCuts'],
-                                                  PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                  PreVertexCuts  = config['EtacComN4Cuts'],
                                                   PostVertexCuts = config['EtacMomN4Cuts']
                                                   )
 
-        
+
         """
         Etac-> Pi Pi Pi Pi
         """
@@ -116,7 +116,7 @@ class Bs2EtacPhiBDTConf(LineBuilder):
                                                       DaughterLists = [ self.SelPions ],
                                                       DecayDescriptor = "eta_c(1S) -> pi+ pi- pi+ pi-",
                                                       ComAMCuts      = config['EtacComAMCuts'],
-                                                      PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                      PreVertexCuts  = config['EtacComN4Cuts'],
                                                       PostVertexCuts = config['EtacMomN4Cuts']
                                                       )
 
@@ -126,65 +126,65 @@ class Bs2EtacPhiBDTConf(LineBuilder):
         from PhysSelPython.Wrappers import MergedSelection
 
         self.SelEtac = MergedSelection( self.name + "SelEtac",
-                                        RequiredSelections =  [ self.SelEtac2KKPiPi, 
+                                        RequiredSelections =  [ self.SelEtac2KKPiPi,
                                                                 self.SelEtac2KKKK,
                                                                 self.SelEtac2PiPiPiPi
                                                                 ])
-        
-        
+
+
         """
-        Phi 
+        Phi
         """
         self.SelPhi = self.createSubSel( OutputList = self.name + "SelPhi",
-                                         InputList =  DataOnDemand(Location = 'Phys/StdTightPhi2KK/Particles' ), 
+                                         InputList =  DataOnDemand(Location = 'Phys/StdTightPhi2KK/Particles' ),
                                          Cuts = config['PhiCuts']
                                          )
 
         """
-        Kshort 
+        Kshort
         """
-        # Both LL and DD 
+        # Both LL and DD
         self.InputKs = MergedSelection( self.name + "InputKs",
                                         RequiredSelections = [DataOnDemand(Location = "Phys/StdLooseKsDD/Particles"),
                                                               DataOnDemand(Location = "Phys/StdLooseKsLL/Particles")] )
 
         self.SelKs = self.createSubSel( OutputList = self.name + "SelKs",
                                         InputList = self.InputKs,
-                                        Cuts = config['KsCuts'] ) 
+                                        Cuts = config['KsCuts'] )
 
-        # Eta_c -> KS0 K Pi 
+        # Eta_c -> KS0 K Pi
         self.SelEtac2KsKPi = self.createCombinationSel( OutputList = self.name + "SelEtac2KsKPi",
                                                         DecayDescriptor = "[eta_c(1S) -> KS0 K+ pi-]cc",
-                                                        DaughterLists = [ self.SelKs, self.SelKaons, self.SelPions ],                                                        
-                                                        PreVertexCuts  = config['EtacComCuts'], 
+                                                        DaughterLists = [ self.SelKs, self.SelKaons, self.SelPions ],
+                                                        PreVertexCuts  = config['EtacComCuts'],
                                                         PostVertexCuts = config['EtacMomN4Cuts']
                                                         )
 
         """
-        Bs->Eta_c(KsKPi) Phi 
+        Bs->Eta_c(KsKPi) Phi
         """
         self.SelBs2EtacPhi_KsKPi = self.createCombinationSel( OutputList = self.name + "SelBs2EtacPhi_KsKPi",
                                                               DecayDescriptor = "B_s0 -> eta_c(1S) phi(1020)",
-                                                              DaughterLists = [ self.SelPhi, self.SelEtac2KsKPi ],                    
+                                                              DaughterLists = [ self.SelPhi, self.SelEtac2KsKPi ],
                                                               PreVertexCuts  = config['BsComCuts'],
                                                               PostVertexCuts = config['BsMomCuts'] )
 
-        self.Bs2EtacPhi_KsKPiLine = StrippingLine( self.name + '_KsKPiLine',                                                
+        self.Bs2EtacPhi_KsKPiLine = StrippingLine( self.name + '_KsKPiLine',
                                                    prescale  = config['Prescale'],
                                                    HLT2      = config['HLTCuts'],
                                                    algos     = [ self.SelBs2EtacPhi_KsKPi ],
                                                    EnableFlavourTagging = True )#, MDSTFlag = True )
 
         self.registerLine( self.Bs2EtacPhi_KsKPiLine )
-        
+
 
 
         """
-        Bs->Eta_c Phi 
+        Bs->Eta_c Phi
         """
         self.SelBs2EtacPhi = self.createCombinationSel( OutputList = self.name + "SelBs2EtacPhi",
                                                         DecayDescriptor = "B_s0 -> eta_c(1S) phi(1020)",
-                                                        DaughterLists = [ self.SelPhi, self.SelEtac ],                    
+                                                        DaughterLists = [ self.SelPhi, self.SelEtac ],
                                                         PreVertexCuts  = config['BsComCuts'],
                                                         PostVertexCuts = config['BsMomCuts'] )
 
@@ -195,28 +195,28 @@ class Bs2EtacPhiBDTConf(LineBuilder):
             'sqrt(Kp_Etac_IPCHI2_OWNPV)'     : "sqrt( CHILD(MIPCHI2DV(), 1, 1) )",
             'sqrt(Km_Etac_IPCHI2_OWNPV)'     : "sqrt( CHILD(MIPCHI2DV(), 1, 2) )",
             'sqrt(Pip_Etac_IPCHI2_OWNPV)'    : "sqrt( CHILD(MIPCHI2DV(), 1, 3) )",
-            'sqrt(Pim_Etac_IPCHI2_OWNPV)'    : "sqrt( CHILD(MIPCHI2DV(), 1, 4) )",           
+            'sqrt(Pim_Etac_IPCHI2_OWNPV)'    : "sqrt( CHILD(MIPCHI2DV(), 1, 4) )",
             'sqrt(Kp_Phi_IPCHI2_OWNPV)'      : "sqrt( CHILD(MIPCHI2DV(), 2, 1) )",
             'sqrt(Km_Phi_IPCHI2_OWNPV)'      : "sqrt( CHILD(MIPCHI2DV(), 2, 2) )",
 
             'sqrt(Kp_Etac_IPCHI2_OWNPV+Km_Etac_IPCHI2_OWNPV+Pip_Etac_IPCHI2_OWNPV+Pim_Etac_IPCHI2_OWNPV)'  : "sqrt( CHILD(MIPCHI2DV(), 1, 1)+CHILD(MIPCHI2DV(), 1, 2)+CHILD(MIPCHI2DV(), 1, 3)+CHILD(MIPCHI2DV(), 1, 4))",
             'sqrt(Etac_IPCHI2_OWNPV)'        : "sqrt( CHILD(MIPCHI2DV(), 1 ) )",
             'sqrt(Phi_IPCHI2_OWNPV)'         : "sqrt( CHILD(MIPCHI2DV(), 2 ) )",
-            
+
 
             'log(Kp_Etac_PT)'      : "log( CHILD(PT, 1, 1) )",
             'log(Km_Etac_PT)'      : "log( CHILD(PT, 1, 2) )",
             'log(Pip_Etac_PT)'     : "log( CHILD(PT, 1, 3) )",
             'log(Pim_Etac_PT)'     : "log( CHILD(PT, 1, 4) )",
             'log(Kp_Phi_PT)'       : "log( CHILD(PT, 2, 1) )",
-            'log(Km_Phi_PT)'       : "log( CHILD(PT, 2, 2) )",            
+            'log(Km_Phi_PT)'       : "log( CHILD(PT, 2, 2) )",
             'log(Etac_PT)'         : "log( CHILD(PT, 1 ) )",
             'log(Phi_PT)'          : "log( CHILD(PT, 2 ) )",
-            
+
             'Etac_ENDVERTEX_CHI2'   :   "CHILD(VFASPF(VCHI2), 1)",
-            'Phi_ENDVERTEX_CHI2'    :   "CHILD(VFASPF(VCHI2), 2)", 
+            'Phi_ENDVERTEX_CHI2'    :   "CHILD(VFASPF(VCHI2), 2)",
 
-            'sqrt(B_IPCHI2_OWNPV)'  :   "sqrt( BPVIPCHI2() )", 
+            'sqrt(B_IPCHI2_OWNPV)'  :   "sqrt( BPVIPCHI2() )",
             'B_DIRA_OWNPV'          :   "BPVDIRA",
             'B_LOKI_FDS'            :   "BPVDLS",
             'B_PVFit_chi2[0]'       :   "DTF_CHI2 ( True  )"
@@ -226,19 +226,19 @@ class Bs2EtacPhiBDTConf(LineBuilder):
         self.MvaBs2EtacPhi = self.applyMVA( self.name + "MvaBs2EtacPhi",
                                              SelB        = self.SelBs2EtacPhi,
                                              MVAVars     = self.Bs2EtacPhiVars,
-                                             MVACutValue = config['Bs2EtacPhiMVACut'], 
+                                             MVACutValue = config['Bs2EtacPhiMVACut'],
                                              MVAxmlFile  = config['Bs2EtacPhiXmlFile']
                                              )
-        
-                
-        self.Bs2EtacPhiBDTLine = StrippingLine( self.name + 'Line',                                                
+
+
+        self.Bs2EtacPhiBDTLine = StrippingLine( self.name + 'Line',
                                                 prescale  = config['Prescale'],
                                                 HLT2      = config['HLTCuts'],
                                                 algos     = [ self.MvaBs2EtacPhi ],
                                                 EnableFlavourTagging = True )#, MDSTFlag = True )
 
         self.registerLine( self.Bs2EtacPhiBDTLine )
-        
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -273,7 +273,7 @@ class Bs2EtacPhiBDTConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
@@ -283,9 +283,9 @@ class Bs2EtacPhiBDTConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
 
-    def applyMVA( self, name, 
+
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -301,7 +301,7 @@ class Bs2EtacPhiBDTConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py
index 716a09f2332f102ccafdc5e0378a6772bb3c7e5e..2513273fe715a36ce41d5b6a2336322f91372c18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -86,9 +86,9 @@ class Bs2JpsieePhiConf(LineBuilder):
     def __init__(self, name, config) :
         LineBuilder.__init__(self, name, config)
 
-        # if name not set outside, set it to empty 
+        # if name not set outside, set it to empty
         if name == None:
-            name = ""        
+            name = ""
         self.name = name
         DiElectrons           = DataOnDemand(Location = "Phys/StdLooseDiElectron/Particles")
         DiElectronsFromTracks = DataOnDemand(Location = "Phys/StdDiElectronFromTracks/Particles")
@@ -157,7 +157,7 @@ class Bs2JpsieePhiConf(LineBuilder):
 
 
     def _Bs2JpsieePhiDetachedLine( self, dielectron, name, config ) :
-        
+
         _jpsi = FilterDesktop("FilterJpsi2eeFor"+name,
                               Code = "   (MM > %(JpsiMassMinLoose)s *MeV)" \
                                      " & (MM < %(JpsiMassMaxLoose)s *MeV)" \
@@ -170,7 +170,7 @@ class Bs2JpsieePhiConf(LineBuilder):
         Jpsi = Selection("SelJpsi2eeFor"+name,
                          Algorithm = _jpsi,
                          RequiredSelections = [dielectron])
-    
+
         _stdPhi = DataOnDemand(Location="Phys/StdLoosePhi2KK/Particles")
         _phi = FilterDesktop("FilterPhi2KKFor"+name,
                              Code = \
@@ -189,7 +189,7 @@ class Bs2JpsieePhiConf(LineBuilder):
         MC = "(VFASPF(VCHI2/VDOF) < %(BsVertexCHI2pDOFLoose)s)" % config
         _Bs = CombineParticles("CombineBsFor"+name,
                                DecayDescriptor = "B_s0 -> J/psi(1S) phi(1020)",
-                               CombinationCut = CC , 
+                               CombinationCut = CC ,
                                MotherCut = MC + config['LifetimeCut'],
                                ReFitPVs = True
                                )
@@ -212,4 +212,4 @@ class Bs2JpsieePhiConf(LineBuilder):
               , prescale = 1
               , postscale = 1
               , selection = dielectron
-              )
\ No newline at end of file
+              )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 2cd71fec8f70476a11e885fa161bf8c6343f95f5..e9a88069aa4f372ac32596d5560ee6f1876a3144 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -37,8 +37,8 @@ class B2DXBuilder(object):
         self.hhh = hhh
         self.ks = ks
         self.pi0 = pi0
-        self.lines = []        
-        
+        self.lines = []
+
         # B -> D0(HH) X
         self.b2dhd2hh = self._makeB2D0H('D2HH',self.d.hh_pid)   # B+- -> D0(HH)  H+-
         self._makeB2D0H('D2HHWS',self.d.hh_ws)
@@ -72,7 +72,7 @@ class B2DXBuilder(object):
         self._makeB2D0HH('D2KSHHDDWS',self.d.kshh_dd_ws)
         self.lines[-1].pre = 0.1 # last line is WS D line
 
-        
+
         self._makeB2D0HH('D2HHHH',self.d.hhhh_pid) # B+- -> D0(HHHH) H+- H0
         self._makeB2D0HH('D2HHHHWS',self.d.hhhh_ws) # B+- -> D0(HHHH,WS) H+- H0
         self.lines[-1].pre = 0.1 # last line is WS D line
@@ -114,7 +114,7 @@ class B2DXBuilder(object):
         self._makeB02D0HH('D2KSHHDD',self.d.kshh_dd_pid) # B0  -> D0(KSDDHH)H+H-
         self._makeB02D0HH('D2KSHHLLWS',self.d.kshh_ll_ws, 0.1) # B0  -> D0(KSLLHH)H+H- (WS D daughters)
         self._makeB02D0HH('D2KSHHDDWS',self.d.kshh_dd_ws, 0.1) # B0  -> D0(KSDDHH)H+H- (WS D daughters)
-        
+
         self._makeB2D0H('D2KSHHLLWS',self.d.kshh_ll_ws)
         self.lines[-1].pre = 0.1 # last line is WS D line
         self._makeB2D0H('D2KSHHDDWS',self.d.kshh_dd_ws)
@@ -163,16 +163,16 @@ class B2DXBuilder(object):
         self._makeB2D0H('D02KSPi0DDMerged',self.d.kspi0_dd_merged)
 
         pi0Cut = "(NINGENERATION(('pi0'==ABSID) & (PT>1000), 1) == 1)"
-        self.d2pi0hh_tight = [filterSelection('GammaSelection',pi0Cut,d.pi0hh_resolved_pid)]        
+        self.d2pi0hh_tight = [filterSelection('GammaSelection',pi0Cut,d.pi0hh_resolved_pid)]
         self._makeB02D0HH('D2Pi0HHResolved',self.d2pi0hh_tight) # self.d.pi0hh_resolved_pid
         self._makeB02D0HH('D2Pi0HHMerged',self.d.pi0hh_merged_pid)
         #self._makeB02D0KS('D2Pi0KPiResolved',self.d.pi0kpi_resolved,'DD')
-        #self._makeB02D0KS('D2Pi0KPiMerged',self.d.pi0kpi_merged,'LL') 
+        #self._makeB02D0KS('D2Pi0KPiMerged',self.d.pi0kpi_merged,'LL')
         # B0 -> D+-(Pi0HHH) H-+  (resolved & merged) (+WS)
         self._makeB02DH('D2Pi0HHHResolved',self.d.pi0hhh_resolved)
         self._makeB02DH('D2Pi0HHHMerged',self.d.pi0hhh_merged)
         #self._makeB02DH('D2Pi0HHHResolvedUP',self.d.pi0hhh_resolved_up)
-        #self._makeB02DH('D2Pi0HHHMergedUP',self.d.pi0hhh_merged_up) 
+        #self._makeB02DH('D2Pi0HHHMergedUP',self.d.pi0hhh_merged_up)
         # B -> D0(HH) 3h
         self.b2dhhhd2hhpid = self._makeB2D0HHH('D2HHPID',self.d.hh_pid)   # B+- -> D0(HH)  H+H-H+
         self._makeB2D0HHH('D2KSHHDD',self.d.kshh_dd_pid)
@@ -184,7 +184,7 @@ class B2DXBuilder(object):
         #lines going to full dst: B+- -> D0(Kpi)3pi and B+- -> D0(K3pi)pi
         self._makeB2D0HHH_FULLDST('D2HHTIGHT',self.d.kpi_pid_tighter1_narrow)
         self._makeB2D0Pi('D2HHHHTIGHT',self.d.k3pi_pid_tighter1_narrow)
-        
+
         # B -> D(HHH) 3h
         self._makeB02DHHH('D2HHHPID',self.d.hhh_pid)   # B+- -> D(HHH)  H+H-H+
         #Tighter selection Full DST lines
@@ -192,12 +192,12 @@ class B2DXBuilder(object):
 
         self._makeB2D0ppbarH('D2HH', self.d.hh_pid)
         self._makeB02DppbarH('D2HHH', self.d.hhh)
-        
+
         # B+- -> D0(HH)  H+H-H+
         self._makeB02DstHHH('Dstar2D0PiPID',self.dst.d0pi_pid)
 
         # B+ -> D(_s)+ mu+ mu- / D(_s)- mu+ mu+ / D(_s)+ mu+ mu+
-        self._makeB2DMuMu() 
+        self._makeB2DMuMu()
 
         # B -> D*H, D*(Dgamma), D(HHH) CPV
         self._makeB02DsstH('Dsstar2DGammaD2HHH',self.dst.dsgammacpv_hhh)
@@ -230,19 +230,19 @@ class B2DXBuilder(object):
         self._makeB2DstHH('D0Pi',self.dst.d0pi_pid)
         self._makeB2DstHH('D2HHHHPi',self.dst.d0pi_hhhh_pid)
 
-        # B -> D D 
+        # B -> D D
         self._makeB02DD()
-        self.b2dd = self._makeB2D0D()   
-        self._makeB02DstD() 
+        self.b2dd = self._makeB2D0D()
+        self._makeB02DstD()
         self._makeB02DstDD02K3Pi()
         self._makeB02D0D0()
         self._makeB2DstD0()
         self._makeB02DstDst()
 
         # B -> D D H
-        self._makeB2DDH()   
-        self._makeB02D0DH() 
-        self._makeB2DstDH() 
+        self._makeB2DDH()
+        self._makeB02D0DH()
+        self._makeB2DstDH()
         self._makeB2D0D0H()
         self._makeB02DstD0H()
         self._makeB2DstDstH()
@@ -257,25 +257,25 @@ class B2DXBuilder(object):
         self._makeB2DD0Kst()
         self._makeB2DstD0Kst()
         # B -> D D KS
-        self._makeB02DDKS('DD')   
-        self._makeB2D0DKS('DD') 
-        self._makeB02DstDKS('DD') 
+        self._makeB02DDKS('DD')
+        self._makeB2D0DKS('DD')
+        self._makeB02DstDKS('DD')
         self._makeB02D0D0KS('DD')
         self._makeB2DstD0KS('DD')
         self._makeB02DstDstKS('DD')
-        self._makeB02DDKS('LL')   
-        self._makeB2D0DKS('LL') 
-        self._makeB02DstDKS('LL') 
+        self._makeB02DDKS('LL')
+        self._makeB2D0DKS('LL')
+        self._makeB02DstDKS('LL')
         self._makeB02D0D0KS('LL')
         self._makeB2DstD0KS('LL')
         self._makeB02DstDstKS('LL')
         # B->DDKK
         self._makeB2D0DKK()
         self._makeB2D0DKPi()
-        self._makeB02DDKK()        
+        self._makeB02DDKK()
         self._makeB02DstDKK()
         self._makeB02DstDstKK()
- 
+
     def _makeB02DH(self,dname,d2x,useIP=True):
         '''Makes RS and WS B0 -> D + h- + c.c.'''
         tag = 'B02D%s'
@@ -287,7 +287,7 @@ class B2DXBuilder(object):
         if useIP:
             decays[tag%'K'] = ["[B0 -> D- K+]cc"]
             inputs[tag%'K'] = d2x+kaons
-        b02dh_rs = makeB2XSels(decays,dname,inputs,self.config,useIP)        
+        b02dh_rs = makeB2XSels(decays,dname,inputs,self.config,useIP)
         decays = {tag%'PiWS': ["[B0 -> D- pi-]cc"]}
         inputs = {tag%'PiWS': d2x+pions}
         if useIP:
@@ -430,7 +430,7 @@ class B2DXBuilder(object):
                   'B02DKstarPM' : d2x+self.hh.kstarpm}
         b2dv = makeB2XSels(decays,dname,inputs,self.config)
         self.lines.append(ProtoLine(b2dv,1.0))
-                                    
+
     def _makeB2D0H(self,dname,d2x,useIP=True):
         '''Makes RS B+ -> D0 h+ (h=pi,K) + c.c.'''
         tag = 'B2D0%s'
@@ -468,7 +468,7 @@ class B2DXBuilder(object):
         inputs = {tag%'Pi': d2x+self.topoPions}
         b2d0h = makeB2XSels(decays,dname,inputs,self.config,useIP)
         self.lines.append(ProtoLine(b2d0h,1.0))
-        
+
     def _makeB02D0KS(self,dname,d2x,ks):
         '''Makes B0 -> D0 KS'''
         decays = {'B02D0KS'+ks: ["B0 -> D0 KS0"]}
@@ -534,7 +534,7 @@ class B2DXBuilder(object):
                   'B02DstarKsPiDD': d2x+self.topoPions + self.ks['DD'],
                   'B02DstarKsKDD' : d2x+self.topoKaons + self.ks['DD'],
                   'B02DstarKsPiLL': d2x+self.topoPions + self.ks['LL'],
-                  'B02DstarKsKLL' : d2x+self.topoKaons + self.ks['LL'] 
+                  'B02DstarKsKLL' : d2x+self.topoKaons + self.ks['LL']
                  }
         b2dstksh_rs = makeB2XSels(decays,dname,inputs,self.config,True,False)
         self.lines.append(ProtoLine(b2dstksh_rs,1.0))
@@ -549,7 +549,7 @@ class B2DXBuilder(object):
                   'B02DstarKsPiDDWS': d2x+self.topoPions + self.ks['DD'],
                   'B02DstarKsKDDWS' : d2x+self.topoKaons + self.ks['DD'],
                   'B02DstarKsPiLLWS': d2x+self.topoPions + self.ks['LL'],
-                  'B02DstarKsKLLWS' : d2x+self.topoKaons + self.ks['LL'] 
+                  'B02DstarKsKLLWS' : d2x+self.topoKaons + self.ks['LL']
                  }
         b2dstksh_ws = makeB2XSels(decays,dname,inputs,self.config,True,False)
         self.lines.append(ProtoLine(b2dstksh_ws,0.1))
@@ -615,7 +615,7 @@ class B2DXBuilder(object):
         inputs = {'B02D0PPbarWS': d2x+self.hh.ppbar_ws_pid}
         b2d0ppbar_ws = makeB2XSels(decays,dname,inputs,self.config)
         self.lines.append(ProtoLine(b2d0ppbar,1.0))
-        self.lines.append(ProtoLine(b2d0ppbar_ws,0.1))        
+        self.lines.append(ProtoLine(b2d0ppbar_ws,0.1))
 
     def _makeB02D0PPbar_FULLDST(self,dname,d2x):
         '''Makes RS B0 -> D0 p+p~- + c.c.'''
@@ -631,7 +631,7 @@ class B2DXBuilder(object):
         #inputs = {'B02D0PPbarWS': d2x+self.hh.ppbar_ws_pid_tighter}
         #b2d0ppbar_ws = makeB2XSels(decays,dname,inputs,self.config)
         self.lines.append(ProtoLine(b2d0ppbar,1.0))
-        #self.lines.append(ProtoLine(b2d0ppbar_ws,0.1))        
+        #self.lines.append(ProtoLine(b2d0ppbar_ws,0.1))
 
     def _makeB02DHHH(self,dname,d2x):
         '''Makes RS and WS B0 -> D + h- + c.c.'''
@@ -660,7 +660,7 @@ class B2DXBuilder(object):
         b02dhhh_ws = makeB2XSels(decays,dname,inputs,config)
         self.lines.append(ProtoLine(b02dhhh_rs,1.0))
         self.lines.append(ProtoLine(b02dhhh_ws,0.1))
-        
+
 
     def _makeB02DHHH_FULLDST(self,dname,d2x):
         '''Makes RS and WS B0 -> D + h- + c.c.  (Tighter selection for Full DST)'''
@@ -669,7 +669,7 @@ class B2DXBuilder(object):
         config['AM_MAX'] = '6000*MeV'
         config['B2CBBDT_MIN'] = '0.3'
         config['DZ1_MIN'] = '-1.5*mm'
-        
+
         kpipi_realtightk = self.hhh.kpipi_realtightk
         pipipi_tighterpi = self.hhh.pipipi_tighterpi
         decays = {'B02DKPiPi' : ["[B0 -> D- K_1(1270)+]cc"],
@@ -732,7 +732,7 @@ class B2DXBuilder(object):
         self.lines.append(ProtoLine(b2d03h,1.0))
         return [MergedSelection('B2D0HHHForBc'+dname,RequiredSelections=b2d03h)]
 
-    def _makeB2D0ppbarH(self, dname, d2x) : 
+    def _makeB2D0ppbarH(self, dname, d2x) :
         '''Makes B+ -> D0 p pbar h+ (h=pi,K) + c.c.'''
         ppbarpi = self.hhh.ppbarpi
         ppbark = self.hhh.ppbark
@@ -742,7 +742,7 @@ class B2DXBuilder(object):
         b2d0ppbarh = makeB2XSels(decays,dname,inputs,self.config)
         self.lines.append(ProtoLine(b2d0ppbarh,1.0))
 
-    def _makeB02DppbarH(self, dname, d2x) : 
+    def _makeB02DppbarH(self, dname, d2x) :
         '''Makes B0 -> D- p pbar h+ (h=pi,K) + c.c.'''
         ppbarpi = self.hhh.ppbarpi
         ppbark = self.hhh.ppbark
@@ -823,7 +823,7 @@ class B2DXBuilder(object):
         inputs = {'B02DstDD02K3Pi': self.dst.d0pi_k3pi + self.d.hhh_pid }
         b2dstdd02k3pi = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b2dstdd02k3pi,1.0))
- 
+
 
     def _makeB2DstD0(self):
         '''Makes B+- -> D*+- D0'''
@@ -832,7 +832,7 @@ class B2DXBuilder(object):
         b2dstd0 = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b2dstd0,1.0))
         inputs = {'B2DstD0': self.dst.d0pi_pid+self.d.k3pi_pid}
-        b2dstd0 = makeB2XSels(decays,'D02K3Pi',inputs,self.config)  
+        b2dstd0 = makeB2XSels(decays,'D02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstd0,1.0))
 
     def _makeB02DstDst(self):
@@ -884,12 +884,12 @@ class B2DXBuilder(object):
                   'B02D0DPiWS': self.d.d_and_ds_cf_pid+self.d.k3pi_pid_tight+self.topoPions_PID }
         b2d0dh_ws = makeB2XSels(decays,'D02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2d0dh_ws,0.1))
-   
+
     def _makeB2D0D0H(self):
         '''Makes B+- -> D0 D0 H+-'''
         dec = {'B2D0D0K' : ["B+ -> D0 D0 K+","B- -> D0 D0 K-"] ,
                'B2D0D0Pi': ["B+ -> D0 D0 pi+","B- -> D0 D0 pi-"] }
-        decays = {'B2D0D0KD02HHD02HH' : dec['B2D0D0K'], 'B2D0D0KD02HHD02K3Pi' :  dec['B2D0D0K'], 'B2D0D0KD02K3PiD02K3Pi' : dec['B2D0D0K'], 
+        decays = {'B2D0D0KD02HHD02HH' : dec['B2D0D0K'], 'B2D0D0KD02HHD02K3Pi' :  dec['B2D0D0K'], 'B2D0D0KD02K3PiD02K3Pi' : dec['B2D0D0K'],
                   'B2D0D0PiD02HHD02HH': dec['B2D0D0Pi'],'B2D0D0PiD02HHD02K3Pi': dec['B2D0D0Pi'], 'B2D0D0PiD02K3PiD02K3Pi': dec['B2D0D0Pi']}
         inputs = {'B2D0D0KD02HHD02HH' : self.d.hh_pid_tight+self.topoKaons_PID, 'B2D0D0KD02HHD02K3Pi' : self.d.hh_pid_tight+self.d.k3pi_pid_tight+self.topoKaons_PID,  'B2D0D0KD02K3PiD02K3Pi':self.d.k3pi_pid_tight+self.topoKaons_PID,
                   'B2D0D0PiD02HHD02HH': self.d.hh_pid_tight+self.topoPions_PID, 'B2D0D0PiD02HHD02K3Pi': self.d.hh_pid_tight+self.d.k3pi_pid_tight+self.topoPions_PID,  'B2D0D0PiD02K3PiD02K3Pi':self.d.k3pi_pid_tight+self.topoPions_PID}
@@ -1043,7 +1043,7 @@ class B2DXBuilder(object):
         self.lines.append(ProtoLine(b2ddkst,1.0))
 
     def _makeB02DstDKst(self):
-        '''Makes the RS B0 -> D*+ D- K*'''   
+        '''Makes the RS B0 -> D*+ D- K*'''
         decays = {'B02DstDKst':["B0 -> D*(2010)+ D- K*(892)0",
                               "B0 -> D+ D*(2010)- K*(892)~0",
                               "B0 -> D- D*(2010)+ K*(892)~0",
@@ -1055,7 +1055,7 @@ class B2DXBuilder(object):
         b2dstdkst = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstdkst,1.0))
 
-    def _makeB02DstDstKst(self):       
+    def _makeB02DstDstKst(self):
         '''Makes the RS B0 -> D*+ D*- K*'''
         decays = {'B02DstDstKst':["B0 -> D*(2010)+ D*(2010)- K*(892)0",
                                 "B0 -> D*(2010)- D*(2010)+ K*(892)~0"]}
@@ -1076,18 +1076,18 @@ class B2DXBuilder(object):
         b2dd0kst = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b2dd0kst,1.0))
         inputs = {'B2DD0Kst':self.d.d_and_ds_cf_pid+self.d.k3pi_pid_tight+self.hh.kpi}
-        b2dd0kst = makeB2XSels(decays,'D02K3Pi',inputs,self.config)      
+        b2dd0kst = makeB2XSels(decays,'D02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dd0kst,1.0))
 
     def _makeB2DstD0Kst(self):
         '''Makes the RS B+ -> D*(2010)+ D~0 K*'''
-        decays = {'B2DstD0Kst':["B- -> D*(2010)- D0 K*(892)~0","B+ -> D*(2010)+ D0 K*(892)0"]}     
+        decays = {'B2DstD0Kst':["B- -> D*(2010)- D0 K*(892)~0","B+ -> D*(2010)+ D0 K*(892)0"]}
         inputs = {'B2DstD0Kst':self.dst.d0pi_pid+self.d.hh_pid_tight+self.hh.kpi}
         b2dstd0kst = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b2dstd0kst,1.0))
         inputs = {'B2DstD0Kst':self.dst.d0pi_k3pi_pid+self.d.hh_pid_tight+self.hh.kpi}
         b2dstd0kst = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)
-        self.lines.append(ProtoLine(b2dstd0kst,1.0)) 
+        self.lines.append(ProtoLine(b2dstd0kst,1.0))
         inputs = {'B2DstD0Kst':self.dst.d0pi_pid+self.d.k3pi_pid_tight+self.hh.kpi}
         b2dstd0kst = makeB2XSels(decays,'D02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstd0kst,1.0))
@@ -1152,8 +1152,8 @@ class B2DXBuilder(object):
         b2dstd0ks = makeB2XSels(decays,'D02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstd0ks,1.0))
         inputs={'B2DstD0KS'+ks:self.dst.d0pi_k3pi_pid+self.d.hh_pid_tight+self.ks[ks]}
-        b2dstd0ks = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)  
-        self.lines.append(ProtoLine(b2dstd0ks,1.0))  
+        b2dstd0ks = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)
+        self.lines.append(ProtoLine(b2dstd0ks,1.0))
         inputs={'B2DstD0KS'+ks:self.dst.d0pi_k3pi_pid+self.d.k3pi_pid_tight+self.ks[ks]}
         b2dstd0ks = makeB2XSels(decays,'DstarD02K3PiD02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstd0ks,1.0))
@@ -1175,10 +1175,10 @@ class B2DXBuilder(object):
         b2dstdstks_ws = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b2dstdstks_ws,0.1))
         inputs = {'B02DstDstKSWS'+ks: self.dst.d0pi_pid+self.dst.d0pi_k3pi_pid+self.ks[ks]}
-        b2dstdstks_ws = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)   
+        b2dstdstks_ws = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstdstks_ws,0.1))
         inputs = {'B02DstDstKSWS'+ks: self.dst.d0pi_k3pi_pid+self.ks[ks]}
-        b2dstdstks_ws = makeB2XSels(decays,'DstarD02K3PiDstarD02K3Pi',inputs,self.config)   
+        b2dstdstks_ws = makeB2XSels(decays,'DstarD02K3PiDstarD02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b2dstdstks_ws,0.1))
 
     def _makeB2D0DKK(self):
@@ -1193,7 +1193,7 @@ class B2DXBuilder(object):
 
     def _makeB2D0DKPi(self):
         '''Makes RS B+ -> D0D-K+pi+ + c.c.'''
-        decays = {'B2D0DKPi': ["B+ -> D- D0 K+ pi+","B- -> D+ D0 K- pi-"]}  
+        decays = {'B2D0DKPi': ["B+ -> D- D0 K+ pi+","B- -> D+ D0 K- pi-"]}
         inputs = {'B2D0DKPi': self.d.d_and_ds_cf_pid+self.d.hh_pid_tight+self.topoKaons_PID+self.topoPions}
         b2d0dkpi = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b2d0dkpi,1.0))
@@ -1202,11 +1202,11 @@ class B2DXBuilder(object):
         self.lines.append(ProtoLine(b2d0dkpi,1.0))
 
     def _makeB02DDKK(self):
-        '''Makes RS B0 -> D+D-K+K- + c.c.'''  
-        decays = {'B02DDKK': ["B0 -> D+ D- K+ K-"]}                  
+        '''Makes RS B0 -> D+D-K+K- + c.c.'''
+        decays = {'B02DDKK': ["B0 -> D+ D- K+ K-"]}
         inputs = {'B02DDKK': self.d.d_and_ds_cf_pid+self.topoKaons_PID}
         b02ddkk = makeB2XSels(decays,'',inputs,self.config)
-        self.lines.append(ProtoLine(b02ddkk,1.0))   
+        self.lines.append(ProtoLine(b02ddkk,1.0))
 
     def _makeB02DstDKK(self):
         '''Makes RS B0 -> Dst+D-K+K- + c.c.'''
@@ -1220,15 +1220,15 @@ class B2DXBuilder(object):
 
     def _makeB02DstDstKK(self):
         '''Makes RS B0 -> Dst+Dst-K+K- + c.c.'''
-        decays = {'B02DstDstKK': ["B0 -> D*(2010)+ D*(2010)- K+ K-"]}                                 
+        decays = {'B02DstDstKK': ["B0 -> D*(2010)+ D*(2010)- K+ K-"]}
         inputs = {'B02DstDstKK': self.dst.d0pi_pid+self.topoKaons_PID}
         b02dstdstkk = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b02dstdstkk,1.0))
         inputs = {'B02DstDstKK': self.dst.d0pi_pid+self.dst.d0pi_k3pi_pid+self.topoKaons_PID}
-        b02dstdstkk = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)   
+        b02dstdstkk = makeB2XSels(decays,'DstarD02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b02dstdstkk,1.0))
         inputs = {'B02DstDstKK': self.dst.d0pi_k3pi_pid+self.topoKaons_PID}
-        b02dstdstkk = makeB2XSels(decays,'DstarD02K3PiDstarD02K3Pi',inputs,self.config)   
+        b02dstdstkk = makeB2XSels(decays,'DstarD02K3PiDstarD02K3Pi',inputs,self.config)
         self.lines.append(ProtoLine(b02dstdstkk,1.0))
 
     def _makeB02D0D0KK(self):
@@ -1241,11 +1241,11 @@ class B2DXBuilder(object):
         dec = ["B0 -> D0 D0 K+ K+","B0 -> D0 D0 K- K-"]
         decays = {'B02D0D0KKWSD02HHD02HH': dec,'B02D0D0KKWSD02HHD02K3Pi': dec, 'B02D0D0KKWSD02K3PiD02K3Pi': dec}
         inputs = {'B02D0D0KKWSD02HHD02HH': self.d.hh_pid_tight+self.topoKaons,
-                  'B02D0D0KKWSD02HHD02K3Pi': self.d.hh_pid_tight+self.d.k3pi_pid_tight+self.topoKaons, 
-                  'B02D0D0KKWSD02K3PiD02K3Pi': self.d.k3pi_pid_tight+self.topoKaons}	
+                  'B02D0D0KKWSD02HHD02K3Pi': self.d.hh_pid_tight+self.d.k3pi_pid_tight+self.topoKaons,
+                  'B02D0D0KKWSD02K3PiD02K3Pi': self.d.k3pi_pid_tight+self.topoKaons}
         b02d0d0kk_ws = makeB2XSels(decays,'',inputs,self.config)
         self.lines.append(ProtoLine(b02d0d0kk_ws,1.0))
-    
+
     def _makeB2Dst0D0K(self):
         '''Makes B+ -> D*0 D0 K+ and B0 -> D*0 D- K+'''
         decays = {'B2Dst0D0KDst02D0Pi0ResolvedD02HH':["[B+ -> D*(2007)0 D0 K+]cc"],
@@ -1266,9 +1266,9 @@ class B2DXBuilder(object):
         config = deepcopy(self.config)
         #config{ # Cuts made on all B's and Lb's used in all lines
         config['SUMPT_MIN'    ] = '4000*MeV'
-        config['AM_MIN'       ] = '4000*MeV' 
+        config['AM_MIN'       ] = '4000*MeV'
         config.pop('BPVIPCHI2_MAX')
-        
+
         tag = 'B02D%s'
         if not useIP: tag += 'NoIP'
         pions = self.topoPions
@@ -1278,7 +1278,7 @@ class B2DXBuilder(object):
         if useIP:
             decays[tag%'K'] = ["[B0 -> D- K+]cc"]
             inputs[tag%'K'] = d2x+kaons
-        b02dh_rs = makeB2XSels(decays,dname,inputs,config,useIP)        
+        b02dh_rs = makeB2XSels(decays,dname,inputs,config,useIP)
         decays = {tag%'PiWS': ["[B0 -> D- pi-]cc"]}
         inputs = {tag%'PiWS': d2x+pions}
         if useIP:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 33303e92b10f53b33100ed9f690f0e6971f1639d..709ccadd357993bcb79f6d330700bae77330da2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -16,9 +16,9 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 class Bc2BXBuilder(object):
-     
+
     def __init__(self,b,pions,kaons,config):
-   
+
         self.config = config
         self.b      = b
         self.pions   = [pions]
@@ -34,7 +34,7 @@ class Bc2BXBuilder(object):
 
         self._makeBc2BHH("B2D0HD02HH",b2dhd2hh,self.config)
         #self._makeBc2BHH("B02D0HHD02HH",b02dhhd2hh,self.config)
-        #self._makeBc2BHH("B02DHD2HHH",b02dhd2hhh,self.config)      
+        #self._makeBc2BHH("B02DHD2HHH",b02dhd2hhh,self.config)
         self._makeBc2BHH("B2D0HD02HHHH",b2dhd2hhhh,self.config)
         self._makeBc2BHH("B2DHHD2HHHCFPID",b2dhhd2hhhcfpid,self.config)
         self._makeBc2BHH("B2D0HHHD02HHPID",b2dhhhd2hhpid,self.config)
@@ -58,20 +58,20 @@ class Bc2BXBuilder(object):
                   'Bc2BKPi':   b2dx+self.pions+self.kaons,
                   'Bc2BKK':     b2dx+self.kaons,
                   'Bc2BKKWS':   b2dx+self.kaons}
-         
+
         bc2bhh = makeBc2BXSels(decays,bname,inputs,config)
-        self.lines.append(ProtoLine(bc2bhh,1.0))   
+        self.lines.append(ProtoLine(bc2bhh,1.0))
 
     def _makeUpsilon2BB(self,bmodes):
         comboCuts = "( (ACHILD(PT,1) +ACHILD(PT,2)) > 500*MeV) & (AM > 10000*MeV) & (AM < 12000*MeV)"
         momCuts = "(VFASPF(VCHI2/VDOF) < 20) & ( (CHILD(VFASPF(VZ),1) - VFASPF(VZ)) > -1.5*mm) & ((CHILD(VFASPF(VZ),2) - VFASPF(VZ)) > -1.5*mm)"
         u2bb = CombineParticles(DecayDescriptor= "Upsilon(4S) -> B+ B-",
-                                CombinationCut=comboCuts, 
+                                CombinationCut=comboCuts,
                                 MotherCut=momCuts)
         u2bbws = CombineParticles(DecayDescriptors=["[Upsilon(4S) -> B+ B+]cc"],
                                   CombinationCut=comboCuts,
                                   MotherCut=momCuts)
-        u2bbsel = [Selection('Upsilon2BB'+'Beauty2Charm',Algorithm=u2bb,RequiredSelections=bmodes)] 
-        u2bbselws = [Selection('Upsilon2BBWS'+'Beauty2Charm',Algorithm=u2bbws,RequiredSelections=bmodes)]                   
+        u2bbsel = [Selection('Upsilon2BB'+'Beauty2Charm',Algorithm=u2bb,RequiredSelections=bmodes)]
+        u2bbselws = [Selection('Upsilon2BBWS'+'Beauty2Charm',Algorithm=u2bbws,RequiredSelections=bmodes)]
         self.lines.append(ProtoLine(u2bbsel,1.0))
         self.lines.append(ProtoLine(u2bbselws,1.0))
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 0c577a6bdc29ca4abe8a2adc4cc4834d7e925ff9..19989899db244e1c5704073ea7b57d21c6cfad85 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -24,11 +24,11 @@ class Bc2DDBuilder(object):
     '''Makes all Bc->DD decays for the Beauty2Charm module.'''
 
     def __init__(self,d,dst,config):
-        
+
         self.config = config
         self.d      = d
         self.dst    = dst
-        
+
         self.lines  = []
 
         self.d0modes     = { }
@@ -102,7 +102,7 @@ class Bc2DDBuilder(object):
         ## # With Upstream tracks as well
         ## #dmodes += self.d.pi0hhhh_merged_up + self.d.pi0hhhh_resolved_up
         ## self._buildSel(dmodes,name,self.d0modes)
-         
+
         ## # ( D0->Kshhpi0 )
         ## name = "D02KSHHPI0"
         ## #dmodes  = self.d.kspi0hh_ll_merged + self.d.kspi0hh_ll_resolved
@@ -115,7 +115,7 @@ class Bc2DDBuilder(object):
         ## self._buildSel(dmodes,name,self.d0modes)
 
     def _createDpModes(self):
-        
+
         ## # ( D->hhh )
         ## name = "D2HHH"
         ## dmodes = self.d.hhh
@@ -170,7 +170,7 @@ class Bc2DDBuilder(object):
 
         ## # ( D->Khhpi0 )
         ## name = "D2KHHPI0"
-        ## dmodes = self.d.pi0khh_merged_pid + self.d.pi0khh_resolved_pid 
+        ## dmodes = self.d.pi0khh_merged_pid + self.d.pi0khh_resolved_pid
         ## self._buildSel(dmodes,name,self.dpmodes)
 
         ## # ( D->Kshpi0 )
@@ -196,7 +196,7 @@ class Bc2DDBuilder(object):
         ## name = "D2KstKS"
         ## dmodes = self.d.kstarks_ll + self.d.kstarks_dd
         ## self._buildSel(dmodes,name,self.dpmodes)
-  
+
     def _createDstarPlusModes(self):
 
         # D*+ modes ( D0 -> hh )
@@ -249,7 +249,7 @@ class Bc2DDBuilder(object):
         ## name = "Dst2DPI0D2KHH"
         ## dmodes = self.dst.dpi0_khh_merged_pid + self.dst.dpi0_khh_resolved_pid
         ## self._buildSel(dmodes,name,self.dstarpmodes)
-        
+
         # Ds*+ pi0 modes ( Ds+ -> Ksh )
         name = "Dst2DPI0D2KSH"
         dmodes  = self.dst.dpi0_merged_ksh_ll + self.dst.dpi0_resolved_ksh_ll
@@ -374,7 +374,7 @@ class Bc2DDBuilder(object):
 
     def _makeBc2DD0(self):
         '''Makes Bc+ -> D+ D0 + c.c.'''
-        self._createLines( 'Bc2DD0', self.dpmodes, self.d0modes, 
+        self._createLines( 'Bc2DD0', self.dpmodes, self.d0modes,
                            ["B_c+ -> D+ D0",
                             "B_c- -> D- D0"] )
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 8806392ba766f5ccbd03dad7ab87a026987e1ca8..c5b20d27a26572c7c95fa3041aed60f36dc9d415 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -16,9 +16,9 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 class Bc2DXBuilder(object):
-     
+
     def __init__(self,d,dst,hh,pions,kaons,config):
-   
+
         self.config = config
         self.d = d
         self.dst = dst
@@ -55,7 +55,7 @@ class Bc2DXBuilder(object):
         config['AM_MIN'] = '5850*MeV'
         config['SUMPT_MIN'] = '5850*MeV'
         decays = {'Bc2DPiPi':         ["B_c+ -> D+ rho(770)0","B_c- -> D- rho(770)0"],
-                  'Bc2DHHWS':         ["B_c+ -> D- rho(770)+","B_c- -> D+ rho(770)-"], 
+                  'Bc2DHHWS':         ["B_c+ -> D- rho(770)+","B_c- -> D+ rho(770)-"],
                   'Bc2DHHNP':         ["B_c+ -> D+ rho(770)+","B_c- -> D- rho(770)-"],
                   'Bc2DKPi':          ["[B_c+ -> D+ K*(892)0]cc","[B_c- -> D- K*(892)0]cc"],
                   'Bc2DKK':           ["B_c+ -> D+ phi(1020)","B_c- -> D- phi(1020)"],
@@ -66,14 +66,14 @@ class Bc2DXBuilder(object):
                   'Bc2DHHNP':         d+self.hh.hh_ws_pid,
                   'Bc2DKPi':          d+self.hh.kpi_pid,
                   'Bc2DKK':           d+self.hh.kk_pid,
-                  'Bc2DPiK':          d+self.hh.kpi_pid 
+                  'Bc2DPiK':          d+self.hh.kpi_pid
                   }
         bc2dx = makeBc2DXSels(decays,bname,inputs,config)
         self.lines.append(ProtoLine(bc2dx,1.0))
 
     def _makeBc2DstX(self,bname,dst,config):
         decays = {'Bc2DstarPiPi':         ["B_c+ -> D*(2010)+ rho(770)0","B_c- -> D*(2010)- rho(770)0"],
-                  'Bc2DstarHHWS':         ["B_c+ -> D*(2010)- rho(770)+","B_c- -> D*(2010)+ rho(770)-"], 
+                  'Bc2DstarHHWS':         ["B_c+ -> D*(2010)- rho(770)+","B_c- -> D*(2010)+ rho(770)-"],
                   'Bc2DstarHHNP':         ["B_c+ -> D*(2010)+ rho(770)+","B_c- -> D*(2010)- rho(770)-"],
                   'Bc2DstarKPi':          ["[B_c+ -> D*(2010)+ K*(892)0]cc","[B_c- -> D*(2010)- K*(892)0]cc"],
                   'Bc2DstarKK':           ["B_c+ -> D*(2010)+ phi(1020)","B_c- -> D*(2010)- phi(1020)"],
@@ -88,4 +88,3 @@ class Bc2DXBuilder(object):
                   }
         bc2dstx = makeBc2DstXSels(decays,bname,inputs,config)
         self.lines.append(ProtoLine(bc2dstx,1.0))
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py
index 9dccde56ef1f3e098c7d557726e498c0fe54512c..c13f9a4aff6b84e3f6f18853e02b94224255d7c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -201,7 +201,7 @@ class DBuilder(object):
                                                              tightPi0_sel, self.pi0hhh_merged_pid)]
           self.pi0hhh_tightpi0_resolved_pid = [filterSelection('D2ResolvedTightPi0HHHPID',
                                                                tightPi0_sel, self.pi0hhh_resolved_pid)] '''
-          
+
           # subset decays
           nossK = "((NINTREE(ID=='K+') < 2) & (NINTREE(ID=='K-') < 2))"
           self.hhh_pid_nossK = [filterSelection('D2HHHPIDNOSSK',nossK,self.hhh_pid)]
@@ -520,7 +520,7 @@ class DBuilder(object):
           if 'pi-' in dec or 'pi+' in dec :
                inputs += [self.pions]
                if up : inputs += [self.uppions]
-               
+
           # kaons ?
           if 'K-' in dec or 'K+' in dec :
                inputs += [self.kaons]
@@ -551,9 +551,9 @@ class DBuilder(object):
 
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max  = self._massWindow('D0')
-          
+
           decays = [['pi+','pi-'],['K+','pi-'],['K+','K-'],['K-','pi+']]
 
           sels = [ ]
@@ -587,12 +587,12 @@ class DBuilder(object):
      # Implementation not using SubPID
      def _makeD2hhWS(self,up=False):
           '''Makes D->hh WS'''
-          
+
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max  = self._massWindow('D0')
-          
+
           decaysp = [['pi+','pi+'],['K+','pi+'],['K+','K+']]
           decaysm = getCCs(decaysp)
 
@@ -611,7 +611,7 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,[])
                sels += [ self._makeD2TwoBody(name,[sel],awmFunctor([dec],min,max),
                                              up,self.config,inputs) ]
-          
+
           return [MergedSelection('D2HHWS'+tag+'Beauty2Charm',RequiredSelections=sels)]
 
      ## # Implementation using one instance of SubPID for all subsitutions
@@ -727,15 +727,15 @@ class DBuilder(object):
      # Implementation not using SubPID
      def _makeD2KSh(self,which,up=False):
           '''Makes D->Ksh'''
-          
+
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max  = self._massWindow('D+')
-          
+
           decaysp = [['KS0','pi+'],['KS0','K+']]
           decaysm = getCCs(decaysp)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA12_MAX')
 
@@ -754,76 +754,76 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,self.ks[which])
                sels += [ self._makeD2TwoBody( name, [sel], awmFunctor([dec],min,max),
                                               up,config,inputs ) ]
-          
+
           return [MergedSelection('D2KsHBeauty2Charm_%s%s'%(which,tag),RequiredSelections=sels)]
 
      def _makeD2KstarKs(self,which):
-          
+
           min,max = self._massWindow('D+')
-          
+
           decaysp = [["K*(892)+","KS0"]]
           wmp = awmFunctor(decaysp,min,max)
-          
+
           decaysm = [["K*(892)-","KS0"]]
           wmm = awmFunctor(decaysm,min,max)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA12_MAX')
-          
+
           inputs = self.hhBuilder.kspi + self.hhBuilder.kstarpm + self.ks[which]
-          
+
           comboCutsp = [LoKiCuts(['ASUMPT'],config).code(),wmp]
           comboCutsp = LoKiCuts.combine(comboCutsp)
           comboCutsm = [LoKiCuts(['ASUMPT'],config).code(),wmm]
           comboCutsm = LoKiCuts.combine(comboCutsm)
-          
+
           momCuts = LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],config).code()
-          
+
           cpp = CombineParticles(CombinationCut=comboCutsp,MotherCut=momCuts,
                                  DecayDescriptors=['D+ -> K*(892)+ KS0'])
           cpm = CombineParticles(CombinationCut=comboCutsm,MotherCut=momCuts,
                                  DecayDescriptors=['D- -> K*(892)- KS0'])
-          
+
           selp = Selection('ProtoD+2KstKs'+which+'Beauty2Charm',Algorithm=cpp,RequiredSelections=inputs)
           selm = Selection('ProtoD-2KstKs'+which+'Beauty2Charm',Algorithm=cpm,RequiredSelections=inputs)
-          
+
           return [ MergedSelection('D2KstKsBeauty2Charm'+which,RequiredSelections=[selp,selm]) ]
 
      def _makeD2KstarKstar0(self):
           min,max = self._massWindow('D+')
-          
+
           decaysp = [["K*(892)+","K*(892)~0"]]
           wmp = awmFunctor(decaysp,min,max)
-          
+
           decaysm = [["K*(892)-","K*(892)0"]]
           wmm = awmFunctor(decaysm,min,max)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA12_MAX')
-          
+
           inputs = self.hhBuilder.kspi + self.hhBuilder.kstarpm + self.hhBuilder.kstar0
-          
+
           comboCutsp = [LoKiCuts(['ASUMPT'],config).code(),wmp]
           comboCutsp = LoKiCuts.combine(comboCutsp)
           comboCutsm = [LoKiCuts(['ASUMPT'],config).code(),wmm]
           comboCutsm = LoKiCuts.combine(comboCutsm)
           momCuts = LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],config).code()
-          
+
           #dauCuts = { "K*(892)+"  : hasTopoChild(),
           #            "K*(892)-"  : hasTopoChild(),
           #            "K*(892)~0" : hasTopoChild(),
           #            "K*(892)0"  : hasTopoChild() }
-          
+
           cpp = CombineParticles(CombinationCut=comboCutsp,MotherCut=momCuts,
                                  #DaughtersCuts=dauCuts,
                                  DecayDescriptors=['D+ -> K*(892)+ K*(892)~0'])
           cpm = CombineParticles(CombinationCut=comboCutsm,MotherCut=momCuts,
                                  #DaughtersCuts=dauCuts,
                                  DecayDescriptors=['D- -> K*(892)- K*(892)0'])
-          
+
           selp = Selection('ProtoD+2KstKst0Beauty2Charm',Algorithm=cpp,RequiredSelections=inputs)
           selm = Selection('ProtoD-2KstKst0Beauty2Charm',Algorithm=cpm,RequiredSelections=inputs)
-          
+
           return [ MergedSelection('D2KstKst0Beauty2Charm',RequiredSelections=[selp,selm]) ]
 
      ## # Implementation using one instance of SubPID for all substitutions
@@ -947,14 +947,14 @@ class DBuilder(object):
                ks_tag = ks_tag.replace("PartialD","")
 
           min,max = self._massWindow(mass_window_tag)
-          
+
           decays = [['pi+','pi-','KS0'],['pi+','K-','KS0'],
                     ['K+', 'pi-','KS0'],['K+', 'K-','KS0']]
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA13_MAX')
           config.pop('ADOCA23_MAX')
-          
+
           extrainputs = self.ks[ks_tag]
 
           sels = []
@@ -973,15 +973,15 @@ class DBuilder(object):
 
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max = self._massWindow('D0')
-          
+
           decays = [['mu+','mu-','KS0']]
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA13_MAX')
           config.pop('ADOCA23_MAX')
-          
+
           extrainputs = self.ks[which]
 
           sels = []
@@ -999,7 +999,7 @@ class DBuilder(object):
           ''' Makes D0 -> Ks pi0 selection.'''
           comboCuts = "(ADAMASS('D0') < %(MASS_WINDOW)s) " % self.config
           momCuts = "ALL"
-         
+
           cp = CombineParticles( CombinationCut   = comboCuts,
                                  MotherCut        = momCuts  ,
                                  DecayDescriptors = decays    )
@@ -1145,21 +1145,21 @@ class DBuilder(object):
      # Implementation not using SubPID
      def _makeD2KShhWS(self,which,up=False):
           '''Makes D->Kshh WS'''
-          
+
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max = self._massWindow('D0')
-          
+
           decaysp = [['pi+','pi+','KS0'],
                      ['K+', 'pi+','KS0'],
                      ['K+', 'K+', 'KS0']]
           decaysm = getCCs(decaysp)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA13_MAX')
           config.pop('ADOCA23_MAX')
-          
+
           extrainputs = self.ks[which]
 
           sels = [ ]
@@ -1177,25 +1177,25 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,extrainputs)
                sels += [ self._makeD2ThreeBody(name,[sel],awmFunctor([dec],min,max),
                                                up,config,inputs) ]
-          
+
           return [MergedSelection('D2KsHHWSBeauty2Charm_%s%s'%(which,tag),
                                   RequiredSelections=sels)]
 
      def _makeD2KSmumuWS(self,which,up=False):
           '''Makes D->Ksmumu WS'''
-          
+
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max = self._massWindow('D0')
-          
+
           decaysp = [['mu+','mu+','KS0']]
           decaysm = getCCs(decaysp)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA13_MAX')
           config.pop('ADOCA23_MAX')
-          
+
           extrainputs = self.ks[which]
 
           sels = [ ]
@@ -1213,7 +1213,7 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,extrainputs)
                sels += [ self._makeD2ThreeBody(name,[sel],awmFunctor([dec],min,max),
                                                up,config,inputs) ]
-          
+
           return [MergedSelection('D2KsMuMuWSBeauty2Charm_%s%s'%(which,tag),
                                   RequiredSelections=sels)]
 
@@ -1351,7 +1351,7 @@ class DBuilder(object):
                      ['pi+','pi+','K-', 'pi0'],
                      ['K+', 'K+', 'K-', 'pi0']]
           decaysm = getCCs(decaysp)
-          
+
           sels = [ ]
 
           for dec in decaysp :
@@ -1404,15 +1404,15 @@ class DBuilder(object):
      ## # Implementation using SubPID
      ## def _makeD2Pi0hhWS(self,which,up=False):
      ##      '''Makes D->Pi0hh WS'''
-          
+
      ##      tag = ''
      ##      if up: tag = 'UP'
-          
+
      ##      min,max = self._massWindow('D0')
-          
+
      ##      decays = [['pi+','pi+','pi0'],['pi+','K+','pi0'],
      ##                ['K+', 'pi+','pi0'],['K+', 'K+','pi0']]
-          
+
      ##      wm = awmFunctor(decays,min,max)
      ##      config = deepcopy(self.config)
      ##      config.pop('ADOCA13_MAX')
@@ -1431,23 +1431,23 @@ class DBuilder(object):
      # Implementation not using SubPID
      def _makeD2Pi0hhWS(self,which,up=False):
           '''Makes D->Pi0hh WS'''
-          
+
           tag = ''
           if up: tag = 'UP'
-          
+
           min,max = self._massWindow('D0')
-          
+
           decaysp = [['pi+','pi+','pi0'],
                      ['K+', 'pi+','pi0'],
                      ['K+', 'K+', 'pi0']]
           decaysm = getCCs(decaysp)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA13_MAX')
           config.pop('ADOCA23_MAX')
-          
+
           extrainputs = self.pi0[which]
-          
+
           sels = [ ]
 
           for dec in decaysp :
@@ -1463,7 +1463,7 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,extrainputs)
                sels += [ self._makeD2ThreeBody(name,[sel],awmFunctor([dec],min,max),
                                                up,config,inputs) ]
-          
+
           return [MergedSelection('D2Pi0HHWSBeauty2Charm'+which+tag,RequiredSelections=sels)]
 
      ## # Implementation using one instance of SubPID
@@ -1492,22 +1492,22 @@ class DBuilder(object):
      # Implementation not using SubPID
      def _makeD2KSPi0h(self,whichKs,whichPi0,up=False):
           '''Makes D->KsPi0h'''
-          
+
           tag = ''
           if up: tag = 'UP'
-          
+
           which = whichKs+whichPi0
-          
+
           min,max = self._massWindow('D+')
-          
+
           decaysp = [['pi+','KS0','pi0'],
                      ['K+', 'KS0','pi0']]
           decaysm = getCCs(decaysp)
-          
+
           config = deepcopy(self.config)
           config.pop('ADOCA13_MAX')
           config.pop('ADOCA23_MAX')
-          
+
           extrainputs = self.pi0[whichPi0] + self.ks[whichKs]
 
           sels = [ ]
@@ -1518,14 +1518,14 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,extrainputs)
                sels += [ self._makeD2ThreeBody(name,[sel],awmFunctor([dec],min,max),
                                                up,config,inputs) ]
-               
+
           for dec in decaysm :
                name = makeSelName('D-',dec,which)
                sel  = makeSel('D-',dec)
                inputs = self.getInputs(dec,up,extrainputs)
                sels += [ self._makeD2ThreeBody(name,[sel],awmFunctor([dec],min,max),
                                                up,config,inputs) ]
-          
+
           return [MergedSelection('D2KSPi0HBeauty2Charm_'+which+tag,RequiredSelections=sels)]
 
      ## # Implementation using one instance of SubPID for all substitutions
@@ -1713,7 +1713,7 @@ class DBuilder(object):
                      ['K+', 'K+', 'K+', 'pi+'],
                      ['K+', 'K+', 'K+', 'K+' ]]
           decaysm = getCCs(decaysp)
-          
+
           sels = []
 
           for dec in decaysp :
@@ -1722,7 +1722,7 @@ class DBuilder(object):
                inputs = self.getInputs(dec,up,[])
                sels += [ self._makeD2FourBody(name,[sel],awmFunctor([dec],min,max),
                                               up,self.config,inputs) ]
-               
+
           for dec in decaysm :
                name = makeSelName('D',dec,'WSMinus')
                sel  = makeSel('D0',dec)
@@ -1953,7 +1953,7 @@ class DstarBuilder(object):
           self.d0gamma_loose_hh_pid  = self._makeDstar02D0GammaLoose( 'HHPID', self.d.hh_pid )
           self.d0gamma_loose_k3h_pid = self._makeDstar02D0GammaLoose( 'K3HPID', self.d.k3h_pid )
           self.d0gamma_loose_hhhh = self._makeDstar02D0GammaLoose('HHHH',self.d.hhhh)
-          
+
 
           d0pi_2460 = self._makeDstar24602D0pi()
           self.d0pi_2460_pid = [filterPID('Dstar24602D0PiPID',d0pi_2460,
@@ -2058,7 +2058,7 @@ class DstarBuilder(object):
           return [ Selection( 'Dstar02D0' + name + 'Beauty2Charm'        ,
                               Algorithm          = cp                    ,
                               RequiredSelections = d2x + [ self.photons ] ) ]
-     
+
      # Donal: make D*0 -> D0 gamma with higher upper delta mass window
      def _makeDstar02D0GammaLoose( self, name, d2x ):
           decays = [ "D*(2007)0 -> D0 gamma" ]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
index 5c2c2080659ba3c3bfde9675581dad9df0af3246..79889bb878d70f038e0e4d0c5f9549b1833a07e8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -75,7 +75,7 @@ class HHBuilder(object):
         self.pipi_pid_tightpi = [filterPID('X2PiPiPIDTIGHTPI',self.pipi,config_pid['TIGHTPI'])]
         #tighter on the kaon
         self.kpi_pid_tighter = [filterPID('X2KPiPIDTIGHTER',self.kpi,config_pid['TIGHTER'])]
-        
+
         self.kk_pid = [filterPID('X2KKPID',self.kk,config_pid)]
         self.hh_ws_pid = [filterPID('X2HHWSPID',self.hh_ws,config_pid)]
         self.ph_pid = [filterPID('X2PHPID',self.ph,config_pid)]
@@ -117,7 +117,7 @@ class HHBuilder(object):
         ''' Makes all X+ -> HH selections involving neutrals.'''
         comboCuts = [LoKiCuts(['ASUMPT'],config).code(),amass,hasTopoChild()]
         comboCuts = LoKiCuts.combine(comboCuts)
-        momCuts = "ALL" 
+        momCuts = "ALL"
         cp = CombineParticles(CombinationCut=comboCuts,MotherCut=momCuts,
                               DecayDescriptors=decays)
         if pi0:
@@ -167,7 +167,7 @@ class HHBuilder(object):
         sel2 = subPID('X2KPiBar_Loose','K*(892)~0',['pi+','K-'],pipi_loose)
         return [MergedSelection('X2KPiLooseBeauty2Charm',
                                 RequiredSelections=[sel1,sel2])]
-   
+
     def _makeKK(self,pipi):
         '''Makes X -> K+K-.'''
         return [subPID('X2KK','phi(1020)',['K+','K-'],pipi)]
@@ -183,7 +183,7 @@ class HHBuilder(object):
                            [protoSels[1]])
         return [MergedSelection('X2HHWSBeauty2Charm',
                                 RequiredSelections=[plus,minus])]
-        
+
     def _makeKsPi(self):
         '''Makes X -> Ks0pi- + c.c.'''
         dd = self._makeXPLUS2HH('X2KsPiDD',['[K*(892)+ -> KS0 pi+]cc'],
@@ -206,7 +206,7 @@ class HHBuilder(object):
         return [MergedSelection('X2KPi0Beauty2Charm',RequiredSelections=[m,r])]
 
     def _makePiPi0(self):
-        '''Makes X -> pi+pi0'''        
+        '''Makes X -> pi+pi0'''
         m = self._makeXPLUS2HH('X2PiPi0Merged',['[rho(770)+ -> pi+ pi0]cc'],
                                'AM < 5*GeV',self.config,
                                [self.pions]+self.pi0["Merged"],True)
@@ -235,7 +235,7 @@ class HHBuilder(object):
     def _makeKstarPM(self,kpi):
         mass = self._massWindow('KST','K*(892)+').replace('ADAMASS','ADMASS')
         return [filterSelection('K*PM',mass,kpi)]
-                                
+
     def _makePH(self):
         '''Makes X -> p+ h- + c.c.'''
         sel = self._makeX2HH('X2PPi',['Lambda0 -> pi+ pi-'],
@@ -272,7 +272,7 @@ class HHBuilder(object):
         msel = Selection('X2PHMinusWSSubPIDSelBeauty2Charm',Algorithm=mfilter,
                          RequiredSelections=[msel])
         msel = filterSelection('X2PHMinusWS',filter,[msel])
-        return [psel,msel]                                        
+        return [psel,msel]
 
     def _makePHNoPID(self):
         '''Makes X -> p+ h- + c.c.'''
@@ -348,7 +348,7 @@ class HHBuilder(object):
         msel = Selection('X2PPbarMinusWSSubPIDSelBeauty2Charm',Algorithm=mfilter,
                          RequiredSelections=[msel])
         msel = filterSelection('X2PPbarMinusWS',filter,[msel])
-        return [psel,msel]                                        
+        return [psel,msel]
+
 
-                                                            
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 5973ec1c48adcf1a28a710fc3835ad89653a8ecc..e41fe977807acbc5bba6846185f30d5b924c14ff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -34,7 +34,7 @@ class HHHBuilder(object):
         self.pipipi_tighterpi = [filterPID('X2PiPiPiPIDTIGHTERPI',self.pipipi,config['PID']['TIGHTERPI'])]
         tightpipipiSel = "(MIPCHI2DV(PRIMARY)>20) & (M<2800)"
         self.pipipi_tightersel = [filterSelection('X2PiPiPiPIDTIGHTER3PISEL',tightpipipiSel,self.pipipi_tighterpi)]
-        
+
         self.kkpi = [self._makeKKPi()]
         self.kpipi = [self._makeKPiPi()]
         self.kpipiSS = [self._makeKPiPiSS()]
@@ -43,7 +43,7 @@ class HHHBuilder(object):
         self.kkpi_pid = [filterPID('X2KKPiPID',self.kkpi,config_pid)]
         #Really tight on the kaon (for FULL DST)
         self.kpipi_realtightk = [filterPID('X2KPiPiPIDREALTIGHTK',self.kpipi,config['PID']['REALTIGHTK'])]
-        
+
         self.ppbarpi = [self._makeppbarPi()]
         self.ppbark = [self._makeppbarK()]
         self.pppbar = [self._makepppbar()]
@@ -51,19 +51,19 @@ class HHHBuilder(object):
         self.ppipi = [self._makepPiPi()]
         self.pkpi  = [self._makepKPi()]
         self.pkk   = [self._makepKK()]
-        
+
         self.ppipiOS = [self._makepPiPiOS()]
         self.pkpiOS  = [self._makepKPiOS()]
         self.pkkOS   = [self._makepKKOS()]
-        
+
         self.ppipi_pid = [filterPID('X2pPiPiTIGHTPID',self.ppipi,config_pid['TIGHTER'])]
         self.pkpi_pid =  [filterPID('X2pKPiTIGHTPID', self.pkpi,config_pid['TIGHTER'])]
         self.pkk_pid =   [filterPID('X2pKKTIGHTPID',  self.pkk,config_pid['TIGHTER'])]
-        
+
         self.ppipi_pid_OS = [filterPID('X2pPiPiOSTIGHTPID',self.ppipiOS,config_pid['TIGHTER'])]
         self.pkpi_pid_OS =  [filterPID('X2pKPiOSTIGHTPID', self.pkpiOS,config_pid['TIGHTER'])]
         self.pkk_pid_OS =   [filterPID('X2pKKOSTIGHTPID',  self.pkkOS,config_pid['TIGHTER'])]
-        
+
     def _makeX2HHH(self,name,decays,amass,config,inputs):
         ''' Makes all X -> HHH selections with charged tracks only.'''
         comboCuts = [LoKiCuts(['ASUMPT'],config).code(),amass,hasTopoChild()]
@@ -170,5 +170,5 @@ class HHHBuilder(object):
                               massWindow,self.config,
                               [self.pions,self.protons])
 
-        
+
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 1b156cbffa5a32e2271e70b1cd4d2889aecee4d0..42639fae9c7340e50f4e444f9ea9e78b93f14c17 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -42,13 +42,13 @@ class LcBuilder(object):
         mCutLc = "ADMASS('Lambda_c+') < 60.0"
         mCutXic = "ADMASS('Xi_c+') < 60.0"
         mCutXicTight = "ADMASS('Xi_c+') < 50.0"
-        mCutOmegac = "ADMASS('Omega_c0') < 60.0" 
+        mCutOmegac = "ADMASS('Omega_c0') < 60.0"
         self.pkpi_tight_win = [filterSelection('LC2PKPITIGHTER3PIDMWIN',mCutLc,self.pkpi_tight)]
         self.xic_pkpi_tight_win = [filterSelection('XIC2PKPITIGHTER3PIDMWIN',mCutXic,self.xic_pkpi_tight)]
         self.xic_pkpi_tightest_win = [filterSelection('XIC2PKPITIGHTEST3PIDMWIN',mCutXicTight,self.xic_pkpi_tight)]
         self.omegac0_pkkpi_tight_win = [filterSelection('OMC02PKPITIGHTER3PIDMWIN',mCutOmegac,self.omegac0_pkkpi_tight)]
 
-        
+
     def _makeLc2pKpi(self):
         '''Makes Lc -> p K pi + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
@@ -69,7 +69,7 @@ class LcBuilder(object):
         return Selection('Lc2PKPiBeauty2Charm',Algorithm=cp,
                          RequiredSelections=[self.pions,self.kaons,
                                              self.protons])
-    
+
     def _makeXic2pKpi(self):
         '''Makes Xic -> p K pi + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
@@ -118,28 +118,28 @@ class LcBuilder(object):
                                              self.protons])
 
     def _makeOmegac02pKKpi(self):
-        '''Makes Omegac0 -> p K K pi + cc'''   
+        '''Makes Omegac0 -> p K K pi + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
         comboCuts = [LoKiCuts(['ASUMPT'],self.config).code(),
                      "(ADAMASS('Omega_c0') < %s*%s) " % (dm+10,units),
                      hasTopoChild()]
-        comboCuts12 = [LoKiCuts(['ADOCA12'],self.config).code()] 
+        comboCuts12 = [LoKiCuts(['ADOCA12'],self.config).code()]
         comboCuts123 = [LoKiCuts(['ADOCA13'],self.config).code()]
         comboCuts123.append(LoKiCuts(['ADOCA23'],self.config).code())
         comboCuts.append(LoKiCuts(['ADOCA14'],self.config).code())
         comboCuts.append(LoKiCuts(['ADOCA24'],self.config).code())
-        comboCuts.append(LoKiCuts(['ADOCA34'],self.config).code()) 
+        comboCuts.append(LoKiCuts(['ADOCA34'],self.config).code())
         comboCuts12 = LoKiCuts.combine(comboCuts12)
         comboCuts123 = LoKiCuts.combine(comboCuts123)
         comboCuts = LoKiCuts.combine(comboCuts)
-        momCuts = ["(ADMASS('Omega_c0') < %s*%s) " % (dm,units),   
+        momCuts = ["(ADMASS('Omega_c0') < %s*%s) " % (dm,units),
                    LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],
                             self.config).code()]
         momCuts = LoKiCuts.combine(momCuts)
         cp = DaVinci__N4BodyDecays(Combination12Cut=comboCuts12, Combination123Cut=comboCuts123,
                               CombinationCut=comboCuts,MotherCut=momCuts,
                               DecayDescriptors=["[Omega_c0 -> p+ K- K- pi+]cc"])
-        return Selection('Omegac02PKKPiBeauty2Charm',Algorithm=cp,  
+        return Selection('Omegac02PKKPiBeauty2Charm',Algorithm=cp,
                          RequiredSelections=[self.pions,self.kaons,
                                              self.protons])
 
@@ -158,7 +158,7 @@ class LooseLcBuilder(object):
         self.xic_pkpi = [self._makeLooseXic2pKpi()]
         self.xic0_pkkpi = [self._makeLooseXic02pKKpi()]
         self.omegac0_pkkpi = [self._makeLooseOmegac02pKKpi()]
-        
+
     def _makeLooseLc2pKpi(self):
         '''Makes Lc -> p K pi + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
@@ -180,7 +180,7 @@ class LooseLcBuilder(object):
         return Selection('LooseLc2PKPiBeauty2Charm',Algorithm=cp,
                          RequiredSelections=[self.pions,self.kaons,
                                              self.protons])
-    
+
     def _makeLooseXic2pKpi(self):
         '''Makes Xic -> p K pi + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
@@ -229,7 +229,7 @@ class LooseLcBuilder(object):
         return Selection('LooseXic02PKKPiBeauty2Charm',Algorithm=cp,
                          RequiredSelections=[self.pions,self.kaons,
                                              self.protons])
-    
+
     def _makeLooseOmegac02pKKpi(self):
         '''Makes Omegac0 -> p K K pi + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
@@ -253,7 +253,7 @@ class LooseLcBuilder(object):
         cp = DaVinci__N4BodyDecays(Combination12Cut=comboCuts12, Combination123Cut=comboCuts123,
                               CombinationCut=comboCuts,MotherCut=momCuts,
                               DecayDescriptors=["[Omega_c0 -> p+ K- K- pi+]cc"])
-        return Selection('LooseOmegac02PKKPiBeauty2Charm',Algorithm=cp,  
+        return Selection('LooseOmegac02PKKPiBeauty2Charm',Algorithm=cp,
                          RequiredSelections=[self.pions,self.kaons,
                                              self.protons])
 
@@ -271,13 +271,13 @@ class XiccBuilder(object):
         self.xiccpp = [self._makeXiccpp2Xicpi()]
         self.xiccp = [self._makeXiccp2Xic0pi()]
         self.sigmacpp =[self._makeSigmacpp2LcPi()]
-        
+
     def _makeXiccpp2Xicpi(self):
         '''Makes Xi_cc++-> Xi_c+ pi+ + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
         comboCuts = [LoKiCuts(['ASUMPT'],self.config).code(),
                      "(ADAMASS('Xi_cc++') < %s*%s) " % (dm+410,units)]
-        comboCuts.append(LoKiCuts(['ADOCA12'],self.config).code())  
+        comboCuts.append(LoKiCuts(['ADOCA12'],self.config).code())
         comboCuts = LoKiCuts.combine(comboCuts)
         momCuts = ["(ADMASS('Xi_cc++') < %s*%s) " % (dm+400,units),
                    LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],
@@ -309,7 +309,7 @@ class XiccBuilder(object):
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
         comboCuts = [LoKiCuts(['ASUMPT'],self.config).code(),
                      "(ADAMASS('Sigma_c++') < %s*%s) " % (dm+150,units)]
-        comboCuts.append(LoKiCuts(['ADOCA12'],self.config).code())  
+        comboCuts.append(LoKiCuts(['ADOCA12'],self.config).code())
         comboCuts = LoKiCuts.combine(comboCuts)
         momCuts = ["(ADMASS('Sigma_c++') < %s*%s) " % (dm+120,units),
                    LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],
@@ -335,13 +335,13 @@ class LooseXiccBuilder(object):
         self.xiccpp = [self._makeLooseXiccpp2Xicpi()]
         self.xiccpp2lck2pi =[self._makeLooseXiccpp2LcK2Pi()]
         self.xiccp = [self._makeLooseXiccp2Xic0pi()]
-        
+
     def _makeLooseXiccpp2Xicpi(self):
         '''Makes Xi_cc++-> Xi_c+ pi+ + cc'''
         dm,units = LoKiCuts.cutValue(self.config['MASS_WINDOW'])
         comboCuts = [LoKiCuts(['ASUMPT'],self.config).code(),
                      "(ADAMASS('Xi_cc++') < %s*%s) " % (dm+410,units)]
-        comboCuts.append(LoKiCuts(['ADOCA12'],self.config).code())  
+        comboCuts.append(LoKiCuts(['ADOCA12'],self.config).code())
         comboCuts = LoKiCuts.combine(comboCuts)
         momCuts = ["(ADMASS('Xi_cc++') < %s*%s) " % (dm+400,units),
                    LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],
@@ -393,7 +393,7 @@ class XibcBuilder(object):
         self.lc = lc.pkpi
         self.xic = lc.xic_pkpi
         self.xic0 = lc.xic0_pkkpi
-        self.omegac0 = lc.omegac0_pkkpi        
+        self.omegac0 = lc.omegac0_pkkpi
         self.xiccp = xicc.xiccp
         self.xiccpp = xicc.xiccpp
         self.xiccpp2lck2pi = xicc.xiccpp2lck2pi
@@ -417,16 +417,16 @@ class XibcBuilder(object):
         #-----------------------
         ### bc baryon -> Lc D0
         self._makeXibc2LcD0()
-        ### bc baryon -> Lc D0 H 
+        ### bc baryon -> Lc D0 H
         self._makeXibc2LcD0H()
         ### bc baryon -> Xi_cc+ pi-
         self._makeXibc02XiccH()
         ### bc baryon -> Xi_cc++ pi- (Xicc -> XicPi/LcK2Pi)
         self._makeXibc2XiccH('Xiccpp2XicPi',self.xiccpp)
         self._makeXibc2XiccH('Xiccpp2LcK2Pi',self.xiccpp2lck2pi)
-        ### bc baryon -> Lc H+H-, 
+        ### bc baryon -> Lc H+H-,
         self._makeXibc2LcHH()
-        # Xibc -> Lc+- H- 
+        # Xibc -> Lc+- H-
         self._makeXibc2LcH()
         # Xibc -> Xic+- Pi
         self._makeXibc2XicH()
@@ -444,9 +444,9 @@ class XibcBuilder(object):
         self._makeXibc02XiccMu()
         ### bc baryon -> Xi_cc++ mu-
         self._makeXibc2XiccMu()
-        ### bc baryon -> Lc D0 H 
+        ### bc baryon -> Lc D0 H
         self._makeXibc2LcD0Mu()
-        ### bc baryon -> Lc D0 H 
+        ### bc baryon -> Lc D0 H
         self._makeXibc2LcDMu()
 
 
@@ -466,7 +466,7 @@ class XibcBuilder(object):
 
 
     def _makeXibc2LcD0H(self):
-        '''Makes RS  Xibc -> Lc D0 H + c.c. Need loose pions here as they may be soft''' 
+        '''Makes RS  Xibc -> Lc D0 H + c.c. Need loose pions here as they may be soft'''
         pions = self.pions
         #kaons = self.kaons
         decays = {'Xibc2LcD0Pi': ["Xi_bc0 -> Lambda_c+ D0 pi-", "Xi_bc0 -> Lambda_c~- D0 pi+"]}
@@ -519,7 +519,7 @@ class XibcBuilder(object):
         self.lines.append(ProtoLine(rs,1.0))
 
     def _makeXibc2XicH(self):
-        '''Make RS Xibc -> Xi_c+ H (H=pi) + cc.''' 
+        '''Make RS Xibc -> Xi_c+ H (H=pi) + cc.'''
         pions = self.topoPions_pid
         #kaons = self.topoKaons
         decays = {'Xibc2XicPi': ["[Xi_bc0 -> Xi_c+ pi-]cc"]}
@@ -530,7 +530,7 @@ class XibcBuilder(object):
     def _makeXibc2Xic0H(self):
         '''Make RS and WS Xi_bc -> Xi_c0 H (H=pi) + cc.'''
         pions = self.topoPions_pid
-        decays = {'Xibc2Xic0Pi': ["[Xi_bc+ -> Xi_c0 pi+]cc"]}                  
+        decays = {'Xibc2Xic0Pi': ["[Xi_bc+ -> Xi_c0 pi+]cc"]}
         inputs = {'Xibc2Xic0Pi': self.xic0+pions}
         rs = makeB2XSels(decays,'Xic02PKKPi',inputs,self.config)
         self.lines.append(ProtoLine(rs,1.0))
@@ -539,13 +539,13 @@ class XibcBuilder(object):
         '''Make Omega_b --> Omega_c {pi,K} and Xibc+ -->  Omega_c0 K+  + cc.'''
         pions = self.topoPions_pid
         kaons = self.topoKaons_pid
-        decays = {'X2Omegac0Pi': ["[Omega_b- -> Omega_c0 pi-]cc"]}                  
+        decays = {'X2Omegac0Pi': ["[Omega_b- -> Omega_c0 pi-]cc"]}
         inputs = {'X2Omegac0Pi': self.omegac0+pions}
         rspi = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config)
-        decays = {'X2Omegac0K': ["[Omega_b- -> Omega_c0 K-]cc"]}                  
+        decays = {'X2Omegac0K': ["[Omega_b- -> Omega_c0 K-]cc"]}
         inputs = {'X2Omegac0K': self.omegac0+kaons}
         rsk = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config)
-        decays = {'X2Omegac0KOS': ["[Xi_bc+ -> Omega_c0 K+]cc"]}                  
+        decays = {'X2Omegac0KOS': ["[Xi_bc+ -> Omega_c0 K+]cc"]}
         inputs = {'X2Omegac0KOS': self.omegac0+kaons}
         osk = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config)
         self.lines.append(ProtoLine(rspi,1.0))
@@ -576,10 +576,10 @@ class XibcBuilder(object):
         ws = makeB2XSels(decays,'Xiccpp2XicPi',inputs,self.configSL)
         self.lines.append(ProtoLine(rs,1.0))
         self.lines.append(ProtoLine(ws,1.0))
-        
-        
+
+
     def _makeXibc2LcD0Mu(self):
-        '''Makes RS  Xibc -> Lc D0 mu + c.c. Need loose pions here as they may be soft''' 
+        '''Makes RS  Xibc -> Lc D0 mu + c.c. Need loose pions here as they may be soft'''
         muons = self.muons
         decays = {'Xibc2LcD0Mu': ["Xi_bc0 -> Lambda_c+ D0 mu-", "Xi_bc0 -> Lambda_c~- D0 mu+"]}
         inputs = {'Xibc2LcD0Mu': self.d0+self.lc+muons}
@@ -589,9 +589,9 @@ class XibcBuilder(object):
         ws = makeB2XSels(decays,'D02KPi',inputs,self.configSL)
         self.lines.append(ProtoLine(rs,1.0))
         self.lines.append(ProtoLine(ws,1.0))
-        
+
     def _makeXibc2LcDMu(self):
-        '''Makes RS  Xibc -> Lc D+ mu + c.c. Need loose muons here as they may be soft''' 
+        '''Makes RS  Xibc -> Lc D+ mu + c.c. Need loose muons here as they may be soft'''
         muons = self.muons
         decays = {'Xibc2LcDMu': ["[Xi_bc+ -> Lambda_c+ D+ mu-]cc"]}
         inputs = {'Xibc2LcDMu': self.dp+self.lc+muons}
@@ -631,7 +631,7 @@ class Lb2XBuilder(object):
         self.ds = d.ds_hhh_pid_tight
         self.lambda0 = lambda0
         self.pions = [pions]
-        self.kaons = [kaons]    
+        self.kaons = [kaons]
         self.topoPions = [topoPions]
         self.topoPions_pid = [topoPions_PID]
         self.topoKaons = [topoKaons]
@@ -689,7 +689,7 @@ class Lb2XBuilder(object):
         # Lb  -> Lc D*0 K, D*0 -> D0 gamma/Pi0_resolved/merged
         self._makeLb2Dst0K('Dst02D0GammaD2HH',self.dst.d0gamma_hh_pid)
         self._makeLb2Dst0K('Dst02D0Pi0ResolvedD2HH',self.dst.d0pi0_resolved_pid)
-        self._makeLb2Dst0K('Dst02D0Pi0MergedD2HH',self.dst.d0pi0_merged_pid) 
+        self._makeLb2Dst0K('Dst02D0Pi0MergedD2HH',self.dst.d0pi0_merged_pid)
 
         ### bc baryon -> Lc D0
         self._makeX2LcD0()
@@ -705,7 +705,7 @@ class Lb2XBuilder(object):
         self._makeX2LcKPiPiPi()
         ### Xib,Omega_b -> Lc HH (+WS)
         self._makeXib2XicHH()
-        
+
         # Lb -> Lc D* (+WS)
         self._makeLb2LcDst()
         # X -> Lc Lc (+WS)
@@ -714,12 +714,12 @@ class Lb2XBuilder(object):
         self._makeLb2Lc5Pi()
         # Lb -> D0 Lambda0
         self._makeLb2D0Lambda0()
-        
+
         # Lb -> D+ p h- h-
         self._makeLb2DpHH()
         # Xib -> D0 p h- h-
         self._makeXib2D0pHH()
-        
+
         # B -> Lc pbar h-
         self._makeB2LcpbarH()
         # B-> Lc pbar
@@ -729,7 +729,7 @@ class Lb2XBuilder(object):
 
         # B0->Lc pbar Ks
         self._makeB02LcpbarKS('DD')
-        self._makeB02LcpbarKS('LL')        
+        self._makeB02LcpbarKS('LL')
 
         # Lb -> D(s)+ Lambda0 pi-
         self._makeLb2DLambda0pi()
@@ -809,7 +809,7 @@ class Lb2XBuilder(object):
         self.lines.append(ProtoLine(rs,1.0))
 
     def _makeLb2XicH(self):
-        '''Make RS and WS Lb -> Xi_c+ H (H=pi,K) + cc.''' 
+        '''Make RS and WS Lb -> Xi_c+ H (H=pi,K) + cc.'''
         pions = self.topoPions
         kaons = self.topoKaons
         decays = {'Lb2XicPi': ["[Lambda_b0 -> Xi_c+ pi-]cc"],
@@ -847,9 +847,9 @@ class Lb2XBuilder(object):
         ws = makeB2XSels(decays,'Xic02PKKPi',inputs,self.config)
         decays = {'Xib2Xic0PiNoIP': ["[Xi_b- -> Xi_c0 pi-]cc"]}
         inputs = {'Xib2Xic0PiNoIP': self.xic0+pions}
-        noip = makeB2XSels(decays,'Xic02PKKPi',inputs,self.config,False)                
+        noip = makeB2XSels(decays,'Xic02PKKPi',inputs,self.config,False)
         decays = {'Xib2Xic0PiNoIPWS': ["[Xi_b- -> Xi_c0 pi+]cc"]}
-        inputs = {'Xib2Xic0PiNoIPWS':self.xic0+pions}  
+        inputs = {'Xib2Xic0PiNoIPWS':self.xic0+pions}
         noip_ws = makeB2XSels(decays,'Xic02PKKPi',inputs,self.config,False)
         self.lines.append(ProtoLine(rs,1.0))
         self.lines.append(ProtoLine(ws,0.1))
@@ -857,11 +857,11 @@ class Lb2XBuilder(object):
         self.lines.append(ProtoLine(noip_ws,0.1))
 
     def _makeOmegab2Omegac0H(self):
-        '''Make RS and WS Omega_b- -> Omega_c0 H (H=pi,K) + cc.''' 
+        '''Make RS and WS Omega_b- -> Omega_c0 H (H=pi,K) + cc.'''
         pions = self.topoPions
         kaons = self.topoKaons
-        decays = {'Omegab2Omegac0Pi': ["[Omega_b- -> Omega_c0 pi-]cc"],    
-                  'Omegab2Omegac0K' : ["[Omega_b- -> Omega_c0 K-]cc"]}      
+        decays = {'Omegab2Omegac0Pi': ["[Omega_b- -> Omega_c0 pi-]cc"],
+                  'Omegab2Omegac0K' : ["[Omega_b- -> Omega_c0 K-]cc"]}
         inputs = {'Omegab2Omegac0Pi': self.omegac0+pions, 'Omegab2Omegac0K': self.omegac0+kaons}
         rs = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config)
         decays = {'Omegab2Omegac0PiWS': ["[Omega_b- -> Omega_c0 pi+]cc"],
@@ -870,17 +870,17 @@ class Lb2XBuilder(object):
         ws = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config)
         decays = {'Omegab2Omegac0PiNoIP': ["[Omega_b- -> Omega_c0 pi-]cc"]}
         #inputs = {'Omegab2Omegac0PiNoIP': self.omegac0+pions}
-        inputs = {'Omegab2Omegac0PiNoIP': self.omegac0_tight+pions} 
+        inputs = {'Omegab2Omegac0PiNoIP': self.omegac0_tight+pions}
         noip = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config,False)
         decays = {'Omegab2Omegac0PiNoIPWS': ["[Omega_b- -> Omega_c0 pi+]cc"]}
         #inputs = {'Omegab2Omegac0PiNoIPWS':self.omegac0+pions}
-        inputs = {'Omegab2Omegac0PiNoIPWS':self.omegac0_tight+pions}  
+        inputs = {'Omegab2Omegac0PiNoIPWS':self.omegac0_tight+pions}
         noip_ws = makeB2XSels(decays,'Omegac02PKKPi',inputs,self.config,False)
         self.lines.append(ProtoLine(rs,1.0))
         self.lines.append(ProtoLine(ws,0.1))
         self.lines.append(ProtoLine(noip,1.0))
-        self.lines.append(ProtoLine(noip_ws,0.1))     
-     
+        self.lines.append(ProtoLine(noip_ws,0.1))
+
     def _makeOmegab2XicpKPi(self):
         '''Make Omega_b- -> Xic+ K- pi-, Xic+ -> pKpi'''
         pions = self.pions
@@ -964,11 +964,11 @@ class Lb2XBuilder(object):
         ppbarpi = self.hhh.ppbarpi
         ppbark = self.hhh.ppbark
         pppbar = self.hhh.pppbar
-        
+
         ppipi = self.hhh.ppipiOS
         pkpi = self.hhh.pkpiOS
         pkk = self.hhh.pkkOS
-        
+
         decays = {'Lb2LcPiPiPi'   : ["[Lambda_b0 -> Lambda_c+ a_1(1260)-]cc"],
                   'Lb2LcKPiPi'    : ["[Lambda_b0 -> Lambda_c+ K_1(1270)-]cc"],
                   'Lb2LcppbarPi'  : ["[Lambda_b0 -> Lambda_c+ a_1(1260)-]cc"],
@@ -996,26 +996,26 @@ class Lb2XBuilder(object):
 
         config = deepcopy(self.config)
         config['AM_MIN'] = '4750.*MeV'
-        decays = {'B02Lcpbarpbarp': ["[B0 -> Lambda_c+ a_1(1260)-]cc"], 
-                  'B02LcpbarPiPi':  ["[B0 -> Lambda_c+ a_1(1260)-]cc"], 
-                  'B02LcpbarKPi':   ["[B0 -> Lambda_c+ a_1(1260)-]cc"], 
-                  'B02LcpbarKK':    ["[B0 -> Lambda_c+ a_1(1260)-]cc"] 
+        decays = {'B02Lcpbarpbarp': ["[B0 -> Lambda_c+ a_1(1260)-]cc"],
+                  'B02LcpbarPiPi':  ["[B0 -> Lambda_c+ a_1(1260)-]cc"],
+                  'B02LcpbarKPi':   ["[B0 -> Lambda_c+ a_1(1260)-]cc"],
+                  'B02LcpbarKK':    ["[B0 -> Lambda_c+ a_1(1260)-]cc"]
                  }
-        inputs = {'B02Lcpbarpbarp': self.lc+pppbar, 
-                  'B02LcpbarPiPi': self.lc+ppipi, 
-                  'B02LcpbarKPi': self.lc+pkpi, 
-                  'B02LcpbarKK': self.lc+pkk, 
+        inputs = {'B02Lcpbarpbarp': self.lc+pppbar,
+                  'B02LcpbarPiPi': self.lc+ppipi,
+                  'B02LcpbarKPi': self.lc+pkpi,
+                  'B02LcpbarKK': self.lc+pkk,
                  }
         rs = makeB2XSels(decays,'Lc2PKPi',inputs,config)
-        decays = {'B02LcpbarpbarpWS': ["[B0 -> Lambda_c+ a_1(1260)+]cc"], 
-                  'B02LcpbarPiPiWS':  ["[B0 -> Lambda_c+ a_1(1260)+]cc"], 
-                  'B02LcpbarKPiWS':   ["[B0 -> Lambda_c+ a_1(1260)+]cc"], 
-                  'B02LcpbarKKWS':    ["[B0 -> Lambda_c+ a_1(1260)+]cc"], 
+        decays = {'B02LcpbarpbarpWS': ["[B0 -> Lambda_c+ a_1(1260)+]cc"],
+                  'B02LcpbarPiPiWS':  ["[B0 -> Lambda_c+ a_1(1260)+]cc"],
+                  'B02LcpbarKPiWS':   ["[B0 -> Lambda_c+ a_1(1260)+]cc"],
+                  'B02LcpbarKKWS':    ["[B0 -> Lambda_c+ a_1(1260)+]cc"],
                  }
-        inputs = {'B02LcpbarpbarpWS': self.lc+pppbar, 
-                  'B02LcpbarPiPiWS':  self.lc+ppipi, 
-                  'B02LcpbarKPiWS':   self.lc+pkpi, 
-                  'B02LcpbarKKWS':    self.lc+pkk, 
+        inputs = {'B02LcpbarpbarpWS': self.lc+pppbar,
+                  'B02LcpbarPiPiWS':  self.lc+ppipi,
+                  'B02LcpbarKPiWS':   self.lc+pkpi,
+                  'B02LcpbarKKWS':    self.lc+pkk,
                   }
         ws = makeB2XSels(decays,'Lc2PKPi',inputs,config)
         self.lines.append(ProtoLine(rs,1.0))
@@ -1102,7 +1102,7 @@ class Lb2XBuilder(object):
         inputs = {'Lb2DLambda0LLpiWS': self.d.hhh_cf_pid + self.lambda0["LL"] + self.pions }
         lb_ll = makeB2XSels(decays,'D2HHH',inputs,self.config)
         self.lines.append(ProtoLine(lb_ll,0.1))
-    
+
     def _makeXib2D0Lambda0pi(self):
         '''Makes Xib -> D0(HH) Lambda0 pi- + c.c.'''
         decays = {'Xib2D0Lambda0DDpi': ["Xi_b- -> D0 Lambda0 pi-","Xi_b~+ -> D0 Lambda~0 pi+"] }
@@ -1141,7 +1141,7 @@ class Lb2XBuilder(object):
         inputs = {'Sb2D0P': self.d.hh_pid+protons}
         rs = makeB2XSels(decays,'D2HHPID',inputs,self.config)
         self.lines.append(ProtoLine(rs,1.0))
-        
+
     def _makeLb2LcD(self):
         '''Makes RS + WS Lb -> Lc D + c.c.'''
         config = deepcopy(self.config)
@@ -1168,7 +1168,7 @@ class Lb2XBuilder(object):
         decays = {'Lb2LcDstKst': ["[Lambda_b0 -> Lambda_c+ D*(2010)- K*(892)~0]cc"]}
         inputs = {'Lb2LcDstKst': self.dst.d0pi_pid+self.lc_tight + self.hh.kpi_loose}
         rs = makeB2XSels(decays,'',inputs,self.config)
-        self.lines.append(ProtoLine(rs,1.0)) 
+        self.lines.append(ProtoLine(rs,1.0))
 
     def _makeLb2Dst0K(self,dname,d2x):
         '''Makes Lb  -> Lc+ D*0 K-, D*0 -> D0 gamma/Pi0_resolved/merged'''
@@ -1188,7 +1188,7 @@ class Lb2XBuilder(object):
         self.lines.append(ProtoLine(rs,1.0))
 
     def _makeX2LcD0H(self):
-        '''Makes RS + WS X -> Lc D0 H + c.c. Need loose pions here as they may be soft''' 
+        '''Makes RS + WS X -> Lc D0 H + c.c. Need loose pions here as they may be soft'''
         pions = self.pions
         kaons = self.kaons
         config = deepcopy(self.config)
@@ -1273,7 +1273,7 @@ class Lb2XBuilder(object):
         decays = {'B02LcpbarKS'+ks: ["[B0 -> Lambda_c+ p~- KS0]cc"]}
         inputs = {'B02LcpbarKS'+ks: self.lc+self.ks[ks]+protons}
         rs = makeB2XSels(decays,'Lc2PKPi',inputs,config)
-        self.lines.append(ProtoLine(rs,1.0))                  
+        self.lines.append(ProtoLine(rs,1.0))
         decays = {'B02LcpbarKSWS'+ks: ["[B0 -> Lambda_c+ p+ KS0]cc"]}
         inputs = {'B02LcpbarKSWS'+ks: self.lc+self.ks[ks]+protons}
         ws = makeB2XSels(decays,'Lc2PKPi',inputs,config)
@@ -1327,7 +1327,7 @@ class Lb2XBuilder(object):
         pions = self.pions
         kaons = self.kaons
         decays = {'Xib2XicPiPi': ["[Xi_b- -> Xi_c+ pi- pi-]cc"],
-                  'Xib2XicKPi': ["[Xi_b- -> Xi_c+ K- pi-]cc"],                                
+                  'Xib2XicKPi': ["[Xi_b- -> Xi_c+ K- pi-]cc"],
                   'Xib2XicKK': ["[Xi_b- -> Xi_c+ K- K-]cc"]
                   }
         inputs = {'Xib2XicPiPi': self.xic+pions,
@@ -1336,7 +1336,7 @@ class Lb2XBuilder(object):
         rs = makeB2XSels(decays,'Xic2PKPi',inputs,self.config)
         self.lines.append(ProtoLine(rs,1.0))
         decays = {'Xib2XicPiPiWS': ["[Xi_b- -> Xi_c+ pi+ pi+]cc"],
-                  'Xib2XicKPiWS': ["[Xi_b- -> Xi_c+ K+ pi+]cc"],                                
+                  'Xib2XicKPiWS': ["[Xi_b- -> Xi_c+ K+ pi+]cc"],
                   'Xib2XicKKWS': ["[Xi_b- -> Xi_c+ K+ K+]cc"]
                   }
         inputs = {'Xib2XicPiPiWS': self.xic+pions,
@@ -1386,7 +1386,7 @@ class Lb2XBuilder(object):
         inputs = {'B2LcDspbarWS': self.lc+self.d.hhh_pid+protons}
         ws = makeB2XSels(decays,'Lc2PKPiDs2KKPi',inputs,self.config)
         self.lines.append(ProtoLine(ws,0.1))
-        
+
     def _makeX02XiccH(self):
         '''Make RS and WS Xi_bcd -> Xi_cc+ H (H=pi,K) + cc.'''
         pions = self.pions
@@ -1426,7 +1426,7 @@ class Lb2XBuilder(object):
         self.lines.append(ProtoLine(rs,1.0))
         self.lines.append(ProtoLine(ws,0.1))
 
-        
+
     def _makeLb2LcDst(self):
         '''Makes RS + WS Lb -> Lc D* + c.c.'''
         decays = {'Lb2LcDst': ["[Lambda_b0 -> Lambda_c+ D*(2010)-]cc"]}
@@ -1440,7 +1440,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcLc(self):
         config = deepcopy(self.config)
-        config['AM_MIN' ] = '4800*MeV'                
+        config['AM_MIN' ] = '4800*MeV'
         decays = {'X2LcLc': ["B0 -> Lambda_c+ Lambda_c~-"]}
         inputs = {'X2LcLc': self.lc}
         rs = makeB2XSels(decays,'',inputs,config)
@@ -1450,7 +1450,7 @@ class Lb2XBuilder(object):
         ws = makeB2XSels(decays,'',inputs,config)
         self.lines.append(ProtoLine(ws,0.1))
 
-    def _makeLb2Lc5Pi(self):        
+    def _makeLb2Lc5Pi(self):
         decays = {'Lb2Lc5Pi':
                   ["[Lambda_b0 -> Lambda_c+ a_1(1260)- rho(770)0]cc"]}
         inputs = {'Lb2Lc5Pi': self.lc + self.hhh.pipipi + self.hh.pipi_pid}
@@ -1472,7 +1472,7 @@ class Lb2XBuilder(object):
                   'Lb2DpKK'    : self.d.hhh_cf_pid+pkk}
         rs = makeB2XSels(decays,'D2HHH',inputs,self.config)
         self.lines.append(ProtoLine(rs,1.0))
-        
+
     def _makeXib2D0pHH(self):
         '''Make RS and WS Xi_b ->DpHH (H=pi,K) + cc.'''
         config = deepcopy(self.config)
@@ -1488,7 +1488,7 @@ class Lb2XBuilder(object):
                   'Xib2D0pKK'    : self.d0_pid+pkk}
         rs = makeB2XSels(decays,'D02HH',inputs,self.config)
         self.lines.append(ProtoLine(rs,1.0))
-        
+
     def _makeLb2D0pk(self):
         '''Make RS Lb -> D0(K3pi) p K + cc.'''
         protons_pid = self.protons_pid
@@ -1524,7 +1524,7 @@ class Lb2XBuilder(object):
         config['AM_MIN'] = '5400*MeV'
         config['AM_MAX'] = '5900*MeV'
         config['BPVIPCHI2_MAX'] = '16'
-        pipipi = self.hhh.pipipi_tightersel                
+        pipipi = self.hhh.pipipi_tightersel
         Lc = self.lc_tight
         decays = {'Lb2LcPiPiPi'   : ["[Lambda_b0 -> Lambda_c+ a_1(1260)-]cc"]}
         inputs = {'Lb2LcPiPiPi'   : Lc+pipipi}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index da2e5bbc87fd4503e4286159a8c8109e670cce32..e8b9a8dfcf5c418cc1f82b0c5280e4c0841e8e86 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -38,7 +38,7 @@ class LoKiCuts(object):
     full functor is used (not the key) and that cuts are ignored if the key
     is not supplied to LoKiCuts.
     '''
-    
+
     functors = {'TRCHI2DOF' : 'TRCHI2DOF',
                 'P'         : 'P',
                 'PT'        : 'PT',
@@ -54,7 +54,7 @@ class LoKiCuts(object):
                 'ADOCA15'   : "ADOCA(1,5)",
                 'ADOCA25'   : "ADOCA(2,5)",
                 'ADOCA35'   : "ADOCA(3,5)",
-                'ADOCA45'   : "ADOCA(3,5)", 
+                'ADOCA45'   : "ADOCA(3,5)",
                 'VCHI2DOF'  : "VFASPF(VCHI2/VDOF)",
                 'BPVVDCHI2' : 'BPVVDCHI2',
                 'BPVDIRA'   : 'BPVDIRA',
@@ -72,7 +72,7 @@ class LoKiCuts(object):
                 'BPVVDZ'    : 'BPVVDZ',
                 'DOCAMAX'   : 'DOCAMAX',
                 'AM'        : 'AM',
-                'CL'        : 'CL', 
+                'CL'        : 'CL',
                 'TRGHP'     : 'TRGHP',
                 'DZ1'       : ' (CHILD(VFASPF(VZ), 1) - VFASPF(VZ))',
                 'DZ2'       : ' (CHILD(VFASPF(VZ), 2) - VFASPF(VZ))',
@@ -83,7 +83,7 @@ class LoKiCuts(object):
                 'BPVCORRM'  : 'BPVCORRM',
                 'ISNOTE'    : 'PPINFO(LHCb.ProtoParticle.IsNotE,-1)'
                 }
-    
+
     def __init__(self,cuts,config):
         self.cuts = cuts
         self.config = config
@@ -92,7 +92,7 @@ class LoKiCuts(object):
         cuts = []
         for cut in self.cuts: cuts += self._getCut(cut)
         return LoKiCuts.combine(cuts)
-        
+
     def _getCut(self,cut):
         cuts = []
         fun = self.functors[cut]
@@ -103,9 +103,9 @@ class LoKiCuts(object):
                 for key,val in self.config.iteritems():
                     if key.startswith('ADOCA') and key.endswith('MAX'):
                         cuts.append(key.replace('_MAX','')+'<'+str(val))
-                return cuts        
+                return cuts
         for key,val in self.config.iteritems():
-            if key.startswith(cut+'_'):                
+            if key.startswith(cut+'_'):
                 if key.endswith('MIN'): cuts.append(fun+'>'+str(val))
                 else: cuts.append(fun+'<'+str(val))
         return cuts
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py
index d87001f87f766c8c6e23dbf41bfecfed22137440..a5ce955d9d4b8748751f785053dab5cfe5c41c57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py
@@ -106,7 +106,7 @@ def tosSelection(sel,specs):
     tosFilter = makeTOSFilter(sel.name(),specs)
     return Selection(sel.name()+'TOS', Algorithm=tosFilter,
                      RequiredSelections=[sel])
-            
+
 def makeTISTOSFilter(name):
     specs = {'Hlt2Topo.*Decision%TOS':0,
              'Hlt2Topo.*Decision%TIS':0,
@@ -130,7 +130,7 @@ def tisTosSelection(sel):
 
 def filterPID(name,input,config,level=1):
     cuts = ["(NINGENERATION(('p+'==ABSID) & (PIDp < %s),%d) == 0)" \
-            % (config['P']['PIDp_MIN'],level),            
+            % (config['P']['PIDp_MIN'],level),
             "(NINGENERATION(('K+'==ABSID) & (PIDK < %s), %d) == 0)" \
             % (config['K']['PIDK_MIN'],level),
             "(NINGENERATION(('pi+'==ABSID) & (PIDK > %s), %d) == 0)" \
@@ -181,12 +181,12 @@ def makeB2X(name,decay,inputs,config,useIP=True,resVert=True):
 
     momCuts = LoKiCuts.combine(momCuts)
     b2x = CombineParticles(DecayDescriptors=decay,CombinationCut=comboCuts,
-                           MotherCut=momCuts, 
-                           StopAtMaxCombinations = True, 
+                           MotherCut=momCuts,
+                           StopAtMaxCombinations = True,
                            MaxCombinations = 10000000)
 
     presels = []
-    for i in inputs : 
+    for i in inputs :
         if name.find('B02D0KKD2Pi0HHResolved') >=0 or \
            name.find('B02DDKSLL') >=0 or \
            name.find('B2D0DKSLLD02K3Pi') >=0 or \
@@ -200,9 +200,9 @@ def makeB2X(name,decay,inputs,config,useIP=True,resVert=True):
         else :
             _code = "(CONTAINS('%s')<2000)" % i.outputLocation()
         presels += [ VoidEventSelection(name + "CombCut" + i.name(),
-                                  Code=_code, 
+                                  Code=_code,
                                   RequiredSelection = i
-                                  ) ] 
+                                  ) ]
 
     return Selection(name,Algorithm=b2x,RequiredSelections=presels)
 
@@ -231,9 +231,9 @@ def makeB2XSels(decays,xtag,inputs,config,useIP=True,resVert=True):
                                  "PT"         :  "PT",
                                  "HVCHI2DOFTOT" : hvChi2DOFTot }
         sels.append(sel)
-        
+
     return sels
- 
+
 def makeBc2BX(name,decay,inputs,config):
     from copy import deepcopy
     config = deepcopy(config)
@@ -248,7 +248,7 @@ def makeBc2BX(name,decay,inputs,config):
                              CombinationCut=comboCuts,
                              MotherCut=momCuts)
 
-    return Selection(name,Algorithm=bc2bx,RequiredSelections=inputs)    
+    return Selection(name,Algorithm=bc2bx,RequiredSelections=inputs)
 
 def makeBc2BXSels(decays,xtag,inputs,config):
     sels = []
@@ -272,7 +272,7 @@ def makeBc2DX(name,decay,inputs,config):
                              CombinationCut=comboCuts,
                              MotherCut=momCuts)
 
-    return Selection(name,Algorithm=bc2dx,RequiredSelections=inputs) 
+    return Selection(name,Algorithm=bc2dx,RequiredSelections=inputs)
 
 def makeBc2DXSels(decays,xtag,inputs,config):
     sels = []
@@ -296,7 +296,7 @@ def makeBc2DsX(name,decay,inputs,config):
                              CombinationCut=comboCuts,
                              MotherCut=momCuts)
 
-    return Selection(name,Algorithm=bc2dsx,RequiredSelections=inputs) 
+    return Selection(name,Algorithm=bc2dsx,RequiredSelections=inputs)
 
 def makeBc2DsXSels(decays,xtag,inputs,config):
     sels = []
@@ -320,7 +320,7 @@ def makeBc2D0X(name,decay,inputs,config):
                              CombinationCut=comboCuts,
                              MotherCut=momCuts)
 
-    return Selection(name,Algorithm=bc2d0x,RequiredSelections=inputs) 
+    return Selection(name,Algorithm=bc2d0x,RequiredSelections=inputs)
 
 def makeBc2D0XSels(decays,xtag,inputs,config):
     sels = []
@@ -344,7 +344,7 @@ def makeBc2DstX(name,decay,inputs,config):
                              CombinationCut=comboCuts,
                              MotherCut=momCuts)
 
-    return Selection(name,Algorithm=bc2dstx,RequiredSelections=inputs) 
+    return Selection(name,Algorithm=bc2dstx,RequiredSelections=inputs)
 
 def makeBc2DstXSels(decays,xtag,inputs,config):
     sels = []
@@ -367,10 +367,10 @@ def makeB2DstarX(sel,uppions,config):
     # Delta M cut on D* (preambulo is below)
     #dmcut = '((ISD1 & ((MD1PI-MD1) < 180)) | (ISD2 & ((MD2PI-MD2) < 180)))'
     #dmcut = '((MD1PI-MD1) < 180) | ((MD2PI-MD2) < 180)'
-    dmcut = "((((IDD1==421)|(IDD1==411)) & ((MD1PI-MD1) < 180)) | (((IDD2==421)|(IDD2==411)) & ((MD2PI-MD2) < 180)))" 
+    dmcut = "((((IDD1==421)|(IDD1==411)) & ((MD1PI-MD1) < 180)) | (((IDD2==421)|(IDD2==411)) & ((MD2PI-MD2) < 180)))"
     # add UP track
     combConfig = {'AMAXDOCA_MAX' : '0.5*mm'}
-    comboCuts = [LoKiCuts(['AMAXDOCA'],combConfig).code(),dmcut] 
+    comboCuts = [LoKiCuts(['AMAXDOCA'],combConfig).code(),dmcut]
     comboCuts = LoKiCuts.combine(comboCuts)
     momCuts = LoKiCuts(['VCHI2DOF','BPVVDCHI2','BPVDIRA'],config).code()
     #did = "((ABSID=='D+')|(ABSID=='D0'))"
@@ -394,11 +394,11 @@ def makeB2DstarX(sel,uppions,config):
                  'ED2  = ACHILD(CHILD(E,2),1)',
                  'MD2  = ACHILD(CHILD(M,2),1)',
                  'MD2PI = sqrt((EPI+ED2)**2 - (PXPI+PXD2)**2 - (PYPI+PYD2)**2 - (PZPI+PZD2)**2)',
-                 ]                 
+                 ]
     cp = CombineParticles(CombinationCut=comboCuts,MotherCut=momCuts,
                           Preambulo=preambulo,
                           DecayDescriptor='[B+ -> J/psi(1S) pi+]cc')
     return Selection('DstarUP'+sel.name(),Algorithm=cp,
                      RequiredSelections=[uppions]+[subsel])
-                                                 
+
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py
index 5cad2f473d13c39a84d337ca5f9ce90b9a71b633..47ef076cc635b05d5656cbf42c5722fcbe1c60b7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-B->DDphi, D= D0, D+, Ds+, D*0, D*+ 
+B->DDphi, D= D0, D+, Ds+, D*0, D*+
 
 Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
@@ -45,12 +45,12 @@ default_config = {
     'KK_MASS_MAX_DsDs': 2200, #MeV
     'KK_MASS_MAX_DstDst': 2050, #MeV
     'KK_MASS_MAX_DstDp': 2150, #MeV
-    'KK_VCHI2NDOF': 9, 
+    'KK_VCHI2NDOF': 9,
     # Cuts made on all D0's
     'D0_MASS_WIN': 65, #MeV
     'D0_PT': 1500., #MeV
     'D0_IPCHI2': 4,
-    'D0_VCHI2NDOF': 10, 
+    'D0_VCHI2NDOF': 10,
     # Cuts made on all D+'s
     'Dp_MASS_WIN': 65, #MeV
     'Dp_PT': 1500., #MeV
@@ -72,25 +72,25 @@ default_config = {
     'B_MASS_MIN_MDST': 4800, #MeV
 #    'B_DOCA': 0.3, #mm
     'B_DOCACHI2': 16, # 4-body decay
-    'B_DIRA': 0.999, 
+    'B_DIRA': 0.999,
     'B_VCHI2NDOF': 15,
     'B_BPVLTIME': 0.2, #ps
     # Cuts made on PID for specific particles
     'K_ProbNNk_MIN': 0.1,
     'PI_ProbNNpi_MIN': 0.1
-    }, 
+    },
     'STREAMS' : {
      'Bhadron': [
      'StrippingB2DDphi_B2DstDpPhiLine',
      'StrippingB2DDphi_B2DDPhiLine',
      'StrippingB2DDphi_B2DsDsPhiLine',
-     'StrippingB2DDphi_B2DstDstPhiLine', 
+     'StrippingB2DDphi_B2DstDstPhiLine',
     ],
     'BhadronCompleteEvent':[
-     'StrippingB2DDphi_B2D0D0PhiLine',  
+     'StrippingB2DDphi_B2D0D0PhiLine',
      ]
     },
-    'WGs' : [ 'B2OC' ]    
+    'WGs' : [ 'B2OC' ]
 }
 
 
@@ -133,9 +133,9 @@ class B2DDphiConf(LineBuilder):
                                                         config[name+'_PT'],
                                                         config[name+'_IPCHI2'],
                                                         config[name+'_VCHI2NDOF'])})
-            
+
         # Select kaons from StdLoose list
-        self.selK  = self.makeKaons(   'KFor' + moduleName, 
+        self.selK  = self.makeKaons(   'KFor' + moduleName,
                                        config['TR_PT_MIN'],
                                        config['TR_P_MIN'],
                                        config['TR_MIPCHI2DV_MIN'],
@@ -165,7 +165,7 @@ class B2DDphiConf(LineBuilder):
                                                     BDOCACHI2 = config['B_DOCACHI2'],
                                                     BDIRA = config['B_DIRA'],
                                                     BPVLTIME = config['B_BPVLTIME']) })
-            
+
         # Create the stripping lines
         for name, selections in self.selB.iteritems():
             line = StrippingLine(moduleName+"_B2"+name+"PhiLine",
@@ -191,7 +191,7 @@ class B2DDphiConf(LineBuilder):
         KaonIPCHI2       : Minimum impact parameter chi2 of K.
         KaonProbNNk      : Minimum ProbNNk of K.
         """
-        
+
         _params = locals()
         _code = " ( PROBNNk > %(KaonProbNNk)s)"    \
             "& ( PT > %(KaonPT)s *MeV)"  \
@@ -207,7 +207,7 @@ class B2DDphiConf(LineBuilder):
                           Algorithm = _kFilter,
                           RequiredSelections = [StdLooseKaons])
 
-    
+
     def makeDCandidate( self, name,
                         PDGName,
                         ContainerName,
@@ -221,7 +221,7 @@ class B2DDphiConf(LineBuilder):
                         DPT,
                         DIPCHI2,
                         DVCHI2):
-        
+
         """
         Create and return a D candidate Selection object.
         Starts from DataOnDemand 'Phys/StdLooseD02KPi'.
@@ -237,7 +237,7 @@ class B2DDphiConf(LineBuilder):
         DMassWin         : D invariant mass window around PDG mass value (MeV).
         DVCHI2           : Maximum D vertex chi2 (per degree of freedom?)
         """
-        
+
         _params = locals()
         _code = " (INTREE(('K+'==ABSID) & (PROBNNk > %(KaonProbNNk)s) & (PT>%(TrackPT)s *MeV) & (MIPCHI2DV(PRIMARY)> %(TrackIPCHI2)s) & (TRGHP < %(TrackGHP)s)))" \
             "& (INTREE(('pi+'==ABSID) & (PROBNNpi > %(PionProbNNpi)s) & (PT>%(TrackPT)s *MeV) & (MIPCHI2DV(PRIMARY)> %(TrackIPCHI2)s) & (TRGHP < %(TrackGHP)s)))" \
@@ -252,7 +252,7 @@ class B2DDphiConf(LineBuilder):
         return Selection (name,
                           Algorithm = _dFilter,
                           RequiredSelections = [DCandidatesList])
-    
+
     def makeBs2DDPhi(self, name,
                      DecayDesc,
                      Selections,
@@ -275,14 +275,14 @@ class B2DDphiConf(LineBuilder):
         BVCHI2      : Maximum Bs vertex chi2 per degree of freedom.
         BDOCACHI2   : Maximum DOCACHI2 for tracks used in B vertex.
         BPVLTIME    : Minimum Bs lifetime
-        """ 
-        
+        """
+
         _motherCuts = "(VFASPF(VCHI2/VDOF) < %(BVCHI2)s) & (BPVDIRA > %(BDIRA)s) & (BPVLTIME() > %(BPVLTIME)s*ps)"% locals()
         _combinationCut = "(AM > %(BMassMin)s *MeV) & (AM < %(BMassMax)s *MeV)" \
-            " & (ACHI2DOCA(1,4)< %(BDOCACHI2)s) & (ACHI2DOCA(2,4)< %(BDOCACHI2)s) & (ACHI2DOCA(3,4)< %(BDOCACHI2)s)" % locals() 
+            " & (ACHI2DOCA(1,4)< %(BDOCACHI2)s) & (ACHI2DOCA(2,4)< %(BDOCACHI2)s) & (ACHI2DOCA(3,4)< %(BDOCACHI2)s)" % locals()
         _combination12Cut = "(AM < %(KKMassMax)s *MeV) & (ACHI2DOCA(1,2) < %(BDOCACHI2)s )"  % locals()
         _combination123Cut = "(ACHI2DOCA(1,3) < %(BDOCACHI2)s ) & (ACHI2DOCA(2,3) < %(BDOCACHI2)s )"  % locals()
-        
+
         _Bs = DaVinci__N4BodyDecays("_"+name)
         _Bs.DecayDescriptor = DecayDesc
         _Bs.DaughtersCuts = { }
@@ -290,8 +290,7 @@ class B2DDphiConf(LineBuilder):
         _Bs.Combination123Cut = _combination123Cut
         _Bs.CombinationCut = _combinationCut
         _Bs.MotherCut = _motherCuts
-        
+
         return Selection ( name,
                            Algorithm = _Bs,
                            RequiredSelections = Selections)
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
index a762d73876426f69086e1566b14ab6a4e48c628b..0fd0692b1b7f1c634de0e90a00def916bca06835 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -106,19 +106,19 @@ default_config = {
    }
 }
 
-            
+
 class B2DXD2HMuNuBuilder(LineBuilder):
-            
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self,name,config): 
+
+    def __init__(self,name,config):
         LineBuilder.__init__(self, name, config)
         self._config=config
-               
+
         self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                       "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
-        self._muon = self._muonFilter() 
+
+        self._muon = self._muonFilter()
         self._pion = self._pionFilter()
         self._kaon = self._kaonFilter()
 
@@ -130,7 +130,7 @@ class B2DXD2HMuNuBuilder(LineBuilder):
         self._d2kpipimunuws = self._D2KPiPiMuNuBuilder("D02KPiPiMuNuWS",["[D0 -> K- pi+ pi- mu-]cc"],[self._kaon,self._pion,self._muon])
         self._hh = self._HHBuilder()
         self._hhh = self._HHHBuilder()
-               
+
         self.registerLine(self._makeBLine("B2D0PiD02PiMuNu",["[B- -> D0 pi-]cc"],[self._d2pimunu,self._pion],1.0))
         self.registerLine(self._makeBLine("B2D0PiD02KMuNu",["[B- -> D0 pi-]cc"],[self._d2kmunu,self._pion],1.0))
         self.registerLine(self._makeBLine("B2D0PiD02KPiPiMuNu",["[B- -> D0 pi-]cc"],[self._d2kpipimunu,self._pion],1.0))
@@ -192,7 +192,7 @@ class B2DXD2HMuNuBuilder(LineBuilder):
                "& (PIDmu-PIDp> %(MuonPIDp)s )"\
                "& (PIDmu-PIDK> %(MuonPIDK)s )"\
                "& (MIPCHI2DV(PRIMARY)> %(MIPCHI2DV_MIN)s )"
-        
+
     def _NominalKSelection( self ):
         return " (PT> %(PT_MIN)s *MeV)"\
                "& (P> %(P_MIN)s* MeV)"\
@@ -201,7 +201,7 @@ class B2DXD2HMuNuBuilder(LineBuilder):
                "& (PIDK-PIDp> %(KaonPIDp)s )   "\
                "& (PIDK-PIDmu> %(KaonPIDmu)s ) "\
                "& (MIPCHI2DV(PRIMARY)> %(MIPCHI2DV_MIN)s )"
-        
+
     def _NominalPiSelection( self ):
         return " (PT> %(PT_MIN)s *MeV)"\
                "& (P> %(P_MIN)s* MeV)"\
@@ -213,12 +213,12 @@ class B2DXD2HMuNuBuilder(LineBuilder):
 
     def _muonFilter( self ):
         _mu = FilterDesktop( Code = self._NominalMuSelection() % self._config )
-        return Selection("Mu_for"+self._name,Algorithm=_mu,RequiredSelections = [StdLooseMuons])        
+        return Selection("Mu_for"+self._name,Algorithm=_mu,RequiredSelections = [StdLooseMuons])
 
     def _pionFilter( self ):
         _pi = FilterDesktop( Code = self._NominalPiSelection() % self._config )
         return Selection("Pi_for"+self._name,Algorithm=_pi,RequiredSelections = [StdLoosePions])
-       
+
     def _kaonFilter( self ):
         _ka = FilterDesktop( Code = self._NominalKSelection() % self._config )
         return Selection("K_for"+self._name,Algorithm=_ka,RequiredSelections = [StdLooseKaons])
@@ -244,7 +244,7 @@ class B2DXD2HMuNuBuilder(LineBuilder):
                          "cos = (px1*px2+py1*py2+pz1*pz2)/(sqrt(px1*px1+py1*py1+pz1*pz1)*sqrt(px2*px2+py2*py2+pz2*pz2))",
                         ]
         return Selection(_name+"_for"+self._name,Algorithm=_d,RequiredSelections=inputs)
-    
+
     def _D2KPiPiMuNuBuilder( self,_name,_decay,inputs ):
         _d = DaVinci__N4BodyDecays(
             DecayDescriptors =  _decay,
@@ -287,12 +287,12 @@ class B2DXD2HMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BPVVDCHI2_MIN)s)"% self._config,
             )
         return Selection("HHH_for"+self._name,Algorithm=_hhh,RequiredSelections=[self._kaon,self._pion])
-    
+
     def _makeBLine(self,_name,_decay,inputs, pre):
         _b = CombineParticles(
             DecayDescriptors = _decay,
             CombinationCut = "(AM<%(BMass_MAX)s *MeV)" %self._config,
-            MotherCut = "(MDNDOCA(5.279,0) < %(Plane_MAX)s*mm) & (lim_up<0) & (lim_lo>0)"%self._config, 
+            MotherCut = "(MDNDOCA(5.279,0) < %(Plane_MAX)s*mm) & (lim_up<0) & (lim_lo>0)"%self._config,
             )
         _b.Preambulo = ["from LoKiPhys.decorators import *",
                         "m_B = 5279.29 ",
@@ -303,7 +303,7 @@ class B2DXD2HMuNuBuilder(LineBuilder):
                         "m_all = M",
                         "m_n   = CHILD(M,1)",
                         "lim_up = (m_all*m_all - m_B*m_B) - (1.+e3/m_D -p3/m_D)*(m_n*m_n - m_D*m_D) ",
-                        "lim_lo = (m_all*m_all - m_B*m_B) - (1.+e3/m_D + p3/m_D)*(m_n*m_n - m_D*m_D) ",                 
+                        "lim_lo = (m_all*m_all - m_B*m_B) - (1.+e3/m_D + p3/m_D)*(m_n*m_n - m_D*m_D) ",
                  ]
         _bsel = Selection("Sel"+_name,Algorithm = _b,RequiredSelections = inputs)
 
@@ -314,9 +314,6 @@ class B2DXD2HMuNuBuilder(LineBuilder):
                checkPV = True,
                FILTER=self.GECs,
                HLT2 = hlt2,
-               selection = _bsel) 
-        
-        return Line
-                                                    
+               selection = _bsel)
 
-    
\ No newline at end of file
+        return Line
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py
index e1e46bfc7bfbce3ef2d8143fbb6c6527abcf6867..290301f0c65a3c553bd58bc9c5030d8e2bc65840 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py
@@ -17,7 +17,7 @@ __all__ = ('B2nbodyConf',
            'makeB2nbody',
            'makePi',
            'makeK',
-           'makep', 
+           'makep',
            'makeKs',
            'makeLm',
            'makeDz',
@@ -182,7 +182,7 @@ default_config ={
                   'MinDSD0DauPt':     250.0,
                   'MinDSD0DauIPChi2':   9.0,
                   'MaxDSD0DauTrkChi2':  5.0
-                  }, 
+                  },
     'STREAMS' : [ 'Bhadron' ],
     'WGs' : [ 'B2OC' ]
     },
@@ -337,7 +337,7 @@ default_config ={
                   'MinDSD0DauPt':     250.0,
                   'MinDSD0DauIPChi2':   9.0,
                   'MaxDSD0DauTrkChi2':  5.0
-                  }, 
+                  },
     'STREAMS' : [ 'Bhadron' ],
     'WGs' : [ 'B2OC' ]
     },
@@ -492,10 +492,10 @@ default_config ={
                   'MinDSD0DauPt':     250.0,
                   'MinDSD0DauIPChi2':   9.0,
                   'MaxDSD0DauTrkChi2':  5.0
-                  }, 
+                  },
     'STREAMS' : [ 'Bhadron' ],
     'WGs' : [ 'B2OC' ]
-    }    
+    }
 }
 
 from Gaudi.Configuration import *
@@ -518,7 +518,7 @@ class B2nbodyConf(LineBuilder) :
                              MinPiIPChi2DV=config['MinPiIPChi2DV'],
                              MaxPiChi2    =config['MaxPiChi2'],
                              MinPiPIDK    =config['MinPiPIDK'],
-                             MinPiPIDp    =config['MinPiPIDp'], 
+                             MinPiPIDp    =config['MinPiPIDp'],
                              MaxPiGHP     =config['MaxPiGHP'])
         self.selK = makeK( 'KFor'+name,
                              MinKPt      =config['MinKPt'],
@@ -535,121 +535,121 @@ class B2nbodyConf(LineBuilder) :
                              MinpPIDK    =config['MinpPIDK'],
                              MaxpGHP     =config['MaxpGHP'])
         self.selKs = makeKs('KsFor'+name,
-                            MaxKsDeltaM     =config['MaxKsDeltaM'],    
-                            MinKsPt         =config['MinKsPt'],        
+                            MaxKsDeltaM     =config['MaxKsDeltaM'],
+                            MinKsPt         =config['MinKsPt'],
                             MaxKsVertChi2DOF=config['MaxKsVertChi2DOF'],
-                            MinKsPVVDChi2   =config['MinKsPVVDChi2'],  
+                            MinKsPVVDChi2   =config['MinKsPVVDChi2'],
                             MinKsIPChi2     =config['MinKsIPChi2'],
-                            MinKsDauPt      =config['MinKsDauPt'],     
-                            MinKsDauIPChi2  =config['MinKsDauIPChi2'], 
+                            MinKsDauPt      =config['MinKsDauPt'],
+                            MinKsDauIPChi2  =config['MinKsDauIPChi2'],
                             MaxKsDauTrkChi2 =config['MaxKsDauTrkChi2'])
         self.selLm = makeLm('LmFor'+name,
-                            MaxLmDeltaM     =config['MaxLmDeltaM'],    
-                            MinLmPt         =config['MinLmPt'],        
+                            MaxLmDeltaM     =config['MaxLmDeltaM'],
+                            MinLmPt         =config['MinLmPt'],
                             MaxLmVertChi2DOF=config['MaxLmVertChi2DOF'],
-                            MinLmPVVDChi2   =config['MinLmPVVDChi2'],  
-                            MinLmIPChi2     =config['MinLmIPChi2'],    
-                            MinLmPrtPt      =config['MinLmPrtPt'],     
-                            MinLmPiPt       =config['MinLmPiPt'],      
-                            MinLmPrtIPChi2  =config['MinLmPrtIPChi2'], 
-                            MinLmPiIPChi2   =config['MinLmPiIPChi2'],  
+                            MinLmPVVDChi2   =config['MinLmPVVDChi2'],
+                            MinLmIPChi2     =config['MinLmIPChi2'],
+                            MinLmPrtPt      =config['MinLmPrtPt'],
+                            MinLmPiPt       =config['MinLmPiPt'],
+                            MinLmPrtIPChi2  =config['MinLmPrtIPChi2'],
+                            MinLmPiIPChi2   =config['MinLmPiIPChi2'],
                             MaxLmPrtTrkChi2 =config['MaxLmPrtTrkChi2'],
                             MaxLmPiTrkChi2  =config['MaxLmPiTrkChi2'])
         self.selDz = makeDz('DzFor'+name,
-                            MaxDzDeltaM     =config['MaxDzDeltaM'],   
-                            MinDzPt         =config['MinDzPt'],        
+                            MaxDzDeltaM     =config['MaxDzDeltaM'],
+                            MinDzPt         =config['MinDzPt'],
                             MaxDzVertChi2DOF=config['MaxDzVertChi2DOF'],
-                            MinDzPVVDChi2   =config['MinDzPVVDChi2'],  
-                            MinDzIPChi2     =config['MinDzIPChi2'],    
-                            MinDzDauPt      =config['MinDzDauPt'],     
-                            MinDzDauIPChi2  =config['MinDzDauIPChi2'], 
+                            MinDzPVVDChi2   =config['MinDzPVVDChi2'],
+                            MinDzIPChi2     =config['MinDzIPChi2'],
+                            MinDzDauPt      =config['MinDzDauPt'],
+                            MinDzDauIPChi2  =config['MinDzDauIPChi2'],
                             MaxDzDauTrkChi2 =config['MaxDzDauTrkChi2'],
                             MinDzKPIDPi     =config['MinDzKPIDPi'],
                             MinDzPiPIDK     =config['MinDzPiPIDK'])
         self.selDp = makeDp('DpFor'+name,
-                            MaxDpDeltaM     =config['MaxDpDeltaM'],   
-                            MinDpPt         =config['MinDpPt'],        
+                            MaxDpDeltaM     =config['MaxDpDeltaM'],
+                            MinDpPt         =config['MinDpPt'],
                             MaxDpVertChi2DOF=config['MaxDpVertChi2DOF'],
-                            MinDpPVVDChi2   =config['MinDpPVVDChi2'],  
-                            MinDpIPChi2     =config['MinDpIPChi2'],    
-                            MinDpDauPt      =config['MinDpDauPt'],     
-                            MinDpDauIPChi2  =config['MinDpDauIPChi2'], 
+                            MinDpPVVDChi2   =config['MinDpPVVDChi2'],
+                            MinDpIPChi2     =config['MinDpIPChi2'],
+                            MinDpDauPt      =config['MinDpDauPt'],
+                            MinDpDauIPChi2  =config['MinDpDauIPChi2'],
                             MaxDpDauTrkChi2 =config['MaxDpDauTrkChi2'],
                             MinDpKPIDPi     =config['MinDpKPIDPi'],
                             MinDpPiPIDK     =config['MinDpPiPIDK'])
         self.selDs = makeDs('DsFor'+name,
-                            MaxDsDeltaM     =config['MaxDsDeltaM'],   
-                            MinDsPt         =config['MinDsPt'],        
+                            MaxDsDeltaM     =config['MaxDsDeltaM'],
+                            MinDsPt         =config['MinDsPt'],
                             MaxDsVertChi2DOF=config['MaxDsVertChi2DOF'],
-                            MinDsPVVDChi2   =config['MinDsPVVDChi2'],  
-                            MinDsIPChi2     =config['MinDsIPChi2'],    
-                            MinDsDauPt      =config['MinDsDauPt'],     
-                            MinDsDauIPChi2  =config['MinDsDauIPChi2'], 
+                            MinDsPVVDChi2   =config['MinDsPVVDChi2'],
+                            MinDsIPChi2     =config['MinDsIPChi2'],
+                            MinDsDauPt      =config['MinDsDauPt'],
+                            MinDsDauIPChi2  =config['MinDsDauIPChi2'],
                             MaxDsDauTrkChi2 =config['MaxDsDauTrkChi2'],
                             MinDsKmPIDPi    =config['MinDsKmPIDPi'],
                             MinDsKpPIDPi    =config['MinDsKpPIDPi'],
                             MinDsPiPIDK     =config['MinDsPiPIDK'])
         self.selLc = makeLc('LcFor'+name,
-                            MaxLcDeltaM     =config['MaxLcDeltaM'],   
-                            MinLcPt         =config['MinLcPt'],        
+                            MaxLcDeltaM     =config['MaxLcDeltaM'],
+                            MinLcPt         =config['MinLcPt'],
                             MaxLcVertChi2DOF=config['MaxLcVertChi2DOF'],
-                            MinLcPVVDChi2   =config['MinLcPVVDChi2'],  
-                            MinLcIPChi2     =config['MinLcIPChi2'],    
-                            MinLcDauPt      =config['MinLcDauPt'],     
-                            MinLcDauIPChi2  =config['MinLcDauIPChi2'], 
+                            MinLcPVVDChi2   =config['MinLcPVVDChi2'],
+                            MinLcIPChi2     =config['MinLcIPChi2'],
+                            MinLcDauPt      =config['MinLcDauPt'],
+                            MinLcDauIPChi2  =config['MinLcDauIPChi2'],
                             MaxLcDauTrkChi2 =config['MaxLcDauTrkChi2'],
                             MinLcKPIDPi     =config['MinLcKPIDPi'],
                             MinLcpPIDPi     =config['MinLcpPIDPi'],
                             MinLcpPIDK      =config['MinLcpPIDK'],
                             MinLcPiPIDK     =config['MinLcPiPIDK'])
         self.selPh = makePh('PhFor'+name,
-                            MaxPhDeltaM     =config['MaxPhDeltaM'],     
-                            MinPhPt         =config['MinPhPt'],         
+                            MaxPhDeltaM     =config['MaxPhDeltaM'],
+                            MinPhPt         =config['MinPhPt'],
                             MaxPhVertChi2DOF=config['MaxPhVertChi2DOF'],
-                            MinPhPVVDChi2   =config['MinPhPVVDChi2'],   
-                            MinPhIPChi2     =config['MinPhIPChi2'],     
-                            MinPhDauPt      =config['MinPhDauPt'],      
-                            MinPhDauIPChi2  =config['MinPhDauIPChi2'],  
+                            MinPhPVVDChi2   =config['MinPhPVVDChi2'],
+                            MinPhIPChi2     =config['MinPhIPChi2'],
+                            MinPhDauPt      =config['MinPhDauPt'],
+                            MinPhDauIPChi2  =config['MinPhDauIPChi2'],
                             MaxPhDauTrkChi2 =config['MaxPhDauTrkChi2'])
         self.selKS = makeKS('KSFor'+name,
-                            MaxKSDeltaM     =config['MaxKSDeltaM'],     
-                            MinKSPt         =config['MinKSPt'],         
+                            MaxKSDeltaM     =config['MaxKSDeltaM'],
+                            MinKSPt         =config['MinKSPt'],
                             MaxKSVertChi2DOF=config['MaxKSVertChi2DOF'],
-                            MinKSPVVDChi2   =config['MinKSPVVDChi2'],   
-                            MinKSIPChi2     =config['MinKSIPChi2'],     
-                            MinKSDauPt      =config['MinKSDauPt'],      
-                            MinKSDauIPChi2  =config['MinKSDauIPChi2'],  
+                            MinKSPVVDChi2   =config['MinKSPVVDChi2'],
+                            MinKSIPChi2     =config['MinKSIPChi2'],
+                            MinKSDauPt      =config['MinKSDauPt'],
+                            MinKSDauIPChi2  =config['MinKSDauIPChi2'],
                             MaxKSDauTrkChi2 =config['MaxKSDauTrkChi2'],
                             MinKSKPIDPi     =config['MinKSKPIDPi'],
                             MinKSPiPIDK     =config['MinKSPiPIDK'])
         self.selJp = makeJp('JpFor'+name,
-                            MaxJpDeltaM     =config['MaxJpDeltaM'],     
-                            MinJpPt         =config['MinJpPt'],         
+                            MaxJpDeltaM     =config['MaxJpDeltaM'],
+                            MinJpPt         =config['MinJpPt'],
                             MaxJpVertChi2DOF=config['MaxJpVertChi2DOF'],
-                            MinJpPVVDChi2   =config['MinJpPVVDChi2'],   
-                            MinJpIPChi2     =config['MinJpIPChi2'],     
-                            MinJpDauPt      =config['MinJpDauPt'],      
-                            MinJpDauIPChi2  =config['MinJpDauIPChi2'],  
-                            MaxJpDauTrkChi2 =config['MaxJpDauTrkChi2']) 
+                            MinJpPVVDChi2   =config['MinJpPVVDChi2'],
+                            MinJpIPChi2     =config['MinJpIPChi2'],
+                            MinJpDauPt      =config['MinJpDauPt'],
+                            MinJpDauIPChi2  =config['MinJpDauIPChi2'],
+                            MaxJpDauTrkChi2 =config['MaxJpDauTrkChi2'])
         self.selDS = makeDS('DSFor'+name,
-                            MaxDSDeltaM       =config['MaxDSDeltaM'],      
-                            MinDSPt           =config['MinDSPt'],          
-                            MaxDSVertChi2DOF  =config['MaxDSVertChi2DOF'], 
-                            MinDSPVVDChi2     =config['MinDSPVVDChi2'],    
-                            MinDSIPChi2       =config['MinDSIPChi2'],      
-                            MinDSPiPt         =config['MinDSPiPt'],        
-                            MinDSPiIPChi2     =config['MinDSPiIPChi2'],    
-                            MaxDSPiTrkChi2    =config['MaxDSPiTrkChi2'],   
-                            MaxDSD0DeltaM     =config['MaxDSD0DeltaM'],    
-                            MinDSD0Pt         =config['MinDSD0Pt'],        
+                            MaxDSDeltaM       =config['MaxDSDeltaM'],
+                            MinDSPt           =config['MinDSPt'],
+                            MaxDSVertChi2DOF  =config['MaxDSVertChi2DOF'],
+                            MinDSPVVDChi2     =config['MinDSPVVDChi2'],
+                            MinDSIPChi2       =config['MinDSIPChi2'],
+                            MinDSPiPt         =config['MinDSPiPt'],
+                            MinDSPiIPChi2     =config['MinDSPiIPChi2'],
+                            MaxDSPiTrkChi2    =config['MaxDSPiTrkChi2'],
+                            MaxDSD0DeltaM     =config['MaxDSD0DeltaM'],
+                            MinDSD0Pt         =config['MinDSD0Pt'],
                             MaxDSD0VertChi2DOF=config['MaxDSD0VertChi2DOF'],
-                            MinDSD0PVVDChi2   =config['MinDSD0PVVDChi2'],  
-                            MinDSD0IPChi2     =config['MinDSD0IPChi2'],    
-                            MinDSD0DauPt      =config['MinDSD0DauPt'],     
-                            MinDSD0DauIPChi2  =config['MinDSD0DauIPChi2'], 
+                            MinDSD0PVVDChi2   =config['MinDSD0PVVDChi2'],
+                            MinDSD0IPChi2     =config['MinDSD0IPChi2'],
+                            MinDSD0DauPt      =config['MinDSD0DauPt'],
+                            MinDSD0DauIPChi2  =config['MinDSD0DauIPChi2'],
                             MaxDSD0DauTrkChi2 =config['MaxDSD0DauTrkChi2'])
 
-        
+
         self.selB2nbody = makeB2nbody(name,
                                      PiSel=self.selPi,
                                      KSel =self.selK,
@@ -664,14 +664,14 @@ class B2nbodyConf(LineBuilder) :
                                      KSSel=self.selKS,
                                      JpSel=self.selJp,
                                      DSSel=self.selDS,
-                                     nbody          =config['nbody'],       
-                                     MinBMass       =config['MinBMass'],       
-                                     MaxBMass       =config['MaxBMass'],       
-                                     MinBPt         =config['MinBPt'],         
+                                     nbody          =config['nbody'],
+                                     MinBMass       =config['MinBMass'],
+                                     MaxBMass       =config['MaxBMass'],
+                                     MinBPt         =config['MinBPt'],
                                      MaxBVertChi2DOF=config['MaxBVertChi2DOF'],
-                                     MinBPVVDChi2   =config['MinBPVVDChi2'],   
-                                     MaxBPVIPChi2   =config['MaxBPVIPChi2'],   
-                                     MinBPVDIRA     =config['MinBPVDIRA'],     
+                                     MinBPVVDChi2   =config['MinBPVVDChi2'],
+                                     MaxBPVIPChi2   =config['MaxBPVIPChi2'],
+                                     MinBPVDIRA     =config['MinBPVDIRA'],
                                      MaxMass        =config['MaxMass'],
                                      MaxNtrk        =config['MaxNtrk'],
                                      MinNvc         =config['MinNvc'],
@@ -797,7 +797,7 @@ def makeB2nbody(name,PiSel,KSel,pSel,KsSel,LmSel,DzSel,DpSel,DsSel,LcSel,PhSel,K
         for p in comb: B+=p.B
         if abs(B)>1: continue
 
-        #assign identity to mother 
+        #assign identity to mother
         mother=""
         if Q==0  and B==0: mother="B0"
         if Q==1  and B==0: mother="B+"
@@ -819,8 +819,8 @@ def makeB2nbody(name,PiSel,KSel,pSel,KsSel,LmSel,DzSel,DpSel,DsSel,LcSel,PhSel,K
             if not doagain: break
         if len(ps)==0: CP=True
         else: CP=False
-        
-        #for B0 non-CP combinations come twice. 
+
+        #for B0 non-CP combinations come twice.
         if mother=="B0" and not CP:
             combcp=[x.cp for x in comb]
             if pname(comb)<pname(combcp):continue
@@ -877,7 +877,7 @@ def makePi(name, MinPiPt, MinPiIPChi2DV, MaxPiChi2, MinPiPIDK, MinPiPIDp, MaxPiG
     _code+="& (TRGHP < %(MaxPiGHP)s)"%locals()
     _PiFilter=FilterDesktop(Code=_code)
     return Selection (name,  Algorithm = _PiFilter, RequiredSelections = [StdLoosePions])
-                        
+
 from StandardParticles import StdLooseKaons
 def makeK(name, MinKPt, MinKIPChi2DV, MaxKChi2, MinKPIDPi, MinKPIDp, MaxKGHP) :
     _code =  "(PT > %(MinKPt)s*MeV)"%locals()
@@ -888,7 +888,7 @@ def makeK(name, MinKPt, MinKIPChi2DV, MaxKChi2, MinKPIDPi, MinKPIDp, MaxKGHP) :
     _code+="& (TRGHP < %(MaxKGHP)s)"%locals()
     _KFilter=FilterDesktop(Code=_code)
     return Selection (name,  Algorithm = _KFilter, RequiredSelections = [StdLooseKaons])
-                        
+
 from StandardParticles import StdLooseProtons
 def makep(name, MinpPt, MinpIPChi2DV, MaxpChi2, MinpPIDPi, MinpPIDK, MaxpGHP) :
     _code =  "(PT > %(MinpPt)s*MeV)"%locals()
@@ -1056,7 +1056,7 @@ def makeKS(name, MaxKSDeltaM, MinKSPt, MaxKSVertChi2DOF, MinKSPVVDChi2, MinKSIPC
     _KSFilter = FilterDesktop(Code = _code)
     _stdKS = DataOnDemand(Location = "Phys/StdLooseKstar2Kpi/Particles")
     return Selection (name, Algorithm = _KSFilter, RequiredSelections = [_stdKS])
-                                                            
+
 def makeJp(name, MaxJpDeltaM, MinJpPt, MaxJpVertChi2DOF, MinJpPVVDChi2, MinJpIPChi2, MinJpDauPt, MinJpDauIPChi2, MaxJpDauTrkChi2):
     _code =  "( ADMASS('J/psi(1S)') < %(MaxJpDeltaM)s*MeV)"%locals()
     _code+="& ( PT > %(MinJpPt)s )"%locals()
@@ -1094,5 +1094,3 @@ def makeDS(name, MaxDSDeltaM, MinDSPt, MaxDSVertChi2DOF, MinDSPVVDChi2, MinDSIPC
     _DSFilter = FilterDesktop(Code = _code)
     _stdDS = DataOnDemand(Location = "Phys/StdLooseDstarWithD02KPi/Particles")
     return Selection (name, Algorithm = _DSFilter, RequiredSelections = [_stdDS])
-                                                               
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py
index 7e6960a09d07d643ef8fc6588f5bd37f80c7f690..9b0f2d1d4330e35a913c5032d52dc8957a6ef50b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py
@@ -56,7 +56,7 @@ default_config ={
     'TRCHI2DOF_MAX' : 4.,
     'PT_MIN'        : '100*MeV',
     'P_MIN'         : '1000*MeV',
-    'MIPCHI2DV_MIN' : 4., 
+    'MIPCHI2DV_MIN' : 4.,
     'TRGHP_MAX'     : 0.4
     },
     "PIDPION" : {
@@ -169,7 +169,7 @@ default_config ={
     'ISNOTE_MIN' : -999.0,
     'PT_VLAPH'   : '145*MeV'
     },
-    "D2X" : { # Cuts made on all D's and Lc's used in all lines 
+    "D2X" : { # Cuts made on all D's and Lc's used in all lines
     'ASUMPT_MIN'    : '1800*MeV',
     'ADOCA12_MAX'   : '0.5*mm',
     'ADOCA13_MAX'   : '0.5*mm',
@@ -183,7 +183,7 @@ default_config ={
     'ADOCA45_MAX'   : '0.5*mm',
     'VCHI2DOF_MAX'  : 10,
     'BPVVDCHI2_MIN' : 36,
-    'BPVDIRA_MIN'   : 0, 
+    'BPVDIRA_MIN'   : 0,
     'MASS_WINDOW'   : '100*MeV'
     },
     "LC_FOR_XIBC" : { # Cuts made on Lc's/Xic(0) used in Xibc lines
@@ -200,10 +200,10 @@ default_config ={
     'ADOCA45_MAX'   : '0.5*mm',
     'VCHI2DOF_MAX'  : 8,
     'BPVVDCHI2_MIN' : 36,
-    'BPVDIRA_MIN'   : 0, 
+    'BPVDIRA_MIN'   : 0,
     'MASS_WINDOW'   : '50*MeV'
     },
-    "D2X_FOR_DDX" : { # Cuts made on all D's and Lc's used in B->DDX lines 
+    "D2X_FOR_DDX" : { # Cuts made on all D's and Lc's used in B->DDX lines
     'ASUMPT_MIN'    : '1800*MeV',
     'ADOCA12_MAX'   : '0.5*mm',
     'ADOCA13_MAX'   : '0.5*mm',
@@ -217,7 +217,7 @@ default_config ={
     'ADOCA45_MAX'   : '0.5*mm',
     'VCHI2DOF_MAX'  : 8,
     'BPVVDCHI2_MIN' : 50,
-    'BPVDIRA_MIN'   : 0, 
+    'BPVDIRA_MIN'   : 0,
     'MASS_WINDOW'   : '100*MeV'
     },
     "B2X" : { # Cuts made on all B's and Lb's used in all lines
@@ -236,7 +236,7 @@ default_config ={
     'BPVIPCHI2_MAX' : 20,
     'BPVLTIME_MIN'  : '0.05*ps',
     'BPVDIRA_MIN'   : 0.999,
-    'AM_MIN'        : '4800*MeV', 
+    'AM_MIN'        : '4800*MeV',
     'AM_MAX'        : '6800*MeV',
     'B2CBBDT_MIN'   : -999.9
     },
@@ -246,7 +246,7 @@ default_config ={
     'BPVIPCHI2_MAX' : 20,
     'BPVLTIME_MIN'  : '0.05*ps',
     'BPVDIRA_MIN'   : 0.99,
-    'AM_MIN'        : '5500*MeV', 
+    'AM_MIN'        : '5500*MeV',
     'AM_MAX'        : '9000*MeV',
     'B2CBBDT_MIN'   : -999.9
     },
@@ -277,15 +277,15 @@ default_config ={
     'BPVIPCHI2_MAX' : 25,
     'BPVLTIME_MIN'  : '0.05*ps',
     'BPVDIRA_MIN'   : 0.999,
-    'AM_MIN'        : '5800*MeV', 
-    'AM_MAX'        : '6800*MeV', 
+    'AM_MIN'        : '5800*MeV',
+    'AM_MAX'        : '6800*MeV',
     'B2CBBDT_MIN'   : -999.9
     },
-    "Dstar" : { # Cuts made on all D*'s used in all lines 
+    "Dstar" : { # Cuts made on all D*'s used in all lines
     'ADOCA12_MAX'   : '0.5*mm',
     'VCHI2DOF_MAX'  : 10,
     'BPVVDCHI2_MIN' : 36,
-    'BPVDIRA_MIN'   : 0, 
+    'BPVDIRA_MIN'   : 0,
     'MASS_WINDOW'   : '600*MeV', # was 50MeV
     'DELTAMASS_MAX' : '200*MeV',
     'DELTAMASSLOOSE_MAX' : '250*MeV',
@@ -297,7 +297,7 @@ default_config ={
     'DAUGHTERS'     : {'PT_MIN':'100*MeV','P_MIN':'2000*MeV'},
     'ADOCA12_MAX'  : '0.5*mm',
     'VCHI2DOF_MAX'  : 16,
-    'BPVVDCHI2_MIN' : 16, 
+    'BPVVDCHI2_MIN' : 16,
     'BPVDIRA_MIN'   : 0,
     'ASUMPT_MIN'    : '1000*MeV',
     'pP_MIN'        : '5000*MeV' # for pH only (obviously)
@@ -307,11 +307,11 @@ default_config ={
     'KDAUGHTERS'    : {'PT_MIN':'100*MeV','P_MIN':'2000*MeV','PIDK_MIN':'-2'},
     'PiDAUGHTERS'   : {'PT_MIN':'100*MeV','P_MIN':'2000*MeV','PIDK_MAX':'10'},
     'pDAUGHTERS'    : {'PT_MIN':'100*MeV','P_MIN':'2000*MeV','PIDp_MIN':'-2'},
-    'ADOCA12_MAX'   : '0.40*mm', 
-    'ADOCA13_MAX'   : '0.40*mm',  
-    'ADOCA23_MAX'   : '0.40*mm',    
+    'ADOCA12_MAX'   : '0.40*mm',
+    'ADOCA13_MAX'   : '0.40*mm',
+    'ADOCA23_MAX'   : '0.40*mm',
     'VCHI2DOF_MAX'  : 8,
-    'BPVVDCHI2_MIN' : 16, 
+    'BPVVDCHI2_MIN' : 16,
     'BPVDIRA_MIN'   : 0.98,
     'ASUMPT_MIN'    : '1250*MeV',
     'MIPCHI2DV_MIN' : 0.0,
@@ -340,7 +340,7 @@ default_config ={
                   'K' : {'PIDK_MIN' : -10}},
     'TIGHTER1' : {    'P'  : {'PIDp_MIN' : 0},
                      'PI' : {'PIDK_MAX' : 10},
-                     'K'  : {'PIDK_MIN' : -1}},                      
+                     'K'  : {'PIDK_MIN' : -1}},
     'TIGHTER2' : {    'P'  : {'PIDp_MIN' : 5},
                       'PI' : {'PIDK_MAX' : 10},
                       'K'  : {'PIDK_MIN' : 0}},
@@ -359,212 +359,212 @@ default_config ={
     'B02DstarMuNuDst2D0Pi_D2HHHHBeauty2CharmLine',
     'B02DstarMuNuWSDst2D0Pi_D2HHHHBeauty2CharmLine',
     'B02DstarMuNuDst2D0Pi_D2HHHHWSBeauty2CharmLine',
-    'B02DstarMuNuWSDst2D0Pi_D2HHHHWSBeauty2CharmLine', 
+    'B02DstarMuNuWSDst2D0Pi_D2HHHHWSBeauty2CharmLine',
     'B2D0PiPiPiD2HHPIDBeauty2CharmLine',
-    
+
     'B02DKD2Pi0HHHMergedBeauty2CharmLine',
     'B02DKD2Pi0HHHResolvedBeauty2CharmLine',
     'B02DPiD2Pi0HHHMergedBeauty2CharmLine',
     'B02DPiD2Pi0HHHResolvedBeauty2CharmLine',
-    'B02D0KKD2HHBeauty2CharmLine', 
-    'B02D0KPiD2HHBeauty2CharmLine', 
-    'B02DHHWSD2HHBeauty2CharmLine', 
-    'B02D0PPbarD2HHBeauty2CharmLine', 
-    'B02D0PPbarWSD2HHBeauty2CharmLine', 
-    'B02D0KKD2HHWSBeauty2CharmLine', 
-    'B02D0PiPiD2HHWSBeauty2CharmLine', 
-    'B02D0KPiD2HHWSBeauty2CharmLine', 
-    'B02DHHWSD2HHWSBeauty2CharmLine', 
-    'B02D0KSDDD2HHBeauty2CharmLine', 
-    'B02D0KSLLD2HHBeauty2CharmLine', 
-    'B02DKD2PhiMuNuBeauty2CharmLine', 
-    'B02DPiD2PhiMuNuBeauty2CharmLine', 
-    'B02DKWSD2PhiMuNuBeauty2CharmLine', 
-    'B02DPiWSD2PhiMuNuBeauty2CharmLine', 
-    #'B02DKD2HHHBeauty2CharmLine', 
-    #'B02DPiD2HHHBeauty2CharmLine', 
-    #'B02DKWSD2HHHBeauty2CharmLine', 
-    #'B02DPiWSD2HHHBeauty2CharmLine', 
-    'B02DKD2HHHUPBeauty2CharmLine', 
-    #'B02DPiD2HHHUPBeauty2CharmLine', 
-    #'B02DKWSD2HHHUPBeauty2CharmLine', 
-    #'B02DPiWSD2HHHUPBeauty2CharmLine', 
-    #'B02DPiNoIPD2HHHCFPIDBeauty2CharmLine', 
-    'B02DPiWSNoIPD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DPiNoIPDs2HHHPIDBeauty2CharmLine', 
-    'B02DPiWSNoIPDs2HHHPIDBeauty2CharmLine', 
-    'B02DKsKDDD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsKLLD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DKPi0ResolvedD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsPiDDD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DPiPi0MergedD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DKPi0MergedD2HHHCFPIDBeauty2CharmLine', 
-    'B02DPiPi0ResolvedD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsPiLLD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DKPi0MergedWSD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsPiDDWSD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DKPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine', 
-    #'B02DPiPi0MergedWSD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsPiLLWSD2HHHCFPIDBeauty2CharmLine', 
-    'B02DPiPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsKLLWSD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKsKDDWSD2HHHCFPIDBeauty2CharmLine', 
-    'B02DRhoPMD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKstarPMD2HHHCFPIDBeauty2CharmLine', 
-    'B02DKD2KSHLLBeauty2CharmLine', 
-    'B02DPiD2KSHLLBeauty2CharmLine', 
-    'B02DKWSD2KSHLLBeauty2CharmLine', 
-    'B02DPiWSD2KSHLLBeauty2CharmLine', 
-    'B02DKD2KSHDDBeauty2CharmLine', 
-    'B02DPiD2KSHDDBeauty2CharmLine', 
-    'B02DKWSD2KSHDDBeauty2CharmLine', 
-    'B02DPiWSD2KSHDDBeauty2CharmLine', 
-    #'B02D0KKD2KSHHLLBeauty2CharmLine', 
-    #'B02D0PiPiD2KSHHLLBeauty2CharmLine', 
-    'B02D0KPiD2KSHHLLBeauty2CharmLine', 
-    'B02DHHWSD2KSHHLLBeauty2CharmLine', 
-    #'B02D0KKD2KSHHDDBeauty2CharmLine', 
-    #'B02D0PiPiD2KSHHDDBeauty2CharmLine', 
-    'B02D0KPiD2KSHHDDBeauty2CharmLine', 
-    'B02DHHWSD2KSHHDDBeauty2CharmLine', 
-    #'B02D0KKD2KSHHLLWSBeauty2CharmLine', 
-    #'B02D0PiPiD2KSHHLLWSBeauty2CharmLine', 
-    'B02D0KPiD2KSHHLLWSBeauty2CharmLine', 
-    'B02DHHWSD2KSHHLLWSBeauty2CharmLine', 
-    #'B02D0KKD2KSHHDDWSBeauty2CharmLine', 
-    #'B02D0PiPiD2KSHHDDWSBeauty2CharmLine', 
-    'B02D0KPiD2KSHHDDWSBeauty2CharmLine', 
-    'B02DHHWSD2KSHHDDWSBeauty2CharmLine', 
-    'B02DstarKDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'B02DstarPiDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'B02DstarKDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
-    'B02DstarPiDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
-    'B02DstarMuNuDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'B02DstarMuNuWSDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'B02DstarMuNuDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
-    'B02DstarMuNuWSDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
-    'B02DstarKsPiDDDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsKDDDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsKLLDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsPiLLDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsKDDWSDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsKLLWSDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsPiDDWSDst2D0PiBeauty2CharmLine', 
-    'B02DstarKsPiLLWSDst2D0PiBeauty2CharmLine', 
-    'B02D0KKD2HHHHBeauty2CharmLine', 
-    'B02D0PiPiD2HHHHBeauty2CharmLine', 
-    'B02D0KPiD2HHHHBeauty2CharmLine', 
-    'B02DHHWSD2HHHHBeauty2CharmLine', 
-    'B02D0KKD2HHHHWSBeauty2CharmLine', 
-    'B02D0PiPiD2HHHHWSBeauty2CharmLine', 
-    'B02D0KPiD2HHHHWSBeauty2CharmLine', 
-    'B02DHHWSD2HHHHWSBeauty2CharmLine', 
-    'B02D0KSDDD2K3PiBeauty2CharmLine', 
-    'B02D0KSLLD2K3PiBeauty2CharmLine', 
+    'B02D0KKD2HHBeauty2CharmLine',
+    'B02D0KPiD2HHBeauty2CharmLine',
+    'B02DHHWSD2HHBeauty2CharmLine',
+    'B02D0PPbarD2HHBeauty2CharmLine',
+    'B02D0PPbarWSD2HHBeauty2CharmLine',
+    'B02D0KKD2HHWSBeauty2CharmLine',
+    'B02D0PiPiD2HHWSBeauty2CharmLine',
+    'B02D0KPiD2HHWSBeauty2CharmLine',
+    'B02DHHWSD2HHWSBeauty2CharmLine',
+    'B02D0KSDDD2HHBeauty2CharmLine',
+    'B02D0KSLLD2HHBeauty2CharmLine',
+    'B02DKD2PhiMuNuBeauty2CharmLine',
+    'B02DPiD2PhiMuNuBeauty2CharmLine',
+    'B02DKWSD2PhiMuNuBeauty2CharmLine',
+    'B02DPiWSD2PhiMuNuBeauty2CharmLine',
+    #'B02DKD2HHHBeauty2CharmLine',
+    #'B02DPiD2HHHBeauty2CharmLine',
+    #'B02DKWSD2HHHBeauty2CharmLine',
+    #'B02DPiWSD2HHHBeauty2CharmLine',
+    'B02DKD2HHHUPBeauty2CharmLine',
+    #'B02DPiD2HHHUPBeauty2CharmLine',
+    #'B02DKWSD2HHHUPBeauty2CharmLine',
+    #'B02DPiWSD2HHHUPBeauty2CharmLine',
+    #'B02DPiNoIPD2HHHCFPIDBeauty2CharmLine',
+    'B02DPiWSNoIPD2HHHCFPIDBeauty2CharmLine',
+    #'B02DPiNoIPDs2HHHPIDBeauty2CharmLine',
+    'B02DPiWSNoIPDs2HHHPIDBeauty2CharmLine',
+    'B02DKsKDDD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsKLLD2HHHCFPIDBeauty2CharmLine',
+    #'B02DKPi0ResolvedD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsPiDDD2HHHCFPIDBeauty2CharmLine',
+    #'B02DPiPi0MergedD2HHHCFPIDBeauty2CharmLine',
+    #'B02DKPi0MergedD2HHHCFPIDBeauty2CharmLine',
+    'B02DPiPi0ResolvedD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsPiLLD2HHHCFPIDBeauty2CharmLine',
+    #'B02DKPi0MergedWSD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsPiDDWSD2HHHCFPIDBeauty2CharmLine',
+    #'B02DKPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine',
+    #'B02DPiPi0MergedWSD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsPiLLWSD2HHHCFPIDBeauty2CharmLine',
+    'B02DPiPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsKLLWSD2HHHCFPIDBeauty2CharmLine',
+    'B02DKsKDDWSD2HHHCFPIDBeauty2CharmLine',
+    'B02DRhoPMD2HHHCFPIDBeauty2CharmLine',
+    'B02DKstarPMD2HHHCFPIDBeauty2CharmLine',
+    'B02DKD2KSHLLBeauty2CharmLine',
+    'B02DPiD2KSHLLBeauty2CharmLine',
+    'B02DKWSD2KSHLLBeauty2CharmLine',
+    'B02DPiWSD2KSHLLBeauty2CharmLine',
+    'B02DKD2KSHDDBeauty2CharmLine',
+    'B02DPiD2KSHDDBeauty2CharmLine',
+    'B02DKWSD2KSHDDBeauty2CharmLine',
+    'B02DPiWSD2KSHDDBeauty2CharmLine',
+    #'B02D0KKD2KSHHLLBeauty2CharmLine',
+    #'B02D0PiPiD2KSHHLLBeauty2CharmLine',
+    'B02D0KPiD2KSHHLLBeauty2CharmLine',
+    'B02DHHWSD2KSHHLLBeauty2CharmLine',
+    #'B02D0KKD2KSHHDDBeauty2CharmLine',
+    #'B02D0PiPiD2KSHHDDBeauty2CharmLine',
+    'B02D0KPiD2KSHHDDBeauty2CharmLine',
+    'B02DHHWSD2KSHHDDBeauty2CharmLine',
+    #'B02D0KKD2KSHHLLWSBeauty2CharmLine',
+    #'B02D0PiPiD2KSHHLLWSBeauty2CharmLine',
+    'B02D0KPiD2KSHHLLWSBeauty2CharmLine',
+    'B02DHHWSD2KSHHLLWSBeauty2CharmLine',
+    #'B02D0KKD2KSHHDDWSBeauty2CharmLine',
+    #'B02D0PiPiD2KSHHDDWSBeauty2CharmLine',
+    'B02D0KPiD2KSHHDDWSBeauty2CharmLine',
+    'B02DHHWSD2KSHHDDWSBeauty2CharmLine',
+    'B02DstarKDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'B02DstarPiDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'B02DstarKDst2D0Pi_D2KSHHDDBeauty2CharmLine',
+    'B02DstarPiDst2D0Pi_D2KSHHDDBeauty2CharmLine',
+    'B02DstarMuNuDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'B02DstarMuNuWSDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'B02DstarMuNuDst2D0Pi_D2KSHHDDBeauty2CharmLine',
+    'B02DstarMuNuWSDst2D0Pi_D2KSHHDDBeauty2CharmLine',
+    'B02DstarKsPiDDDst2D0PiBeauty2CharmLine',
+    'B02DstarKsKDDDst2D0PiBeauty2CharmLine',
+    'B02DstarKsKLLDst2D0PiBeauty2CharmLine',
+    'B02DstarKsPiLLDst2D0PiBeauty2CharmLine',
+    'B02DstarKsKDDWSDst2D0PiBeauty2CharmLine',
+    'B02DstarKsKLLWSDst2D0PiBeauty2CharmLine',
+    'B02DstarKsPiDDWSDst2D0PiBeauty2CharmLine',
+    'B02DstarKsPiLLWSDst2D0PiBeauty2CharmLine',
+    'B02D0KKD2HHHHBeauty2CharmLine',
+    'B02D0PiPiD2HHHHBeauty2CharmLine',
+    'B02D0KPiD2HHHHBeauty2CharmLine',
+    'B02DHHWSD2HHHHBeauty2CharmLine',
+    'B02D0KKD2HHHHWSBeauty2CharmLine',
+    'B02D0PiPiD2HHHHWSBeauty2CharmLine',
+    'B02D0KPiD2HHHHWSBeauty2CharmLine',
+    'B02DHHWSD2HHHHWSBeauty2CharmLine',
+    'B02D0KSDDD2K3PiBeauty2CharmLine',
+    'B02D0KSLLD2K3PiBeauty2CharmLine',
     'B02D0KKD2Pi0HHResolvedBeauty2CharmLine',
     'B02D0PiPiD2Pi0HHResolvedBeauty2CharmLine',
     'B02D0KPiD2Pi0HHResolvedBeauty2CharmLine',
     'B02DHHWSD2Pi0HHResolvedBeauty2CharmLine',
-    'B02D0KKD2Pi0HHMergedBeauty2CharmLine', 
-    'B02D0PiPiD2Pi0HHMergedBeauty2CharmLine', 
-    'B02D0KPiD2Pi0HHMergedBeauty2CharmLine', 
-    'B02DHHWSD2Pi0HHMergedBeauty2CharmLine', 
-    'B02DKWSD2Pi0HHHResolvedBeauty2CharmLine', 
-    'B02DPiWSD2Pi0HHHResolvedBeauty2CharmLine', 
-    'B02DKWSD2Pi0HHHMergedBeauty2CharmLine', 
-    'B02DPiWSD2Pi0HHHMergedBeauty2CharmLine', 
-    'B02DKPiPiSSD2HHHPIDBeauty2CharmLine', 
-    'B02DKKPiD2HHHPIDBeauty2CharmLine', 
-    'B02DKPiPiSSWSD2HHHPIDBeauty2CharmLine', 
-    'B02DKKPiWSD2HHHPIDBeauty2CharmLine', 
-    'B02DKPiPiWSD2HHHPIDBeauty2CharmLine', 
-    'B02DPiPiPiWSD2HHHPIDBeauty2CharmLine', 
-    #'B02DppbarKD2HHHBeauty2CharmLine', 
-    #'B02DppbarPiD2HHHBeauty2CharmLine', 
-    'B02DstKKPiDstar2D0PiPIDBeauty2CharmLine', 
-    'B02DstKPiPiDstar2D0PiPIDBeauty2CharmLine', 
-    'B02DstPiPiPiDstar2D0PiPIDBeauty2CharmLine', 
-    'B02DstPiPiPiWSDstar2D0PiPIDBeauty2CharmLine', 
-    'B02DstKPiPiWSDstar2D0PiPIDBeauty2CharmLine', 
-    'B02DstKKPiWSDstar2D0PiPIDBeauty2CharmLine', 
-    'B02DDWSBeauty2CharmLine', 
-    'B02D0D0D02K3PiD02K3PiBeauty2CharmLine', 
-    'B02D0D0D02HHD02K3PiBeauty2CharmLine', 
-    'B02D0D0D02HHD02HHBeauty2CharmLine', 
-    'B02DstDstWSBeauty2CharmLine', 
-    'B02D0DKBeauty2CharmLine', 
-    'B02D0DKD02K3PiBeauty2CharmLine', 
-    'B02D0DKWSBeauty2CharmLine', 
-    'B02D0DKWSD02K3PiBeauty2CharmLine', 
-    'B02DstD0KBeauty2CharmLine', 
-    'B02DstD0KD02K3PiBeauty2CharmLine', 
-    'B02DstD0KDstarD02K3PiBeauty2CharmLine', 
-    #'B02DstD0KDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'B02DstD0KWSBeauty2CharmLine', 
-    'B02DstD0KWSD02K3PiBeauty2CharmLine', 
-    'B02DstD0KWSDstarD02K3PiBeauty2CharmLine', 
-    'B02DstD0KWSDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    #'B02D0D0KstD02K3PiD02K3PiBeauty2CharmLine', 
-    'B02D0D0KstD02HHD02HHBeauty2CharmLine', 
-    #'B02D0D0KstD02HHD02K3PiBeauty2CharmLine', 
-    #'B02DDKstBeauty2CharmLine', 
-    #'B02DstDKstBeauty2CharmLine', 
-    #'B02DstDKstDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKstBeauty2CharmLine', 
-    'B02DstDstKstDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKstDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'B02DDKSDDBeauty2CharmLine', 
-    'B02DDKSWSDDBeauty2CharmLine', 
-    'B02DstDKSDDBeauty2CharmLine', 
-    'B02DstDKSDDDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDKSWSDDBeauty2CharmLine', 
-    'B02DstDKSWSDDDstarD02K3PiBeauty2CharmLine', 
-    'B02D0D0KSD02K3PiD02K3PiDDBeauty2CharmLine', 
-    'B02D0D0KSD02HHD02HHDDBeauty2CharmLine', 
-    'B02D0D0KSD02HHD02K3PiDDBeauty2CharmLine', 
-    'B02DstDstKSDDBeauty2CharmLine', 
-    'B02DstDstKSDDDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKSWSDDBeauty2CharmLine', 
-    'B02DstDstKSWSDDDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKSWSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'B02DDKSLLBeauty2CharmLine', 
-    'B02DDKSWSLLBeauty2CharmLine', 
-    'B02DstDKSLLBeauty2CharmLine', 
-    'B02DstDKSLLDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDKSWSLLBeauty2CharmLine', 
-    'B02DstDKSWSLLDstarD02K3PiBeauty2CharmLine', 
-    'B02D0D0KSD02K3PiD02K3PiLLBeauty2CharmLine', 
-    'B02D0D0KSD02HHD02HHLLBeauty2CharmLine', 
-    'B02D0D0KSD02HHD02K3PiLLBeauty2CharmLine', 
-    'B02DstDstKSLLBeauty2CharmLine', 
-    'B02DstDstKSLLDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKSWSLLBeauty2CharmLine', 
-    'B02DstDstKSWSLLDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKSWSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    #'B02DDKKBeauty2CharmLine', 
-    #'B02DstDKKBeauty2CharmLine', 
-    #'B02DstDKKDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKKBeauty2CharmLine', 
-    'B02DstDstKKDstarD02K3PiBeauty2CharmLine', 
-    'B02DstDstKKDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'B02LcpbarKKLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarpbarpLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarPiPiLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKPiLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarPiPiWSLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarpbarpWSLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKKWSLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKPiWSLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKSDDLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKSWSDDLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKSLLLc2PKPiBeauty2CharmLine', 
-    'B02LcpbarKSWSLLLc2PKPiBeauty2CharmLine', 
-    'B02LcLambda0KLc2PKPiBeauty2CharmLine', 
-    'B02LcLambda0PiLc2PKPiBeauty2CharmLine', 
-    'B02LcLambda0PiWSLc2PKPiBeauty2CharmLine', 
-    'B02LcLambda0KWSLc2PKPiBeauty2CharmLine', 
+    'B02D0KKD2Pi0HHMergedBeauty2CharmLine',
+    'B02D0PiPiD2Pi0HHMergedBeauty2CharmLine',
+    'B02D0KPiD2Pi0HHMergedBeauty2CharmLine',
+    'B02DHHWSD2Pi0HHMergedBeauty2CharmLine',
+    'B02DKWSD2Pi0HHHResolvedBeauty2CharmLine',
+    'B02DPiWSD2Pi0HHHResolvedBeauty2CharmLine',
+    'B02DKWSD2Pi0HHHMergedBeauty2CharmLine',
+    'B02DPiWSD2Pi0HHHMergedBeauty2CharmLine',
+    'B02DKPiPiSSD2HHHPIDBeauty2CharmLine',
+    'B02DKKPiD2HHHPIDBeauty2CharmLine',
+    'B02DKPiPiSSWSD2HHHPIDBeauty2CharmLine',
+    'B02DKKPiWSD2HHHPIDBeauty2CharmLine',
+    'B02DKPiPiWSD2HHHPIDBeauty2CharmLine',
+    'B02DPiPiPiWSD2HHHPIDBeauty2CharmLine',
+    #'B02DppbarKD2HHHBeauty2CharmLine',
+    #'B02DppbarPiD2HHHBeauty2CharmLine',
+    'B02DstKKPiDstar2D0PiPIDBeauty2CharmLine',
+    'B02DstKPiPiDstar2D0PiPIDBeauty2CharmLine',
+    'B02DstPiPiPiDstar2D0PiPIDBeauty2CharmLine',
+    'B02DstPiPiPiWSDstar2D0PiPIDBeauty2CharmLine',
+    'B02DstKPiPiWSDstar2D0PiPIDBeauty2CharmLine',
+    'B02DstKKPiWSDstar2D0PiPIDBeauty2CharmLine',
+    'B02DDWSBeauty2CharmLine',
+    'B02D0D0D02K3PiD02K3PiBeauty2CharmLine',
+    'B02D0D0D02HHD02K3PiBeauty2CharmLine',
+    'B02D0D0D02HHD02HHBeauty2CharmLine',
+    'B02DstDstWSBeauty2CharmLine',
+    'B02D0DKBeauty2CharmLine',
+    'B02D0DKD02K3PiBeauty2CharmLine',
+    'B02D0DKWSBeauty2CharmLine',
+    'B02D0DKWSD02K3PiBeauty2CharmLine',
+    'B02DstD0KBeauty2CharmLine',
+    'B02DstD0KD02K3PiBeauty2CharmLine',
+    'B02DstD0KDstarD02K3PiBeauty2CharmLine',
+    #'B02DstD0KDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'B02DstD0KWSBeauty2CharmLine',
+    'B02DstD0KWSD02K3PiBeauty2CharmLine',
+    'B02DstD0KWSDstarD02K3PiBeauty2CharmLine',
+    'B02DstD0KWSDstarD02K3PiD02K3PiBeauty2CharmLine',
+    #'B02D0D0KstD02K3PiD02K3PiBeauty2CharmLine',
+    'B02D0D0KstD02HHD02HHBeauty2CharmLine',
+    #'B02D0D0KstD02HHD02K3PiBeauty2CharmLine',
+    #'B02DDKstBeauty2CharmLine',
+    #'B02DstDKstBeauty2CharmLine',
+    #'B02DstDKstDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKstBeauty2CharmLine',
+    'B02DstDstKstDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKstDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'B02DDKSDDBeauty2CharmLine',
+    'B02DDKSWSDDBeauty2CharmLine',
+    'B02DstDKSDDBeauty2CharmLine',
+    'B02DstDKSDDDstarD02K3PiBeauty2CharmLine',
+    'B02DstDKSWSDDBeauty2CharmLine',
+    'B02DstDKSWSDDDstarD02K3PiBeauty2CharmLine',
+    'B02D0D0KSD02K3PiD02K3PiDDBeauty2CharmLine',
+    'B02D0D0KSD02HHD02HHDDBeauty2CharmLine',
+    'B02D0D0KSD02HHD02K3PiDDBeauty2CharmLine',
+    'B02DstDstKSDDBeauty2CharmLine',
+    'B02DstDstKSDDDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKSWSDDBeauty2CharmLine',
+    'B02DstDstKSWSDDDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKSWSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'B02DDKSLLBeauty2CharmLine',
+    'B02DDKSWSLLBeauty2CharmLine',
+    'B02DstDKSLLBeauty2CharmLine',
+    'B02DstDKSLLDstarD02K3PiBeauty2CharmLine',
+    'B02DstDKSWSLLBeauty2CharmLine',
+    'B02DstDKSWSLLDstarD02K3PiBeauty2CharmLine',
+    'B02D0D0KSD02K3PiD02K3PiLLBeauty2CharmLine',
+    'B02D0D0KSD02HHD02HHLLBeauty2CharmLine',
+    'B02D0D0KSD02HHD02K3PiLLBeauty2CharmLine',
+    'B02DstDstKSLLBeauty2CharmLine',
+    'B02DstDstKSLLDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKSWSLLBeauty2CharmLine',
+    'B02DstDstKSWSLLDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKSWSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    #'B02DDKKBeauty2CharmLine',
+    #'B02DstDKKBeauty2CharmLine',
+    #'B02DstDKKDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKKBeauty2CharmLine',
+    'B02DstDstKKDstarD02K3PiBeauty2CharmLine',
+    'B02DstDstKKDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'B02LcpbarKKLc2PKPiBeauty2CharmLine',
+    'B02LcpbarpbarpLc2PKPiBeauty2CharmLine',
+    'B02LcpbarPiPiLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKPiLc2PKPiBeauty2CharmLine',
+    'B02LcpbarPiPiWSLc2PKPiBeauty2CharmLine',
+    'B02LcpbarpbarpWSLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKKWSLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKPiWSLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKSDDLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKSWSDDLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKSLLLc2PKPiBeauty2CharmLine',
+    'B02LcpbarKSWSLLLc2PKPiBeauty2CharmLine',
+    'B02LcLambda0KLc2PKPiBeauty2CharmLine',
+    'B02LcLambda0PiLc2PKPiBeauty2CharmLine',
+    'B02LcLambda0PiWSLc2PKPiBeauty2CharmLine',
+    'B02LcLambda0KWSLc2PKPiBeauty2CharmLine',
     'B02DKLTUBD2HHHBeauty2CharmLine',
     'B02DsKPiPiLTUBD2HHHBeauty2CharmLine',
     'B02DsstarKLTUBDsstar2DGammaD2HHHBeauty2CharmLine',
@@ -591,25 +591,25 @@ default_config ={
     'MDSTChannels':[
     ],
     'RelatedInfoTools' : [
-      { "Type" : "RelInfoConeVariables", 
-        "ConeAngle" : 1.5, 
-        "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+      { "Type" : "RelInfoConeVariables",
+        "ConeAngle" : 1.5,
+        "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
         "Location"  : 'P2ConeVar1'
-      }, 
-      { "Type" : "RelInfoConeVariables", 
-        "ConeAngle" : 1.7, 
-        "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+      },
+      { "Type" : "RelInfoConeVariables",
+        "ConeAngle" : 1.7,
+        "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
         "Location"  : 'P2ConeVar2'
-      }, 
-      { "Type" : "RelInfoConeVariables", 
-        "ConeAngle" : 1.0, 
-        "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+      },
+      { "Type" : "RelInfoConeVariables",
+        "ConeAngle" : 1.0,
+        "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
         "Location"  : 'P2ConeVar3'
       },
     ],
     "Prescales" : { # Prescales for individual lines
     'RUN_BY_DEFAULT' : True, # False = lines off by default
-    'RUN_RE'         : ['.*'],  
+    'RUN_RE'         : ['.*'],
     # Defaults are defined in, eg, Beauty2Charm_B2DXBuilder.py.  Put the full
     # line name here to override. E.g. 'B2D0HD2HHBeauty2CharmTOSLine':0.5.
     'B02DKLTUBD2HHHBeauty2CharmLine' : 0.04,
@@ -631,8 +631,8 @@ default_config ={
     'B2Dstar0KDst02D0GammaD2KSHHDDWSBeauty2CharmLine' : 0.1
     },
     'GECNTrkMax'   : 500
-  }, 
-  'STREAMS' : { 
+  },
+  'STREAMS' : {
     'BhadronCompleteEvent' : [
     'StrippingB02DKD2HHHBeauty2CharmLine',
     'StrippingB02DPiD2HHHBeauty2CharmLine',
@@ -657,16 +657,16 @@ default_config ={
     'StrippingB02DstDstBeauty2CharmLine',
     'StrippingB02DKPiPiD2HHHPIDBeauty2CharmLine',
     'StrippingB02DPiPiPiD2HHHPIDBeauty2CharmLine',
-    'StrippingB2D0PiD2KSHHLLPartialDBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSHHDDPartialDBeauty2CharmLine', 
-    'StrippingB2D0KD2KSHHLLPartialDBeauty2CharmLine', 
+    'StrippingB2D0PiD2KSHHLLPartialDBeauty2CharmLine',
+    'StrippingB2D0PiD2KSHHDDPartialDBeauty2CharmLine',
+    'StrippingB2D0KD2KSHHLLPartialDBeauty2CharmLine',
     'StrippingB2D0KD2KSHHDDPartialDBeauty2CharmLine',
     'StrippingB02D0KKDSTD2HHBeauty2CharmLine',
     'StrippingLb2LcPiPiPiLc2PKPiFullDSTBeauty2CharmLine',
     'StrippingXib02XicPiPiPiXic2PKPiFullDSTBeauty2CharmLine',
     'StrippingXib2Xic0PiPiPiXic02PKKPiFullDSTBeauty2CharmLine',
     'StrippingOmegab2Omegac0PiPiPiOmegac02PKKPiFullDSTBeauty2CharmLine'
-    ],  
+    ],
     'Bhadron' : [
 
 
@@ -688,7 +688,7 @@ default_config ={
     'StrippingB2D0KsPiLLD2KSHHDDWSBeauty2CharmLine',
     'StrippingB2D0KsPiDDD2KSHHLLWSBeauty2CharmLine',
     'StrippingB2D0KsPiDDD2KSHHDDWSBeauty2CharmLine',
-    
+
     'StrippingUpsilon2BBBeauty2CharmLine',
 
     'StrippingBc2BPiPiB2D0HD02HHBeauty2CharmLine',
@@ -754,256 +754,256 @@ default_config ={
     'StrippingBc2DstarKKDstar2D0PiD02HHHHPIDBeauty2CharmLine',
     'StrippingBc2DstarPiKDstar2D0PiD02HHHHPIDBeauty2CharmLine',
 
-    'StrippingB2D0KD2HHWSBeauty2CharmLine', 
-    'StrippingB2D0PiD2HHWSBeauty2CharmLine', 
-    #'StrippingB2D0KD2HHUPBeauty2CharmLine', 
-    'StrippingB2D0PiD2HHUPBeauty2CharmLine', 
-    'StrippingB02DKWSD2HHHBeauty2CharmLine', 
-    'StrippingB02DPiWSD2HHHBeauty2CharmLine', 
-    'StrippingB02DPiNoIPDs2HHHPIDBeauty2CharmLine', 
+    'StrippingB2D0KD2HHWSBeauty2CharmLine',
+    'StrippingB2D0PiD2HHWSBeauty2CharmLine',
+    #'StrippingB2D0KD2HHUPBeauty2CharmLine',
+    'StrippingB2D0PiD2HHUPBeauty2CharmLine',
+    'StrippingB02DKWSD2HHHBeauty2CharmLine',
+    'StrippingB02DPiWSD2HHHBeauty2CharmLine',
+    'StrippingB02DPiNoIPDs2HHHPIDBeauty2CharmLine',
     'StrippingB02DKD2Pi0HHHMergedBeauty2CharmLine',
     'StrippingB02DKD2Pi0HHHResolvedBeauty2CharmLine',
     'StrippingB02DPiD2Pi0HHHMergedBeauty2CharmLine',
-    'StrippingB02DPiD2Pi0HHHResolvedBeauty2CharmLine', 
-    'StrippingB02D0KKD2HHBeauty2CharmLine', 
-    'StrippingB02D0KPiD2HHBeauty2CharmLine', 
-    'StrippingB02DHHWSD2HHBeauty2CharmLine', 
-    'StrippingB02D0PPbarD2HHBeauty2CharmLine', 
-    'StrippingB02D0PPbarWSD2HHBeauty2CharmLine', 
-    'StrippingB02D0KKD2HHWSBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2HHWSBeauty2CharmLine', 
-    'StrippingB02D0KPiD2HHWSBeauty2CharmLine', 
-    'StrippingB02DHHWSD2HHWSBeauty2CharmLine', 
-    'StrippingB02D0KSDDD2HHBeauty2CharmLine', 
-    'StrippingB02D0KSLLD2HHBeauty2CharmLine', 
+    'StrippingB02DPiD2Pi0HHHResolvedBeauty2CharmLine',
+    'StrippingB02D0KKD2HHBeauty2CharmLine',
+    'StrippingB02D0KPiD2HHBeauty2CharmLine',
+    'StrippingB02DHHWSD2HHBeauty2CharmLine',
+    'StrippingB02D0PPbarD2HHBeauty2CharmLine',
+    'StrippingB02D0PPbarWSD2HHBeauty2CharmLine',
+    'StrippingB02D0KKD2HHWSBeauty2CharmLine',
+    'StrippingB02D0PiPiD2HHWSBeauty2CharmLine',
+    'StrippingB02D0KPiD2HHWSBeauty2CharmLine',
+    'StrippingB02DHHWSD2HHWSBeauty2CharmLine',
+    'StrippingB02D0KSDDD2HHBeauty2CharmLine',
+    'StrippingB02D0KSLLD2HHBeauty2CharmLine',
 
     'StrippingB02Dst0PiPiDst02D0Pi0D2HHResolvedBeauty2CharmLine',
     'StrippingB02Dst0KPiDst02D0Pi0D2HHResolvedBeauty2CharmLine',
     'StrippingB02Dst0KKDst02D0Pi0D2HHResolvedBeauty2CharmLine',
-    'StrippingB02Dst0HHWSDst02D0Pi0D2HHResolvedBeauty2CharmLine', 
-    'StrippingB02Dst0PiPiDst02D0GammaD2HHBeauty2CharmLine', 
-    'StrippingB02Dst0KPiDst02D0GammaD2HHBeauty2CharmLine', 
-    'StrippingB02Dst0KKDst02D0GammaD2HHBeauty2CharmLine', 
-    'StrippingB02Dst0HHWSDst02D0GammaD2HHBeauty2CharmLine', 
-
-    'StrippingB2D0KPi0MergedD2HHBeauty2CharmLine', 
-    'StrippingB2D0PiPi0MergedD2HHBeauty2CharmLine', 
-    'StrippingB2D0KsPiDDD2HHBeauty2CharmLine', 
-    'StrippingB2D0KPi0ResolvedD2HHBeauty2CharmLine', 
-    'StrippingB2D0KsPiLLD2HHBeauty2CharmLine', 
-    'StrippingB2D0PiPi0ResolvedD2HHBeauty2CharmLine', 
-
-    'StrippingB2D0KPi0MergedD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0PiPi0MergedD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0KsPiDDD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0KPi0ResolvedD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0KsPiLLD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0PiPi0ResolvedD2KSHHLLBeauty2CharmLine', 
-
-    'StrippingB2D0KPi0MergedD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0PiPi0MergedD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0KsPiDDD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0KPi0ResolvedD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0KsPiLLD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0PiPi0ResolvedD2KSHHDDBeauty2CharmLine', 
-
-    'StrippingB2D0KPi0MergedD2HHHHBeauty2CharmLine', 
-    'StrippingB2D0PiPi0MergedD2HHHHBeauty2CharmLine', 
-    'StrippingB2D0KsPiDDD2HHHHBeauty2CharmLine', 
-    'StrippingB2D0KPi0ResolvedD2HHHHBeauty2CharmLine', 
-    'StrippingB2D0KsPiLLD2HHHHBeauty2CharmLine', 
+    'StrippingB02Dst0HHWSDst02D0Pi0D2HHResolvedBeauty2CharmLine',
+    'StrippingB02Dst0PiPiDst02D0GammaD2HHBeauty2CharmLine',
+    'StrippingB02Dst0KPiDst02D0GammaD2HHBeauty2CharmLine',
+    'StrippingB02Dst0KKDst02D0GammaD2HHBeauty2CharmLine',
+    'StrippingB02Dst0HHWSDst02D0GammaD2HHBeauty2CharmLine',
+
+    'StrippingB2D0KPi0MergedD2HHBeauty2CharmLine',
+    'StrippingB2D0PiPi0MergedD2HHBeauty2CharmLine',
+    'StrippingB2D0KsPiDDD2HHBeauty2CharmLine',
+    'StrippingB2D0KPi0ResolvedD2HHBeauty2CharmLine',
+    'StrippingB2D0KsPiLLD2HHBeauty2CharmLine',
+    'StrippingB2D0PiPi0ResolvedD2HHBeauty2CharmLine',
+
+    'StrippingB2D0KPi0MergedD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0PiPi0MergedD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0KsPiDDD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0KPi0ResolvedD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0KsPiLLD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0PiPi0ResolvedD2KSHHLLBeauty2CharmLine',
+
+    'StrippingB2D0KPi0MergedD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0PiPi0MergedD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0KsPiDDD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0KPi0ResolvedD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0KsPiLLD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0PiPi0ResolvedD2KSHHDDBeauty2CharmLine',
+
+    'StrippingB2D0KPi0MergedD2HHHHBeauty2CharmLine',
+    'StrippingB2D0PiPi0MergedD2HHHHBeauty2CharmLine',
+    'StrippingB2D0KsPiDDD2HHHHBeauty2CharmLine',
+    'StrippingB2D0KPi0ResolvedD2HHHHBeauty2CharmLine',
+    'StrippingB2D0KsPiLLD2HHHHBeauty2CharmLine',
     'StrippingB2D0PiPi0ResolvedD2HHHHBeauty2CharmLine',
 
     'StrippingB2D0KPi0MergedD2HHHHWSBeauty2CharmLine',
     'StrippingB2D0PiPi0MergedD2HHHHWSBeauty2CharmLine',
-    'StrippingB2D0KsPiDDD2HHHHWSBeauty2CharmLine',  
+    'StrippingB2D0KsPiDDD2HHHHWSBeauty2CharmLine',
     'StrippingB2D0KPi0ResolvedD2HHHHWSBeauty2CharmLine',
     'StrippingB2D0KsPiLLD2HHHHWSBeauty2CharmLine',
     'StrippingB2D0PiPi0ResolvedD2HHHHWSBeauty2CharmLine',
 
-    'StrippingB02DKD2PhiMuNuBeauty2CharmLine', 
-    'StrippingB02DPiD2PhiMuNuBeauty2CharmLine', 
-    'StrippingB02DKWSD2PhiMuNuBeauty2CharmLine', 
-    'StrippingB02DPiWSD2PhiMuNuBeauty2CharmLine', 
-   
-    'StrippingB02DKD2HHHUPBeauty2CharmLine', 
-    #'StrippingB02DPiD2HHHUPBeauty2CharmLine', 
-    #'StrippingB02DKWSD2HHHUPBeauty2CharmLine', 
-    #'StrippingB02DPiWSD2HHHUPBeauty2CharmLine', 
-    'StrippingB02DPiWSNoIPD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DPiWSNoIPDs2HHHPIDBeauty2CharmLine', 
-    'StrippingB02DKsKDDD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsKLLD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKPi0ResolvedD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsPiDDD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DPiPi0MergedD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKPi0MergedD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DPiPi0ResolvedD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsPiLLD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKPi0MergedWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsPiDDWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DPiPi0MergedWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsPiLLWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DPiPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsKLLWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKsKDDWSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB2DKKD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB2DKPiD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB2DPiPiD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB2DHHOSD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB2DRho0D2HHHPIDBeauty2CharmLine', 
-    'StrippingB2DKstar0D2HHHPIDBeauty2CharmLine', 
-    'StrippingB2DPhiD2HHHPIDBeauty2CharmLine', 
-    'StrippingB2DKSDDD2HHHBeauty2CharmLine', 
-    'StrippingB2DKSLLD2HHHBeauty2CharmLine', 
-    'StrippingB02DRhoPMD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKstarPMD2HHHCFPIDBeauty2CharmLine', 
-    'StrippingB02DKD2KSHLLBeauty2CharmLine', 
-    'StrippingB02DPiD2KSHLLBeauty2CharmLine', 
-    'StrippingB02DKWSD2KSHLLBeauty2CharmLine', 
-    'StrippingB02DPiWSD2KSHLLBeauty2CharmLine', 
-    'StrippingB02DKD2KSHDDBeauty2CharmLine', 
-    'StrippingB02DPiD2KSHDDBeauty2CharmLine', 
-    'StrippingB02DKWSD2KSHDDBeauty2CharmLine', 
+    'StrippingB02DKD2PhiMuNuBeauty2CharmLine',
+    'StrippingB02DPiD2PhiMuNuBeauty2CharmLine',
+    'StrippingB02DKWSD2PhiMuNuBeauty2CharmLine',
+    'StrippingB02DPiWSD2PhiMuNuBeauty2CharmLine',
+
+    'StrippingB02DKD2HHHUPBeauty2CharmLine',
+    #'StrippingB02DPiD2HHHUPBeauty2CharmLine',
+    #'StrippingB02DKWSD2HHHUPBeauty2CharmLine',
+    #'StrippingB02DPiWSD2HHHUPBeauty2CharmLine',
+    'StrippingB02DPiWSNoIPD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DPiWSNoIPDs2HHHPIDBeauty2CharmLine',
+    'StrippingB02DKsKDDD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsKLLD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKPi0ResolvedD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsPiDDD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DPiPi0MergedD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKPi0MergedD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DPiPi0ResolvedD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsPiLLD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKPi0MergedWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsPiDDWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DPiPi0MergedWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsPiLLWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DPiPi0ResolvedWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsKLLWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKsKDDWSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB2DKKD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB2DKPiD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB2DPiPiD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB2DHHOSD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB2DRho0D2HHHPIDBeauty2CharmLine',
+    'StrippingB2DKstar0D2HHHPIDBeauty2CharmLine',
+    'StrippingB2DPhiD2HHHPIDBeauty2CharmLine',
+    'StrippingB2DKSDDD2HHHBeauty2CharmLine',
+    'StrippingB2DKSLLD2HHHBeauty2CharmLine',
+    'StrippingB02DRhoPMD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKstarPMD2HHHCFPIDBeauty2CharmLine',
+    'StrippingB02DKD2KSHLLBeauty2CharmLine',
+    'StrippingB02DPiD2KSHLLBeauty2CharmLine',
+    'StrippingB02DKWSD2KSHLLBeauty2CharmLine',
+    'StrippingB02DPiWSD2KSHLLBeauty2CharmLine',
+    'StrippingB02DKD2KSHDDBeauty2CharmLine',
+    'StrippingB02DPiD2KSHDDBeauty2CharmLine',
+    'StrippingB02DKWSD2KSHDDBeauty2CharmLine',
     'StrippingB02DPiWSD2KSHDDBeauty2CharmLine',
-    'StrippingB2D0KD2KSMuMuLLBeauty2CharmLine', 
+    'StrippingB2D0KD2KSMuMuLLBeauty2CharmLine',
     'StrippingB2D0PiD2KSMuMuLLBeauty2CharmLine',
-    'StrippingB2D0KD2KSMuMuDDBeauty2CharmLine', 
+    'StrippingB2D0KD2KSMuMuDDBeauty2CharmLine',
     'StrippingB2D0PiD2KSMuMuDDBeauty2CharmLine',
-    'StrippingB2D0MuNuD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0MuNuD2KSHHDDBeauty2CharmLine', 
-    'StrippingB02D0KKD2KSHHLLBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2KSHHLLBeauty2CharmLine', 
-    'StrippingB02D0KPiD2KSHHLLBeauty2CharmLine', 
-    'StrippingB02DHHWSD2KSHHLLBeauty2CharmLine', 
-    'StrippingB02D0KKD2KSHHDDBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2KSHHDDBeauty2CharmLine', 
-    'StrippingB02D0KPiD2KSHHDDBeauty2CharmLine', 
-    'StrippingB02DHHWSD2KSHHDDBeauty2CharmLine', 
-    'StrippingB02D0KKD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB02D0KPiD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB02DHHWSD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB02D0KKD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB02D0KPiD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB02DHHWSD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2D0KD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0KD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2D0KD2KSMuMuLLWSBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSMuMuLLWSBeauty2CharmLine', 
-    'StrippingB2D0KD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0KD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2D0KD2KSMuMuDDWSBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSMuMuDDWSBeauty2CharmLine', 
-    'StrippingB02DstarKDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'StrippingB02DstarPiDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'StrippingB02DstarKDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
-    'StrippingB02DstarPiDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
-
-    'StrippingB02DstarMuNuDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'StrippingB02DstarMuNuWSDst2D0Pi_D2KSHHLLBeauty2CharmLine', 
-    'StrippingB02DstarMuNuDst2D0Pi_D2KSHHDDBeauty2CharmLine', 
+    'StrippingB2D0MuNuD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0MuNuD2KSHHDDBeauty2CharmLine',
+    'StrippingB02D0KKD2KSHHLLBeauty2CharmLine',
+    'StrippingB02D0PiPiD2KSHHLLBeauty2CharmLine',
+    'StrippingB02D0KPiD2KSHHLLBeauty2CharmLine',
+    'StrippingB02DHHWSD2KSHHLLBeauty2CharmLine',
+    'StrippingB02D0KKD2KSHHDDBeauty2CharmLine',
+    'StrippingB02D0PiPiD2KSHHDDBeauty2CharmLine',
+    'StrippingB02D0KPiD2KSHHDDBeauty2CharmLine',
+    'StrippingB02DHHWSD2KSHHDDBeauty2CharmLine',
+    'StrippingB02D0KKD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB02D0PiPiD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB02D0KPiD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB02DHHWSD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB02D0KKD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB02D0PiPiD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB02D0KPiD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB02DHHWSD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2D0KD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0KD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2D0PiD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0PiD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2D0KD2KSMuMuLLWSBeauty2CharmLine',
+    'StrippingB2D0PiD2KSMuMuLLWSBeauty2CharmLine',
+    'StrippingB2D0KD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0KD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2D0PiD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0PiD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2D0KD2KSMuMuDDWSBeauty2CharmLine',
+    'StrippingB2D0PiD2KSMuMuDDWSBeauty2CharmLine',
+    'StrippingB02DstarKDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'StrippingB02DstarPiDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'StrippingB02DstarKDst2D0Pi_D2KSHHDDBeauty2CharmLine',
+    'StrippingB02DstarPiDst2D0Pi_D2KSHHDDBeauty2CharmLine',
+
+    'StrippingB02DstarMuNuDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'StrippingB02DstarMuNuWSDst2D0Pi_D2KSHHLLBeauty2CharmLine',
+    'StrippingB02DstarMuNuDst2D0Pi_D2KSHHDDBeauty2CharmLine',
     'StrippingB02DstarMuNuWSDst2D0Pi_D2KSHHDDBeauty2CharmLine',
 
     'StrippingB02DstarMuNuDst2D0Pi_D2HHHHBeauty2CharmLine',
     'StrippingB02DstarMuNuWSDst2D0Pi_D2HHHHBeauty2CharmLine',
     'StrippingB02DstarMuNuDst2D0Pi_D2HHHHWSBeauty2CharmLine',
-    'StrippingB02DstarMuNuWSDst2D0Pi_D2HHHHWSBeauty2CharmLine', 
-
-    'StrippingB02DstarKsPiDDDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsKDDDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsKLLDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsPiLLDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsKDDWSDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsKLLWSDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsPiDDWSDst2D0PiBeauty2CharmLine', 
-    'StrippingB02DstarKsPiLLWSDst2D0PiBeauty2CharmLine', 
-    'StrippingB2D0KD2HHHHBeauty2CharmLine', 
-    'StrippingB2D0PiD2HHHHBeauty2CharmLine', 
-    'StrippingB2D0KD2HHHHWSBeauty2CharmLine', 
-    'StrippingB2D0PiD2HHHHWSBeauty2CharmLine', 
-    #'StrippingB2D0KD2HHHHUPBeauty2CharmLine', 
-    #'StrippingB2D0PiD2HHHHUPBeauty2CharmLine', 
-    'StrippingB02D0KKD2HHHHBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2HHHHBeauty2CharmLine', 
-    'StrippingB02D0KPiD2HHHHBeauty2CharmLine', 
-    'StrippingB02DHHWSD2HHHHBeauty2CharmLine', 
-    'StrippingB02D0KKD2HHHHWSBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2HHHHWSBeauty2CharmLine', 
-    'StrippingB02D0KPiD2HHHHWSBeauty2CharmLine', 
-    'StrippingB02DHHWSD2HHHHWSBeauty2CharmLine', 
-    'StrippingB02D0KSDDD2K3PiBeauty2CharmLine', 
-    'StrippingB02D0KSLLD2K3PiBeauty2CharmLine', 
-    'StrippingB2D0KD2Pi0HHResolvedBeauty2CharmLine', 
-    'StrippingB2D0PiD2Pi0HHResolvedBeauty2CharmLine', 
-    'StrippingB2D0KD2Pi0HHWSResolvedBeauty2CharmLine', 
-    'StrippingB2D0PiD2Pi0HHWSResolvedBeauty2CharmLine', 
-    'StrippingB2D0KD2Pi0HHMergedBeauty2CharmLine', 
-    'StrippingB2D0PiD2Pi0HHMergedBeauty2CharmLine', 
-    'StrippingB2D0KD2Pi0HHWSMergedBeauty2CharmLine', 
-    'StrippingB2D0PiD2Pi0HHWSMergedBeauty2CharmLine', 
-    'StrippingB2D0KD2KSPi0HHLLResolvedBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSPi0HHLLResolvedBeauty2CharmLine', 
-    'StrippingB2D0KD2KSPi0HHLLMergedBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSPi0HHLLMergedBeauty2CharmLine', 
-    'StrippingB2D0KD2KSPi0HHDDResolvedBeauty2CharmLine', 
-    'StrippingB2D0PiD2KSPi0HHDDResolvedBeauty2CharmLine', 
-    'StrippingB2D0KD2KSPi0HHDDMergedBeauty2CharmLine', 
+    'StrippingB02DstarMuNuWSDst2D0Pi_D2HHHHWSBeauty2CharmLine',
+
+    'StrippingB02DstarKsPiDDDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsKDDDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsKLLDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsPiLLDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsKDDWSDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsKLLWSDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsPiDDWSDst2D0PiBeauty2CharmLine',
+    'StrippingB02DstarKsPiLLWSDst2D0PiBeauty2CharmLine',
+    'StrippingB2D0KD2HHHHBeauty2CharmLine',
+    'StrippingB2D0PiD2HHHHBeauty2CharmLine',
+    'StrippingB2D0KD2HHHHWSBeauty2CharmLine',
+    'StrippingB2D0PiD2HHHHWSBeauty2CharmLine',
+    #'StrippingB2D0KD2HHHHUPBeauty2CharmLine',
+    #'StrippingB2D0PiD2HHHHUPBeauty2CharmLine',
+    'StrippingB02D0KKD2HHHHBeauty2CharmLine',
+    'StrippingB02D0PiPiD2HHHHBeauty2CharmLine',
+    'StrippingB02D0KPiD2HHHHBeauty2CharmLine',
+    'StrippingB02DHHWSD2HHHHBeauty2CharmLine',
+    'StrippingB02D0KKD2HHHHWSBeauty2CharmLine',
+    'StrippingB02D0PiPiD2HHHHWSBeauty2CharmLine',
+    'StrippingB02D0KPiD2HHHHWSBeauty2CharmLine',
+    'StrippingB02DHHWSD2HHHHWSBeauty2CharmLine',
+    'StrippingB02D0KSDDD2K3PiBeauty2CharmLine',
+    'StrippingB02D0KSLLD2K3PiBeauty2CharmLine',
+    'StrippingB2D0KD2Pi0HHResolvedBeauty2CharmLine',
+    'StrippingB2D0PiD2Pi0HHResolvedBeauty2CharmLine',
+    'StrippingB2D0KD2Pi0HHWSResolvedBeauty2CharmLine',
+    'StrippingB2D0PiD2Pi0HHWSResolvedBeauty2CharmLine',
+    'StrippingB2D0KD2Pi0HHMergedBeauty2CharmLine',
+    'StrippingB2D0PiD2Pi0HHMergedBeauty2CharmLine',
+    'StrippingB2D0KD2Pi0HHWSMergedBeauty2CharmLine',
+    'StrippingB2D0PiD2Pi0HHWSMergedBeauty2CharmLine',
+    'StrippingB2D0KD2KSPi0HHLLResolvedBeauty2CharmLine',
+    'StrippingB2D0PiD2KSPi0HHLLResolvedBeauty2CharmLine',
+    'StrippingB2D0KD2KSPi0HHLLMergedBeauty2CharmLine',
+    'StrippingB2D0PiD2KSPi0HHLLMergedBeauty2CharmLine',
+    'StrippingB2D0KD2KSPi0HHDDResolvedBeauty2CharmLine',
+    'StrippingB2D0PiD2KSPi0HHDDResolvedBeauty2CharmLine',
+    'StrippingB2D0KD2KSPi0HHDDMergedBeauty2CharmLine',
     'StrippingB2D0PiD2KSPi0HHDDMergedBeauty2CharmLine',
-    'StrippingB2D0KD02KSPi0LLResolvedBeauty2CharmLine', 
-    'StrippingB2D0PiD02KSPi0LLResolvedBeauty2CharmLine', 
-    'StrippingB2D0KD02KSPi0LLMergedBeauty2CharmLine', 
-    'StrippingB2D0PiD02KSPi0LLMergedBeauty2CharmLine', 
-    'StrippingB2D0KD02KSPi0DDResolvedBeauty2CharmLine', 
-    'StrippingB2D0PiD02KSPi0DDResolvedBeauty2CharmLine', 
-    'StrippingB2D0KD02KSPi0DDMergedBeauty2CharmLine', 
+    'StrippingB2D0KD02KSPi0LLResolvedBeauty2CharmLine',
+    'StrippingB2D0PiD02KSPi0LLResolvedBeauty2CharmLine',
+    'StrippingB2D0KD02KSPi0LLMergedBeauty2CharmLine',
+    'StrippingB2D0PiD02KSPi0LLMergedBeauty2CharmLine',
+    'StrippingB2D0KD02KSPi0DDResolvedBeauty2CharmLine',
+    'StrippingB2D0PiD02KSPi0DDResolvedBeauty2CharmLine',
+    'StrippingB2D0KD02KSPi0DDMergedBeauty2CharmLine',
     'StrippingB2D0PiD02KSPi0DDMergedBeauty2CharmLine',
     'StrippingB02D0KKD2Pi0HHResolvedBeauty2CharmLine',
     'StrippingB02D0PiPiD2Pi0HHResolvedBeauty2CharmLine',
     'StrippingB02D0KPiD2Pi0HHResolvedBeauty2CharmLine',
     'StrippingB02DHHWSD2Pi0HHResolvedBeauty2CharmLine',
-    'StrippingB02D0KKD2Pi0HHMergedBeauty2CharmLine', 
-    'StrippingB02D0PiPiD2Pi0HHMergedBeauty2CharmLine', 
-    'StrippingB02D0KPiD2Pi0HHMergedBeauty2CharmLine', 
-    'StrippingB02DHHWSD2Pi0HHMergedBeauty2CharmLine', 
-    'StrippingB02DKWSD2Pi0HHHResolvedBeauty2CharmLine', 
-    'StrippingB02DPiWSD2Pi0HHHResolvedBeauty2CharmLine', 
-    'StrippingB02DKWSD2Pi0HHHMergedBeauty2CharmLine', 
-    'StrippingB02DPiWSD2Pi0HHHMergedBeauty2CharmLine', 
-    'StrippingB2D0KKPiD2HHPIDBeauty2CharmLine', 
-    'StrippingB2D0KPiPiD2HHPIDBeauty2CharmLine', 
-    'StrippingB2D0PiPiPiD2HHPIDBeauty2CharmLine', 
-    'StrippingB2D0KKPiD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0KPiPiD2KSHHDDBeauty2CharmLine', 
+    'StrippingB02D0KKD2Pi0HHMergedBeauty2CharmLine',
+    'StrippingB02D0PiPiD2Pi0HHMergedBeauty2CharmLine',
+    'StrippingB02D0KPiD2Pi0HHMergedBeauty2CharmLine',
+    'StrippingB02DHHWSD2Pi0HHMergedBeauty2CharmLine',
+    'StrippingB02DKWSD2Pi0HHHResolvedBeauty2CharmLine',
+    'StrippingB02DPiWSD2Pi0HHHResolvedBeauty2CharmLine',
+    'StrippingB02DKWSD2Pi0HHHMergedBeauty2CharmLine',
+    'StrippingB02DPiWSD2Pi0HHHMergedBeauty2CharmLine',
+    'StrippingB2D0KKPiD2HHPIDBeauty2CharmLine',
+    'StrippingB2D0KPiPiD2HHPIDBeauty2CharmLine',
+    'StrippingB2D0PiPiPiD2HHPIDBeauty2CharmLine',
+    'StrippingB2D0KKPiD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0KPiPiD2KSHHDDBeauty2CharmLine',
     'StrippingB2D0KPiPiD2KSHHDDWSBeauty2CharmLine',
-    'StrippingB2D0PiPiPiD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2D0PiPiPiD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2D0KKPiD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0KPiPiD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0KPiPiD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2D0PiPiPiD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2D0PiPiPiD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB02DKPiPiSSD2HHHPIDBeauty2CharmLine', 
-    'StrippingB02DKKPiD2HHHPIDBeauty2CharmLine', 
-    'StrippingB02DKPiPiSSWSD2HHHPIDBeauty2CharmLine', 
-    'StrippingB02DKKPiWSD2HHHPIDBeauty2CharmLine', 
-    'StrippingB02DKPiPiWSD2HHHPIDBeauty2CharmLine', 
-    'StrippingB02DPiPiPiWSD2HHHPIDBeauty2CharmLine', 
-    'StrippingB2D0ppbarKD2HHBeauty2CharmLine', 
-    'StrippingB2D0ppbarPiD2HHBeauty2CharmLine', 
-    'StrippingB02DppbarKD2HHHBeauty2CharmLine', 
-    'StrippingB02DppbarPiD2HHHBeauty2CharmLine', 
-    'StrippingB02DstKKPiDstar2D0PiPIDBeauty2CharmLine', 
-    'StrippingB02DstKPiPiDstar2D0PiPIDBeauty2CharmLine', 
-    'StrippingB02DstPiPiPiDstar2D0PiPIDBeauty2CharmLine', 
-    'StrippingB02DstPiPiPiWSDstar2D0PiPIDBeauty2CharmLine', 
-    'StrippingB02DstKPiPiWSDstar2D0PiPIDBeauty2CharmLine', 
+    'StrippingB2D0PiPiPiD2KSHHDDBeauty2CharmLine',
+    'StrippingB2D0PiPiPiD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2D0KKPiD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0KPiPiD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0KPiPiD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2D0PiPiPiD2KSHHLLBeauty2CharmLine',
+    'StrippingB2D0PiPiPiD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB02DKPiPiSSD2HHHPIDBeauty2CharmLine',
+    'StrippingB02DKKPiD2HHHPIDBeauty2CharmLine',
+    'StrippingB02DKPiPiSSWSD2HHHPIDBeauty2CharmLine',
+    'StrippingB02DKKPiWSD2HHHPIDBeauty2CharmLine',
+    'StrippingB02DKPiPiWSD2HHHPIDBeauty2CharmLine',
+    'StrippingB02DPiPiPiWSD2HHHPIDBeauty2CharmLine',
+    'StrippingB2D0ppbarKD2HHBeauty2CharmLine',
+    'StrippingB2D0ppbarPiD2HHBeauty2CharmLine',
+    'StrippingB02DppbarKD2HHHBeauty2CharmLine',
+    'StrippingB02DppbarPiD2HHHBeauty2CharmLine',
+    'StrippingB02DstKKPiDstar2D0PiPIDBeauty2CharmLine',
+    'StrippingB02DstKPiPiDstar2D0PiPIDBeauty2CharmLine',
+    'StrippingB02DstPiPiPiDstar2D0PiPIDBeauty2CharmLine',
+    'StrippingB02DstPiPiPiWSDstar2D0PiPIDBeauty2CharmLine',
+    'StrippingB02DstKPiPiWSDstar2D0PiPIDBeauty2CharmLine',
     'StrippingB02DstKKPiWSDstar2D0PiPIDBeauty2CharmLine',
     'StrippingB2DMuMuD2HHHBeauty2CharmLine',
     'StrippingB2DMuMuWSD2HHHBeauty2CharmLine',
@@ -1014,16 +1014,16 @@ default_config ={
     'StrippingB2DMuMuD2KSHDDBeauty2CharmLine',
     'StrippingB2DMuMuWSD2KSHDDBeauty2CharmLine',
     'StrippingB2DMuMuNPD2KSHDDBeauty2CharmLine',
-    'StrippingB2DstarMuMuD0PiBeauty2CharmLine', 
-    'StrippingB2DstarMuMuWSD0PiBeauty2CharmLine', 
-    'StrippingB2DstarMuMuNPD0PiBeauty2CharmLine', 
-    'StrippingB2DstarMuMuD2HHHHPiBeauty2CharmLine', 
-    'StrippingB2DstarMuMuWSD2HHHHPiBeauty2CharmLine', 
-    'StrippingB2DstarMuMuNPD2HHHHPiBeauty2CharmLine', 
-    'StrippingB02D0MuMuD2HHBeauty2CharmLine', 
-    'StrippingB02D0MuMuWSD2HHBeauty2CharmLine', 
-    'StrippingB02D0MuMuD2HHHHBeauty2CharmLine', 
-    'StrippingB02D0MuMuWSD2HHHHBeauty2CharmLine', 
+    'StrippingB2DstarMuMuD0PiBeauty2CharmLine',
+    'StrippingB2DstarMuMuWSD0PiBeauty2CharmLine',
+    'StrippingB2DstarMuMuNPD0PiBeauty2CharmLine',
+    'StrippingB2DstarMuMuD2HHHHPiBeauty2CharmLine',
+    'StrippingB2DstarMuMuWSD2HHHHPiBeauty2CharmLine',
+    'StrippingB2DstarMuMuNPD2HHHHPiBeauty2CharmLine',
+    'StrippingB02D0MuMuD2HHBeauty2CharmLine',
+    'StrippingB02D0MuMuWSD2HHBeauty2CharmLine',
+    'StrippingB02D0MuMuD2HHHHBeauty2CharmLine',
+    'StrippingB02D0MuMuWSD2HHHHBeauty2CharmLine',
     'StrippingB02D0MuMuD2KSHHLLBeauty2CharmLine',
     'StrippingB02D0MuMuWSD2KSHHLLBeauty2CharmLine',
     'StrippingB02D0MuMuD2KSHHDDBeauty2CharmLine',
@@ -1031,25 +1031,25 @@ default_config ={
     'StrippingB02DsstKsPiLLDsst2DGammaD2HHHBeauty2CharmLine',
     'StrippingB02DsstKsPiDDDsst2DGammaD2HHHBeauty2CharmLine',
     'StrippingB02DDWSBeauty2CharmLine',
-    'StrippingB2D0DD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0D0D02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0D0D02HHD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0D0D02HHD02HHBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0Pi0D2KSHHLLBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0Pi0D2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHLLBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0Pi0D2KSHHDDBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0Pi0D2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHDDBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0GammaD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0GammaD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0GammaD2KSHHLLBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0GammaD2KSHHLLWSBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0GammaD2KSHHDDBeauty2CharmLine', 
-    'StrippingB2Dstar0KDst02D0GammaD2KSHHDDWSBeauty2CharmLine', 
-    'StrippingB2Dstar0PiDst02D0GammaD2KSHHDDBeauty2CharmLine', 
+    'StrippingB2D0DD02K3PiBeauty2CharmLine',
+    'StrippingB02D0D0D02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB02D0D0D02HHD02K3PiBeauty2CharmLine',
+    'StrippingB02D0D0D02HHD02HHBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0Pi0D2KSHHLLBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0Pi0D2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHLLBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0Pi0D2KSHHDDBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0Pi0D2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHDDBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0Pi0D2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0GammaD2KSHHLLBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0GammaD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0GammaD2KSHHLLBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0GammaD2KSHHLLWSBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0GammaD2KSHHDDBeauty2CharmLine',
+    'StrippingB2Dstar0KDst02D0GammaD2KSHHDDWSBeauty2CharmLine',
+    'StrippingB2Dstar0PiDst02D0GammaD2KSHHDDBeauty2CharmLine',
     'StrippingB2Dstar0PiDst02D0GammaD2KSHHDDWSBeauty2CharmLine',
     'StrippingB2DstPiKFavD0PiBeauty2CharmLine',
     'StrippingB2DstPiKFavD2HHHHPiBeauty2CharmLine',
@@ -1065,309 +1065,309 @@ default_config ={
     'StrippingB2DstPiPiWSD2HHHHPiBeauty2CharmLine',
     'StrippingB2D0D0KD02HHD02HHBeauty2CharmLine',
     'StrippingB2D0D0PiD02HHD02HHBeauty2CharmLine',
-    'StrippingB2DstD0Beauty2CharmLine', 
-    'StrippingB2DstD0D02K3PiBeauty2CharmLine', 
+    'StrippingB2DstD0Beauty2CharmLine',
+    'StrippingB2DstD0D02K3PiBeauty2CharmLine',
     'StrippingB02DstDstWSBeauty2CharmLine',
     'StrippingB02DstDWSBeauty2CharmLine',
-    
+
     ######################
     ###### DDX lines #####
     ######################
     #### DDK lines ###
-    'StrippingB2DDKBeauty2CharmLine', 
-    'StrippingB2DDKWSBeauty2CharmLine', 
-    'StrippingB02D0DKBeauty2CharmLine', 
-    'StrippingB02D0DKD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0DKWSBeauty2CharmLine', 
-    'StrippingB02D0DKWSD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDKBeauty2CharmLine', 
-    'StrippingB2DstDKDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDKWSBeauty2CharmLine', 
-    'StrippingB2DstDKWSDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2D0D0KD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB2D0D0KD02HHD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0KBeauty2CharmLine', 
-    'StrippingB02DstD0KD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0KDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0KDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0KWSBeauty2CharmLine', 
-    'StrippingB02DstD0KWSD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0KWSDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0KWSDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstKBeauty2CharmLine', 
-    'StrippingB2DstDstKDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstKDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstKWSBeauty2CharmLine', 
-    'StrippingB2DstDstKWSDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstKWSDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2Dst2460DKBeauty2CharmLine', 
-    'StrippingB2Dst2460DKWSBeauty2CharmLine', 
-    'StrippingB2D0st2460D0KBeauty2CharmLine', 
-    'StrippingB2Dst0D0KDst02D0Pi0ResolvedD02HHBeauty2CharmLine', 
-    'StrippingB2Dst0D0KDst02D0GammaD02HHBeauty2CharmLine', 
-    'StrippingB02Dst0DKDst02D0Pi0ResolvedD2HHHBeauty2CharmLine', 
-    'StrippingB02Dst0DKDst02D0GammaD2HHHBeauty2CharmLine', 
+    'StrippingB2DDKBeauty2CharmLine',
+    'StrippingB2DDKWSBeauty2CharmLine',
+    'StrippingB02D0DKBeauty2CharmLine',
+    'StrippingB02D0DKD02K3PiBeauty2CharmLine',
+    'StrippingB02D0DKWSBeauty2CharmLine',
+    'StrippingB02D0DKWSD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDKBeauty2CharmLine',
+    'StrippingB2DstDKDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDKWSBeauty2CharmLine',
+    'StrippingB2DstDKWSDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2D0D0KD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB2D0D0KD02HHD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0KBeauty2CharmLine',
+    'StrippingB02DstD0KD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0KDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0KDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0KWSBeauty2CharmLine',
+    'StrippingB02DstD0KWSD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0KWSDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0KWSDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstKBeauty2CharmLine',
+    'StrippingB2DstDstKDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstKDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstKWSBeauty2CharmLine',
+    'StrippingB2DstDstKWSDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstKWSDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2Dst2460DKBeauty2CharmLine',
+    'StrippingB2Dst2460DKWSBeauty2CharmLine',
+    'StrippingB2D0st2460D0KBeauty2CharmLine',
+    'StrippingB2Dst0D0KDst02D0Pi0ResolvedD02HHBeauty2CharmLine',
+    'StrippingB2Dst0D0KDst02D0GammaD02HHBeauty2CharmLine',
+    'StrippingB02Dst0DKDst02D0Pi0ResolvedD2HHHBeauty2CharmLine',
+    'StrippingB02Dst0DKDst02D0GammaD2HHHBeauty2CharmLine',
     #### DDKS lines ###
-    'StrippingB02DDKSDDBeauty2CharmLine', 
-    'StrippingB02DDKSWSDDBeauty2CharmLine', 
-    'StrippingB2D0DKSDDBeauty2CharmLine', 
-    'StrippingB2D0DKSDDD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDKSDDBeauty2CharmLine', 
-    'StrippingB02DstDKSDDDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDKSWSDDBeauty2CharmLine', 
-    'StrippingB02DstDKSWSDDDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0D0KSD02K3PiD02K3PiDDBeauty2CharmLine', 
-    'StrippingB02D0D0KSD02HHD02HHDDBeauty2CharmLine', 
-    'StrippingB02D0D0KSD02HHD02K3PiDDBeauty2CharmLine', 
-    'StrippingB2DstD0KSDDBeauty2CharmLine', 
-    'StrippingB2DstD0KSDDD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KSDDDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KSDDDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSDDBeauty2CharmLine', 
-    'StrippingB02DstDstKSDDDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSWSDDBeauty2CharmLine', 
-    'StrippingB02DstDstKSWSDDDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSWSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DDKSLLBeauty2CharmLine', 
-    'StrippingB02DDKSWSLLBeauty2CharmLine', 
-    'StrippingB2D0DKSLLBeauty2CharmLine', 
-    'StrippingB2D0DKSLLD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDKSLLBeauty2CharmLine', 
-    'StrippingB02DstDKSLLDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDKSWSLLBeauty2CharmLine', 
-    'StrippingB02DstDKSWSLLDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0D0KSD02K3PiD02K3PiLLBeauty2CharmLine', 
-    'StrippingB02D0D0KSD02HHD02HHLLBeauty2CharmLine', 
-    'StrippingB02D0D0KSD02HHD02K3PiLLBeauty2CharmLine', 
-    'StrippingB2DstD0KSLLBeauty2CharmLine', 
-    'StrippingB2DstD0KSLLD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KSLLDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KSLLDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSLLBeauty2CharmLine', 
-    'StrippingB02DstDstKSLLDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSWSLLBeauty2CharmLine', 
-    'StrippingB02DstDstKSWSLLDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKSWSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
+    'StrippingB02DDKSDDBeauty2CharmLine',
+    'StrippingB02DDKSWSDDBeauty2CharmLine',
+    'StrippingB2D0DKSDDBeauty2CharmLine',
+    'StrippingB2D0DKSDDD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDKSDDBeauty2CharmLine',
+    'StrippingB02DstDKSDDDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDKSWSDDBeauty2CharmLine',
+    'StrippingB02DstDKSWSDDDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02D0D0KSD02K3PiD02K3PiDDBeauty2CharmLine',
+    'StrippingB02D0D0KSD02HHD02HHDDBeauty2CharmLine',
+    'StrippingB02D0D0KSD02HHD02K3PiDDBeauty2CharmLine',
+    'StrippingB2DstD0KSDDBeauty2CharmLine',
+    'StrippingB2DstD0KSDDD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KSDDDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KSDDDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSDDBeauty2CharmLine',
+    'StrippingB02DstDstKSDDDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSWSDDBeauty2CharmLine',
+    'StrippingB02DstDstKSWSDDDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSWSDDDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DDKSLLBeauty2CharmLine',
+    'StrippingB02DDKSWSLLBeauty2CharmLine',
+    'StrippingB2D0DKSLLBeauty2CharmLine',
+    'StrippingB2D0DKSLLD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDKSLLBeauty2CharmLine',
+    'StrippingB02DstDKSLLDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDKSWSLLBeauty2CharmLine',
+    'StrippingB02DstDKSWSLLDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02D0D0KSD02K3PiD02K3PiLLBeauty2CharmLine',
+    'StrippingB02D0D0KSD02HHD02HHLLBeauty2CharmLine',
+    'StrippingB02D0D0KSD02HHD02K3PiLLBeauty2CharmLine',
+    'StrippingB2DstD0KSLLBeauty2CharmLine',
+    'StrippingB2DstD0KSLLD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KSLLDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KSLLDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSLLBeauty2CharmLine',
+    'StrippingB02DstDstKSLLDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSWSLLBeauty2CharmLine',
+    'StrippingB02DstDstKSWSLLDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKSWSLLDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
     #### DDK* lines ###
-    'StrippingB02D0D0KstD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0D0KstD02HHD02HHBeauty2CharmLine', 
-    'StrippingB02D0D0KstD02HHD02K3PiBeauty2CharmLine', 
-    'StrippingB02DDKstBeauty2CharmLine', 
-    'StrippingB02DstDKstBeauty2CharmLine', 
-    'StrippingB02DstDKstDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKstBeauty2CharmLine', 
-    'StrippingB02DstDstKstDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKstDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DD0KstBeauty2CharmLine', 
-    'StrippingB2DD0KstD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KstBeauty2CharmLine', 
-    'StrippingB2DstD0KstDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KstD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstD0KstDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB2D0DKPiBeauty2CharmLine', 
-    'StrippingB2D0DKPiD02K3PiBeauty2CharmLine', 
+    'StrippingB02D0D0KstD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB02D0D0KstD02HHD02HHBeauty2CharmLine',
+    'StrippingB02D0D0KstD02HHD02K3PiBeauty2CharmLine',
+    'StrippingB02DDKstBeauty2CharmLine',
+    'StrippingB02DstDKstBeauty2CharmLine',
+    'StrippingB02DstDKstDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKstBeauty2CharmLine',
+    'StrippingB02DstDstKstDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKstDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DD0KstBeauty2CharmLine',
+    'StrippingB2DD0KstD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KstBeauty2CharmLine',
+    'StrippingB2DstD0KstDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KstD02K3PiBeauty2CharmLine',
+    'StrippingB2DstD0KstDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB2D0DKPiBeauty2CharmLine',
+    'StrippingB2D0DKPiD02K3PiBeauty2CharmLine',
     #### DDPhi lines ###
-    'StrippingB2D0DKKBeauty2CharmLine', 
-    'StrippingB2D0DKKD2K3PiBeauty2CharmLine', 
-    #'StrippingB02DDKKBeauty2CharmLine', 
-    #'StrippingB02DstDKKBeauty2CharmLine', 
-    #'StrippingB02DstDKKDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKKBeauty2CharmLine', 
-    'StrippingB02DstDstKKDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstDstKKDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
+    'StrippingB2D0DKKBeauty2CharmLine',
+    'StrippingB2D0DKKD2K3PiBeauty2CharmLine',
+    #'StrippingB02DDKKBeauty2CharmLine',
+    #'StrippingB02DstDKKBeauty2CharmLine',
+    #'StrippingB02DstDKKDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKKBeauty2CharmLine',
+    'StrippingB02DstDstKKDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstDstKKDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
     #### DDPi lines ###
-    'StrippingB2DDPiBeauty2CharmLine', 
-    'StrippingB2DDPiWSBeauty2CharmLine', 
-    'StrippingB02D0DPiBeauty2CharmLine', 
-    'StrippingB02D0DPiD02K3PiBeauty2CharmLine', 
-    'StrippingB02D0DPiWSBeauty2CharmLine', 
-    'StrippingB02D0DPiWSD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDPiBeauty2CharmLine', 
-    'StrippingB2DstDPiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDPiWSBeauty2CharmLine', 
-    'StrippingB2DstDPiWSDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2D0D0PiD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB2D0D0PiD02HHD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiWSBeauty2CharmLine', 
-    'StrippingB02DstD0PiWSD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiWSDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB02DstD0PiWSDstarD02K3PiD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstPiBeauty2CharmLine', 
-    'StrippingB2DstDstPiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstPiDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstPiWSBeauty2CharmLine', 
-    'StrippingB2DstDstPiWSDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2DstDstPiWSDstarD02K3PiDstarD02K3PiBeauty2CharmLine', 
-    'StrippingB2Dst2460DPiBeauty2CharmLine', 
-    'StrippingB2Dst2460DPiWSBeauty2CharmLine', 
-    'StrippingB2D0st2460D0PiBeauty2CharmLine', 
+    'StrippingB2DDPiBeauty2CharmLine',
+    'StrippingB2DDPiWSBeauty2CharmLine',
+    'StrippingB02D0DPiBeauty2CharmLine',
+    'StrippingB02D0DPiD02K3PiBeauty2CharmLine',
+    'StrippingB02D0DPiWSBeauty2CharmLine',
+    'StrippingB02D0DPiWSD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDPiBeauty2CharmLine',
+    'StrippingB2DstDPiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDPiWSBeauty2CharmLine',
+    'StrippingB2DstDPiWSDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2D0D0PiD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB2D0D0PiD02HHD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0PiBeauty2CharmLine',
+    'StrippingB02DstD0PiD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0PiDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0PiWSBeauty2CharmLine',
+    'StrippingB02DstD0PiWSD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0PiWSDstarD02K3PiBeauty2CharmLine',
+    'StrippingB02DstD0PiWSDstarD02K3PiD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstPiBeauty2CharmLine',
+    'StrippingB2DstDstPiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstPiDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstPiWSBeauty2CharmLine',
+    'StrippingB2DstDstPiWSDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2DstDstPiWSDstarD02K3PiDstarD02K3PiBeauty2CharmLine',
+    'StrippingB2Dst2460DPiBeauty2CharmLine',
+    'StrippingB2Dst2460DPiWSBeauty2CharmLine',
+    'StrippingB2D0st2460D0PiBeauty2CharmLine',
     #########################
     #### End of DDX lines ###
     #########################
 
-    'StrippingLb2LcKLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcPiLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcKWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcPiNoIPWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2XicPiXic2PKPiBeauty2CharmLine', 
-    'StrippingLb2XicKXic2PKPiBeauty2CharmLine', 
-    'StrippingLb2XicKWSXic2PKPiBeauty2CharmLine', 
-    'StrippingLb2XicPiWSXic2PKPiBeauty2CharmLine', 
-    'StrippingLb2XicPiNoIPWSXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0KXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0PiXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0PiWSXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0KWSXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0PiNoIPWSXic02PKKPiBeauty2CharmLine', 
-    'StrippingOmegab2Omegac0PiOmegac02PKKPiBeauty2CharmLine', 
-    'StrippingOmegab2Omegac0KOmegac02PKKPiBeauty2CharmLine', 
-    'StrippingOmegab2Omegac0KWSOmegac02PKKPiBeauty2CharmLine', 
-    'StrippingOmegab2Omegac0PiWSOmegac02PKKPiBeauty2CharmLine', 
+    'StrippingLb2LcKLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcPiLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcKWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcPiNoIPWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2XicPiXic2PKPiBeauty2CharmLine',
+    'StrippingLb2XicKXic2PKPiBeauty2CharmLine',
+    'StrippingLb2XicKWSXic2PKPiBeauty2CharmLine',
+    'StrippingLb2XicPiWSXic2PKPiBeauty2CharmLine',
+    'StrippingLb2XicPiNoIPWSXic2PKPiBeauty2CharmLine',
+    'StrippingXib2Xic0KXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0PiXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0PiWSXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0KWSXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0PiNoIPWSXic02PKKPiBeauty2CharmLine',
+    'StrippingOmegab2Omegac0PiOmegac02PKKPiBeauty2CharmLine',
+    'StrippingOmegab2Omegac0KOmegac02PKKPiBeauty2CharmLine',
+    'StrippingOmegab2Omegac0KWSOmegac02PKKPiBeauty2CharmLine',
+    'StrippingOmegab2Omegac0PiWSOmegac02PKKPiBeauty2CharmLine',
     'StrippingOmegab2Omegac0PiNoIPWSOmegac02PKKPiBeauty2CharmLine',
-    'StrippingOmegab2XicpKPiXicp2PKPiBeauty2CharmLine', 
-    'StrippingOmegab2LcKKLc2PKPiBeauty2CharmLine', 
-    'StrippingXib02XicDXic2PKPiBeauty2CharmLine', 
-    'StrippingXib02XicDWSXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0DXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0DWSXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib02XicKPiPiXic2PKPiBeauty2CharmLine', 
-    'StrippingXib02XicPiPiPiXic2PKPiBeauty2CharmLine', 
-    'StrippingXib02XicPiPiPiWSXic2PKPiBeauty2CharmLine', 
-    'StrippingXib02XicKPiPiWSXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0KPiPiXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0PiPiPiXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0KPiPiWSXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2Xic0PiPiPiWSXic02PKKPiBeauty2CharmLine', 
-    'StrippingXib2LcDKLc2PKPiD2HHHBeauty2CharmLine', 
-    'StrippingXib2LcDKWSLc2PKPiD2HHHBeauty2CharmLine', 
-    'StrippingXib02LcDsKPiLc2PKPiDs2KKPiBeauty2CharmLine', 
-    'StrippingXib02LcDsKPiWSLc2PKPiDs2KKPiBeauty2CharmLine', 
-    'StrippingB2LcDspbarLc2PKPiDs2KKPiBeauty2CharmLine', 
-    'StrippingB2LcDspbarWSLc2PKPiDs2KKPiBeauty2CharmLine', 
-    'StrippingSb2D0PD2HHPIDBeauty2CharmLine', 
-    'StrippingSb02DPD2HHHPIDBeauty2CharmLine', 
-    'StrippingSb02DPWSD2HHHPIDBeauty2CharmLine', 
-    'StrippingLb2D0PHD02HHBeauty2CharmLine', 
-    'StrippingLb2D0PHWSD02HHBeauty2CharmLine', 
-    'StrippingLb2D0PHNoPIDD02HHBeauty2CharmLine', 
-    'StrippingLb2D0PHNoPIDWSD02HHBeauty2CharmLine', 
-    'StrippingLb2D0PHD02K3PiBeauty2CharmLine', 
-    'StrippingLb2D0PHWSD02K3PiBeauty2CharmLine', 
+    'StrippingOmegab2XicpKPiXicp2PKPiBeauty2CharmLine',
+    'StrippingOmegab2LcKKLc2PKPiBeauty2CharmLine',
+    'StrippingXib02XicDXic2PKPiBeauty2CharmLine',
+    'StrippingXib02XicDWSXic2PKPiBeauty2CharmLine',
+    'StrippingXib2Xic0DXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0DWSXic02PKKPiBeauty2CharmLine',
+    'StrippingXib02XicKPiPiXic2PKPiBeauty2CharmLine',
+    'StrippingXib02XicPiPiPiXic2PKPiBeauty2CharmLine',
+    'StrippingXib02XicPiPiPiWSXic2PKPiBeauty2CharmLine',
+    'StrippingXib02XicKPiPiWSXic2PKPiBeauty2CharmLine',
+    'StrippingXib2Xic0KPiPiXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0PiPiPiXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0KPiPiWSXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2Xic0PiPiPiWSXic02PKKPiBeauty2CharmLine',
+    'StrippingXib2LcDKLc2PKPiD2HHHBeauty2CharmLine',
+    'StrippingXib2LcDKWSLc2PKPiD2HHHBeauty2CharmLine',
+    'StrippingXib02LcDsKPiLc2PKPiDs2KKPiBeauty2CharmLine',
+    'StrippingXib02LcDsKPiWSLc2PKPiDs2KKPiBeauty2CharmLine',
+    'StrippingB2LcDspbarLc2PKPiDs2KKPiBeauty2CharmLine',
+    'StrippingB2LcDspbarWSLc2PKPiDs2KKPiBeauty2CharmLine',
+    'StrippingSb2D0PD2HHPIDBeauty2CharmLine',
+    'StrippingSb02DPD2HHHPIDBeauty2CharmLine',
+    'StrippingSb02DPWSD2HHHPIDBeauty2CharmLine',
+    'StrippingLb2D0PHD02HHBeauty2CharmLine',
+    'StrippingLb2D0PHWSD02HHBeauty2CharmLine',
+    'StrippingLb2D0PHNoPIDD02HHBeauty2CharmLine',
+    'StrippingLb2D0PHNoPIDWSD02HHBeauty2CharmLine',
+    'StrippingLb2D0PHD02K3PiBeauty2CharmLine',
+    'StrippingLb2D0PHWSD02K3PiBeauty2CharmLine',
     'StrippingLb2D0PPbarD02HHBeauty2CharmLine',
-    'StrippingLb2D0PPbarWSD02HHBeauty2CharmLine', 
-    'StrippingLb2LcKKPiLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcppbarKLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcppbarPiLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcKPiPiLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcPiPiPiLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcKPiPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcPiPiPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcppbarKWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcppbarPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcKKPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKKLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarpbarpLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarPiPiLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKPiLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarPiPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarpbarpWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKKWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcDD2HHHPIDBeauty2CharmLine', 
-    'StrippingLb2LcDWSD2HHHPIDBeauty2CharmLine', 
-    'StrippingLb2LcDKstBeauty2CharmLine', 
-    'StrippingLb2LcDstKstBeauty2CharmLine', 
-    'StrippingLb2LcDst0KLc2PKPiDst02D0GammaD2HHBeauty2CharmLine', 
-    'StrippingLb2LcDst0KLc2PKPiDst02D0Pi0ResolvedD2HHBeauty2CharmLine', 
-    'StrippingLb2LcDst0KLc2PKPiDst02D0Pi0MergedD2HHBeauty2CharmLine', 
-    'StrippingX2LcD0D02KPiBeauty2CharmLine', 
-    'StrippingX2LcD0PiD02KPiBeauty2CharmLine', 
-    'StrippingX2LcD0KD02KPiBeauty2CharmLine', 
-    'StrippingX2LcD0PiWSD02KPiBeauty2CharmLine', 
-    'StrippingX2LcD0KWSD02KPiBeauty2CharmLine', 
-    'StrippingX02XiccpPiXiccp2Xic0PiBeauty2CharmLine', 
-    'StrippingX02XiccpKXiccp2Xic0PiBeauty2CharmLine', 
-    'StrippingX02XiccpPiWSXiccp2Xic0PiBeauty2CharmLine', 
-    'StrippingX02XiccpKWSXiccp2Xic0PiBeauty2CharmLine', 
-    'StrippingX2XiccppKXiccpp2XicPiBeauty2CharmLine', 
-    'StrippingX2XiccppPiXiccpp2XicPiBeauty2CharmLine', 
-    'StrippingX2XiccppKWSXiccpp2XicPiBeauty2CharmLine', 
-    'StrippingX2XiccppPiWSXiccpp2XicPiBeauty2CharmLine', 
-    'StrippingX2LcPiPiOSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcPiKOSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcPiPiSSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKKSSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKPiOSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKKOSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKPiSSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcPiPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKKWSLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKPiPiPiLc2PKPiBeauty2CharmLine', 
-    'StrippingX2LcKPiPiPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingXib2XicPiPiXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2XicKPiXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2XicKKXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2XicKKWSXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2XicPiPiWSXic2PKPiBeauty2CharmLine', 
-    'StrippingXib2XicKPiWSXic2PKPiBeauty2CharmLine', 
-    'StrippingLb2LcDstDstar2D0PiPIDBeauty2CharmLine', 
-    'StrippingLb2LcDstWSDstar2D0PiPIDBeauty2CharmLine', 
-    'StrippingX2LcLcBeauty2CharmLine', 
-    'StrippingX2LcLcWSBeauty2CharmLine', 
-    'StrippingLb2Lc5PiLc2PKPiPIDBeauty2CharmLine', 
-    'StrippingLb2D0Lambda0DDD02HHBeauty2CharmLine', 
+    'StrippingLb2D0PPbarWSD02HHBeauty2CharmLine',
+    'StrippingLb2LcKKPiLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcppbarKLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcppbarPiLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcKPiPiLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcPiPiPiLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcKPiPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcPiPiPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcppbarKWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcppbarPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcKKPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKKLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarpbarpLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarPiPiLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKPiLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarPiPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarpbarpWSLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKKWSLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2LcDD2HHHPIDBeauty2CharmLine',
+    'StrippingLb2LcDWSD2HHHPIDBeauty2CharmLine',
+    'StrippingLb2LcDKstBeauty2CharmLine',
+    'StrippingLb2LcDstKstBeauty2CharmLine',
+    'StrippingLb2LcDst0KLc2PKPiDst02D0GammaD2HHBeauty2CharmLine',
+    'StrippingLb2LcDst0KLc2PKPiDst02D0Pi0ResolvedD2HHBeauty2CharmLine',
+    'StrippingLb2LcDst0KLc2PKPiDst02D0Pi0MergedD2HHBeauty2CharmLine',
+    'StrippingX2LcD0D02KPiBeauty2CharmLine',
+    'StrippingX2LcD0PiD02KPiBeauty2CharmLine',
+    'StrippingX2LcD0KD02KPiBeauty2CharmLine',
+    'StrippingX2LcD0PiWSD02KPiBeauty2CharmLine',
+    'StrippingX2LcD0KWSD02KPiBeauty2CharmLine',
+    'StrippingX02XiccpPiXiccp2Xic0PiBeauty2CharmLine',
+    'StrippingX02XiccpKXiccp2Xic0PiBeauty2CharmLine',
+    'StrippingX02XiccpPiWSXiccp2Xic0PiBeauty2CharmLine',
+    'StrippingX02XiccpKWSXiccp2Xic0PiBeauty2CharmLine',
+    'StrippingX2XiccppKXiccpp2XicPiBeauty2CharmLine',
+    'StrippingX2XiccppPiXiccpp2XicPiBeauty2CharmLine',
+    'StrippingX2XiccppKWSXiccpp2XicPiBeauty2CharmLine',
+    'StrippingX2XiccppPiWSXiccpp2XicPiBeauty2CharmLine',
+    'StrippingX2LcPiPiOSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcPiKOSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcPiPiSSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKKSSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKPiOSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKKOSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKPiSSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcPiPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKKWSLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKPiPiPiLc2PKPiBeauty2CharmLine',
+    'StrippingX2LcKPiPiPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingXib2XicPiPiXic2PKPiBeauty2CharmLine',
+    'StrippingXib2XicKPiXic2PKPiBeauty2CharmLine',
+    'StrippingXib2XicKKXic2PKPiBeauty2CharmLine',
+    'StrippingXib2XicKKWSXic2PKPiBeauty2CharmLine',
+    'StrippingXib2XicPiPiWSXic2PKPiBeauty2CharmLine',
+    'StrippingXib2XicKPiWSXic2PKPiBeauty2CharmLine',
+    'StrippingLb2LcDstDstar2D0PiPIDBeauty2CharmLine',
+    'StrippingLb2LcDstWSDstar2D0PiPIDBeauty2CharmLine',
+    'StrippingX2LcLcBeauty2CharmLine',
+    'StrippingX2LcLcWSBeauty2CharmLine',
+    'StrippingLb2Lc5PiLc2PKPiPIDBeauty2CharmLine',
+    'StrippingLb2D0Lambda0DDD02HHBeauty2CharmLine',
     'StrippingLb2D0Lambda0LLD02HHBeauty2CharmLine',
-    'StrippingLb2D0Lambda0DDD02K3PiBeauty2CharmLine', 
+    'StrippingLb2D0Lambda0DDD02K3PiBeauty2CharmLine',
     'StrippingLb2D0Lambda0LLD02K3PiBeauty2CharmLine',
-    'StrippingLb2DpKKD2HHHBeauty2CharmLine', 
-    'StrippingLb2DpPiPiD2HHHBeauty2CharmLine', 
-    'StrippingLb2DpKPiD2HHHBeauty2CharmLine', 
-    'StrippingXib2D0pKKD02HHBeauty2CharmLine', 
-    'StrippingXib2D0pPiPiD02HHBeauty2CharmLine', 
-    'StrippingXib2D0pKPiD02HHBeauty2CharmLine', 
+    'StrippingLb2DpKKD2HHHBeauty2CharmLine',
+    'StrippingLb2DpPiPiD2HHHBeauty2CharmLine',
+    'StrippingLb2DpKPiD2HHHBeauty2CharmLine',
+    'StrippingXib2D0pKKD02HHBeauty2CharmLine',
+    'StrippingXib2D0pPiPiD02HHBeauty2CharmLine',
+    'StrippingXib2D0pKPiD02HHBeauty2CharmLine',
     'StrippingLb2D0pKD02K3PiBeauty2CharmLine',
     'StrippingLb2DD0pD2HHHD02K3PiBeauty2CharmLine',
     'StrippingLb2DD0pD2HHHD2HHBeauty2CharmLine',
     'StrippingXibc2DpKD2HHHBeauty2CharmLine',
-    'StrippingB2LcpbarKSSLc2PKPiBeauty2CharmLine', 
-    'StrippingB2LcpbarPiSSLc2PKPiBeauty2CharmLine', 
-    'StrippingB2LcpbarKWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB2LcpbarPiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB2LcpbarLc2PKPiBeauty2CharmLine', 
-    'StrippingB2LcpbarWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB2LcLcKLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKSDDLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKSWSDDLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKSLLLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcpbarKSWSLLLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2DLambda0DDpiD2HHHBeauty2CharmLine', 
-    'StrippingLb2DLambda0LLpiD2HHHBeauty2CharmLine', 
-    'StrippingLb2DLambda0DDpiWSD2HHHBeauty2CharmLine', 
-    'StrippingLb2DLambda0LLpiWSD2HHHBeauty2CharmLine', 
-    'StrippingXib2D0Lambda0DDpiD02HHBeauty2CharmLine', 
-    'StrippingXib2D0Lambda0LLpiD02HHBeauty2CharmLine', 
-    'StrippingXib2D0Lambda0DDpiWSD02HHBeauty2CharmLine', 
-    'StrippingXib2D0Lambda0LLpiWSD02HHBeauty2CharmLine', 
-    'StrippingB02LcLambda0KLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcLambda0PiLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcLambda0PiWSLc2PKPiBeauty2CharmLine', 
-    'StrippingB02LcLambda0KWSLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2sigmacpp4PiSigmacpp2LcPiLc2PKPiBeauty2CharmLine', 
-    'StrippingLb2sigmacppD0KPiSigmacpp2LcPiLc2PKPiBeauty2CharmLine', 
+    'StrippingB2LcpbarKSSLc2PKPiBeauty2CharmLine',
+    'StrippingB2LcpbarPiSSLc2PKPiBeauty2CharmLine',
+    'StrippingB2LcpbarKWSLc2PKPiBeauty2CharmLine',
+    'StrippingB2LcpbarPiWSLc2PKPiBeauty2CharmLine',
+    'StrippingB2LcpbarLc2PKPiBeauty2CharmLine',
+    'StrippingB2LcpbarWSLc2PKPiBeauty2CharmLine',
+    'StrippingB2LcLcKLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKSDDLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKSWSDDLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKSLLLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcpbarKSWSLLLc2PKPiBeauty2CharmLine',
+    'StrippingLb2DLambda0DDpiD2HHHBeauty2CharmLine',
+    'StrippingLb2DLambda0LLpiD2HHHBeauty2CharmLine',
+    'StrippingLb2DLambda0DDpiWSD2HHHBeauty2CharmLine',
+    'StrippingLb2DLambda0LLpiWSD2HHHBeauty2CharmLine',
+    'StrippingXib2D0Lambda0DDpiD02HHBeauty2CharmLine',
+    'StrippingXib2D0Lambda0LLpiD02HHBeauty2CharmLine',
+    'StrippingXib2D0Lambda0DDpiWSD02HHBeauty2CharmLine',
+    'StrippingXib2D0Lambda0LLpiWSD02HHBeauty2CharmLine',
+    'StrippingB02LcLambda0KLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcLambda0PiLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcLambda0PiWSLc2PKPiBeauty2CharmLine',
+    'StrippingB02LcLambda0KWSLc2PKPiBeauty2CharmLine',
+    'StrippingLb2sigmacpp4PiSigmacpp2LcPiLc2PKPiBeauty2CharmLine',
+    'StrippingLb2sigmacppD0KPiSigmacpp2LcPiLc2PKPiBeauty2CharmLine',
     'StrippingB02DKLTUBD2HHHBeauty2CharmLine',
     'StrippingB02DsKPiPiLTUBD2HHHBeauty2CharmLine',
     'StrippingB02DsstarKLTUBDsstar2DGammaD2HHHBeauty2CharmLine',
-    
-    'StrippingDstarUPB02D0KPiD2HHBeauty2CharmLine', 
-    
+
+    'StrippingDstarUPB02D0KPiD2HHBeauty2CharmLine',
+
     # Bc+ -> D+ D0
     'StrippingBc2DD0D2KSHHHD02HHBeauty2CharmLine',
     'StrippingBc2DD0D2KSHHHD02KHHHBeauty2CharmLine',
@@ -1381,7 +1381,7 @@ default_config ={
     'StrippingBc2DD0D2HHHD02KHHHBeauty2CharmLine',
     'StrippingBc2DD0D2HHHD02HHPI0Beauty2CharmLine',
     'StrippingBc2DD0D2HHHD02KSHHBeauty2CharmLine',
-    
+
     # Bc+ -> D*+ D0
     'StrippingBc2DstD0Dst2DPI0D2HHHD02HHBeauty2CharmLine',
     'StrippingBc2DstD0Dst2DPI0D2HHHD02KHHHBeauty2CharmLine',
@@ -1499,7 +1499,7 @@ default_config ={
     #Xibc
     'StrippingXibc2LcD0D02KPiBeauty2CharmLine',
     'StrippingXibc2LcD0PiD02KPiBeauty2CharmLine',
-    'StrippingXibc2D0D0pD02KPiBeauty2CharmLine', 
+    'StrippingXibc2D0D0pD02KPiBeauty2CharmLine',
     'StrippingXibc2LcPiPiOSLc2PKPiBeauty2CharmLine',
     'StrippingXibc2LcKPiOSLc2PKPiBeauty2CharmLine',
     'StrippingXibc2LcPiKOSLc2PKPiBeauty2CharmLine',
@@ -1521,7 +1521,7 @@ default_config ={
     'StrippingXibc2LcD0MuWSD02KPiBeauty2CharmLine',
     'StrippingXibc2LcDMuD2KPiPiBeauty2CharmLine',
     'StrippingXibc2LcDMuWSD2KPiPiBeauty2CharmLine'
-    
+
 ]
   },
   'WGs' : [ 'B2OC' ]
@@ -1529,11 +1529,11 @@ default_config ={
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 class Beauty2CharmConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
- 
+
     def __init__(self, moduleName, config) :
-        
+
         LineBuilder.__init__(self, moduleName, config)
 
         # pre-filter inputs
@@ -1554,14 +1554,14 @@ class Beauty2CharmConf(LineBuilder):
         pions_Xb_Xibc = filterInputs('Pi_Xb_Xibc',[pions_pid],config['Xibc_Xb_PION'])
         kaons_Xb_Xibc = filterInputs('K_Xb_Xibc',[kaons_pid],config['Xibc_Xb_KAON'])
         protons_Xb_Xibc = filterInputs('P_Xb_Xibc',[protons_pid],config['Xibc_Xb_PROTON'])
-        
+
         ks_dd = filterInputs('KS0_DD',[dataOnDemand("StdLooseKsDD")],
-                                       config['KS0']) 
+                                       config['KS0'])
         ks_ll = filterInputs('KS0_LL',[dataOnDemand("StdVeryLooseKsLL")],
                              config['VLKS0_LL'])
         ks = {"DD":[ks_dd],"LL":[ks_ll]}
         lambda0_dd = filterInputs('Lambda0_DD',[dataOnDemand("StdLooseLambdaDD")],
-                                  config['Lambda0']) 
+                                  config['Lambda0'])
         lambda0_ll = filterInputs('Lambda0_LL',[dataOnDemand("StdLooseLambdaLL")],
                                   config['Lambda0'])
         lambda0 = {"DD":[lambda0_dd],"LL":[lambda0_ll]}
@@ -1694,7 +1694,7 @@ class Beauty2CharmConf(LineBuilder):
                   "HLT_PASS_RE('Hlt2.*IncPhi.*Decision'))"
 
             if ((name in config['RawEvents'])):
-                rawevent = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker"] 
+                rawevent = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker"]
             else:
                 rawevent = []
 
@@ -1704,7 +1704,7 @@ class Beauty2CharmConf(LineBuilder):
                                   selection=tmpSel,checkPV=checkPV_option,FILTER=filter,
                                   HLT2=hlt,
                                   EnableFlavourTagging = (name in config['FlavourTagging']),
-                                  RequiredRawEvents = rawevent, 
+                                  RequiredRawEvents = rawevent,
                                   MDSTFlag = (name in config['MDSTChannels']),
                                   RelatedInfoTools = config['RelatedInfoTools'] )
 
@@ -1712,5 +1712,5 @@ class Beauty2CharmConf(LineBuilder):
 
     def _makeLines(self,lines,config):
         for line in lines: self._makeLine(line,config)
-        
+
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py
index 965f3b3491905d01f026db44fd4e482526d21a23..8ce6f59ef19899a5982c97e932ceea05a2905221 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -105,7 +105,7 @@ default_config = {
                       'ConeAngle'         : 2.0,
                       "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_2.0'
-                  }]       
+                  }]
         },
     'STREAMS'           : ['Bhadron'],
     'WGs'               : ['BandQ'],
@@ -113,7 +113,7 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
@@ -121,38 +121,38 @@ from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class B2Chic0KPiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, name, config ): 
-        
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         self.SelKaons   = self.createSubSel( OutputList = self.name + "SelKaons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ),
                                            Cuts = config['KaonCuts']
                                            )
 
         self.SelPions   = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ),
                                            Cuts = config['PionCuts']
                                            )
 
         self.SelPions4h = self.createSubSel( OutputList = self.name + "SelPions4h",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ),
                                            Cuts = config['PionCuts4h']
                                            )
 
         self.SelKaons4h = self.createSubSel( OutputList = self.name + "SelKaons4h",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ),
                                            Cuts = config['KaonCuts4h']
                                            )
 
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseProtons/Particles' ),
                                            Cuts = config['ProtonCuts']
                                            )
 
@@ -163,7 +163,7 @@ class B2Chic0KPiConf(LineBuilder):
                                                     DaughterLists = [ self.SelKaons4h, self.SelPions4h ],
                                                     DecayDescriptor = "chi_c0(1P) -> K+ K- pi+ pi-",
                                                     ComAMCuts      = config['Chic0ComAMCuts'],
-                                                    PreVertexCuts  = config['Chic0ComN4Cuts'], 
+                                                    PreVertexCuts  = config['Chic0ComN4Cuts'],
                                                     PostVertexCuts = config['Chic0MomN4Cuts']
                                                     )
 
@@ -174,11 +174,11 @@ class B2Chic0KPiConf(LineBuilder):
                                                   DaughterLists = [ self.SelKaons4h ],
                                                   DecayDescriptor = "chi_c0(1P) -> K+ K- K+ K-",
                                                   ComAMCuts      = config['Chic0ComAMCuts'],
-                                                  PreVertexCuts  = config['Chic0ComN4Cuts'], 
+                                                  PreVertexCuts  = config['Chic0ComN4Cuts'],
                                                   PostVertexCuts = config['Chic0MomN4Cuts']
                                                   )
 
-        
+
         """
         Chic0-> Pi Pi Pi Pi
         """
@@ -186,7 +186,7 @@ class B2Chic0KPiConf(LineBuilder):
                                                       DaughterLists = [ self.SelPions4h ],
                                                       DecayDescriptor = "chi_c0(1P) -> pi+ pi- pi+ pi-",
                                                       ComAMCuts      = config['Chic0ComAMCuts'],
-                                                      PreVertexCuts  = config['Chic0ComN4Cuts'], 
+                                                      PreVertexCuts  = config['Chic0ComN4Cuts'],
                                                       PostVertexCuts = config['Chic0MomN4Cuts']
                                                       )
 
@@ -197,7 +197,7 @@ class B2Chic0KPiConf(LineBuilder):
                                                       DaughterLists = [ self.SelPions4h, self.SelProtons ],
                                                       DecayDescriptor = "chi_c0(1P) -> p+ p~- pi+ pi-",
                                                       ComAMCuts      = config['Chic0ComAMCuts'],
-                                                      PreVertexCuts  = config['Chic0ComN4Cuts'], 
+                                                      PreVertexCuts  = config['Chic0ComN4Cuts'],
                                                       PostVertexCuts = config['Chic0MomN4Cuts']
                                                       )
         """
@@ -216,8 +216,8 @@ class B2Chic0KPiConf(LineBuilder):
         """
         self.SelChic02PPbar = self.createCombinationSel( OutputList = self.name + "SelChic02PPbar",
                                                         DecayDescriptor = "chi_c0(1P) -> p+ p~-",
-                                                        DaughterLists = [ self.SelProtons ],          
-                                                        PreVertexCuts  = config['Chic0ComCuts'], 
+                                                        DaughterLists = [ self.SelProtons ],
+                                                        PreVertexCuts  = config['Chic0ComCuts'],
                                                         PostVertexCuts = config['Chic0MomN2Cuts']
                                                         )
 
@@ -246,7 +246,7 @@ class B2Chic0KPiConf(LineBuilder):
         """
         from PhysSelPython.Wrappers import MergedSelection
         self.SelChic0_4h = MergedSelection( self.name + "SelChic0_4h",
-                                        RequiredSelections =  [ self.SelChic02KKPiPi, 
+                                        RequiredSelections =  [ self.SelChic02KKPiPi,
                                                                 self.SelChic02KKKK,
                                                                 self.SelChic02PiPiPiPi,
                                                                 self.SelChic02PPbarPiPi,
@@ -263,9 +263,9 @@ class B2Chic0KPiConf(LineBuilder):
         K*
         """
         self.SelKstar       = self.createCombinationSel( OutputList = self.name + "SelKstar",
-                                         DecayDescriptor = "[K*(892)0 -> K+ pi-]cc", 
+                                         DecayDescriptor = "[K*(892)0 -> K+ pi-]cc",
                                          DaughterLists = [self.SelKaons, self.SelPions],
-                                         PreVertexCuts  = config['KstarComCuts'],     
+                                         PreVertexCuts  = config['KstarComCuts'],
                                          PostVertexCuts = config['KstarMomCuts']
                                          )
 
@@ -273,22 +273,22 @@ class B2Chic0KPiConf(LineBuilder):
         phi(1020)
         """
         self.SelPhi = self.createCombinationSel( OutputList = self.name + "SelPhi",
-                                         DecayDescriptor = "phi(1020) -> K+ K-", 
+                                         DecayDescriptor = "phi(1020) -> K+ K-",
                                          DaughterLists = [self.SelKaons],
-                                         PreVertexCuts  = config['PhiComCuts'],     
+                                         PreVertexCuts  = config['PhiComCuts'],
                                          PostVertexCuts = config['PhiMomCuts']
                                          )
-         
+
         """
-        B->Chi_c0(->2h) K* 
+        B->Chi_c0(->2h) K*
         """
         self.SelB2Chic0Kpi_2h = self.createCombinationSel( OutputList = self.name + "SelB2Chic0Kpi_2h",
                                                               DecayDescriptor = "[B0 -> chi_c0(1P) K*(892)0]cc",
-                                                              DaughterLists = [ self.SelKstar, self.SelChic0_2h ],                    
+                                                              DaughterLists = [ self.SelKstar, self.SelChic0_2h ],
                                                               PreVertexCuts  = config['BComCuts'],
                                                               PostVertexCuts = config['BMomCuts'] )
-         
-        self.B2Chic0Kpi_2hLine = StrippingLine( self.name + '_2hLine',                                                
+
+        self.B2Chic0Kpi_2hLine = StrippingLine( self.name + '_2hLine',
                                                    prescale  = config['Prescale'],
                                                   # HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelB2Chic0Kpi_2h ],
@@ -296,22 +296,22 @@ class B2Chic0KPiConf(LineBuilder):
 #                                                   MDSTFlag = False,
                                                    RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
-        
+
         self.registerLine( self.B2Chic0Kpi_2hLine )
-        
-        
-        
+
+
+
         """
-        B->(Chi_c0->4h) K* 
+        B->(Chi_c0->4h) K*
         """
 
         self.SelB2Chic0Kpi_4h = self.createCombinationSel( OutputList = self.name + "SelB2Chic0Kpi_4h",
                                                               DecayDescriptor = "[B0 -> chi_c0(1P) K*(892)0]cc",
-                                                              DaughterLists = [ self.SelKstar, self.SelChic0_4h ],                    
+                                                              DaughterLists = [ self.SelKstar, self.SelChic0_4h ],
                                                               PreVertexCuts  = config['BComCuts'],
                                                               PostVertexCuts = config['BMomCuts'] )
-         
-        self.B2Chic0Kpi_4hLine = StrippingLine( self.name + '_4hLine',                                                
+
+        self.B2Chic0Kpi_4hLine = StrippingLine( self.name + '_4hLine',
                                                    prescale  = config['Prescale'],
                                                   # HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelB2Chic0Kpi_4h ],
@@ -319,24 +319,24 @@ class B2Chic0KPiConf(LineBuilder):
 #                                                   MDSTFlag = False,
                                                    RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
-        
+
         self.registerLine( self.B2Chic0Kpi_4hLine )
-        
-        
+
+
 
 
 
 
         """
-        B+->Chi_c0(->2h) phi K+ 
+        B+->Chi_c0(->2h) phi K+
         """
         self.SelB2Chic0phiK_2h = self.createCombinationSel( OutputList = self.name + "SelB2Chic0phiK_2h",
                                                               DecayDescriptor = "[B+ -> chi_c0(1P) phi(1020) K+]cc",
-                                                              DaughterLists = [ self.SelPhi, self.SelKaons, self.SelChic0_2h ],                    
+                                                              DaughterLists = [ self.SelPhi, self.SelKaons, self.SelChic0_2h ],
                                                               PreVertexCuts  = config['BComCuts'],
                                                               PostVertexCuts = config['BMomCuts'] )
-         
-        self.B2Chic0phiK_2hLine = StrippingLine( 'B2Chic0phiK_2hLine',                                                
+
+        self.B2Chic0phiK_2hLine = StrippingLine( 'B2Chic0phiK_2hLine',
                                                    prescale  = config['Prescale'],
                                                   # HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelB2Chic0phiK_2h ],
@@ -344,40 +344,40 @@ class B2Chic0KPiConf(LineBuilder):
 #                                                   MDSTFlag = False,
                                                    RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
-        
+
         self.registerLine( self.B2Chic0phiK_2hLine )
-        
-        
-        
+
+
+
         """
-        B+->Chi_c0(->4h) phi K+ 
+        B+->Chi_c0(->4h) phi K+
         """
         self.SelB2Chic0phiK_4h = self.createCombinationSel( OutputList = self.name + "SelB2Chic0phiK_4h",
                                                         DecayDescriptor = "[B+ -> chi_c0(1P) phi(1020) K+]cc",
-                                                        DaughterLists = [ self.SelPhi, self.SelKaons, self.SelChic0_4h ],                    
+                                                        DaughterLists = [ self.SelPhi, self.SelKaons, self.SelChic0_4h ],
                                                         PreVertexCuts  = config['BComCuts'],
                                                         PostVertexCuts = config['BMomCuts'] )
-        
-        self.B2Chic0phiK_4hLine            = StrippingLine( 'B2Chic0phiK_4hLine',                                                
+
+        self.B2Chic0phiK_4hLine            = StrippingLine( 'B2Chic0phiK_4hLine',
                                                    prescale  = config['Prescale'],
                                                  #  HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelB2Chic0phiK_4h ],
                                                    EnableFlavourTagging = False,
 #                                                   MDSTFlag = False,
-                                                   RelatedInfoTools = self.config['RelatedInfoTools']                                                   
+                                                   RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
         self.registerLine( self.B2Chic0phiK_4hLine )
 
         """
-        Lambda_b0->Chi_c0(->2h) p+ K- 
+        Lambda_b0->Chi_c0(->2h) p+ K-
         """
         self.SelLb2Chic0pK_2h = self.createCombinationSel( OutputList = self.name + "SelLb2Chic0pK_2h",
                                                               DecayDescriptor = "[Lambda_b0 -> chi_c0(1P) p+ K-]cc",
-                                                              DaughterLists = [ self.SelProtons, self.SelKaons, self.SelChic0_2h ],                    
+                                                              DaughterLists = [ self.SelProtons, self.SelKaons, self.SelChic0_2h ],
                                                               PreVertexCuts  = config['LbComCuts'],
                                                               PostVertexCuts = config['LbMomCuts'] )
-         
-        self.Lb2Chic0pK_2hLine = StrippingLine( 'Lb2Chic0pK_2hLine',                                                
+
+        self.Lb2Chic0pK_2hLine = StrippingLine( 'Lb2Chic0pK_2hLine',
                                                    prescale  = config['Prescale'],
                                                   # HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelLb2Chic0pK_2h ],
@@ -385,19 +385,19 @@ class B2Chic0KPiConf(LineBuilder):
 #                                                   MDSTFlag = False,
                                                    RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
-        
+
         self.registerLine( self.Lb2Chic0pK_2hLine )
 
         """
-        Lambda_b0->Chi_c0(->4h) p+ K- 
+        Lambda_b0->Chi_c0(->4h) p+ K-
         """
         self.SelLb2Chic0pK_4h = self.createCombinationSel( OutputList = self.name + "SelLb2Chic0pK_4h",
                                                               DecayDescriptor = "[Lambda_b0 -> chi_c0(1P) p+ K-]cc",
-                                                              DaughterLists = [ self.SelProtons, self.SelKaons, self.SelChic0_4h ],                    
+                                                              DaughterLists = [ self.SelProtons, self.SelKaons, self.SelChic0_4h ],
                                                               PreVertexCuts  = config['LbComCuts'],
                                                               PostVertexCuts = config['LbMomCuts'] )
-         
-        self.Lb2Chic0pK_4hLine = StrippingLine( 'Lb2Chic0pK_4hLine',                                                
+
+        self.Lb2Chic0pK_4hLine = StrippingLine( 'Lb2Chic0pK_4hLine',
                                                    prescale  = config['Prescale'],
                                                   # HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelLb2Chic0pK_4h ],
@@ -405,9 +405,9 @@ class B2Chic0KPiConf(LineBuilder):
 #                                                   MDSTFlag = False,
                                                    RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
-        
+
         self.registerLine( self.Lb2Chic0pK_4hLine )
-        
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -442,7 +442,7 @@ class B2Chic0KPiConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
@@ -452,9 +452,9 @@ class B2Chic0KPiConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
 
-    #def applyMVA( self, name, 
+
+    #def applyMVA( self, name,
     #              SelB,
     #              MVAVars,
     #              MVAxmlFile,
@@ -470,7 +470,7 @@ class B2Chic0KPiConf(LineBuilder):
     #                            XMLFile   = MVAxmlFile,
     #                            Variables = MVAVars,
     #                            ToolName  = name )
-    #    
+    #
     #    return Selection( name,
     #                      Algorithm =  _FilterB,
     #                      RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index fcb99c173c185cb62d2ed45e03cb97da3fb99cd5..0b41a10bc8a326dfe8a4c01ee6357a010950fe7a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -70,8 +70,8 @@ default_config = {
                    ,'KstarPT'           :       500.0
                    ,'KstarVCHI2'        :       16.0
                    ,'PTKaon'            :       500.
-                   
-                   
+
+
                    },
     'STREAMS' : {'Dimuon' : ['StrippingB2JpsiXforEMBu2JpsiKDetachedLine',
                              'StrippingB2JpsiXforEMBd2JpsiKstarDetachedLine',
@@ -94,7 +94,7 @@ class B2JpsiXforEM_sConf(LineBuilder) :
         LineBuilder.__init__(self, name, config)
         self.name = name
         self.config = config
-	
+
         # Define input daughter lists for various B -> J/psi X selections:
 
         self.WideJpsiList = DataOnDemand(Location = "Phys/StdLooseJpsi2MuMu/Particles")
@@ -102,13 +102,13 @@ class B2JpsiXforEM_sConf(LineBuilder) :
         self.JpsiList = self.createSubSel( OutputList = 'NarrowJpsiForBandQ' + self.name,
                                            InputList = self.WideJpsiList,
                                            Cuts = "(PFUNA(ADAMASS('J/psi(1S)')) < %(JpsiMassWindow)s * MeV)" % self.config)
-        
+
 
         self.NoIPKaonList = self.createSubSel( OutputList = "NoIPKaonsForBandQ" + self.name,
                                                InputList = DataOnDemand(Location = "Phys/StdAllNoPIDsKaons/Particles"),
-                                               Cuts = "(TRCHI2DOF < %(TRCHI2DOF)s )" % self.config )    
-        
-                        
+                                               Cuts = "(TRCHI2DOF < %(TRCHI2DOF)s )" % self.config )
+
+
         self.PhiList = self.createSubSel( OutputList = "Phi2KKForBandQ" + self.name,
                                           InputList = DataOnDemand(Location = "Phys/StdLoosePhi2KK/Particles"),
                                           #Cuts = "(in_range(980,M,1050))" \
@@ -118,15 +118,15 @@ class B2JpsiXforEM_sConf(LineBuilder) :
                                             #Cuts = "(in_range(826,M,966))" \
                                             Cuts = "(in_range( %(MinKstarMass)s *MeV, M, %(MaxKstarMass)s *MeV ) & (PT > %(KstarPT)s *MeV) & (VFASPF(VCHI2) < %(KstarVCHI2)s ) & (MAXTREE('K+'==ABSID,  TRCHI2DOF) < %(TRCHI2DOF)s ) & (MAXTREE('pi-'==ABSID, TRCHI2DOF) < %(TRCHI2DOF)s )  & (MINTREE('K+'==ABSID, PIDK) > %(PIDKaon)s ))" % self.config)
         #  & (MINTREE('K+'==ABSID, PIDK) > %(PIDKaon)s )
-        
-        
-        
+
+
+
         self.makeBu2JpsiK()
         self.makeBs2JpsiPhi()
-        
+
         self.makeBd2JpsiKstar()
-        
-        
+
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -148,7 +148,7 @@ class B2JpsiXforEM_sConf(LineBuilder) :
                                      MotherCut = PostVertexCuts,
                                      CombinationCut = PreVertexCuts,
                                      ReFitPVs = ReFitPVs)
-        
+
         if ReFitPVs:
             mypvrefitter=LoKi__PVReFitter("mypvrefitter")
             mypvrefitter.CheckTracksByLHCbIDs = True
@@ -157,12 +157,12 @@ class B2JpsiXforEM_sConf(LineBuilder) :
             combiner.IgnoreP2PVFromInputLocations = True
             combiner.addTool(mypvrefitter)
             combiner.PVReFitters.update( {"": "LoKi::PVReFitter/mypvrefitter"} )
-            
-        
+
+
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def createCombinationsSel( self, OutputList,
 	                  DecayDescriptors,
                           DaughterLists,
@@ -185,12 +185,12 @@ class B2JpsiXforEM_sConf(LineBuilder) :
             combiner.addTool(mypvrefitter)
             combiner.PVReFitters.update( {"": "LoKi::PVReFitter/mypvrefitter"} )
 
-        
+
         return Selection ( OutputList,
                        Algorithm = combiner,
                        RequiredSelections = DaughterLists)
 
-    
+
     def makeBu2JpsiK( self ):
         Bu2JpsiK = self.createCombinationSel( OutputList = "Bu2JpsiK" + self.name,
                                               DecayDescriptor = "[B+ -> J/psi(1S) K+]cc",
@@ -209,7 +209,7 @@ class B2JpsiXforEM_sConf(LineBuilder) :
                                               Cuts = "(CHILD('Beauty -> ^J/psi(1S) X', PFUNA(ADAMASS('J/psi(1S)'))) < %(JpsiMassWindow)s * MeV) & (BPVLTIME() > %(BPVLTIME)s *ps)" % self.config)
 
         Bu2JpsiKDetachedLine  = StrippingLine( self.name + "Bu2JpsiKDetachedLine", algos = [ Bu2JpsiKDetached ] )
-        
+
         self.registerLine(Bu2JpsiKDetachedLine)
         #self.registerLine(Bu2JpsiKPrescaledLine)
 
@@ -221,7 +221,7 @@ class B2JpsiXforEM_sConf(LineBuilder) :
                                                 PostVertexCuts = "in_range( %(MinBsMass)s *MeV,M, %(MaxBsMass)s *MeV) & (VFASPF(VCHI2PDOF) < %(BsVCHI2PDOF)s)" % self.config,
                                                 ReFitPVs = self.config["ReFitPVsFlag"]
                                                 )
-				   
+
         #Bs2JpsiPhiPrescaledLine = StrippingLine( self.name + "Bs2JpsiPhiPrescaledLine", algos = [ Bs2JpsiPhi ] , HLT = "HLT_PASS_RE('Hlt2DiMuonJPsiDecision')", prescale = self.config['Bs2JpsiPhiPrescale'], MDSTFlag = True, EnableFlavourTagging = True )
 
         Bs2JpsiPhiDetached = self.createSubSel( InputList = Bs2JpsiPhi,
@@ -229,7 +229,7 @@ class B2JpsiXforEM_sConf(LineBuilder) :
                                                 Cuts = "(CHILD('Beauty -> ^J/psi(1S) X', PFUNA(ADAMASS('J/psi(1S)'))) < %(JpsiMassWindow)s * MeV) & (BPVLTIME() > %(BPVLTIME)s*ps)" % self.config )
 
         Bs2JpsiPhiDetachedLine  = StrippingLine( self.name + "Bs2JpsiPhiDetachedLine", algos = [ Bs2JpsiPhiDetached ] )
-        
+
         #self.registerLine(Bs2JpsiPhiPrescaledLine)
         self.registerLine(Bs2JpsiPhiDetachedLine)
 
@@ -256,13 +256,13 @@ class B2JpsiXforEM_sConf(LineBuilder) :
         #self.registerLine(Bd2JpsiKstarPrescaledLine)
         self.registerLine(Bd2JpsiKstarDetachedLine)
 
-        
+
     def filterTisTos( self, name, DiMuonInput, myTisTosSpecs ) :
         from Configurables import TisTosParticleTagger
-    
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system:
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
@@ -271,5 +271,4 @@ class B2JpsiXforEM_sConf(LineBuilder) :
 
         return Selection(name + "_SelTisTos",
                      Algorithm = myTagger,
-                     RequiredSelections = [ DiMuonInput ] ) 
-
+                     RequiredSelections = [ DiMuonInput ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
index bdcc6c4a1e1a7794aa0d906634d5e671d53e4645..73cb6a9d5e092a747ecce4c6430df3c24beefab4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -11,7 +11,7 @@
 '''
 Module for selecting Bbbar->PhiPhi, including two lines:
 1. Prompt line, with tight PT, PID cuts, requiring Hlt Tis, since there is no lifetime unbiased phi trigger yet.
-2. Detached line, with loose PT, PID cuts, but with IPS cuts on Kaons. 
+2. Detached line, with loose PT, PID cuts, but with IPS cuts on Kaons.
 
 To include it:
 
@@ -28,14 +28,14 @@ __all__ = (
     )
 
 default_config = {
-    'NAME'        : 'Bbbar2PhiPhi', 
+    'NAME'        : 'Bbbar2PhiPhi',
     'BUILDERTYPE' : 'Bbbar2PhiPhiConf',
     'CONFIG' : {
         'TRCHI2DOF'        :     3.  ,
         'KaonPIDK'         :     0.  ,
         'KaonPT'           :   650.  , # MeV
         'PhiVtxChi2'       :     9.  ,
-        'PhiMassW'         :    30.  , 
+        'PhiMassW'         :    30.  ,
         'CombMaxMass'      : 10700.  , # MeV, before Vtx fit
         'CombMinMass'      :  8800.  , # MeV, before Vtx fit
         'MaxMass'          : 10600.  , # MeV, after Vtx fit
@@ -55,21 +55,21 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 
 class Bbbar2PhiPhiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         """
-        Unbiased, require Hlt Tis 
+        Unbiased, require Hlt Tis
         """
         self.PhiForJpsiList = self.createSubSel( OutputList = "PhiFor" + self.name,
-                                                 InputList =  DataOnDemand( Location = 'Phys/StdTightPhi2KK/Particles' ), 
+                                                 InputList =  DataOnDemand( Location = 'Phys/StdTightPhi2KK/Particles' ),
                                                  Cuts = "(VFASPF(VCHI2/VDOF)<%(PhiVtxChi2)s)"\
                                                  " & (ADMASS('phi(1020)')<%(PhiMassW)s*MeV)"\
                                                  " & (INTREE( ('K+'==ID) & (PT> %(KaonPT)s*MeV) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PIDK> %(KaonPIDK)s) ))"\
@@ -81,14 +81,14 @@ class Bbbar2PhiPhiConf(LineBuilder):
                                                     )
 
         self.makeJpsi2PhiPhi()
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -104,37 +104,36 @@ class Bbbar2PhiPhiConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
-    
-    
+
+
+
     def makeJpsi2PhiPhi(self):
         Jpsi2PhiPhi = self.createCombinationSel( OutputList = "Jpsi2PhiPhi" + self.name,
-                                                 DecayDescriptor = " J/psi(1S) -> phi(1020) phi(1020)", 
-                                                 DaughterLists = [ self.TisPhiForJpsiList ], 
+                                                 DecayDescriptor = " J/psi(1S) -> phi(1020) phi(1020)",
+                                                 DaughterLists = [ self.TisPhiForJpsiList ],
                                                  PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                  PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 16 )" %self.config )
-        
+
         Jpsi2PhiPhiLine = StrippingLine( self.name + "Line",
                                          algos = [ Jpsi2PhiPhi ] )
-        
+
         self.registerLine(Jpsi2PhiPhiLine)
-        
-        
+
+
     def filterTisTos(self, name,
                      PhiInput,
                      myTisTosSpecs ) :
         from Configurables import TisTosParticleTagger
-        
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system)
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
         myTagger.CaloClustForNeutral = False
         myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-        
+
         return Selection(name + "_SelTisTos",
                          Algorithm = myTagger,
                          RequiredSelections = [ PhiInput ] )
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2Ds1Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2Ds1Gamma.py
index 5911a5e2d95c997c07013127b0384366059eff39..0fbd8d563eae20ae93ff147b24927f70643f1d28 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2Ds1Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2Ds1Gamma.py
@@ -43,7 +43,7 @@ default_config = {
                   #'TrIPchi2'            : 4.        # Dimensionless Already implemented in the particle lists
 #                   'BcMassWin'           : 1500.     # MeV
                    'MinBcMass'           : 4800.     # MeV
-                  ,'MaxBcMass'           : 7500.     # MeV  
+                  ,'MaxBcMass'           : 7500.     # MeV
                   ,'BcPVIPchi2'          : 16.       # Dimensionless
                   ,'photonPT'            : 1500.     # MeV
                   ,'KaonProbNN'          : 0.1       # Dimensionless
@@ -64,7 +64,7 @@ default_config = {
 class Bc2Ds1GammaConf(LineBuilder):
     """
     Definition of Bc -> Ds1 Gamma stripping
-    
+
     Constructs Bc -> Ds1 Gamma Selections and StrippingLines from
     a configuration dictionary.
     Usage:
@@ -78,16 +78,16 @@ class Bc2Ds1GammaConf(LineBuilder):
     Exports as instance data members:
     selPhoton                    : Photon Selection object
     selD0                        : nominal D0 -> K pi Selection object
-    selDs1                       : nominal Ds1 -> D0 K Selection object 
+    selDs1                       : nominal Ds1 -> D0 K Selection object
     selDs1WS                     : nominal Ds1 -> D~0 K Selection object
-    selBc2Ds1Gamma               : Bc -> Ds1 Gamma Selection object 
+    selBc2Ds1Gamma               : Bc -> Ds1 Gamma Selection object
     selBc2Ds1GammaWS             : Bc -> Ds1 Gamma Selection object
     lines                  : List of lines
 
     Exports as class data member:
-    StrippingB2XGammaConf.__configuration_keys__ : List of required configuration parameters.    
+    StrippingB2XGammaConf.__configuration_keys__ : List of required configuration parameters.
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config):
@@ -95,7 +95,7 @@ class Bc2Ds1GammaConf(LineBuilder):
 
         # if name not set outside, set it to empty
         #if name == None:
-        #    name = ""   
+        #    name = ""
 
         # Selection of Bc daughters: photon, D0, Ds1
         self.selPhoton = makePhoton('GammaFor%s' % name,
@@ -155,7 +155,7 @@ class Bc2Ds1GammaConf(LineBuilder):
                                                postscale=config['Bc2Ds1GammaPostScale'],
                                                selection=self.selBc2Ds1GammaWS)
         self.registerLine(self.Bc2Ds1GammaLineWS)
-        
+
 def makePhoton(name, photonPT):
     """
     Create photon Selection object starting from DataOnDemand 'Phys/StdLooseAllPhotons'.
@@ -163,7 +163,7 @@ def makePhoton(name, photonPT):
     @arg name: name of the Selection.
     @arg photonPT: PT of the photon
     @return: Selection object
-    
+
     """
 
     _code = "(PT> %(photonPT)s*MeV)" % locals()
@@ -174,13 +174,13 @@ def makePhoton(name, photonPT):
 def makeD0(name,  KaonProbNN, pionProbNN, TrGhostProb) :
     """
     Create and return a D0->Kpi Selection object, starting from DataOnDemand 'Phys/StdLooseD02KPi'.
-    
+
     @arg name: name of the Selection.
     @arg KaonProbNN: PID of Kaon
     @arg pionProbNN: PID of pion
     @arg TrGhostProb: Ghost probability of pion/kaon
     @return: Selection object
-    
+
     """
 
     _code = "(MAXTREE(ABSID=='K+',PROBNNk) > %(KaonProbNN)s) & (MAXTREE(ABSID=='pi+',PROBNNpi) > %(pionProbNN)s) & CHILDCUT( (TRGHOSTPROB<%(TrGhostProb)s) , 1 ) & CHILDCUT( (TRGHOSTPROB<%(TrGhostProb)s) , 2 )" % locals()
@@ -208,10 +208,10 @@ def makeDs1(name, D0Sel, DecDescr, KaonProbNN, TrGhostProb, Ds1DeltaMassWin, Max
                             DaughtersCuts = {"K+" : _daughterCut},
                             CombinationCut = _combinationCut,
                             MotherCut=_motherCut)
-    
+
     _stdANNKaon = DataOnDemand(Location="Phys/StdLooseANNKaons/Particles")
     return Selection(name, Algorithm=_Ds1, RequiredSelections=[D0Sel, _stdANNKaon])
-                                
+
 def makeBc2Ds1Gamma(name, Ds1Sel, gammaSel, BcPVIPchi2, MinBcMass, MaxBcMass, Bc_PT, CTAU_Bc):
     """
     Create and return a Bc+ -> Ds1+ Gamma Selection object, starting with the daughters' selections.
@@ -220,23 +220,23 @@ def makeBc2Ds1Gamma(name, Ds1Sel, gammaSel, BcPVIPchi2, MinBcMass, MaxBcMass, Bc
     @arg Ds1Sel: Ds1 -> D0/D~0 K selection
     @arg gammaSel: photon selection
     @arg BcPVIPchi2: IP chi2 of the Bc wrt the PV
-    @arg MinBcMass: Lower bound of Bc mass 
+    @arg MinBcMass: Lower bound of Bc mass
     @arg MaxBcMass: Upper bound of Bc mass
     @arg Bc_PT : PT of Bc
     @arg CTAU_Bc: lifetime*c of the Bc
     @return: Selection object
 
-    """  
+    """
 #    _combinationCut = "ADAMASS('B_c+') < 1.5*%(BcMassWin)s*MeV" % locals()
 #    _motherCut = "(ADMASS('B_c+')<%(BcMassWin)s*MeV) & (BPVIPCHI2() < %(BcPVIPchi2)s) & ((BPVLTIME()*c_light)>%(CTAU_Bc)s*micrometer) & (PT>%(Bc_PT)s*MeV)" % locals()
 
     _combinationCut = "(AM < %(MaxBcMass)s*MeV+500*MeV) & (AM > %(MinBcMass)s*MeV-500*MeV)" % locals()
     _motherCut = "(M < %(MaxBcMass)s*MeV) & (M > %(MinBcMass)s*MeV) & (BPVIPCHI2() < %(BcPVIPchi2)s) & ((BPVLTIME()*c_light)>%(CTAU_Bc)s*micrometer) & (PT>%(Bc_PT)s*MeV)" % locals()
-        
+
     _Bc = CombineParticles(DecayDescriptor="[B_c+ -> D_s1(2536)+ gamma]cc",
                            CombinationCut=_combinationCut,
                            MotherCut=_motherCut,
                            ReFitPVs=False)#True)
     return Selection(name, Algorithm=_Bc, RequiredSelections=[Ds1Sel, gammaSel])
-        
+
 # EOF
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
index 8a53050918a7f420e9cfb1ba2d6ad7b59d3fb28b..6f4b15764afd039573ae92626f5666550891c91f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -32,17 +32,17 @@ default_config =  {
     'BUILDERTYPE' : 'Bc2JpsiHBDTConf',
     'CONFIG'      : {
     'LinePrescale'        :    1.   ,
-    'LinePostscale'       :    1.   ,    
+    'LinePostscale'       :    1.   ,
     'MuonCuts'            : "(MINTREE('mu+'==ABSID,PT)>500*MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF)<3) & (MINTREE('mu+'==ABSID,PIDmu)>0.)",
     'JpsiCuts'            : '((MM>3.0*GeV) & (MM<3.2*GeV) & (VFASPF(VCHI2PDOF)<16))',
     'PionCuts'            : '((TRGHOSTPROB<0.6) & (PT>1.0*GeV))',
     'BcComCuts'           : '(in_range(5.8*GeV, AM, 7.0*GeV))',
-    'BcMomCuts'           : """(VFASPF(VCHI2/VDOF)<16) 
+    'BcMomCuts'           : """(VFASPF(VCHI2/VDOF)<16)
                              & (in_range(6.0*GeV, DTF_FUN(M,True,strings( ['J/psi(1S)'])), 6.75*GeV))
-                             & (BPVIPCHI2()<25) 
+                             & (BPVIPCHI2()<25)
                             """,
     'BDTCutValue'         :  0.6 ,
-    'BDTWeightsFile'      : '$TMVAWEIGHTSROOT/data/Bc2JpsiH_BDTG_v1r0.xml'    
+    'BDTWeightsFile'      : '$TMVAWEIGHTSROOT/data/Bc2JpsiH_BDTG_v1r0.xml'
     },
     'STREAMS'   : [ 'Dimuon' ]
     }
@@ -55,46 +55,46 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class Bc2JpsiHBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config ):
 
         LineBuilder.__init__(self, name, config)
-        
+
         Bc2JpsiHName = name
         Bc2JpsiHLineName = Bc2JpsiHName + "Line"
-        
+
         self.SelJpsi2MuMu = makeJpsi2MuMu( 'Jpsi2MuMuFor'+Bc2JpsiHName,
                                            MuonCuts = config['MuonCuts'],
                                            JpsiCuts = config['JpsiCuts']
                                            )
-        
+
         self.SelBc2JpsiH = makeBc2JpsiH( "Sel_"+Bc2JpsiHName,
                                          SelJpsi2MuMu = self.SelJpsi2MuMu,
                                          PionCuts = config['PionCuts'],
                                          BcComCuts = config['BcComCuts'],
                                          BcMomCuts = config['BcMomCuts']
                                          )
-        
+
         self.CutBDTBc2JpsiH  = applyBDT( "CutBDT_" + Bc2JpsiHName,
                                          LineName  = Bc2JpsiHLineName,
                                          SelBc2JpsiH = self.SelBc2JpsiH,
                                          BDTCutValue = config['BDTCutValue'],
                                          BDTWeightsFile = config['BDTWeightsFile']
                                          )
-        
+
         self.line = StrippingLine( Bc2JpsiHLineName,
                                    prescale = config['LinePrescale'],
                                    postscale = config['LinePostscale'],
                                    selection = self.CutBDTBc2JpsiH,
                                    #RequiredRawEvents = [ "Trigger", "Muon", "Calo", "Rich", "Velo","Tracker" ]
                                    )
-                                             
+
         self.registerLine(self.line)
-        
-        
-       
+
+
+
 
 def makeJpsi2MuMu( name,
                    MuonCuts,
@@ -102,12 +102,12 @@ def makeJpsi2MuMu( name,
                    ):
 
     _StdLooseDiMuon = DataOnDemand(Location = "Phys/StdLooseDiMuon/Particles")
-    
-    MuonCut = MuonCuts     
+
+    MuonCut = MuonCuts
     MuMuCut = JpsiCuts
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
-    
+
     return Selection( name + "_SelP2MuMu",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseDiMuon ]
@@ -116,34 +116,34 @@ def makeJpsi2MuMu( name,
 
 def makeBc2JpsiH( name,
                   SelJpsi2MuMu,
-                  PionCuts,                  
+                  PionCuts,
                   BcComCuts,
                   BcMomCuts
                   ):
 
     #---------------------------
     # Pion or Kaon
-    #---------------------------        
+    #---------------------------
     from StandardParticles import StdAllNoPIDsPions as NoPIDsPionsForBc2JpsiH
 
     # Pion Cut
-    PionCut = PionCuts 
+    PionCut = PionCuts
 
     _PionFilter = FilterDesktop( Code = PionCut )
-    
+
     SelPion = Selection("SelPion_"+name,
                         Algorithm = _PionFilter,
                         RequiredSelections = [ NoPIDsPionsForBc2JpsiH ])
 
-    
+
     #---------------------------
     # Bc -> J/psi(MuMu) H
-    #---------------------------            
+    #---------------------------
     _Bc2JpsiH = CombineParticles( DecayDescriptor = "[ B_c+ -> J/psi(1S) pi+ ]cc",
                                   CombinationCut = BcComCuts,
                                   MotherCut      = BcMomCuts,
                                   ReFitPVs = False )
-    
+
     return Selection( name,
                       Algorithm = _Bc2JpsiH,
                       RequiredSelections = [ SelJpsi2MuMu, SelPion  ]
@@ -155,9 +155,9 @@ def applyBDT( name,
               SelBc2JpsiH,
               BDTCutValue,
               BDTWeightsFile ):
-    
+
     _FilterBc2JpsiH = FilterDesktop( Code = "FILTER('Bc2JpsiHBDTSelection/Bc2JpsiHBDT')" )
-    
+
     BDTSel = Selection( name,
                         Algorithm = _FilterBc2JpsiH,
                         RequiredSelections = [ SelBc2JpsiH ]
@@ -172,5 +172,5 @@ def applyBDT( name,
     MyBDT = Bc2JpsiHBDTSelection( LineName + '.Bc2JpsiHBDT' )
     MyBDT.BDTCut = BDTCutValue
     MyBDT.WeightsFile = BDTWeightsFile
-    
-    return BDTSel 
+
+    return BDTSel
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index bf86e6827bd8682fdef730f2e77c0760978430cc..5839b8c36ae4e8507c5d4dc1c56b6aa1f791349a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -31,7 +31,7 @@ default_config = {
     'CONFIG' : {
     'LinePrescale'        :    1.   ,
     'LinePostscale'       :    1.   ,
-   
+
     'MuonTRCHI2DOF'       :    5.   ,  # adimentional
     'MuonPT'              : 1400.   ,  # MeV
     'MuonP'               :   -5.   ,  # MeV, not applied now
@@ -39,14 +39,14 @@ default_config = {
     'MuMuMassWindow'      :  150.   ,  # MeV, 10 sigma, may decreased to 150
     'MuMuVtxCHI2'         :    9.   ,  # adimentional
     'MuMuPT'              :  -10.   ,  # MeV, not applied
-   
-    'MuonBcTRCHI2DOF'     :    5.   ,  # adimentional    
+
+    'MuonBcTRCHI2DOF'     :    5.   ,  # adimentional
     'MuonBcPT'            : 2500.   ,  # MeV
     'MuonBcP'             :   -5.   ,  # MeV, not applied now
     'BcUpperMass'         : 6400.   ,  # MeV, Upper limit for partial rec.
     'BcLowerMass'         : 3200.   ,  # MeV, Lower limit for partial rec.
     'BcVtxCHI2'           :    9.   ,  # adimentional
-    'BcPT'                : 6000.      # MeV, May incrase up to 5000 MeV if needed      
+    'BcPT'                : 6000.      # MeV, May incrase up to 5000 MeV if needed
     },
     'STREAMS' : [ 'Leptonic' ] ,
     'WGs'    : [ 'BandQ' ]
@@ -59,13 +59,13 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class Bc2JpsiMuXConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config ):
 
         LineBuilder.__init__(self, name, config)
-        
+
         Bc2JpsiMuXName = name
         self.SelJpsi2MuMu = makeJpsi2MuMu( 'Jpsi2MuMuFor'+Bc2JpsiMuXName,
                                            MuonPT = config['MuonPT'],
@@ -76,7 +76,7 @@ class Bc2JpsiMuXConf(LineBuilder):
                                            MuMuMassWindow = config['MuMuMassWindow'],
                                            MuMuPT = config['MuMuPT']
                                            )
-        
+
         self.SelBc2JpsiMuX = makeBc2JpsiMu( "Sel_"+Bc2JpsiMuXName,
                                             SelJpsi2MuMu = self.SelJpsi2MuMu,
                                             MuonBcTRCHI2DOF = config['MuonBcTRCHI2DOF'],
@@ -85,40 +85,40 @@ class Bc2JpsiMuXConf(LineBuilder):
                                             BcVtxCHI2 = config['BcVtxCHI2'],
                                             BcUpperMass = config['BcUpperMass'],
                                             BcLowerMass = config['BcLowerMass'],
-                                            BcPT = config['BcPT']                                           
+                                            BcPT = config['BcPT']
                                             )
-                                             
+
         self.line = StrippingLine( Bc2JpsiMuXName+"Line",
                                    prescale = config['LinePrescale'],
                                    postscale = config['LinePostscale'],
                                    RequiredRawEvents = ['Muon'],
-                                   selection = self.SelBc2JpsiMuX 
+                                   selection = self.SelBc2JpsiMuX
                                    )
 
         self.registerLine(self.line)
-        
-        
-       
+
+
+
 
 def makeJpsi2MuMu( name,
                    MuonPT,
                    MuonP,
                    MuonTRCHI2DOF,
-                   MuMuParticleName, 
+                   MuMuParticleName,
                    MuMuVtxCHI2,
                    MuMuMassWindow,
                    MuMuPT
                    ):
-    
+
     _StdLooseDiMuon = DataOnDemand(Location = "Phys/StdLooseDiMuon/Particles")
-    
+
     #MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
     MuonCut = "(CHILDCUT((TRCHI2DOF < %(MuonTRCHI2DOF)s),1)) & (CHILDCUT((TRCHI2DOF < %(MuonTRCHI2DOF)s),2)) & (CHILDCUT((PT > %(MuonPT)s *MeV),1))  & (CHILDCUT((PT > %(MuonPT)s *MeV),2))" % locals()
-    
+
     MuMuCut = "(ADMASS(%(MuMuParticleName)s) < %(MuMuMassWindow)s *MeV) & (VFASPF(VCHI2PDOF)< %(MuMuVtxCHI2)s) & (PT > %(MuMuPT)s *MeV)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
-    
+
     return Selection( name + "_SelP2MuMu",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseDiMuon ]
@@ -138,25 +138,25 @@ def makeBc2JpsiMu( name,
 
     #---------------------------
     # Muon
-    #---------------------------        
+    #---------------------------
     from StandardParticles import StdAllNoPIDsMuons as NoPIDsMuonsForBc2JpsiMu
-    
+
     # MuBc Cut
     MuonBcCut = "(PT > %(MuonBcPT)s *MeV) & (P > %(MuonBcP)s *MeV) & (TRCHI2DOF < %(MuonBcTRCHI2DOF)s) & (TRGHOSTPROB<0.4)" % locals()
 
     _MuonBcFilter = FilterDesktop( Code = MuonBcCut )
-    
+
     SelMuonBc = Selection("SelMuonBc_"+name,
                           Algorithm = _MuonBcFilter,
                           RequiredSelections = [ NoPIDsMuonsForBc2JpsiMu ])
-    
-    
+
+
     #---------------------------
     # Bc -> J/psi(MuMu) Mu X
-    #---------------------------         
+    #---------------------------
     # Comb cut
     combCut = "(in_range( %(BcLowerMass)s *MeV, AM, %(BcUpperMass)s *MeV))" % locals()
-    
+
     # Bc Cut
     BcCut = "(VFASPF(VCHI2PDOF)< %(BcVtxCHI2)s ) & (PT > %(BcPT)s *MeV)" % locals()
 
@@ -164,7 +164,7 @@ def makeBc2JpsiMu( name,
                                     CombinationCut = combCut,
                                     MotherCut = BcCut,
                                     ReFitPVs = True )
-    
+
     return Selection( name,
                       Algorithm = _Bc2JpsiMuX,
                       RequiredSelections = [ SelJpsi2MuMu, SelMuonBc ]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc3h.py
index 310b821a3778d7e1448e50c30793f467c4f90f66..c942a95259361f3d49435162b1f7a78b052b1ba9 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc3h.py
@@ -36,8 +36,8 @@ __date__    = '2010-08-03'
 __version__ = '$Revision: 154361 $'
 # =============================================================================
 __all__ = (
-    'Bc3hConf'       , ## the builder 
-    'default_config' , ## configuration 
+    'Bc3hConf'       , ## the builder
+    'default_config' , ## configuration
     )
 # =============================================================================
 from Gaudi.Configuration import *
@@ -50,7 +50,7 @@ if not logger.handlers :
     logging.basicConfig()
 logger.setLevel(logging.INFO)
 # =============================================================================
-from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer 
+from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer
 from StrippingUtils.Utils                  import LineBuilder
 # =============================================================================
 ## Define the default configuration
@@ -62,24 +62,24 @@ _default_configuration_ = {
     'CheckPV'   : True ,
     #
     ## Global filter
-    # 
-    'FILTER'    : None ,   ## VOID filter 
-    'ODIN'      : None ,   ## ODIN filter 
-    'L0DU'      : None ,   ## L0   filter 
+    #
+    'FILTER'    : None ,   ## VOID filter
+    'ODIN'      : None ,   ## ODIN filter
+    'L0DU'      : None ,   ## L0   filter
     'HLT1'      : None ,   ## HLT  filter
     'HLT2'      : None ,   ## HLT  filter
     #
-    ## c*tau cut for B-hadrons 
+    ## c*tau cut for B-hadrons
     #
-    'CTAU'      : 140 * micrometer , 
-    'CTAU_BC'   :  80 * micrometer , 
+    'CTAU'      : 140 * micrometer ,
+    'CTAU_BC'   :  80 * micrometer ,
     #
     ## pions and kaons
-    # 
+    #
     'PionCut'   : """
-    ( CLONEDIST   > 5000   ) & 
+    ( CLONEDIST   > 5000   ) &
     ( TRGHOSTPROB < 0.4    ) &
-    ( PT          > 500 * MeV               ) & 
+    ( PT          > 500 * MeV               ) &
     in_range ( 2          , ETA , 4.9       ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
     HASRICH                  &
@@ -88,47 +88,47 @@ _default_configuration_ = {
     """ ,
     #
     'KaonCut'   : """
-    ( CLONEDIST   > 5000   ) & 
-    ( TRGHOSTPROB < 0.4    ) & 
-    ( PT          > 500 * MeV               ) & 
+    ( CLONEDIST   > 5000   ) &
+    ( TRGHOSTPROB < 0.4    ) &
+    ( PT          > 500 * MeV               ) &
     in_range ( 2          , ETA , 4.9       ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
     HASRICH                  &
     ( PROBNNk      > 0.20  ) &
-    ( MIPCHI2DV()  > 9.    ) 
+    ( MIPCHI2DV()  > 9.    )
     """ ,
     #
     'ProtonCut'   : """
-    ( CLONEDIST   > 5000    ) & 
-    ( TRGHOSTPROB < 0.4     ) & 
-    ( PT          > 500 * MeV              ) & 
+    ( CLONEDIST   > 5000    ) &
+    ( TRGHOSTPROB < 0.4     ) &
+    ( PT          > 500 * MeV              ) &
     in_range (  2        , ETA , 4.9       ) &
     in_range ( 10 * GeV  , P   , 150 * GeV ) &
     HASRICH                   &
     ( PROBNNp      > 0.15   ) &
-    ( MIPCHI2DV()  > 4.     ) 
+    ( MIPCHI2DV()  > 4.     )
     """ ,
     #
     ## useful shortcuts:
     #
     'Preambulo' : [
-    ## shortcut for chi2 of vertex fit 
-    'chi2vx = VFASPF(VCHI2)   '                                , 
+    ## shortcut for chi2 of vertex fit
+    'chi2vx = VFASPF(VCHI2)   '                                ,
     ## shortcut for the c*tau
-    "from GaudiKernel.PhysicalConstants import c_light"        , 
+    "from GaudiKernel.PhysicalConstants import c_light"        ,
     ## use the embedded cut for chi2(LifetimeFit)<25
     "ctau      = BPVLTIME ( 25 ) * c_light "                   ,
     "ctau_9    = BPVLTIME (  9 ) * c_light "                   ,
     "ctau_16   = BPVLTIME ( 16 ) * c_light "                   ,
-    ## Combination mass-cut for beauty particles 
+    ## Combination mass-cut for beauty particles
     "mbp_acut  = in_range ( 5.050 * GeV , AM , 5.550 * GeV ) " ,
     "mbc_acut  = in_range ( 6.000 * GeV , AM , 6.600 * GeV ) " ,
-    ## mass-cut for beauty particles 
+    ## mass-cut for beauty particles
     "mbp_cut   = in_range ( 5.100 * GeV ,  M , 5.500 * GeV ) " ,
     "mbc_cut   = in_range ( 6.050 * GeV ,  M , 6.550 * GeV ) " ,
     ] ,
     # =========================================================================
-    ## Prescales 
+    ## Prescales
     # =========================================================================
     'Bc3piPrescale'    : 1.0 ,
     'Bc3kPrescale'     : 1.0 ,
@@ -139,18 +139,18 @@ _default_configuration_ = {
     # =========================================================================
     }
 # =============================================================================
-## the mandatory element for stripping framework 
+## the mandatory element for stripping framework
 default_config = {
     'NAME'        :   'Bc3h'                 ,
     'WGs'         : [ 'BandQ' ]              ,
     'BUILDERTYPE' :   'Bc3hConf'             ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'STREAMS'     : { 'Bhadron' : [ 'StrippingBc3piForBc3h'   ,
                                     'StrippingBc3kForBc3h'    ,
-                                    'StrippingBc3kpiForBc3h'  , 
-                                    'StrippingBc3pppiForBc3h' , 
-                                    'StrippingBc3ppkForBc3h'  ] } 
-    }    
+                                    'StrippingBc3kpiForBc3h'  ,
+                                    'StrippingBc3pppiForBc3h' ,
+                                    'StrippingBc3ppkForBc3h'  ] }
+    }
 # =============================================================================
 ## @class  Bc3hConf
 #  @author Vanya BELYAEV Ivan.Belyaev@itep.ru
@@ -160,30 +160,30 @@ class Bc3hConf(LineBuilder) :
     Helper class to configure 'Bc->3h'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    ## get the default configuration 
+
+    ## get the default configuration
     @staticmethod
     def defaultConfiguration ( key = None ) :
         """
         Get the default/recommended configurtaion
-        
+
         >>> conf = Bc3h.defaultConfiguration()
-        
+
         """
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__ ( self , name , config ) :
         """
         Constructor
         """
-        # check the names 
+        # check the names
         if 'Bc3h' != name :
-            logger.warning ( 'The non-default name is specified "%s"' % name  ) 
-            
+            logger.warning ( 'The non-default name is specified "%s"' % name  )
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
 
@@ -193,68 +193,68 @@ class Bc3hConf(LineBuilder) :
         else :
             LineBuilder.__init__( self , name ,  config )
 
-        ## private set of selections 
+        ## private set of selections
         self.__selections_ = {}
-        
+
         if not self.__selections_.has_key ( self.name() ) :
             self.__selections_[ self.name() ] = {}
-            
-        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config ) 
-        
+
+        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config )
+
         keys = _config.keys()
         for key in keys :
-            
+
             if not key in _default_configuration_ :
                 raise KeyError("Invalid key is specified: '%s'" % key )
-            
+
             val = _config[key]
-            if val != _default_configuration_ [ key ] : 
+            if val != _default_configuration_ [ key ] :
                 logger.debug ('new configuration: %-16s : %s ' % ( key , _config[key] ) )
-                
+
         self._name         = name
-        
+
         for line in self._lines_Bc () :
             self.registerLine(line)
-            logger.debug ( "Register line: %s" %  line.name () ) 
-            
-            
-    ## get the selection, associated with some nickname name 
+            logger.debug ( "Register line: %s" %  line.name () )
+
+
+    ## get the selection, associated with some nickname name
     def _selection ( self , nick ) :
         """
         Get the selection, associated with some nickname name
         """
-        
+
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-            
-        return self.__selections_[ self.name() ].get( nick , None ) 
-    
-    ## add the selection, associated with some nickname name 
+            self.__selections_[ self.name() ] = {}
+
+        return self.__selections_[ self.name() ].get( nick , None )
+
+    ## add the selection, associated with some nickname name
     def _add_selection ( self , nick , sel ) :
         """
         add the selection, associated with some nickname name
         """
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-        
+            self.__selections_[ self.name() ] = {}
+
         if self.__selections_[ self.name()].has_key( nick ) :
             raise AttributeError , "Selection '%s'already exists " % nick
-        
+
         self.__selections_[ self.name() ][ nick ] = sel
-        
+
         return sel
 
     # =========================================================================
     ## pure technical method for creation of selections
     # =========================================================================
     def make_selection ( self      ,
-                         tag       , 
+                         tag       ,
                          algotype  ,
-                         inputs    , 
+                         inputs    ,
                          *args     ,
                          **kwargs  ) :
         """
-        Technical method for creation of 1-step selections 
+        Technical method for creation of 1-step selections
         """
         sel_tag  = '%s_Selection' % tag
         sel_name = 'Sel%sFor%s'   % ( tag , self.name() )
@@ -262,34 +262,34 @@ class Bc3hConf(LineBuilder) :
         ## check existing selection
         #
         sel      = self._selection ( sel_tag )
-        if sel : return sel 
-        
+        if sel : return sel
+
         #
         ## adjust a bit the arguments
         if not kwargs.has_key ( 'Preambulo'         ) :
             kwargs ['Preambulo'        ] = self['Preambulo']
-            
+
         if not kwargs.has_key ( 'ParticleCombiners' ) :
-            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' } 
-                          
-        # 
+            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' }
+
+        #
         ## use "simple-selection"
         #
         from PhysSelPython.Wrappers import SimpleSelection
         sel = SimpleSelection (
             sel_name ,
             algotype ,
-            inputs   , 
+            inputs   ,
             *args    ,
             **kwargs )
-        # 
-        return self._add_selection( sel_tag , sel ) 
+        #
+        return self._add_selection( sel_tag , sel )
+
 
- 
-    ## get all single charm lines 
+    ## get all single charm lines
     def _lines_Bc   ( self ) :
         """
-        Get all psiX lines 
+        Get all psiX lines
         """
         sel = self._selection ( 'Bc3h_Lines' )
         if sel : return sel
@@ -302,7 +302,7 @@ class Bc3hConf(LineBuilder) :
             #
             StrippingLine (
             "Bc3pppiFor"    + self.name()              ,
-            prescale        = self ['Bc3pppiPrescale'] , 
+            prescale        = self ['Bc3pppiPrescale'] ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
@@ -313,7 +313,7 @@ class Bc3hConf(LineBuilder) :
             #
             StrippingLine (
             "Bc3ppkFor"     + self.name()              ,
-            prescale        = self ['Bc3ppkPrescale']  , 
+            prescale        = self ['Bc3ppkPrescale']  ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
@@ -324,7 +324,7 @@ class Bc3hConf(LineBuilder) :
             #
             StrippingLine (
             "Bc3piFor"      + self.name()              ,
-            prescale        = self ['Bc3piPrescale'] , 
+            prescale        = self ['Bc3piPrescale'] ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
@@ -332,10 +332,10 @@ class Bc3hConf(LineBuilder) :
             HLT1            = self ['HLT1'   ]         ,
             HLT2            = self ['HLT2'   ]         ,
             algos           = [ self.Bc3pi ()      ]  ) ,
-            ## 
+            ##
             StrippingLine (
             "Bc3kFor"      + self.name()              ,
-            prescale        = self ['Bc3kPrescale'] , 
+            prescale        = self ['Bc3kPrescale'] ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
@@ -346,7 +346,7 @@ class Bc3hConf(LineBuilder) :
             #
             StrippingLine (
             "Bc3kpiFor"     + self.name()              ,
-            prescale        = self ['Bc3kpiPrescale']  , 
+            prescale        = self ['Bc3kpiPrescale']  ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
@@ -355,104 +355,104 @@ class Bc3hConf(LineBuilder) :
             HLT2            = self ['HLT2'   ]         ,
             algos           = [ self.Bc3kpi ()    ]  ) ,
             ]
-        ## 
-        return self._add_selection ( 'Bc3h_Lines' , sel ) 
-    
+        ##
+        return self._add_selection ( 'Bc3h_Lines' , sel )
+
     ## pions :
     def pions     ( self ) :
         """ Pions for   Bc -> 3h lines """
         ##
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdAllLooseANNPions as inpts 
+        from StandardParticles                     import StdAllLooseANNPions as inpts
         return self.make_selection (
             'Pion'                 ,
             FilterDesktop          ,
             [ inpts ]              ,
             Code = self['PionCut'] ,
             )
-    
+
     ## kaons :
     def kaons     ( self ) :
         """ Kaons for   Bc -> 3h lines """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdAllLooseANNKaons as inpts  
+        from StandardParticles                     import StdAllLooseANNKaons as inpts
         return self.make_selection (
             'Kaon'                 ,
             FilterDesktop          ,
             [ inpts ]              ,
             Code = self['KaonCut'] ,
             )
-    
+
     ## protons :
     def protons    ( self ) :
         """ Protons for   Bc -> 3h  lines  """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdAllLooseANNProtons as inpts 
+        from StandardParticles                     import StdAllLooseANNProtons as inpts
         return self.make_selection (
             'Proton'                 ,
             FilterDesktop            ,
             [ inpts ]                ,
             Code = self['ProtonCut'] ,
             )
-    
-    # Bc -> 3 pi 
+
+    # Bc -> 3 pi
     def Bc3pi ( self ) :
         """ Bc -> 3 pi """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            'Bc3pi'               , ## selection name 
-            DaVinci__N3BodyDecays , ## the algorithm type 
-            [ self.pions() ]      , ## input selections 
+            'Bc3pi'               , ## selection name
+            DaVinci__N3BodyDecays , ## the algorithm type
+            [ self.pions() ]      , ## input selections
             #
             ## algorithm configurtaion
             #
             DecayDescriptor  = "[B_c+ -> pi+ pi- pi+ ]cc" ,
             Combination12Cut = """ ( AM < 7 * GeV )
-            & ( ACHI2DOCA(1,2) < 20 )  
-            """  , 
+            & ( ACHI2DOCA(1,2) < 20 )
+            """  ,
             CombinationCut   = """ ( mbp_acut | mbc_acut )
-            & ( ACHI2DOCA(1,3) < 20 ) 
-            & ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
+            & ( ACHI2DOCA(1,3) < 20 )
+            & ( ACHI2DOCA(2,3) < 20 )
+            """ ,
             MotherCut        = """
             ( chi2vx    < 16            ) &
-            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) ) 
-            """ % ( self['CTAU'] , self['CTAU_BC'] ) 
+            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) )
+            """ % ( self['CTAU'] , self['CTAU_BC'] )
             )
-    
-    # Bc -> 3 k 
+
+    # Bc -> 3 k
     def Bc3k ( self ) :
         """ Bc -> 3 k """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            'Bc3k'                , ## selection name 
-            DaVinci__N3BodyDecays , ## the algorithm type 
-            [ self.kaons() ]      , ## input selections 
+            'Bc3k'                , ## selection name
+            DaVinci__N3BodyDecays , ## the algorithm type
+            [ self.kaons() ]      , ## input selections
             #
             ## algorithm configurtaion
             #
             DecayDescriptor  = "[B_c+ -> K+ K- K+ ]cc" ,
             Combination12Cut = """ ( AM < 7 * GeV )
-            & ( ACHI2DOCA(1,2) < 20 )  
-            """  , 
+            & ( ACHI2DOCA(1,2) < 20 )
+            """  ,
             CombinationCut   = """ ( mbp_acut | mbc_acut )
-            & ( ACHI2DOCA(1,3) < 20 ) 
-            & ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
+            & ( ACHI2DOCA(1,3) < 20 )
+            & ( ACHI2DOCA(2,3) < 20 )
+            """ ,
             MotherCut        = """
             ( chi2vx    < 16            ) &
-            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) ) 
-            """ % ( self['CTAU'] , self['CTAU_BC'] ) 
+            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) )
+            """ % ( self['CTAU'] , self['CTAU_BC'] )
             )
 
-    # Bc -> 3kpi 
+    # Bc -> 3kpi
     def Bc3kpi ( self ) :
         """ Bc -> 3 k pi """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            'Bc3kpi'                         , ## selection name 
-            DaVinci__N3BodyDecays            , ## the algorithm type 
-            [ self.kaons() , self.pions() ]  , ## input selections 
+            'Bc3kpi'                         , ## selection name
+            DaVinci__N3BodyDecays            , ## the algorithm type
+            [ self.kaons() , self.pions() ]  , ## input selections
             #
             ## algorithm configurtaion
             #
@@ -461,117 +461,117 @@ class Bc3hConf(LineBuilder) :
             "[B_c+ -> K+  pi- pi+ ]cc" ,
             ] ,
             Combination12Cut = """ ( AM < 7 * GeV )
-            & ( ACHI2DOCA(1,2) < 20 )  
-            """  , 
+            & ( ACHI2DOCA(1,2) < 20 )
+            """  ,
             CombinationCut   = """ ( mbp_acut | mbc_acut )
-            & ( ACHI2DOCA(1,3) < 20 ) 
-            & ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
+            & ( ACHI2DOCA(1,3) < 20 )
+            & ( ACHI2DOCA(2,3) < 20 )
+            """ ,
             MotherCut        = """
             ( chi2vx    < 16            ) &
-            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) ) 
-            """ % ( self['CTAU'] , self['CTAU_BC'] ) 
+            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) )
+            """ % ( self['CTAU'] , self['CTAU_BC'] )
             )
-    
+
     # Bc -> pppi
     def Bc3pppi ( self ) :
         """ Bc -> pppi"""
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            'Bc3pppi'                         , ## selection name 
-            DaVinci__N3BodyDecays             , ## the algorithm type 
-            [ self.protons() , self.pions() ] , ## input selections 
+            'Bc3pppi'                         , ## selection name
+            DaVinci__N3BodyDecays             , ## the algorithm type
+            [ self.protons() , self.pions() ] , ## input selections
             #
             ## algorithm configurtaion
             #
             DecayDescriptor  = "[B_c+ -> p+  p~- pi+ ]cc" ,
             Combination12Cut = """ ( AM < 7 * GeV )
-            & ( ACHI2DOCA(1,2) < 20 )  
-            """  , 
+            & ( ACHI2DOCA(1,2) < 20 )
+            """  ,
             CombinationCut   = """ ( mbp_acut | mbc_acut )
-            & ( ACHI2DOCA(1,3) < 20 ) 
-            & ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
+            & ( ACHI2DOCA(1,3) < 20 )
+            & ( ACHI2DOCA(2,3) < 20 )
+            """ ,
             MotherCut        = """
             ( chi2vx    < 16            ) &
-            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) ) 
-            """ % ( self['CTAU'] , self['CTAU_BC'] ) 
+            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) )
+            """ % ( self['CTAU'] , self['CTAU_BC'] )
             )
-    
+
     # Bc -> ppK
     def Bc3ppk ( self ) :
         """
         Bc -> ppK
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            'Bc3ppk'                          , ## selection name 
-            DaVinci__N3BodyDecays             , ## the algorithm type 
-            [ self.protons() , self.kaons() ] , ## input selections 
+            'Bc3ppk'                          , ## selection name
+            DaVinci__N3BodyDecays             , ## the algorithm type
+            [ self.protons() , self.kaons() ] , ## input selections
             #
             ## algorithm configurtaion
             #
             DecayDescriptor  = "[B_c+ -> p+  p~- K+ ]cc" ,
             Combination12Cut = """ ( AM < 7 * GeV )
-            & ( ACHI2DOCA(1,2) < 20 )  
-            """  , 
+            & ( ACHI2DOCA(1,2) < 20 )
+            """  ,
             CombinationCut   = """ ( mbp_acut | mbc_acut )
-            & ( ACHI2DOCA(1,3) < 20 ) 
-            & ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
+            & ( ACHI2DOCA(1,3) < 20 )
+            & ( ACHI2DOCA(2,3) < 20 )
+            """ ,
             MotherCut        = """
             ( chi2vx    < 16            ) &
-            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) ) 
-            """ % ( self['CTAU'] , self['CTAU_BC'] ) 
+            ( ( mbp_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) )
+            """ % ( self['CTAU'] , self['CTAU_BC'] )
             )
-    
+
 # =============================================================================
 if '__main__' == __name__ :
-    
 
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
+
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
     logger.info ( ' Date   :  %s' % __date__   )
     ##
-    clines = set() 
+    clines = set()
     logger.info ( ' Lines declared in default_config["STREAMS"] are' )
     for stream in default_config['STREAMS'] :
-        lines = default_config['STREAMS'][stream] 
+        lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s : %-50s ' % ( stream , l ) )
             clines.add ( l )
     ##
     logger.info ( ' The output locations for the default configuration: ' )
     _conf = Bc3hConf ( 'Bc3h' , config = default_config['CONFIG'] )
-    ## 
+    ##
     _ln   = ' ' + 61*'-' + '+' + 30*'-'
-    logger.info ( _ln ) 
-    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) ) 
+    logger.info ( _ln )
+    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
-        lname = l.name() 
+        lname = l.name()
         logger.info ( '  %-60s| %-30s  ' % ( lout, lname ) )
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-   
+
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py
index 668113f08f62131fcb3a0747c1c4057986c79204..7cf85f2b634c43e1ccf8471459e639a93da76011 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 # $Id: StrippingCC2DD.py, v 0.4 2015-12-01  $
-''' 
+'''
 Module for construction of CC->D D, where CC is a particle decaying to D D
                                     and D is a D0(Kpi) or a D+(K-pi+pi+)
                                           or a Ds(KKpi)
@@ -108,7 +108,7 @@ default_config =  {
                    'CCMaxD0MinTreeIpChi2'   : "0.",    ## unused for the moment
                    },
     'STREAMS' : [
-    'CharmCompleteEvent' 
+    'CharmCompleteEvent'
     ],
     },
     'CC2DDcontrol' :  {
@@ -207,7 +207,7 @@ class CC2DDConf(LineBuilder) :
 
         LineBuilder.__init__(self, name, config)
 
-        self.selD02HH = makeD02HH( 'D0For'+name, 
+        self.selD02HH = makeD02HH( 'D0For'+name,
                                      D0MassWin     = config['D0MassWin'],
                                      D0PT          = config['D0PT'],
                                      D0VtxChi2Ndof = config['D0VtxChi2Ndof'],
@@ -224,7 +224,7 @@ class CC2DDConf(LineBuilder) :
                                      D0daughterPionProbNNpi = config['D0daughterPionProbNNpi'],
                                    )
 
-        self.selDp2HHH = makeDp2HHH( 'DpFor'+name, 
+        self.selDp2HHH = makeDp2HHH( 'DpFor'+name,
                                      DpmMassWin     = config['DpmMassWin'],
                                      DpmPT          = config['DpmPT'],
                                      DpmVtxChi2Ndof = config['DpmVtxChi2Ndof'],
@@ -241,7 +241,7 @@ class CC2DDConf(LineBuilder) :
                                      DpmdaughterPionProbNNpi = config['DpmdaughterPionProbNNpi'],
                                    )
 
-        self.selDs2HHH = makeDs2HHH( 'DsFor'+name, 
+        self.selDs2HHH = makeDs2HHH( 'DsFor'+name,
                                      DpmMassWin     = config['DpmMassWin'],
                                      DpmPT          = config['DpmPT'],
                                      DpmVtxChi2Ndof = config['DpmVtxChi2Ndof'],
@@ -259,7 +259,7 @@ class CC2DDConf(LineBuilder) :
                                    )
 
 
-        self.selLc2HHH = makeLc2HHH( 'LcFor'+name, 
+        self.selLc2HHH = makeLc2HHH( 'LcFor'+name,
                                      LcMassWin     = config['LcMassWin'],
                                      LcPT          = config['LcPT'],
                                      LcVtxChi2Ndof = config['LcVtxChi2Ndof'],
@@ -277,7 +277,7 @@ class CC2DDConf(LineBuilder) :
                                      LcdaughterPionProbNNpi = config['LcdaughterPionProbNNpi'],
                                    )
 
-        self.selXc2HHHH = makeXc2HHHH( 'XcFor'+name, 
+        self.selXc2HHHH = makeXc2HHHH( 'XcFor'+name,
                                      XcMassWin     = config['XcMassWin'],
                                      XcPT          = config['XcPT'],
                                      XcVtxChi2Ndof = config['XcVtxChi2Ndof'],
@@ -296,7 +296,7 @@ class CC2DDConf(LineBuilder) :
                                    )
 
 
-        self.selCC2DD = makeCC2DD(name,  
+        self.selCC2DD = makeCC2DD(name,
                                   D0Sel    = self.selD02HH,
                                   DplusSel = self.selDp2HHH,
                                   DsSel    = self.selDs2HHH,
@@ -322,11 +322,11 @@ def makeD02HH(name, D0MassWin, D0PT, D0VtxChi2Ndof, D0Bpvdira, D0Bpvdls,
                     D0daughterPT, D0daughterP, D0daughterTrkChi2,
                     D0daughterTrkGhostProb, D0daughterBpvIpChi2,
 ###                    D0daughterKaonPIDK, D0daughterPionPIDK,
-                    D0daughterKaonProbNNk, D0daughterPionProbNNpi, 
+                    D0daughterKaonProbNNk, D0daughterPionProbNNpi,
               ) :
 
     """
-    Create and return a D0 -> K pi 
+    Create and return a D0 -> K pi
     """
 
     _motherCuts = "(ADMASS('D0')<%(D0MassWin)s) & (PT>%(D0PT)s) & (VFASPF(VCHI2PDOF)<%(D0VtxChi2Ndof)s) " % locals()
@@ -558,7 +558,7 @@ def makeCC2DD(name,
     CCMaxD0MinTreeIpChi2 : max between D0/D~0 minima of daughter's MINIPCHI2
     """
 
-    _motherCuts = "(ALL)" 
+    _motherCuts = "(ALL)"
 #    _motherCuts  = "(VFASPF(VCHI2PDOF)<%(CCVtxChi2Ndof)s)" % locals()
 #    _motherCuts += "&(MAXTREE(ISBASIC,PT)>%(CCMaxD0TreePT)s)" % locals()
     _combinationCuts  = "(AALL)"
@@ -616,4 +616,3 @@ def makeCC2DD(name,
     return Selection ( name,
                        Algorithm = _X,
                        RequiredSelections = [DSel])
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py
index fd9476eb9d7628e49ab6759d098f2cb690ab4228..1d249eef5615b4a6ef4d133f2887084cd56b2ee4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -49,58 +49,58 @@ from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPio
 class Ccbar2BaryonsConf(LineBuilder):
 
     __configuration_keys__ = config_default.keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         """
-        Lambda 
+        Lambda
         """
         self.LambdaLLForJpsi = self.createSubSel( OutputList = "LambdaLLFor" + self.name,
-                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLL/Particles' ), 
+                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLL/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)<16)"\
                                                   " & (ADMASS('Lambda0')<5*MeV)"\
                                                   " & (INTREE( ('pi+'==ABSID) & (TRCHI2DOF < %(TRCHI2DOF)s)))" \
                                                   " & (INTREE( ('p+'==ABSID)  & (TRCHI2DOF < %(TRCHI2DOF)s)))" \
                                                   " & (log(CHILD(MIPDV(PRIMARY),1)*CHILD(MIPDV(PRIMARY),2)/MIPDV(PRIMARY))>2.0)"\
                                                   " & (ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20*MeV )" % self.config )
-        
+
         self.LambdaDDForJpsi = self.createSubSel( OutputList = "LambdaDDFor" + self.name,
-                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaDD/Particles' ), 
+                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaDD/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)<16)"\
                                                   " & (ADMASS('Lambda0')<5*MeV)"\
                                                   " & (INTREE( ('pi+'==ABSID) & (TRCHI2DOF < %(TRCHI2DOF)s)))" \
                                                   " & (INTREE( ('p+'==ABSID)  & (TRCHI2DOF < %(TRCHI2DOF)s) & (PIDp>5) ))" \
                                                   " & (log(CHILD(MIPDV(PRIMARY),1)*CHILD(MIPDV(PRIMARY),2)/MIPDV(PRIMARY))>2.5)"\
                                                   " & (ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20*MeV )" % self.config )
-        
+
         self.LambdaForJpsiList = MergedSelection("MergedLambdaForJpsi" + self.name,
-                                                 RequiredSelections =  [ self.LambdaLLForJpsi, 
-                                                                         self.LambdaDDForJpsi, 
+                                                 RequiredSelections =  [ self.LambdaLLForJpsi,
+                                                                         self.LambdaDDForJpsi,
                                                                          ])
-        
+
         """
-        Pion 
+        Pion
         """
         self.PionLongForXi = self.createSubSel( OutputList = "PionLongForXiList" + self.name,
-                                                InputList =  DataOnDemand( Location = 'Phys/StdNoPIDsPions/Particles' ), 
+                                                InputList =  DataOnDemand( Location = 'Phys/StdNoPIDsPions/Particles' ),
                                                 Cuts = "(PT>0.1*GeV) & (P>2.*GeV) & (TRCHI2DOF < %(TRCHI2DOF)s )" % self.config
                                                 )
 
         self.PionDownForXi = self.createSubSel( OutputList = "PionDownForXiList" + self.name,
-                                                InputList =  DataOnDemand( Location = 'Phys/StdNoPIDsDownPions/Particles' ), 
+                                                InputList =  DataOnDemand( Location = 'Phys/StdNoPIDsDownPions/Particles' ),
                                                 Cuts = "(PT>0.1*GeV) & (P>2.*GeV) & (TRCHI2DOF < %(TRCHI2DOF)s )" % self.config
                                                 )
-        
+
         self.PionForXiList = MergedSelection("MergedPionForXi" + self.name,
-                                             RequiredSelections =  [ self.PionLongForXi, 
-                                                                     self.PionDownForXi, 
+                                             RequiredSelections =  [ self.PionLongForXi,
+                                                                     self.PionDownForXi,
                                                                      ])
-        
+
         """
         Xi
         """
@@ -112,7 +112,7 @@ class Ccbar2BaryonsConf(LineBuilder):
                                                  " & (ADMASS('Xi-')<20*MeV)"
                                                  )
 
-        
+
         self.makeJpsi2DiLambda()
         self.makeJpsi2DiXi()
 
@@ -122,7 +122,7 @@ class Ccbar2BaryonsConf(LineBuilder):
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -138,32 +138,32 @@ class Ccbar2BaryonsConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
-    
-    
+
+
+
     def makeJpsi2DiLambda(self):
         Jpsi2DiLambda = self.createCombinationSel( OutputList = "Jpsi2DiLambda" + self.name,
-                                                   DecayDescriptor = " J/psi(1S) -> Lambda0 Lambda~0", 
-                                                   DaughterLists = [ self.LambdaForJpsiList ], 
+                                                   DecayDescriptor = " J/psi(1S) -> Lambda0 Lambda~0",
+                                                   DaughterLists = [ self.LambdaForJpsiList ],
                                                    DaughterCuts  = { "Lambda0": "(PT>0.5*GeV)" },
                                                    PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                    PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 16 )" %self.config )
-        
+
         Jpsi2DiLambdaLine = StrippingLine( self.name + "Jpsi2DiLambdaLine",
                                            algos = [ Jpsi2DiLambda ] )
-        
+
         self.registerLine(Jpsi2DiLambdaLine)
 
 
     def makeJpsi2DiXi(self):
         Jpsi2DiXi = self.createCombinationSel( OutputList = "Jpsi2DiXi" + self.name,
-                                               DecayDescriptor = " J/psi(1S) -> Xi~+  Xi-", 
-                                               DaughterLists = [ self.XiList ], 
+                                               DecayDescriptor = " J/psi(1S) -> Xi~+  Xi-",
+                                               DaughterLists = [ self.XiList ],
                                                DaughterCuts  = { "Xi-": "(PT>0.5*GeV)" },
                                                PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 16 )" %self.config )
-        
+
         Jpsi2DiXiLine = StrippingLine( self.name + "Jpsi2DiXiLine",
                                            algos = [ Jpsi2DiXi ] )
-        
+
         self.registerLine(Jpsi2DiXiLine)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index edc90b93c3ae1617919d687b4dbbfda215624d87..9a334a2decd81205dfe72a2180dc2793fd552f0d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
+Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts.
 '''
 
 __author__=['Andrii Usachov']
@@ -20,11 +20,11 @@ __all__ = (
     )
 
 default_config = {
-    'NAME'        : 'Ccbar2LambdaLambda', 
+    'NAME'        : 'Ccbar2LambdaLambda',
     'BUILDERTYPE' : 'Ccbar2LambdaLambdaConf',
     'CONFIG' : {
         'TRCHI2DOF'        :  5.   ,
-        'TRIPCHI2'         :  4.   , 
+        'TRIPCHI2'         :  4.   ,
         'ProtonProbNNp'    :  0.3  ,
         'ProtonP'          :  5000 ,
         'ProtonPTSec'      :  250. , # MeV
@@ -54,35 +54,35 @@ from StandardParticles import StdAllLoosePions
 
 
 class Ccbar2LambdaLambdaConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         """
-        Lambda 
+        Lambda
         """
         self.LambdaLLForJpsi = self.createSubSel( OutputList = "LambdaLLFor" + self.name,
-                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLL/Particles' ), 
+                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLL/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)< %(LambdaVCHI2DOF)s)"\
                                                   " & (ADMASS('Lambda0')<%(LambdaMassW)s *MeV)"\
                                                   " & (INTREE( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY) > %(TRIPCHI2)s) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNpi> %(PionProbNNpi)s) & (PT> %(PionPTSec)s*MeV)))"\
                                                   " & (INTREE( ('p+'==ABSID)  & (MIPCHI2DV(PRIMARY) > %(TRIPCHI2)s) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNp> %(ProtonProbNNp)s) & (PT> %(ProtonPTSec)s*MeV)))"\
                                                   " & (ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20*MeV ) & (BPVDLS>5)" % self.config )
-        
+
         self.LambdaDDForJpsi = self.createSubSel( OutputList = "LambdaDDFor" + self.name,
-                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaDD/Particles' ), 
+                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaDD/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)< %(LambdaVCHI2DOF)s)"\
                                                   " & (ADMASS('Lambda0')< %(LambdaMassW)s *MeV)"\
                                                   " & (INTREE( ('pi+'==ABSID) & (MIPCHI2DV(PRIMARY) > %(TRIPCHI2)s) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNpi> %(PionProbNNpi)s) & (PT> %(PionPTSec)s*MeV)))"\
                                                   " & (INTREE( ('p+'==ABSID)  & (MIPCHI2DV(PRIMARY) > %(TRIPCHI2)s) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNp> %(ProtonProbNNp)s) & (PT> %(ProtonPTSec)s*MeV)))"\
                                                   " & (ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20*MeV ) & (BPVDLS>5)" % self.config )
-        
+
         self.LambdaLDForJpsi = self.createSubSel( OutputList = "LambdaLDFor" + self.name,
                                                   InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLD/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)< %(LambdaVCHI2DOF)s)"\
@@ -93,21 +93,21 @@ class Ccbar2LambdaLambdaConf(LineBuilder):
 
         self.LambdaForJpsiList = MergedSelection("MergedLambdaForJpsi" + self.name,
                                                  RequiredSelections =  [ self.LambdaLLForJpsi,
-                                                                         self.LambdaDDForJpsi, 
+                                                                         self.LambdaDDForJpsi,
 									 self.LambdaLDForJpsi
                                                                        ])
 
 
         self.makeJpsi2LambdaLambda()
 
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -124,18 +124,14 @@ class Ccbar2LambdaLambdaConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def makeJpsi2LambdaLambda(self):
         Jpsi2LambdaLambda = self.createCombinationSel( OutputList = "Jpsi2LambdaLambda" + self.name,
                                                        DecayDescriptor = "J/psi(1S) -> Lambda0 Lambda~0",
                                                        DaughterLists = [ self.LambdaForJpsiList],
                                                        PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                        PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 9 )" %self.config )
-                                                        
+
         Jpsi2LambdaLambdaLine = StrippingLine( self.name + "Line",
                                                  algos = [ Jpsi2LambdaLambda ] )
         self.registerLine(Jpsi2LambdaLambdaLine)
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py
index b6b87284e26217d8ab7791adba888e744c681cbc..6eca11a2b0c63e2663be1d48e686454bf4d54284 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
+Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts.
 '''
 
 __author__=['Andrii Usachov']
@@ -20,7 +20,7 @@ __all__ = (
     )
 
 default_config = {
-    'NAME'        : 'Ccbar2LstLambda', 
+    'NAME'        : 'Ccbar2LstLambda',
     'BUILDERTYPE' : 'Ccbar2LstLambdaConf',
     'CONFIG' : {
         'TRCHI2DOF'        :  5.   ,
@@ -58,13 +58,13 @@ from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 
 class Ccbar2LstLambdaConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         self.DetachedProtonForLst = self.createSubSel( OutputList = "DetachedProtonForLst" + self.name,
@@ -75,7 +75,7 @@ class Ccbar2LstLambdaConf(LineBuilder):
                                               InputList =  DataOnDemand( Location = 'Phys/StdNoPIDsKaons/Particles' ),
                                               Cuts = "(PT> %(KaonPTSec)s*MeV) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNk> %(KaonProbNNk)s)" % self.config
                                               )
-        
+
         self.DetachedLstForJpsiList = self.createCombinationSel( OutputList = "DetachedLstFor" + self.name,
                                                         DaughterLists = [ self.DetachedProtonForLst, self.DetachedKaonForLst],
                                                         DecayDescriptor = "[Lambda(1520)0 -> p+ K-]cc",
@@ -86,24 +86,24 @@ class Ccbar2LstLambdaConf(LineBuilder):
 
 
         """
-        Lambda 
+        Lambda
         """
         self.LambdaLLForJpsi = self.createSubSel( OutputList = "LambdaLLFor" + self.name,
-                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLL/Particles' ), 
+                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLL/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)< %(LambdaVCHI2DOF)s)"\
                                                   " & (ADMASS('Lambda0')<%(LambdaMassW)s *MeV)"\
                                                   " & (INTREE( ('pi+'==ABSID) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNpi> %(PionProbNNpi)s) & (PT> %(PionPTSec)s*MeV)))"\
                                                   " & (INTREE( ('p+'==ABSID)  & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNp> %(ProtonProbNNp)s) & (PT> %(ProtonPTSec)s*MeV)))"\
                                                   " & (ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20*MeV ) & (BPVDLS>4)" % self.config )
-        
+
         self.LambdaDDForJpsi = self.createSubSel( OutputList = "LambdaDDFor" + self.name,
-                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaDD/Particles' ), 
+                                                  InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaDD/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)< %(LambdaVCHI2DOF)s)"\
                                                   " & (ADMASS('Lambda0')< %(LambdaMassW)s *MeV)"\
                                                   " & (INTREE( ('pi+'==ABSID) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNpi> %(PionProbNNpi)s) & (PT> %(PionPTSec)s*MeV)))"\
                                                   " & (INTREE( ('p+'==ABSID)  & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNp> %(ProtonProbNNp)s) & (PT> %(ProtonPTSec)s*MeV)))"\
                                                   " & (ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20*MeV ) & (BPVDLS>4)" % self.config )
-        
+
         self.LambdaLDForJpsi = self.createSubSel( OutputList = "LambdaLDFor" + self.name,
                                                   InputList =  DataOnDemand( Location = 'Phys/StdLooseLambdaLD/Particles' ),
                                                   Cuts = "(VFASPF(VCHI2/VDOF)< %(LambdaVCHI2DOF)s)"\
@@ -114,21 +114,21 @@ class Ccbar2LstLambdaConf(LineBuilder):
 
         self.LambdaForJpsiList = MergedSelection("MergedLambdaForJpsi" + self.name,
                                                  RequiredSelections =  [ self.LambdaLLForJpsi,
-                                                                         self.LambdaDDForJpsi, 
+                                                                         self.LambdaDDForJpsi,
 									 self.LambdaLDForJpsi
                                                                        ])
 
 
         self.makeDetachedJpsi2LstLambda()
 
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -145,18 +145,14 @@ class Ccbar2LstLambdaConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def makeDetachedJpsi2LstLambda(self):
         DetachedJpsi2LstLambda = self.createCombinationSel( OutputList = "DetachedJpsi2LstLambda" + self.name,
                                                          DecayDescriptor = " [J/psi(1S) -> Lambda(1520)0 Lambda~0]cc",
                                                          DaughterLists = [ self.DetachedLstForJpsiList, self.LambdaForJpsiList],
                                                          PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                          PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 16 ) & (BPVDLS>3)" %self.config )
-                                                        
+
         DetachedJpsi2LstLambdaLine = StrippingLine( self.name + "Line",
                                                  algos = [ DetachedJpsi2LstLambda ] )
         self.registerLine(DetachedJpsi2LstLambdaLine)
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py
index 2b3c831b0ca83aa9ecb5edc379bd68229bccbd7f..a2f5c35aa643ed04ae218fb0da549dccbbbb56d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
+Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts.
 '''
 
 __author__=['Andrii Usachov']
@@ -20,7 +20,7 @@ __all__ = (
     )
 
 default_config = {
-    'NAME'        : 'Ccbar2LstLst', 
+    'NAME'        : 'Ccbar2LstLst',
     'BUILDERTYPE' : 'Ccbar2LstLstConf',
     'CONFIG' : {
         'TRCHI2DOF'        :  5.   ,
@@ -52,13 +52,13 @@ from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 
 
 class Ccbar2LstLstConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         TRCHI2DOF       =   config['TRCHI2DOF']
@@ -85,7 +85,7 @@ class Ccbar2LstLstConf(LineBuilder):
                                               InputList =  DataOnDemand( Location = 'Phys/StdNoPIDsKaons/Particles' ),
                                               Cuts = "(PT> %(KaonPTSec)s*MeV) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PROBNNk> %(KaonProbNNk)s)" % self.config
                                               )
-        
+
         self.DetachedLstForJpsiList = self.createCombinationSel( OutputList = "DetachedLstFor" + self.name,
                                                         DaughterLists = [ self.DetachedProtonForLst, self.DetachedKaonForLst],
                                                         DecayDescriptor = "[Lambda(1520)0 -> p+ K-]cc",
@@ -95,14 +95,14 @@ class Ccbar2LstLstConf(LineBuilder):
                                                         )
         self.makeDetachedJpsi2LstLst()
 
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -119,18 +119,14 @@ class Ccbar2LstLstConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def makeDetachedJpsi2LstLst(self):
         DetachedJpsi2LstLst = self.createCombinationSel( OutputList = "DetachedJpsi2LstLst" + self.name,
                                                          DecayDescriptor = " J/psi(1S) -> Lambda(1520)0 Lambda(1520)~0",
                                                          DaughterLists = [ self.DetachedLstForJpsiList ],
                                                          PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                          PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 16 ) & (BPVDLS>3)" %self.config )
-                                                        
+
         DetachedJpsi2LstLstLine = StrippingLine( self.name + "Line",
                                                  algos = [ DetachedJpsi2LstLst ] )
         self.registerLine(DetachedJpsi2LstLstLine)
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 1d40caa1aa9707f729463f0ad802a0f01ade1675..72ffcba1eaaf26ee4370bcf6967785b074f5fbe0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for selecting charmonium -> p pbar pi pi 
+Module for selecting charmonium -> p pbar pi pi
 '''
 
 __author__=['Jibo He']
@@ -45,30 +45,30 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class Ccbar2PPPiPiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ),
                                            Cuts = config['ProtonCuts']
                                            )
 
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNPions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNPions/Particles' ),
                                            Cuts = config['PionCuts']
                                            )
 
@@ -79,13 +79,13 @@ class Ccbar2PPPiPiConf(LineBuilder):
                                                      DaughterLists = [ self.SelProtons, self.SelPions ],
                                                      DecayDescriptor = "J/psi(1S) -> p+ p~- pi+ pi-",
                                                      ComAMCuts      = config['EtacComAMCuts'],
-                                                     PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                     PreVertexCuts  = config['EtacComN4Cuts'],
                                                      PostVertexCuts = config['EtacMomN4Cuts']
                                                      )
-        
+
 
         """
-        BDT based 
+        BDT based
         """
         self.Ccbar2PPPiPiVars = {
             "sqrt(ProtonP_IPCHI2_OWNPV)"      : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
@@ -109,32 +109,32 @@ class Ccbar2PPPiPiConf(LineBuilder):
             "log(PionP_PT)"                   : "log(CHILD(PT, 3))",
             "log(PionM_PT)"                   : "log(CHILD(PT, 4))",
             "log(Jpsi_PT)"                    : "log(PT)",
-            "Jpsi_ENDVERTEX_CHI2"             : "VFASPF(VCHI2)" 
+            "Jpsi_ENDVERTEX_CHI2"             : "VFASPF(VCHI2)"
         }
 
         self.MvaCcbar2PPPiPi = self.applyMVA( self.name + "MvaCcbar2PPPiPi",
                                            SelB        = self.SelCcbar2PPPiPi,
                                            MVAVars     = self.Ccbar2PPPiPiVars,
-                                           MVACutValue = config['MvaCut'], 
+                                           MVACutValue = config['MvaCut'],
                                            MVAxmlFile  = config['XmlFile']
                                            )
-        
-        self.Ccbar2PPPiPiLine = StrippingLine( self.name + 'Line',                                                
-                                               prescale  = config['Prescale'],                                               
+
+        self.Ccbar2PPPiPiLine = StrippingLine( self.name + 'Line',
+                                               prescale  = config['Prescale'],
                                                algos     = [ self.MvaCcbar2PPPiPi ],
                                                MDSTFlag  = False
                                                )
         self.registerLine( self.Ccbar2PPPiPiLine )
-        
 
-        
+
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createN4BodySel( self, OutputList,
                          DecayDescriptor,
                          DaughterLists,
@@ -143,7 +143,7 @@ class Ccbar2PPPiPiConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
@@ -154,7 +154,7 @@ class Ccbar2PPPiPiConf(LineBuilder):
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
 
-    def applyMVA( self, name, 
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -170,7 +170,7 @@ class Ccbar2PPPiPiConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
-                          RequiredSelections = [ SelB ] )
\ No newline at end of file
+                          RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
index d81db2bd7aff92dfa078f44cf16b37b02c5efaa3..0604f8ba82566f1e42c3fe09b9247a3d74ead916 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -11,7 +11,7 @@
 '''
 Module for selecting Ccbar->PhiPhi, including two lines:
 1. Prompt line, with tight PT, PID cuts, requiring Hlt Tis, since there is no lifetime unbiased phi trigger yet.
-2. Detached line, with loose PT, PID cuts, but with IPS cuts on Kaons. 
+2. Detached line, with loose PT, PID cuts, but with IPS cuts on Kaons.
 
 To include it:
 
@@ -29,7 +29,7 @@ __all__ = (
     )
 
 default_config = {
-    'NAME'        : 'Ccbar2Phi', 
+    'NAME'        : 'Ccbar2Phi',
     'BUILDERTYPE' : 'Ccbar2PhiPhiConf',
     'CONFIG' : {
         'TRCHI2DOF'        :     3.  ,
@@ -38,7 +38,7 @@ default_config = {
         'KaonP'            :  3000.  ,
         'PhiPT'            :   800   ,
         'PhiVtxChi2'       :    9.   ,
-        'PhiMassW'         :    30.  , 
+        'PhiMassW'         :    30.  ,
         'CombMaxMass'      :  4200.  , # MeV, before Vtx fit
         'CombMinMass'      :  2700.  , # MeV, before Vtx fit
         'MaxMass'          :  4150.  , # MeV, after Vtx fit
@@ -61,21 +61,21 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 
 class Ccbar2PhiPhiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         """
-        Unbiased, require Hlt Tis 
+        Unbiased, require Hlt Tis
         """
         self.PhiForJpsiList = self.createSubSel( OutputList = "PhiFor" + self.name,
-                                                 InputList =  DataOnDemand( Location = 'Phys/StdTightPhi2KK/Particles' ), 
+                                                 InputList =  DataOnDemand( Location = 'Phys/StdTightPhi2KK/Particles' ),
                                                  Cuts = "(VFASPF(VCHI2/VDOF)<%(PhiVtxChi2)s) & (PT> %(PhiPT)s*MeV)"\
                                                  " & (ADMASS('phi(1020)')<%(PhiMassW)s*MeV)"\
                                                  " & (INTREE( ('K+'==ID) & (PT> %(KaonPT)s*MeV) & (P> %(KaonP)s*MeV) & (TRCHI2DOF < %(TRCHI2DOF)s) & (PIDK> %(KaonPIDK)s) ))"\
@@ -84,33 +84,33 @@ class Ccbar2PhiPhiConf(LineBuilder):
         #self.TisPhiForJpsiList = self.filterTisTos( "TisPhiFor" + self.name ,
         #                                            PhiInput = self.PhiForJpsiList,
         #                                            myTisTosSpecs = config['Phi_TisTosSpecs']
-        #                                            )        
-        
-        
+        #                                            )
+
+
         """
-        Detached 
+        Detached
         """
         self.DetachedPhiForJpsiList = self.createSubSel( OutputList = "DetachedPhiFor" + self.name,
-                                                         InputList =  DataOnDemand( Location = 'Phys/StdLooseDetachedPhi2KK/Particles' ), 
+                                                         InputList =  DataOnDemand( Location = 'Phys/StdLooseDetachedPhi2KK/Particles' ),
                                                          Cuts = "(VFASPF(VCHI2/VDOF)<%(PhiVtxChi2)s)"\
                                                          " & (ADMASS('phi(1020)')<%(PhiMassW)s*MeV )"\
                                                          " & (MAXTREE('K+'==ABSID, TRCHI2DOF) < %(TRCHI2DOF)s )" \
                                                          " & (MINTREE('K+'==ABSID, PIDK)>0)" % self.config)
 
         """
-        Pion 
+        Pion
         """
         self.PionForCcbar = self.createSubSel( OutputList = "PionFor" + self.name,
-                                               InputList =  DataOnDemand( Location = 'Phys/StdLoosePions/Particles' ), 
-                                               Cuts = config['PionCuts'] 
+                                               InputList =  DataOnDemand( Location = 'Phys/StdLoosePions/Particles' ),
+                                               Cuts = config['PionCuts']
                                                )
 
         """
         Kaon
         """
         self.KaonForCcbar = self.createSubSel( OutputList = "KaonFor" + self.name,
-                                               InputList =  DataOnDemand( Location = 'Phys/StdLooseKaons/Particles' ), 
-                                               Cuts = config['KaonCuts'] 
+                                               InputList =  DataOnDemand( Location = 'Phys/StdLooseKaons/Particles' ),
+                                               Cuts = config['KaonCuts']
                                                )
 
         """
@@ -118,9 +118,9 @@ class Ccbar2PhiPhiConf(LineBuilder):
         """
         self.LooseKaonForCcbar = self.createSubSel( OutputList = "LooseKaonFor" + self.name,
                                                     InputList =  DataOnDemand( Location = 'Phys/StdLooseKaons/Particles' ),
-                                                    Cuts = config['LooseKaonCuts'] 
-                                                    )        
-                                                 
+                                                    Cuts = config['LooseKaonCuts']
+                                                    )
+
 
 
 
@@ -128,14 +128,14 @@ class Ccbar2PhiPhiConf(LineBuilder):
         self.makeDetachedJpsi2PhiKK()
         self.makeDetachedJpsi2PhiPiPi()
         self.makeBs2TriPhi()
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -151,117 +151,116 @@ class Ccbar2PhiPhiConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
-    
-    
+
+
+
     def makeJpsi2PhiPhi(self):
         Jpsi2PhiPhi = self.createCombinationSel( OutputList = "Jpsi2PhiPhi" + self.name,
-                                                 DecayDescriptor = " J/psi(1S) -> phi(1020) phi(1020)", 
-                                                 DaughterLists = [ self.PhiForJpsiList ], 
+                                                 DecayDescriptor = " J/psi(1S) -> phi(1020) phi(1020)",
+                                                 DaughterLists = [ self.PhiForJpsiList ],
                                                  PreVertexCuts = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % self.config,
                                                  PostVertexCuts = "(in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV)) & (VFASPF(VCHI2PDOF) < 9 )" %self.config )
-        
+
         Jpsi2PhiPhiLine = StrippingLine( self.name + "PhiLine",
                                          algos = [ Jpsi2PhiPhi ] )
-        
+
         self.registerLine(Jpsi2PhiPhiLine)
-        
+
 
     def makeDetachedJpsi2PhiKK(self):
         DetachedJpsi2PhiKK = self.createCombinationSel( OutputList = "DetachedJpsi2PhiKK" + self.name,
-                                                        DecayDescriptor = " J/psi(1S) -> phi(1020) K+ K-", 
+                                                        DecayDescriptor = " J/psi(1S) -> phi(1020) K+ K-",
                                                         DaughterLists = [ self.DetachedPhiForJpsiList,
                                                                           self.KaonForCcbar
-                                                                          ], 
+                                                                          ],
                                                         DaughterCuts  = { "phi(1020)": """
                                                                             (INTREE( (ID=='K+') & (PT>500*MeV) & (TRCHI2DOF<5) & (MIPCHI2DV(PRIMARY)>25.) & (PIDK>5)))
                                                                           & (INTREE( (ID=='K-') & (PT>500*MeV) & (TRCHI2DOF<5) & (MIPCHI2DV(PRIMARY)>25.) & (PIDK>5)))
                                                                           """ },
                                                         PreVertexCuts = "AM>2.65*GeV",
                                                         PostVertexCuts = "(MM>2.7*GeV) & (VFASPF(VCHI2PDOF)<16) & (BPVDLS>10)" %self.config )
-        
+
         DetachedJpsi2PhiKKLine = StrippingLine( self.name + "KKDetachedLine",
                                                  algos = [ DetachedJpsi2PhiKK ] )
-        
+
         self.registerLine(DetachedJpsi2PhiKKLine)
 
         """
         Bs->Jpsi Phi
         """
         Bs2JpsiPhi = self.createCombinationSel( OutputList = "Bs2JpsiPhi" + self.name,
-                                                DecayDescriptor = " B_s0 -> J/psi(1S) phi(1020)", 
-                                                DaughterLists = [ DetachedJpsi2PhiKK, 
-                                                                  self.DetachedPhiForJpsiList ], 
+                                                DecayDescriptor = " B_s0 -> J/psi(1S) phi(1020)",
+                                                DaughterLists = [ DetachedJpsi2PhiKK,
+                                                                  self.DetachedPhiForJpsiList ],
                                                 PostVertexCuts = "(VFASPF(VCHI2PDOF)<16)" %self.config )
 
         Bs2JpsiPhiLine = StrippingLine( self.name + "Bs2JpsiPhiLine",
                                         algos = [ Bs2JpsiPhi ] )
-        
+
         self.registerLine( Bs2JpsiPhiLine )
 
         """
         B2JpsiK
         """
         B2JpsiK = self.createCombinationSel( OutputList = "B2JpsiK" + self.name,
-                                             DecayDescriptor = " [ B+ -> J/psi(1S) K+ ]cc", 
-                                             DaughterLists = [ DetachedJpsi2PhiKK, 
-                                                               self.LooseKaonForCcbar ], 
+                                             DecayDescriptor = " [ B+ -> J/psi(1S) K+ ]cc",
+                                             DaughterLists = [ DetachedJpsi2PhiKK,
+                                                               self.LooseKaonForCcbar ],
                                              PostVertexCuts = "(VFASPF(VCHI2PDOF)<16)" %self.config )
 
         B2JpsiKLine = StrippingLine( self.name + "B2JpsiKLine",
                                         algos = [ B2JpsiK ] )
-        
-        self.registerLine( B2JpsiKLine )        
-        
+
+        self.registerLine( B2JpsiKLine )
+
 
 
     def makeDetachedJpsi2PhiPiPi(self):
         DetachedJpsi2PhiPiPi = self.createCombinationSel( OutputList = "DetachedJpsi2PhiPiPi" + self.name,
-                                                          DecayDescriptor = " J/psi(1S) -> phi(1020) pi+ pi-", 
+                                                          DecayDescriptor = " J/psi(1S) -> phi(1020) pi+ pi-",
                                                           DaughterLists = [ self.DetachedPhiForJpsiList,
                                                                             self.PionForCcbar
-                                                                            ], 
-                                                          DaughterCuts  = { "phi(1020)": """                                                                          
+                                                                            ],
+                                                          DaughterCuts  = { "phi(1020)": """
                                                                             (INTREE( (ID=='K+') & (PT>500*MeV) & (TRCHI2DOF<5) & (MIPCHI2DV(PRIMARY)>25.) & (PIDK>5)))
                                                                           & (INTREE( (ID=='K-') & (PT>500*MeV) & (TRCHI2DOF<5) & (MIPCHI2DV(PRIMARY)>25.) & (PIDK>5)))
                                                                           """},
                                                           PreVertexCuts = "AM>2.65*GeV",
                                                           PostVertexCuts = "(MM>2.7*GeV) & (VFASPF(VCHI2PDOF)<16) & (BPVDLS>10)" %self.config )
-        
+
         DetachedJpsi2PhiPiPiLine = StrippingLine( self.name + "PiPiDetachedLine",
                                                   algos = [ DetachedJpsi2PhiPiPi ] )
-        
-        self.registerLine(DetachedJpsi2PhiPiPiLine)     
 
-        
+        self.registerLine(DetachedJpsi2PhiPiPiLine)
+
+
     def makeBs2TriPhi(self):
         Bs2TriPhi = self.createCombinationSel( OutputList = "Bs2TriPhi" + self.name,
-                                               DecayDescriptor = " B_s0 -> phi(1020) phi(1020) phi(1020)", 
-                                               DaughterLists = [ self.DetachedPhiForJpsiList ], 
+                                               DecayDescriptor = " B_s0 -> phi(1020) phi(1020) phi(1020)",
+                                               DaughterLists = [ self.DetachedPhiForJpsiList ],
                                                PreVertexCuts = "AM>2.65*GeV",
                                                PostVertexCuts = "(MM>2.7*GeV) & (VFASPF(VCHI2PDOF)<16)" %self.config )
-        
+
         Bs2TriPhiLine = StrippingLine( self.name + "Bs2TriPhiLine",
                                        algos = [ Bs2TriPhi ] )
-        
-        self.registerLine( Bs2TriPhiLine )        
+
+        self.registerLine( Bs2TriPhiLine )
 
 
     def filterTisTos(self, name,
                      PhiInput,
                      myTisTosSpecs ) :
         from Configurables import TisTosParticleTagger
-        
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system)
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
         myTagger.CaloClustForNeutral = False
         myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-        
+
         return Selection(name + "_SelTisTos",
                          Algorithm = myTagger,
                          RequiredSelections = [ PhiInput ] )
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index a7b1b24bf89321ac141ffd6cbb6b0d92be4bb85d..4ffe3660a76f6c92674c36890d4ae148a87e0a1f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -10,7 +10,7 @@
 ###############################################################################
 '''
 Module for selecting Ccbar->PhiPhi, including one line:
-DiPhi Detached line, with loose PT, PID cuts, but with IPS cuts on Kaons. 
+DiPhi Detached line, with loose PT, PID cuts, but with IPS cuts on Kaons.
 Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
@@ -23,14 +23,14 @@ __all__ = (
     )
 
 default_config = {
-    'NAME'        : 'Ccbar2PhiDetached', 
+    'NAME'        : 'Ccbar2PhiDetached',
     'BUILDERTYPE' : 'Ccbar2PhiPhiDetachedConf',
     'CONFIG' : {
         'TRCHI2DOF'        :     5.  ,
         'KaonPIDK'         :     5.  ,
         'KaonPT'           :   650.  , # MeV
         'PhiVtxChi2'       :    16.  ,
-        'PhiMassW'         :    12.  , 
+        'PhiMassW'         :    12.  ,
         'CombMaxMass'      :  4100.  , # MeV, before Vtx fit
         'CombMinMass'      :  2750.  , # MeV, before Vtx fit
         'MaxMass'          :  4000.  , # MeV, after Vtx fit
@@ -53,21 +53,21 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 
 class Ccbar2PhiPhiDetachedConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
-        
+
         """
-        Detached 
+        Detached
         """
         self.DetachedPhiForJpsiList = self.createSubSel( OutputList = "DetachedPhiFor" + self.name,
-                                                         InputList =  DataOnDemand( Location = 'Phys/StdLooseDetachedPhi2KK/Particles' ), 
+                                                         InputList =  DataOnDemand( Location = 'Phys/StdLooseDetachedPhi2KK/Particles' ),
                                                          Cuts = "(VFASPF(VCHI2/VDOF)<%(PhiVtxChi2)s)"\
                                                          " & (ADMASS('phi(1020)')<%(PhiMassW)s*MeV )"\
                                                          " & (MAXTREE('K+'==ABSID, TRCHI2DOF) < %(TRCHI2DOF)s )" \
@@ -75,14 +75,14 @@ class Ccbar2PhiPhiDetachedConf(LineBuilder):
 
 
         self.makeDetachedJpsi2PhiPhi()
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -98,36 +98,35 @@ class Ccbar2PhiPhiDetachedConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
-    
-    
+
+
+
     def makeDetachedJpsi2PhiPhi(self):
         DetachedJpsi2PhiPhi = self.createCombinationSel( OutputList = "DetachedJpsi2PhiPhi" + self.name,
-                                                         DecayDescriptor = " J/psi(1S) -> phi(1020) phi(1020)", 
-                                                         DaughterLists = [ self.DetachedPhiForJpsiList ],                                                          
+                                                         DecayDescriptor = " J/psi(1S) -> phi(1020) phi(1020)",
+                                                         DaughterLists = [ self.DetachedPhiForJpsiList ],
                                                          PreVertexCuts = "AM>2.65*GeV",
                                                          PostVertexCuts = "(MM>2.7*GeV) & (VFASPF(VCHI2PDOF)<16) & (BPVDLS>10)" %self.config )
-        
+
         DetachedJpsi2PhiPhiLine = StrippingLine( "Ccbar2PhiPhiDetachedLine",
                                                  algos = [ DetachedJpsi2PhiPhi ] )
-        
+
         self.registerLine(DetachedJpsi2PhiPhiLine)
 
     def filterTisTos(self, name,
                      PhiInput,
                      myTisTosSpecs ) :
         from Configurables import TisTosParticleTagger
-        
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system)
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
         myTagger.CaloClustForNeutral = False
         myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-        
+
         return Selection(name + "_SelTisTos",
                          Algorithm = myTagger,
                          RequiredSelections = [ PhiInput ] )
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 472284c35d7b37ffa5a2ec2cea9138c26c7245d4..a533906378d20b84fbbbf832f10a95f415f7d107 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for selecting charmonium -> phi phi pi pi 
+Module for selecting charmonium -> phi phi pi pi
 '''
 
 __author__=['Andrii Usachov']
@@ -30,9 +30,9 @@ default_config = {
         'PionCuts'      : "(PROBNNpi > 0.1) & (PT > 100*MeV) & (MIPCHI2DV(PRIMARY)>4.)",
         'EtacComN4Cuts' : """
                           (AM > 2.7 *GeV)
-                          """,  
+                          """,
         'EtacMomN4Cuts' : "(VFASPF(VCHI2/VDOF) < 16.) & (MM>2.7*GeV) & (BPVDLS>3)",
-        'Prescale'         :     1.,     
+        'Prescale'         :     1.,
         'TRCHI2DOF'        :     5.,
         'KaonProbNNk'      :    0.1,
         'PhiMassW'         :    30.,
@@ -47,20 +47,20 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class Ccbar2PhiPhiPiPiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, name, config ): 
-        
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         PhiVtxChi2 =config['PhiVtxChi2']
@@ -68,16 +68,16 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         KaonPT     =config['KaonPT']
         TRCHI2DOF  =config['TRCHI2DOF']
         KaonProbNNk=config['KaonProbNNk']
-        KaonIPCHI2 =config['KaonIPCHI2'] 
+        KaonIPCHI2 =config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ),
                                            Cuts = config['PionCuts']
                                            )
 
 
         self.PhiForJpsiList = self.createSubSel( OutputList = "PhiFor" + self.name,
-                                                 InputList =  DataOnDemand( Location = 'Phys/StdLooseDetachedPhi2KK/Particles' ), 
+                                                 InputList =  DataOnDemand( Location = 'Phys/StdLooseDetachedPhi2KK/Particles' ),
                                                  Cuts = "(VFASPF(VCHI2/VDOF)<%(PhiVtxChi2)s)"\
                                                          " & (ADMASS('phi(1020)')<%(PhiMassW)s*MeV )"\
                                                          " & (MAXTREE('K+'==ABSID, TRCHI2DOF) < %(TRCHI2DOF)s )" \
@@ -92,24 +92,24 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.SelCcbar2PhiPhiPiPi = self.createN4BodySel( OutputList = self.name + "SelCcbar2PhiPhiPiPi",
                                                      DaughterLists = [ self.PhiForJpsiList, self.SelPions ],
                                                      DecayDescriptor = "J/psi(1S) -> phi(1020) phi(1020) pi+ pi-",
-                                                     PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                     PreVertexCuts  = config['EtacComN4Cuts'],
                                                      PostVertexCuts = config['EtacMomN4Cuts']
                                                      )
-        
-        self.Ccbar2PhiPhiPiPiLine = StrippingLine( self.name + 'Line',                                                
+
+        self.Ccbar2PhiPhiPiPiLine = StrippingLine( self.name + 'Line',
                                                prescale  = config['Prescale'],
                                                algos     = [ self.SelCcbar2PhiPhiPiPi ],
                                                MDSTFlag  = False
                                                )
         self.registerLine( self.Ccbar2PhiPhiPiPiLine )
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createN4BodySel( self, OutputList,
                          DecayDescriptor,
                          DaughterLists,
@@ -118,7 +118,7 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 641efc903dc0b7993c2ea0ccb47b0e0f585c45c9..a5970b4132b0ae149f660aa8ec600ba2ab81a67e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -26,19 +26,19 @@ __all__ = (
     'makePP'
     )
 
-# If you have several configs in one module your default_config should 
+# If you have several configs in one module your default_config should
 # be a dict of configs with the names of the configs as keys. The configs
 # themselves then shouldn't have a 'NAME' element.
 # M.A. 2017/05/02.
 default_config = {
 # is moving to Turbo
-#    'Ccbar2Ppbar' : 
+#    'Ccbar2Ppbar' :
 #    {
 #    'BUILDERTYPE'       : 'Ccbar2PpbarConf',
 #    'CONFIG'    : { 'LinePrescale'     :    1.   ,
 #                    'LinePostscale'    :    1.   ,
-#                    
-#                    'SpdMult'          :   300.  , # dimensionless, Spd Multiplicy cut 
+#
+#                    'SpdMult'          :   300.  , # dimensionless, Spd Multiplicy cut
 #                    'ProtonPT'         :  1950.  , # MeV
 #                    'ProtonP'          :    10.  , # GeV
 #                    'ProtonTRCHI2DOF'  :     4.  ,
@@ -50,7 +50,7 @@ default_config = {
 #                    'MaxMass'          :  4000.  , # MeV, after Vtx fit
 #                    'MinMass'          :  2800.  , # MeV, after Vtx fit
 #                    'VtxCHI2'          :     9.  , # dimensionless
-#                    'CCCut'            :  " & (PT>6*GeV)"    
+#                    'CCCut'            :  " & (PT>6*GeV)"
 #                   },
 #    'STREAMS' : [ 'Charm' ] ,
 #    'WGs'    : [ 'BandQ' ]
@@ -61,8 +61,8 @@ default_config = {
     'CONFIG'    : {
         'LinePrescale'     :     1.  ,
         'LinePostscale'    :     1.  ,
-        
-        'SpdMult'          :    20.  , # dimensionless, Spd Multiplicy cut 
+
+        'SpdMult'          :    20.  , # dimensionless, Spd Multiplicy cut
         'ProtonPT'         :   550.  , # MeV
         'ProtonP'          :    -2.  , # MeV
         'ProtonTRCHI2DOF'  :     5.  ,
@@ -74,7 +74,7 @@ default_config = {
         'MaxMass'          :  1.0e+6 , # MeV, after Vtx fit
         'MinMass'          :     0.  , # MeV, after Vtx fit
         'VtxCHI2'          :     9.  , # dimensionless
-        'CCCut'            :  ""     
+        'CCCut'            :  ""
         },
     'STREAMS' : [ 'Charm' ] ,
     'WGs'    : [ 'BandQ' ]
@@ -85,8 +85,8 @@ default_config = {
     'CONFIG'    : {
       'LinePrescale'     :     1.  ,
       'LinePostscale'    :     1.  ,
-      
-      'SpdMult'          :   600.  , # dimensionless, Spd Multiplicy cut 
+
+      'SpdMult'          :   600.  , # dimensionless, Spd Multiplicy cut
       'ProtonPT'         :  1000.  , # MeV
       'ProtonP'          :    -2.  , # MeV
       'ProtonTRCHI2DOF'  :     5.  ,
@@ -98,19 +98,19 @@ default_config = {
       'MaxMass'          :  1.0e+6 , # MeV, after Vtx fit
       'MinMass'          :  2700.  , # MeV, after Vtx fit
       'VtxCHI2'          :     9.  , # dimensionless
-      'CCCut'            :  " & (BPVDLS>5)"     
+      'CCCut'            :  " & (BPVDLS>5)"
       },
     'STREAMS' : [ 'CharmCompleteEvent' ] ,
     'WGs'    : [ 'BandQ' ]
     },
-    
+
     'Ccbar2PpbarFromB' : { # this will be used for the proton asymmetry
     'BUILDERTYPE'       : 'Ccbar2PpbarConf',
     'CONFIG'    : {
       'LinePrescale'     :     1.  ,
       'LinePostscale'    :     1.  ,
-      
-      'SpdMult'          :   750.  , # dimensionless, Spd Multiplicy cut 
+
+      'SpdMult'          :   750.  , # dimensionless, Spd Multiplicy cut
       'ProtonPT'         :   500.  , # MeV
       'ProtonP'          :    7.5  , # GeV
       'ProtonTRCHI2DOF'  :     5.  , # no cut
@@ -122,7 +122,7 @@ default_config = {
       'MaxMass'          :  3400 , # MeV, after Vtx fit
       'MinMass'          :  2700.  , # MeV, after Vtx fit
       'VtxCHI2'          :     9.  , # dimensionless
-      'CCCut'            :  " & (BPVDLS>5) & (BPVCORRM>4000) & (BPVCORRM<5700)"     
+      'CCCut'            :  " & (BPVDLS>5) & (BPVCORRM>4000) & (BPVCORRM<5700)"
       },
     'STREAMS' : [ 'CharmCompleteEvent' ] ,
     'WGs'    : [ 'Calib' ]
@@ -137,11 +137,11 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class Ccbar2PpbarConf(LineBuilder):
-    
+
     __configuration_keys__ = (
         'LinePrescale',
         'LinePostscale',
-        
+
         'SpdMult',
         'ProtonPT',
         'ProtonP',
@@ -149,7 +149,7 @@ class Ccbar2PpbarConf(LineBuilder):
         'ProtonPIDppi',
         'ProtonPIDpK',
         'ProtonIPCHI2Cut',
-        
+
         'CombMaxMass',
         'CombMinMass',
         'MaxMass',
@@ -158,13 +158,13 @@ class Ccbar2PpbarConf(LineBuilder):
         'CCCut'
         )
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        
-        self.name = name 
-        self.SelPP = makePP( 'eeFor'+self.name,                             
+
+        self.name = name
+        self.SelPP = makePP( 'eeFor'+self.name,
                              #
                              ProtonPT = config['ProtonPT'],
                              ProtonP = config['ProtonP'],
@@ -179,9 +179,9 @@ class Ccbar2PpbarConf(LineBuilder):
                              MaxMass = config['MaxMass'],
                              CCCut = config['CCCut']
                              )
-        
+
         SpdMultForCcbarCut = config['SpdMult']
-        
+
         self.line = StrippingLine( self.name+"Line",
                                    prescale = config['LinePrescale'],
                                    postscale = config['LinePostscale'],
@@ -191,12 +191,12 @@ class Ccbar2PpbarConf(LineBuilder):
                                                    "from LoKiCore.basic import LHCb" ]
                                    },
                                    checkPV  = False,
-                                   selection =  self.SelPP                                   
+                                   selection =  self.SelPP
                                    )
 
         self.registerLine( self.line )
-        
-       
+
+
 def makePP( name,
             #
             ProtonPT,
@@ -214,18 +214,18 @@ def makePP( name,
             ):
 
     from StandardParticles import StdTightProtons as ProtonsForCcbar2Ppbar
-    
+
     ProtonCut = "(PT > %(ProtonPT)s *MeV) & (P > %(ProtonP)s *GeV) & (TRCHI2DOF < %(ProtonTRCHI2DOF)s) & ((PIDp-PIDpi) > %(ProtonPIDppi)s) & ((PIDp-PIDK) > %(ProtonPIDpK)s)" % locals()
     CombCut = "(in_range( %(CombMinMass)s *MeV, AM, %(CombMaxMass)s *MeV))" % locals()
-    MomCut = "(VFASPF(VCHI2)< %(VtxCHI2)s) & (in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV))" % locals() 
-    
+    MomCut = "(VFASPF(VCHI2)< %(VtxCHI2)s) & (in_range( %(MinMass)s *MeV, MM, %(MaxMass)s *MeV))" % locals()
+
     _PP = CombineParticles( DecayDescriptor = "J/psi(1S) -> p+ p~-",
                             DaughtersCuts = {"p+" : ProtonCut + ProtonIPCHI2Cut },
                             CombinationCut = CombCut,
                             MotherCut = MomCut + CCCut
                             )
-    
+
     return Selection( name,
                       Algorithm = _PP,
                       RequiredSelections = [ ProtonsForCcbar2Ppbar ]
-                      )    
+                      )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCharmAssociative.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCharmAssociative.py
index c4b00286ae78f066269ff9b9950810ebc1cf2283..7d73ff2a71aa8faa31f49297f785bef84cde1662 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCharmAssociative.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCharmAssociative.py
@@ -13,20 +13,20 @@
 # $Id: StrippingCharmAssociative.py 176885 2014-08-26 14:00:22Z ibelyaev $
 # =============================================================================
 ## @file
-# 
+#
 #  The attempt for stripping of associative ``onium'' production
 #
-#    - dimuon + dimuon 
+#    - dimuon + dimuon
 #    - dimuon + high-pt gamma
 #
 #   Parasitic:
 #
-#    - dimuon + ( dimuon + gamma ) [ mimic   Chi_(b,c) + dimuon  ] 
-#    -       2x ( dimuon + gamma ) [ mimic 2xChi_(b,c)           ] 
+#    - dimuon + ( dimuon + gamma ) [ mimic   Chi_(b,c) + dimuon  ]
+#    -       2x ( dimuon + gamma ) [ mimic 2xChi_(b,c)           ]
 #
 #   Accociative W+ production:
-#    - dimuon             & W+  
-#    - ( dimuon + gamma ) & W+      [ mimic Chi_(b,c)] 
+#    - dimuon             & W+
+#    - ( dimuon + gamma ) & W+      [ mimic Chi_(b,c)]
 #
 #
 # +-------------------------------------+--------+------+-------+
@@ -49,26 +49,26 @@
 #
 # @author Vanya BELYAEV Ivan.Belyaev@cern.ch
 # @date   2011-05-26
-# 
+#
 #                   $Revision: 176885 $
 # Last modification $Date: 2013-01-05 21:21:10 +0100
 #                by $Author: ibelyaev $
 # =============================================================================
 """The attempt for stripping of associative ``onium'' production
- 
-     - dimuon + dimuon 
+
+     - dimuon + dimuon
      - dimuon + high-pt gamma
- 
+
     Parasitic:
- 
-     - dimuon + ( dimuon + gamma ) [ mimic   Chi_(b,c) + dimuon  ] 
-     -       2x ( dimuon + gamma ) [ mimic 2xChi_(b,c)           ] 
- 
+
+     - dimuon + ( dimuon + gamma ) [ mimic   Chi_(b,c) + dimuon  ]
+     -       2x ( dimuon + gamma ) [ mimic 2xChi_(b,c)           ]
+
     Accociative W+ production:
-     - dimuon             & W+  
-     - ( dimuon + gamma ) & W+      [ mimic Chi_(b,c)] 
- 
- 
+     - dimuon             & W+
+     - ( dimuon + gamma ) & W+      [ mimic Chi_(b,c)]
+
+
   +-------------------------------------+--------+------+-------+
   | StrippingReport   INFO Event 276300, Good event 276300      |
   +-------------------------------------+--------+------+-------+
@@ -103,14 +103,14 @@ from GaudiKernel.SystemOfUnits             import GeV, MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import   Selection
 #
-# Attention: we need prompt onia, thus "All" Loose muons here 
+# Attention: we need prompt onia, thus "All" Loose muons here
 from StandardParticles      import ( StdAllLooseMuons   , ## PROMPT muons!
-                                     StdLooseAllPhotons ) 
+                                     StdLooseAllPhotons )
 #
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils        import LineBuilder
 # =============================================================================
-## logging 
+## logging
 # =============================================================================
 import logging
 logger = logging.getLogger(__name__)
@@ -118,35 +118,35 @@ if not logger.handlers :
     logging.basicConfig()
 logger.setLevel(logging.INFO)
 # =============================================================================
-## Define the default configuration 
+## Define the default configuration
 _default_configuration_ = {
     #
-    ## Selection of basic particles 
+    ## Selection of basic particles
     #
-    'PhotonCuts'      : ' PT > 3.0 * GeV  '                                 , 
+    'PhotonCuts'      : ' PT > 3.0 * GeV  '                                 ,
     'MuonCuts'        : ' ISMUON & ( PT > 650 * MeV ) & ( TRCHI2DOF < 5 ) ' ,
     #
     ## photons from chi_(c,b)
     #
-    'GammaChi'        : ' ( PT > 400 * MeV ) & ( CL > 0.05 ) ' , 
+    'GammaChi'        : ' ( PT > 400 * MeV ) & ( CL > 0.05 ) ' ,
     #
     ## W+- selection
     #
     'WCuts'           : " ( 'mu+'== ABSID ) & ( PT > 15 * GeV )" ,
     #
-    ## Global Event cuts 
+    ## Global Event cuts
     #
-    'CheckPV'         : True , 
+    'CheckPV'         : True ,
     #
     ## Technicalities:
     #
     'Preambulo'       : [
     #
-    ## shortcut for chi2 of vertex fit 
+    ## shortcut for chi2 of vertex fit
     'chi2vx = VFASPF(VCHI2) '                    ,
     #
     ## shortcut for the c*tau
-    "from GaudiKernel.PhysicalConstants import c_light" , 
+    "from GaudiKernel.PhysicalConstants import c_light" ,
     #
     ## dimuons:
     "psi             = ADAMASS ( 'J/psi(1S)'  ) < 125 * MeV"         ,
@@ -162,33 +162,33 @@ _default_configuration_ = {
     ## monitoring ?
     'Monitor'     : False ,
     #
-    ## pescales 
+    ## pescales
     'DiMuonAndGammaPrescale' : 1.0 ,
     'DoubleDiMuonPrescale'   : 1.0 ,
     'ChiAndDiMuonPrescale'   : 1.0 ,
     'DiChiPrescale'          : 1.0 ,
-    'DiMuonAndWPrescale'     : 1.0 , 
+    'DiMuonAndWPrescale'     : 1.0 ,
     'ChiAndWPrescale'        : 1.0
     # =========================================================================
-    }    
+    }
 # =============================================================================
-## the mandatory element for stripping framework 
+## the mandatory element for stripping framework
 default_config = {
     #
     'NAME'        :   'CharmAssociative'     ,
     'WGs'         : [ 'BandQ' ]              ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'StrippingCharmAssociativeConf'            ,
-    'STREAMS'     : { 'Leptonic' : [ 'StrippingDiMuonAndGammaForCharmAssociative', 
-                                     'StrippingDoubleDiMuonForCharmAssociative'  , 
-                                     'StrippingChiAndDiMuonForCharmAssociative'  , 
-                                     'StrippingDiChiForCharmAssociative'         , 
+    'STREAMS'     : { 'Leptonic' : [ 'StrippingDiMuonAndGammaForCharmAssociative',
+                                     'StrippingDoubleDiMuonForCharmAssociative'  ,
+                                     'StrippingChiAndDiMuonForCharmAssociative'  ,
+                                     'StrippingDiChiForCharmAssociative'         ,
                                      'StrippingDiMuonAndWForCharmAssociative'    ,
-                                     'StrippingChiAndWForCharmAssociative'       ] } 
-    }    
+                                     'StrippingChiAndWForCharmAssociative'       ] }
+    }
 # =============================================================================
 ## @class  StrippingCharmAssociativeConf
-#  Helper class required by Tom & Greig 
+#  Helper class required by Tom & Greig
 #  @author Vanya BELYAEV Ivan.Belyaev@cern.ch
 #  @date 2011-05-26
 class StrippingCharmAssociativeConf(LineBuilder) :
@@ -196,38 +196,38 @@ class StrippingCharmAssociativeConf(LineBuilder) :
     Helper class to configure 'CharmAssociative/PromptCharm'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    ## private set of selections 
+
+    ## private set of selections
     __selections_ = {}
-    
-    ## get the default configuration 
+
+    ## get the default configuration
     @staticmethod
     def defaultConfiguration( key = None ) :
         """
         Get the default configurtaion
-        
+
         >>> conf = StrippingCharmAssociativeConf.defaultConfiguration()
-        
+
         Get the elements of default configurtaion:
-        
+
         >>> prescale = StrippingCharmAssociativeConf.defaultConfiguration( 'DoubleDiMuon' )
         """
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__( self , name , config ) :
         """
         Constructor
         """
-        # check the names 
+        # check the names
         if not name : name = 'CharmAssociative'
-        # check the names 
+        # check the names
         if 'CharmAssociative' != name :
-            logger.warning ( 'The non-default name is specified "%s"' % name  ) 
-            
+            logger.warning ( 'The non-default name is specified "%s"' % name  )
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
 
@@ -237,56 +237,56 @@ class StrippingCharmAssociativeConf(LineBuilder) :
         else :
             LineBuilder.__init__( self , name ,  config )
 
-        ## private set of selections 
+        ## private set of selections
         self.__selections_ = {}
-        
-        
+
+
         if not self.__selections_.has_key ( self.name() ) :
             self.__selections_[ self.name() ] = {}
-            
-        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config ) 
+
+        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config )
 
         keys = _config.keys()
         for key in keys :
-            
+
             if not key in _default_configuration_ :
                 raise KeyError("Invalid key is specified: '%s'" % key )
-            
+
             val = _config[key]
-            if val != _default_configuration_ [ key ] : 
+            if val != _default_configuration_ [ key ] :
                 logger.debug ('new configuration: %-16s : %s ' % ( key , _config[key] ) )
 
         keys = _config.keys()
         for key in keys :
-            
+
             if not key in _default_configuration_ :
                 raise KeyError("Invalid key is specified: '%s'" % key )
-            
+
             val = _config[key]
-            if val != _default_configuration_ [ key ] : 
+            if val != _default_configuration_ [ key ] :
                 logger.debug ('new configuration: %-16s : %s ' % ( key , _config[key] ) )
 
-        ## cehck for prescales 
+        ## cehck for prescales
         for keys in self.keys() :
             if 0 > key.find('Prescale') and 0 > key.find('prescale') :  continue
-            if 1 != self[key] : logger.warning ( '%s is %s' % ( key , self[key] ) ) 
-            
+            if 1 != self[key] : logger.warning ( '%s is %s' % ( key , self[key] ) )
+
 
         for line in self._lines_associative_onia () :
             self.registerLine(line)
-            logger.debug ( "Register line: %s" %  line.name () ) 
+            logger.debug ( "Register line: %s" %  line.name () )
 
     # =========================================================================
     ## pure technical method for creation of selections
     # =========================================================================
     def make_selection ( self      ,
-                         tag       , 
+                         tag       ,
                          algotype  ,
-                         inputs    , 
+                         inputs    ,
                          *args     ,
                          **kwargs  ) :
         """
-        Pure Technical method for creation of simple 1-step selections 
+        Pure Technical method for creation of simple 1-step selections
         """
         sel_tag  = '%s_Selection' % tag
         sel_name = 'Sel%sFor%s'   % ( tag , self.name() )
@@ -294,82 +294,82 @@ class StrippingCharmAssociativeConf(LineBuilder) :
         ## check existing selection
         #
         sel      = self._selection ( sel_tag )
-        if sel : return sel 
+        if sel : return sel
         #
         ## adjust a bit the arguments
         if not kwargs.has_key ( 'Preambulo'         ) :
             kwargs ['Preambulo'        ] = self['Preambulo']
-            
+
         if not kwargs.has_key ( 'ParticleCombiners' ) :
-            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' }                 
-        # 
+            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' }
+        #
         ## use "simple-selection"
         #
         from PhysSelPython.Wrappers import SimpleSelection
         sel = SimpleSelection (
             sel_name ,
             algotype ,
-            inputs   , 
+            inputs   ,
             *args    ,
             **kwargs )
-        # 
-        return self._add_selection( sel_tag , sel ) 
-                        
+        #
+        return self._add_selection( sel_tag , sel )
 
-    ## get the common preambulo: 
-    def preambulo    ( self ) : return self [ 'Preambulo' ] 
 
-    ## get photon cuts 
-    def photonCuts   ( self ) : return self [ 'PhotonCuts' ] 
-    
-    ## get muon cuts 
-    def muonCuts     ( self ) : return self [ 'MuonCuts' ] 
+    ## get the common preambulo:
+    def preambulo    ( self ) : return self [ 'Preambulo' ]
 
-    ## get the dimuons 
+    ## get photon cuts
+    def photonCuts   ( self ) : return self [ 'PhotonCuts' ]
+
+    ## get muon cuts
+    def muonCuts     ( self ) : return self [ 'MuonCuts' ]
+
+    ## get the dimuons
     def DiMuon ( self ) :
         """
-        Get the dimuons  
+        Get the dimuons
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles  
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         ## ATTENITON: we need PROMPT onia, thus 'AllMuons' are here
-        from StandardParticles                     import StdAllLooseMuons as inpts  
+        from StandardParticles                     import StdAllLooseMuons as inpts
         return self.make_selection (
             'DiMuon'               ,
             CombineParticles       ,
             [ inpts ]              ,
             DecayDescriptor = 'J/psi(1S) -> mu+ mu-' ,
-            DaughtersCuts   = { 'mu+' : self.muonCuts() } , 
-            CombinationCut  = " psi | psi_prime | ( 8 * GeV < AM ) " , 
-            MotherCut       = " chi2vx < 20 " 
+            DaughtersCuts   = { 'mu+' : self.muonCuts() } ,
+            CombinationCut  = " psi | psi_prime | ( 8 * GeV < AM ) " ,
+            MotherCut       = " chi2vx < 20 "
             )
-    
-    ## get the dimuons & gamma 
+
+    ## get the dimuons & gamma
     def DiMuonAndGamma ( self ) :
         """
-        Get dimuon & gamma 
-        Select events with dimuon and high-pt photon 
-        at least one dimuon 
+        Get dimuon & gamma
+        Select events with dimuon and high-pt photon
+        at least one dimuon
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles  
-        from StandardParticles                     import StdLooseAllPhotons as gamma 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from StandardParticles                     import StdLooseAllPhotons as gamma
         return self.make_selection (
             'DiMuonAdGamma'        ,
             CombineParticles       ,
             [ self.DiMuon() , gamma ]              ,
             DecayDescriptor = " chi_b2(1P)  -> J/psi(1S) gamma"   ,
-            DaughtersCuts   = { 'J/psi(1S)' : " dimuon_tight "    ,   
+            DaughtersCuts   = { 'J/psi(1S)' : " dimuon_tight "    ,
                                 'gamma'     :  self.photonCuts () } ,
             CombinationCut = " AALL "  ,
-            MotherCut      = "  ALL "  
+            MotherCut      = "  ALL "
             )
-    
+
     ## get the double dimuons
     def DoubleDiMuon ( self ) :
         """
         Get 2xdimuon
         Select events with two dimuons
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles  
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         return self.make_selection (
             'DoubleDiMuon'    ,
             CombineParticles  ,
@@ -378,12 +378,12 @@ class StrippingCharmAssociativeConf(LineBuilder) :
             CombinationCut    = " AALL " ,
             MotherCut         = "  ALL "
             )
-    
-    ## get chi_(c,b) & dimuon 
-    def ChiAndDiMuon ( self ) : 
+
+    ## get chi_(c,b) & dimuon
+    def ChiAndDiMuon ( self ) :
         """ Construct Chi_(c,b) + dumuon line """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles  
-        from StandardParticles                     import StdLooseAllPhotons as gamma 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from StandardParticles                     import StdLooseAllPhotons as gamma
         pre_chidimu = self.make_selection (
             'PreChiAndDiMuon'         ,
             CombineParticles          ,
@@ -393,11 +393,11 @@ class StrippingCharmAssociativeConf(LineBuilder) :
             ## mimic chi_(c,b):
             CombinationCut   = """
             ( AM13 - AM1 < 1.05 * GeV ) |
-            ( AM23 - AM2 < 1.05 * GeV ) 
+            ( AM23 - AM2 < 1.05 * GeV )
             """ ,
-            MotherCut        = "  ALL " 
+            MotherCut        = "  ALL "
             )
-        ## apply pi0-veto-tagger ! 
+        ## apply pi0-veto-tagger !
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
         return self.make_selection (
             'ChiAndDiMuon'   ,
@@ -405,14 +405,14 @@ class StrippingCharmAssociativeConf(LineBuilder) :
             [ pre_chidimu ]  ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25011     ## unique ! 
+            ExtraInfoIndex = 25011     ## unique !
             )
-    
-    ## get 2xXhi_(c,b) & dimuon 
-    def DiChi ( self ) : 
+
+    ## get 2xXhi_(c,b) & dimuon
+    def DiChi ( self ) :
         """ Construct 2xChi_(c,b) line """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles  
-        from StandardParticles                     import StdLooseAllPhotons as gamma 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from StandardParticles                     import StdLooseAllPhotons as gamma
         pre_dichi = self.make_selection (
             'PreDiChi'         ,
             CombineParticles   ,
@@ -421,12 +421,12 @@ class StrippingCharmAssociativeConf(LineBuilder) :
             DaughtersCuts   = { 'gamma' :  self [ 'GammaChi' ] } ,
             ## mimic 2xchi_(c,b):
             CombinationCut   = """
-            ( ( AM13 - AM1 < 1.05 * GeV ) & ( AM24 - AM2 < 1.05 * GeV ) ) | 
-            ( ( AM14 - AM1 < 1.05 * GeV ) & ( AM23 - AM2 < 1.05 * GeV ) ) 
+            ( ( AM13 - AM1 < 1.05 * GeV ) & ( AM24 - AM2 < 1.05 * GeV ) ) |
+            ( ( AM14 - AM1 < 1.05 * GeV ) & ( AM23 - AM2 < 1.05 * GeV ) )
             """ ,
-            MotherCut        = "  ALL " 
+            MotherCut        = "  ALL "
             )
-        ## apply pi0-veto-tagger ! 
+        ## apply pi0-veto-tagger !
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
         return self.make_selection (
             'DiChi'          ,
@@ -434,72 +434,72 @@ class StrippingCharmAssociativeConf(LineBuilder) :
             [ pre_dichi   ]  ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25012     ## unique ! 
+            ExtraInfoIndex = 25012     ## unique !
             )
-    
-    ## W+- selection 
+
+    ## W+- selection
     def W ( self )  :
         """ Get simple  W+-selection """
-        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop 
-        from StandardParticles                     import StdAllLooseMuons as inpts 
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from StandardParticles                     import StdAllLooseMuons as inpts
         return self.make_selection (
             'W'                    ,
             FilterDesktop          ,
             [ inpts ]              ,
             Code   = self['WCuts']
             )
-    
-    ## select dimuon + W 
+
+    ## select dimuon + W
     def DiMuonAndW ( self ) :
         """ Select dimuon + W+ """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         return self.make_selection (
             'DiMuW'                     ,
             CombineParticles            ,
-            [ self.W () , self.DiMuon() ] , 
+            [ self.W () , self.DiMuon() ] ,
             DecayDescriptor =  "[chi_b2(2P)  -> J/psi(1S) mu+]cc" ,
             CombinationCut  = " AALL " ,
-            MotherCut       = "  ALL " 
+            MotherCut       = "  ALL "
             )
-    
-    ## select chi + W 
+
+    ## select chi + W
     def ChiAndW ( self ) :
         """ Select chi & W+ """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
-        from StandardParticles                     import StdLooseAllPhotons as gamma 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from StandardParticles                     import StdLooseAllPhotons as gamma
         pre_chiw = self.make_selection (
             'PreChiAndW'        ,
             CombineParticles    ,
             [ self.DiMuon()     , self.W() , gamma ] ,
             DecayDescriptor =  "[chi_b2(2P)  -> J/psi(1S) gamma mu+]cc" ,
             DaughtersCuts = {
-            "J/psi(1S)" : " ( M  < 3.21 * GeV ) | in_range ( 8.5 * GeV , M , 12.0 * GeV ) " ,  
+            "J/psi(1S)" : " ( M  < 3.21 * GeV ) | in_range ( 8.5 * GeV , M , 12.0 * GeV ) " ,
             'gamma'     :  self['GammaChi']
             } ,
             ## mimic chi_(c,b):
             CombinationCut   = """
-            ( AM12 - AM1 < 1.05 * GeV ) | 
-            ( AM12 - AM1 < 1.05 * GeV )  
+            ( AM12 - AM1 < 1.05 * GeV ) |
+            ( AM12 - AM1 < 1.05 * GeV )
             """ ,
-            MotherCut        = "  ALL " 
+            MotherCut        = "  ALL "
             )
-        ## apply pi0-veto-tagger ! 
+        ## apply pi0-veto-tagger !
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
         return self.make_selection (
             'ChiAndW'        ,
             Pi0Veto__Tagger  ,
-            [ pre_chiw ]     , 
+            [ pre_chiw ]     ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25013     ## unique ! 
+            ExtraInfoIndex = 25013     ## unique !
             )
-    
-    ## get all dicharm lines 
+
+    ## get all dicharm lines
     def _lines_associative_onia ( self ) :
-        
+
         sel = self._selection ( 'OniaAndXLines' )
-        if sel : return sel 
-        
+        if sel : return sel
+
         sel = [
             ##
             StrippingLine (
@@ -507,105 +507,105 @@ class StrippingCharmAssociativeConf(LineBuilder) :
             prescale = self [ 'DiMuonAndGammaPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self [ 'CheckPV']                 ,
             algos    = [ self . DiMuonAndGamma () ]      ,
-            MDSTFlag = False                              , ## try to save it on MDST.DST 
+            MDSTFlag = False                              , ## try to save it on MDST.DST
             ) ,
             ##
             StrippingLine (
             "DoubleDiMuonFor" + self._name             ,
-            prescale = self [ 'DoubleDiMuonPrescale' ] , ## ATTENTION! Prescale here !!      
+            prescale = self [ 'DoubleDiMuonPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self [ 'CheckPV' ]              ,
-            algos    = [ self . DoubleDiMuon () ]            
+            algos    = [ self . DoubleDiMuon () ]
             ) ,
             ##
             StrippingLine (
             "ChiAndDiMuonFor" + self._name             ,
-            prescale = self [ 'ChiAndDiMuonPrescale' ] , ## ATTENTION! Prescale here !!           
+            prescale = self [ 'ChiAndDiMuonPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self [ 'CheckPV' ]              ,
-            algos    = [ self . ChiAndDiMuon () ]            
+            algos    = [ self . ChiAndDiMuon () ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "DiChiFor" + self._name             ,
-            prescale = self [ 'DiChiPrescale' ] , ## ATTENTION! Prescale here !!              
+            prescale = self [ 'DiChiPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self [ 'CheckPV']        ,
-            algos    = [ self . DiChi       () ]            
+            algos    = [ self . DiChi       () ]
             ) ,
             ##
             StrippingLine (
             "DiMuonAndWFor" + self._name             ,
-            prescale = self [ 'DiMuonAndWPrescale' ] , ## ATTENTION! Prescale here !!              
+            prescale = self [ 'DiMuonAndWPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self [ 'CheckPV'  ]           ,
-            algos    = [ self . DiMuonAndW ()  ]             
+            algos    = [ self . DiMuonAndW ()  ]
             ) ,
             ##
             StrippingLine (
             "ChiAndWFor" + self._name             ,
-            prescale = self [ 'ChiAndWPrescale' ] , ## ATTENTION! Prescale here !!              
+            prescale = self [ 'ChiAndWPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self [ 'CheckPV'  ]           ,
-            algos    = [ self . ChiAndW ()  ]             
+            algos    = [ self . ChiAndW ()  ]
             ) ,
             ##
             ]
         #
-        return self._add_selection ( 'OniaAndXLines' , sel ) 
-    
-    ## get the selection, associated with some nickname name 
+        return self._add_selection ( 'OniaAndXLines' , sel )
+
+    ## get the selection, associated with some nickname name
     def _selection ( self , nick ) :
         """
         Get the selection, associated with some nickname name
         """
-        
+
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-            
-        return self.__selections_[ self.name() ].get( nick , None ) 
-        
-    ## add the selection, associated with some nickname name 
+            self.__selections_[ self.name() ] = {}
+
+        return self.__selections_[ self.name() ].get( nick , None )
+
+    ## add the selection, associated with some nickname name
     def _add_selection ( self , nick , sel ) :
         """
         Add the selection, associated with some nickname name
         """
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-        
+            self.__selections_[ self.name() ] = {}
+
         if self.__selections_[ self.name()].has_key( nick ) :
             raise AttributeError , "Selection '%s'already exists " % nick
-        
+
         self.__selections_[ self.name() ][ nick ] = sel
-        
-        return sel 
-    
+
+        return sel
+
 # =============================================================================
 if '__main__' == __name__ :
-    
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
-    logger.info ( ' Date   :  %s' % __date__   ) 
-    logger.info ( 80 * '*' ) 
+
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
+    logger.info ( ' Date   :  %s' % __date__   )
+    logger.info ( 80 * '*' )
     ##
-    clines = set() 
-    logger.info ( 70 * '-' ) 
+    clines = set()
+    logger.info ( 70 * '-' )
     logger.info ( ' %-15s | %-40s ' % ( 'STREAM' , 'LINE' ) )
-    logger.info ( 70 * '-' ) 
+    logger.info ( 70 * '-' )
     for stream in default_config['STREAMS'] :
         lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s | %-40s ' % ( stream , l ) )
             clines.add ( l )
-    logger.info ( 80 * '*' ) 
+    logger.info ( 80 * '*' )
     ##
     logger.info ( ' The output locations for the default configuration: ' )
     ##
     _conf = StrippingCharmAssociativeConf ( 'CharmAssociative' ,
                                             config = default_config['CONFIG']  )
     ##
-    ## 
+    ##
     _ln   = ' ' + 61*'-' + '+' + 60*'-'
-    logger.info ( _ln ) 
+    logger.info ( _ln )
     logger.info ( '  %-60s| %-45s | %s ' % ( 'Output location'     ,
                                              'Stripping line name' ,
-                                             'MDST.DST'            ) ) 
+                                             'MDST.DST'            ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
@@ -615,31 +615,30 @@ if '__main__' == __name__ :
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
     keys = default_config['CONFIG'].keys()
     keys.sort()
     prescale = [ i for i in keys if 0 <= i.find('Prescale') ]
-    other    = [ i for i in keys if not i in prescale       ] 
-    logger.info ( 'Configuration keys are: %s' % other    ) 
-    logger.info ( 'Prescale      keys are: %s' % prescale ) 
+    other    = [ i for i in keys if not i in prescale       ]
+    logger.info ( 'Configuration keys are: %s' % other    )
+    logger.info ( 'Prescale      keys are: %s' % prescale )
     logger.info ( 80*'*' )
-    
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-       
+
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 1ceef30005c5d88faf9f9788ededc2acecc7cf19..9bed6df19dc96cb48948f2ffab0b52f685cb412e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -31,13 +31,13 @@ default_config = {
                            , 'JPsiMassMin'           :    3.0 # GeV
                            , 'JPsiMassMax'           :    3.2 # GeV
                            , 'JPsiPTMin'             :     2 # GeV
-                           , 'JPsi_PIDmu'            :    0. 
+                           , 'JPsi_PIDmu'            :    0.
                            , 'JPsiVertexChi2'        :   25.0
                            , 'UpsilonMassMin'        :    9.0  #GeV
                            , 'UpsilonMassMax'        :    12.9 #GeV
                            , 'UpsilonVertexChi2'     :   25.0
                            , 'UpsilonPTMin'          :    0.9 # GeV
-                           , 'Upsilon_PIDmu'         :    0. 
+                           , 'Upsilon_PIDmu'         :    0.
                            , 'eDLLe'                 :   0.0
                            , 'GammaEEMass'           :   100.0 #MeV
                            , 'GammaEEPt'             :   580.0 #MeV
@@ -69,9 +69,9 @@ class StrippingChiCJPsiGammaConvConf(LineBuilder):
     """
     Stripping selection for ChiC -> JPsi Gamma
     where JPsi -> mu mu and Gamma -> e+ e- (i.e. conversions before the magnet)
-    
+
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config) :
@@ -116,35 +116,35 @@ class StrippingChiCJPsiGammaConvConf(LineBuilder):
         self.SelChiC           = self.ChiC(name+"ChiC",
                                            self.SelJPsi,
                                            self.SelGammaEE,
-                                           mMinChiCRaw = config['mMinChiCRaw'],       
-                                           mMaxChiCRaw = config['mMaxChiCRaw'],      
-                                           mMinChiCFit = config['mMinChiCFit'],       
-                                           mMaxChiCFit = config['mMaxChiCFit'])              
+                                           mMinChiCRaw = config['mMinChiCRaw'],
+                                           mMaxChiCRaw = config['mMaxChiCRaw'],
+                                           mMinChiCFit = config['mMinChiCFit'],
+                                           mMaxChiCFit = config['mMaxChiCFit'])
 
         self.SelChiCSym           = self.ChiC(name+"ChiCSym",
                                            self.SelJPsi,
                                            self.SelSymGammaEE,
-                                           mMinChiCRaw = config['mMinChiCRaw'],       
-                                           mMaxChiCRaw = config['mMaxChiCRaw'],      
-                                           mMinChiCFit = config['mMinChiCFit'],       
-                                           mMaxChiCFit = config['mMaxChiCFit'])              
+                                           mMinChiCRaw = config['mMinChiCRaw'],
+                                           mMaxChiCRaw = config['mMaxChiCRaw'],
+                                           mMinChiCFit = config['mMinChiCFit'],
+                                           mMaxChiCFit = config['mMaxChiCFit'])
 
         self.SelChiB           = self.ChiC(name+"ChiB",
                                            self.SelUpsilon,
                                            self.SelGammaEE,
-                                           mMinChiCRaw = config['mMinChiBRaw'],       
-                                           mMaxChiCRaw = config['mMaxChiBRaw'],      
-                                           mMinChiCFit = config['mMinChiBFit'],       
-                                           mMaxChiCFit = config['mMaxChiBFit'])              
+                                           mMinChiCRaw = config['mMinChiBRaw'],
+                                           mMaxChiCRaw = config['mMaxChiBRaw'],
+                                           mMinChiCFit = config['mMinChiBFit'],
+                                           mMaxChiCFit = config['mMaxChiBFit'])
 
         self.SelChiBSym           = self.ChiC(name+"ChiBSym",
                                            self.SelUpsilon,
                                            self.SelSymGammaEE,
-                                           mMinChiCRaw = config['mMinChiBRaw'],       
-                                           mMaxChiCRaw = config['mMaxChiBRaw'],      
-                                           mMinChiCFit = config['mMinChiBFit'],       
-                                           mMaxChiCFit = config['mMaxChiBFit'])              
-            
+                                           mMinChiCRaw = config['mMinChiBRaw'],
+                                           mMaxChiCRaw = config['mMaxChiBRaw'],
+                                           mMinChiCFit = config['mMinChiBFit'],
+                                           mMaxChiCFit = config['mMaxChiBFit'])
+
 
         self.ChiCLine           = StrippingLine(name+"ChicLine",
                                                 prescale  = config['PrescaleChi'],
@@ -177,10 +177,10 @@ class StrippingChiCJPsiGammaConvConf(LineBuilder):
 
 
     #####################################################################################################################
-    #    
+    #
     # filter candidates J/Psi -> mu mu
     #
-    ######################################################################################################################  
+    ######################################################################################################################
     def filterDiMu( self, name,
                       MuonPT,
                       MuonP,
@@ -189,19 +189,19 @@ class StrippingChiCJPsiGammaConvConf(LineBuilder):
                       MuMuMinMass,
                       MuMuMaxMass,
                       MuMuVCHI2PDOF,
-                      MuMuPT 
+                      MuMuPT
                       ):
-        
+
         _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-        
+
         MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s )  & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)  & (MINTREE('mu+'==ABSID,PIDmu)> %(MuonPID)s)" % locals()
         MuonCut += "& (MINTREE('mu+'==ABSID,P) > %(MuonP)s )" % locals()
 #        MuonCut = " (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)  & (MINTREE('mu+'==ABSID,PIDmu)> %(MuonPID)s )" % locals()
-        
+
         MuMuCut = "(MM > %(MuMuMinMass)s *GeV) & (MM < %(MuMuMaxMass)s *GeV) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s *GeV)" % locals()
-        
+
         _MuMu = FilterDesktop( name+"FilterChiCMuMu", Code = MuonCut + " & " + MuMuCut  )
-        
+
         return Selection( name + "_SelMuMu",
                           Algorithm = _MuMu,
                           RequiredSelections = [ _StdLooseDiMuon ]
@@ -209,42 +209,42 @@ class StrippingChiCJPsiGammaConvConf(LineBuilder):
 
 
 
-    ######################################################################################################################  
+    ######################################################################################################################
     #
     # Filter gamma-> e+ e- candidates
-    # 
     #
-    ######################################################################################################################  
+    #
+    ######################################################################################################################
     def filterGammaEE(self, name, eDLLe, GammaEEMass, GammaEEPt):
-        
+
         _StdAllTightGammaDD = DataOnDemand( Location = 'Phys/StdAllTightGammaDD/Particles' )
 
         EleCut = " (MINTREE('e+'==ABSID,PIDe)> %(eDLLe)s)" % locals()
         GammaCut = " (MM < %(GammaEEMass)s *MeV) & ( PT > %(GammaEEPt)s *MeV) " % locals()
 
         _Gamma = FilterDesktop( name+"FilterChiCGamma", Code = EleCut + " & " + GammaCut  )
-        
+
         return Selection( name + "_SelGamma",
                           Algorithm = _Gamma,
                           RequiredSelections = [ _StdAllTightGammaDD ]
                           )
 
 
-    ######################################################################################################################  
+    ######################################################################################################################
     #
     # Filter gamma-> e+ e- candidates
-    # 
     #
-    ######################################################################################################################  
+    #
+    ######################################################################################################################
     def filterSymGammaEE(self, name, eDLLe, GammaEEMass, GammaEEPt):
-        
+
         _StdAllTightSymGammaDD = DataOnDemand( Location = 'Phys/StdAllTightSymGammaDD/Particles' )
 
         EleCut = " (MINTREE('e+'==ABSID,PIDe)> %(eDLLe)s)" % locals()
         GammaCut = " (MM < %(GammaEEMass)s) & ( PT > %(GammaEEPt)s) " % locals()
 
         _Gamma = FilterDesktop( name="FilterChiCSymGamma", Code = EleCut + " & " + GammaCut  )
-        
+
         return Selection( name + "_SelSymGamma",
                           Algorithm = _Gamma,
                           RequiredSelections = [ _StdAllTightSymGammaDD ]
@@ -260,14 +260,13 @@ class StrippingChiCJPsiGammaConvConf(LineBuilder):
 
         combCut   = "(AM > %(mMinChiCRaw)s *GeV) & (AM < %(mMaxChiCRaw)s*GeV)"  % locals()
         motherCut = "(MM > %(mMinChiCFit)s *GeV) & (MM < %(mMaxChiCFit)s*GeV)"  % locals()
-        
+
         ChiC                  = CombineParticles("ChiC"+name)
         ChiC.DecayDescriptor  = "chi_c1(1P) -> J/psi(1S) gamma"
         ChiC.CombinationCut   = combCut
         ChiC.MotherCut        = motherCut
         ChiC.ParticleCombiners.update( { "" : "OfflineVertexFitter:PUBLIC"}  )
-        
+
         ChiCSel = Selection(name+"_ChiCSel", Algorithm = ChiC, RequiredSelections = [inputSelJPsi, inputSelGamma])
 
         return ChiCSel
-        
\ No newline at end of file
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py
index bbbdf9061c8970379f99212003b650429db848bf..04a21bcfc34c81d03c1515386f26da84428ab46a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for selecting J/psi, Psi(2S), and Upsilon 
+Module for selecting J/psi, Psi(2S), and Upsilon
 '''
 
 __author__=['Jibo He']
@@ -45,13 +45,13 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class DiMuonForXsectionConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, name, config ): 
-        
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
@@ -59,17 +59,17 @@ class DiMuonForXsectionConf(LineBuilder):
         DiMuon
         """
         self.SelDiMuon = self.createSubSel( OutputList = self.name + "SelDiMuon",
-                                            InputList =  DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' ), 
+                                            InputList =  DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' ),
                                             Cuts = config['TotalCuts']
                                             )
 
         self.DiMuonForXsectionLine = StrippingLine( self.name + 'Line',
-                                                    prescale  = config['Prescale'],                                                    
+                                                    prescale  = config['Prescale'],
                                                     checkPV   = config['CheckPV'],
                                                     algos     = [ self.SelDiMuon ]
                                                     )
         self.registerLine( self.DiMuonForXsectionLine )
-        
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonInherit.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonInherit.py
index a9e7c2427afc06f5cd55d1313dfe600bc508bef7..757da5addba822e281115441a7368d000a54945b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonInherit.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonInherit.py
@@ -42,7 +42,7 @@ default_config = {
                       "StrippingMicroDSTDiMuonDiMuonIncTISLine"
                     ]
     },
-                   
+
     'BUILDERTYPE': 'DiMuonInherit',
     'CONFIG'     : {
   #### Definition of all the DiMuon lines ############
@@ -79,7 +79,7 @@ default_config = {
     "Inherit"       : "VirtualBase",
     #"Inherit"       : "FullDSTDiMuonDiMuonHighMassLine",
     "InputDiMuon"   : "StdLooseDiMuonSameSign",
-    #"MuonPIDmu"     : None #remove the cut 
+    #"MuonPIDmu"     : None #remove the cut
     #      "Cuts"          : None
     "Cuts"          : {
           "MuonP"         : "MINTREE('mu+'==ABSID,P ) > 8000.0 *MeV",
@@ -95,12 +95,12 @@ default_config = {
         "maxPV"         : 0.5,
         "Cuts"          : {
           "BPVVDZ"        : "BPVVDZ < -1 *mm",
-          #"MuonPIDmu"     : None, #remove the cut 
+          #"MuonPIDmu"     : None, #remove the cut
           "Mass"          : "MM > 2900",
           #"MuonPIDmu"     : "MINTREE('mu+'==ABSID,PIDmu) > 0.0"
           }
       },
-      
+
       "FullDSTDiMuonJpsi2MuMuDetachedLine" : {
         "Prescale"      : 1.0,
         "Inherit"       : "VirtualBase",
@@ -125,14 +125,14 @@ default_config = {
           "Mass"          :  "ADMASS('psi(2S)') < 100.0 *MeV"
         }
       },
-      
+
       "FullDSTDiMuonJpsi2MuMuTOSLine" : {
         "Prescale"      : 1.0,
         "Inherit"       : "VirtualBase",
         "InputDiMuon"   : "StdLooseJpsi2MuMu",
 #        "TOScut"        : { "L0.*Mu.*Decision%TOS":0,
 #                            "Hlt1DiMuonHighMassDecision%TOS" : 0,
-#                            "Hlt2DiMuonJPsiHighPTDecision%TOS" : 0 
+#                            "Hlt2DiMuonJPsiHighPTDecision%TOS" : 0
 #                          },
         "RequiredRawEvents" : None,
         "Cuts"          : {
@@ -143,7 +143,7 @@ default_config = {
           "TOSL0"         : "TOS('L0.*Mu.*Decision', 'L0TriggerTisTos')",
           "TOSHlt1"       : "TOS('Hlt1DiMuonHighMassDecision', 'Hlt1TriggerTisTos')",
           "TOSHlt2"       : "TOS('Hlt2DiMuonJPsiHighPTDecision', 'Hlt2TriggerTisTos')",
-          }   
+          }
       },
 
       "FullDSTDiMuonPsi2MuMuTOSLine" : {
@@ -152,7 +152,7 @@ default_config = {
         "InputDiMuon"   : "StdLooseDiMuon",
 #        "TOScut"        : { "L0.*Mu.*Decision%TOS":0,
 #                            "Hlt1DiMuonHighMassDecision%TOS" : 0,
-#                            "Hlt2DiMuonPsi2SHighPTDecision%TOS" : 0 
+#                            "Hlt2DiMuonPsi2SHighPTDecision%TOS" : 0
 #                          },
         "RequiredRawEvents" : None,
         "Cuts"          : {
@@ -162,7 +162,7 @@ default_config = {
           "TOSL0"         : "TOS('L0.*Mu.*Decision', 'L0TriggerTisTos')",
           "TOSHlt1"       : "TOS('Hlt1DiMuonHighMassDecision', 'Hlt1TriggerTisTos')",
           "TOSHlt2"       : "TOS('Hlt2DiMuonPsi2SHighPTDecision', 'Hlt2TriggerTisTos')",
-          }   
+          }
       },
 
 
@@ -174,7 +174,7 @@ default_config = {
         "InputDiMuon"   : "StdLooseDiMuon",
         "Cuts"          : {
           "Mass"          : "MM > 3000*MeV",
-        }   
+        }
       },
 
       "MicroDSTDiMuonDiMuonSameSignLine" : {
@@ -191,7 +191,7 @@ default_config = {
         "Cuts"          : {
           "Mass"          : "MM > 3000*MeV",
           "JpsiPt"        : "PT > 6 *GeV",
-        }   
+        }
       },
 
       "MicroDSTDiMuonDiMuonSameSignhighPTLine" : {
@@ -210,7 +210,7 @@ default_config = {
           "Mass"          : "MM > 3000*MeV",
           "TISHlt2"       : "TIS('Hlt2(?!Forward)(?!DebugEvent)(?!Express)(?!Lumi)(?!Transparent)(?!PassThrough).*Decision', 'Hlt2TriggerTisTos')",
           #"TISHlt2"       : "TIS('Hlt2.*Decision', 'Hlt2TriggerTisTos')",
-        }   
+        }
       },
 
       "MicroDSTDiMuonDiMuonSameSignTISLine" : {
@@ -229,7 +229,7 @@ default_config = {
        #   "Mass"        :   "(MM > 2976.916 *MeV) & (MM < 3216.916 *MeV)",
        #   "MuonPIDmu"   :   "MINTREE('mu+'==ABSID,PIDmu) > -5",
        #   "JpsiPt"      :   "(PT > 3*GeV)"
-       # }   
+       # }
      # },
 
       #"Psi2MuMu" : {
@@ -252,11 +252,11 @@ from StrippingUtils.Utils import LineBuilder
 class DiMuonInherit (LineBuilder):
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
         self.linesCfg  = config['Lines']
         self.dbug = config['Debug']
@@ -264,7 +264,7 @@ class DiMuonInherit (LineBuilder):
         ### Loops on the lines defined and get line titles
         for lineName in self.linesCfg:
           ### Translate the line name to a dictionary
-          line = self.linesCfg[lineName] 
+          line = self.linesCfg[lineName]
           ### Test the prescale. Zero prescale means virtual line.
           if self.getVariable(line,'Prescale') != None:
             if (self.getVariable(line,'Prescale')  != 0) :
@@ -280,7 +280,7 @@ class DiMuonInherit (LineBuilder):
               ### If a check on maxPV is required defines the proper filter
               _tmpFilter = {}
               if self.getVariable(line, 'maxPV') != None:
-                _tmpFilter = { 'Code'       : "recSummary(LHCb.RecSummary.nPVs, 'Rec/Vertex/Primary')<" + 
+                _tmpFilter = { 'Code'       : "recSummary(LHCb.RecSummary.nPVs, 'Rec/Vertex/Primary')<" +
                                                 str(self.getVariable(line, 'maxPV')) ,
                                'Preambulo'  : [ 'from LoKiTracks.decorators import *' ,
                                                 'from LoKiNumbers.decorators import *',
@@ -292,7 +292,7 @@ class DiMuonInherit (LineBuilder):
                 ## debug cut writer
                 print "###################### DiMuonInh Debugger ########################"
                 print "## " + name + lineName + 'Line'
-                print "## Input:      " +  "Phys/"+self.getVariable(line,"InputDiMuon")+"/Particles" 
+                print "## Input:      " +  "Phys/"+self.getVariable(line,"InputDiMuon")+"/Particles"
                 print "## Parsed Cut: " + self.compileCut(line).replace(" &", " \n\t\t&" )
 
 
@@ -310,7 +310,7 @@ class DiMuonInherit (LineBuilder):
 
               ### StrippingLine
               _tmpDiMuonLine = StrippingLine (  lineName, # name + lineName + 'Line',
-                                                prescale  = self.getVariable(line, 'Prescale'),    
+                                                prescale  = self.getVariable(line, 'Prescale'),
                                                 FILTER    = _tmpFilter,
                                                 checkPV   = self.getVariable(line, 'checkPV'),
                                                 RequiredRawEvents = self.getVariable(line, 'RequiredRawEvents'),
@@ -323,7 +323,7 @@ class DiMuonInherit (LineBuilder):
       if varName in line:
         retVal = line[varName]
       else:
-        if "Inherit" in line and line["Inherit"] != None : 
+        if "Inherit" in line and line["Inherit"] != None :
           retVal = self.getVariable ( self.linesCfg[line["Inherit"]] , varName )
         else:
           raise NameError("Missing definition of " + varName + " in line " + line + " and no inheritance defined")
@@ -334,30 +334,30 @@ class DiMuonInherit (LineBuilder):
     def compileCut ( self, line ):
       ### retrieves the dictionary
       cutDict = self.getCutDict ( line )
-       
+
       ### compiles the dictionary into a cut set
       _compiledCut = ""
       for cut in cutDict:
-         
+
         if cutDict[cut] != None:
           if _compiledCut != "" : _compiledCut += " & "
           _compiledCut += "(" + cutDict[cut] + ")"
 
       return _compiledCut;
-        
+
     def getCutDict ( self, line ):
       ### Loads the current cut dict
       if "Cuts" in line and line["Cuts"] != None:
         dictCutCurr = line["Cuts"]
-        
+
         ### Loads the inherited cut dict
-        if "Inherit" in line and line["Inherit"] != None : 
+        if "Inherit" in line and line["Inherit"] != None :
           dictCutInh = self.getCutDict ( self.linesCfg[line["Inherit"]] )
         else:
           dictCutInh = {}
 
         ### Merges the two dictionaries
-        for cut in dictCutInh: 
+        for cut in dictCutInh:
 #          if self.dbug: print "Consider inherited cut " + cut
           if cut not in dictCutCurr :
 #            if self.dbug:      print " not defined in current dictionary"
@@ -370,7 +370,7 @@ class DiMuonInherit (LineBuilder):
 
 
 
-  
+
     def filterTisTos(self,
                      name,
                      DiMuonInput,
@@ -379,16 +379,16 @@ class DiMuonInherit (LineBuilder):
         from Configurables import TisTosParticleTagger
         if self.dbug:
           print "##  TOS requirement applied"
-        
+
         myTagger = TisTosParticleTagger(name + "_TisTosTagger")
         myTagger.TisTosSpecs = myTisTosSpecs
-        
+
         # To speed it up, TisTos only with tracking system
         myTagger.ProjectTracksToCalo = False
         myTagger.CaloClustForCharged = False
         myTagger.CaloClustForNeutral = False
         myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-        
+
         return Selection(name + "_SelTisTos",
                          Algorithm = myTagger,
                          RequiredSelections = [ DiMuonInput ] )
@@ -406,17 +406,17 @@ logger.setLevel(logging.INFO)
 # =============================================================================
 # =============================================================================
 if '__main__' == __name__ :
-    
-    
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
+
+
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
     logger.info ( ' Date   :  %s' % __date__   )
     ##
-    clines = set() 
+    clines = set()
     logger.info ( ' Lines declared in default_config["STREAMS"] are' )
     for stream in default_config['STREAMS'] :
-        lines = default_config['STREAMS'][stream] 
+        lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s : %-50s ' % ( stream , l ) )
             clines.add ( l )
@@ -428,34 +428,32 @@ if '__main__' == __name__ :
     _conf = DiMuonInherit ( 'DiMuonInherit' ,  config = config)
     ##
     _ln   = ' ' + 61*'-' + '+' + 30*'-'
-    logger.info ( _ln ) 
-    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) ) 
+    logger.info ( _ln )
+    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
-        lname = l.name() 
+        lname = l.name()
         logger.info ( '  %-60s| %-30s  ' % ( lout, lname ) )
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-        
+
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py
index b98e4af0e6f67e2a052f9dba0bd85ba162d68a7a..90f63923fa561a8188c6ee250d1223293766af70 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py
@@ -14,19 +14,19 @@ with inputs from Joel Bressieux, Giulia Manca, Matthew Needham and Patrick Robbe
 
 Including the following lines:
 1. DiMuonLine
-   FullDST (keep 10%) and MicroDST 
+   FullDST (keep 10%) and MicroDST
 2. DiMuonSameSignLine
    FullDST (keep  1%) and MicroDST (keep 10%)
 3. DiMuonExclusiveLine
    Selection is the same as DiMuonLine at present,
-   a cut of "1mm upstream of any PV" applied further  
+   a cut of "1mm upstream of any PV" applied further
 4. DiMuonNoPVLine
    Using the same selection as DiMuonExclusiveLine at present (except the PV cut)
-   Requring no reconstructed PV.   
-5. DiMuonHighMassLine                     
-6. DiMuonHighMassSameSignLine             
+   Requring no reconstructed PV.
+5. DiMuonHighMassLine
+6. DiMuonHighMassSameSignLine
 7. DiMuonLowMassLine
-   Keep Hlt2UnbiasedDiMuonLowMassDecision triggered events 
+   Keep Hlt2UnbiasedDiMuonLowMassDecision triggered events
 8. Jpsi2MuMuLine
 9. Psi2MuMuLine
 10. DiMuonDetachedLine
@@ -70,24 +70,24 @@ default_config = {
     'BUILDERTYPE'       :       'DiMuonConf',
     'CONFIG'    : {
         'MicroDST'                                 :  False   ,
-                
+
         # DiMuon line
         'DiMuon_Prescale'                          :     1.   ,
         'DiMuon_Postscale'                         :     1.   ,
-        'DiMuon_checkPV'                           : False    ,  
-        
+        'DiMuon_checkPV'                           : False    ,
+
         'DiMuon_MuonPT'                            :   650.   ,  # MeV
-        'DiMuon_MuonP'                             : -8000.   ,  # MeV, no cut now 
-        'DiMuon_MuonTRCHI2DOF'                     :     5.   , 
+        'DiMuon_MuonP'                             : -8000.   ,  # MeV, no cut now
+        'DiMuon_MuonTRCHI2DOF'                     :     5.   ,
         'DiMuon_MinMass'                           :  3000.   ,  # MeV
         'DiMuon_MaxMass'                           :  1.0e+8  ,  # MeV
-        'DiMuon_VCHI2PDOF'                         :    20.   , 
-        'DiMuon_PT'                                : -1000.   ,  # MeV, no cut now 
+        'DiMuon_VCHI2PDOF'                         :    20.   ,
+        'DiMuon_PT'                                : -1000.   ,  # MeV, no cut now
 
         # DiMuonTIS line
         'DiMuonTIS_Prescale'                       :     1.   ,
         'DiMuonTIS_Postscale'                      :     1.   ,
-        'DiMuonTIS_checkPV'                        : False    ,  
+        'DiMuonTIS_checkPV'                        : False    ,
         'DiMuonTIS_TisTosSpecs'                    : { "L0(Muon|DiMuon|Electron|Photon|Hadron).*Decision%TIS":0,
                                                        "Hlt1(?!ODIN)(?!L0)(?!Lumi)(?!Tell1)(?!MB)(?!NZS)(?!Velo)(?!BeamGas)(?!Incident).*Decision%TIS" : 0,
                                                        "Hlt2(?!Forward)(?!DebugEvent)(?!Express)(?!Lumi)(?!Transparent)(?!PassThrough).*Decision%TIS" : 0 },
@@ -101,40 +101,40 @@ default_config = {
         'DiMuonPrescaled_Prescale'                 :     0.1  ,
         'DiMuonPrescaled_Postscale'                :     1.   ,
         'DiMuonPrescaled_checkPV'                  : False    ,
-        
+
         'DiMuonPrescaled_MuonPT'                   :   650.   ,  # MeV
-        'DiMuonPrescaled_MuonP'                    : -8000.   ,  # MeV, no cut now 
-        'DiMuonPrescaled_MuonTRCHI2DOF'            :     5.   , 
+        'DiMuonPrescaled_MuonP'                    : -8000.   ,  # MeV, no cut now
+        'DiMuonPrescaled_MuonTRCHI2DOF'            :     5.   ,
         'DiMuonPrescaled_MinMass'                  :  3000.   ,  # MeV
         'DiMuonPrescaled_MaxMass'                  :  1.0e+8  ,  # MeV
-        'DiMuonPrescaled_VCHI2PDOF'                :    20.   , 
-        'DiMuonPrescaled_PT'                       : -1000.   ,  # MeV, no cut now 
-        
+        'DiMuonPrescaled_VCHI2PDOF'                :    20.   ,
+        'DiMuonPrescaled_PT'                       : -1000.   ,  # MeV, no cut now
+
         # DiMuonExclusive line
         'DiMuonExclusive_Prescale'                 :     0.   ,
         'DiMuonExclusive_Postscale'                :     1.   ,
         'DiMuonExclusive_checkPV'                  :  True    ,
-        
+
         'DiMuonExclusive_MuonPT'                   :   650.   ,  # MeV
-        'DiMuonExclusive_MuonP'                    : -8000.   ,  # MeV, no cut now 
+        'DiMuonExclusive_MuonP'                    : -8000.   ,  # MeV, no cut now
         'DiMuonExclusive_MuonTRCHI2DOF'            :     5.   ,
         'DiMuonExclusive_MuonPIDCut'               :    ""    ,
         'DiMuonExclusive_MinMass'                  :  2900.   ,
         'DiMuonExclusive_VCHI2PDOF'                :    20.   ,
-        'DiMuonExclusive_PT'                       : -1000.   ,  # MeV, no cut now 
+        'DiMuonExclusive_PT'                       : -1000.   ,  # MeV, no cut now
         'DiMuonExclusive_DZ'                       :    -1.   ,  # mm, upstream of any PV
 
         # DiMuonNoPV line
         'DiMuonNoPV_Prescale'                      :     1.   ,
         'DiMuonNoPV_Postscale'                     :     1.   ,
-        
+
         # DiMuon High Mass line
         'DiMuonHighMass_Prescale'                  :     1.   ,
         'DiMuonHighMass_Postscale'                 :     1.   ,
         'DiMuonHighMass_checkPV'                   : False    ,
-        
+
         'DiMuonHighMass_MuonPT'                    :  1000.   , # MeV
-        'DiMuonHighMass_MuonP'                     :  8000.   , # MeV 
+        'DiMuonHighMass_MuonP'                     :  8000.   , # MeV
         'DiMuonHighMass_MuonTRCHI2DOF'             :     5.   ,
         'DiMuonHighMass_MuonPIDCut'                : " & (MINTREE('mu+'==ABSID,PIDmu)>0)",
         'DiMuonHighMass_MinMass'                   :  8500.   , # MeV
@@ -149,14 +149,14 @@ default_config = {
         # DiMuon Low Mass line
         'DiMuonLowMass_Prescale'                   :     0.   ,
         'DiMuonLowMass_Postscale'                  :     1.   ,
-        'DiMuonLowMass_checkPV'                    : False    , 
-        
+        'DiMuonLowMass_checkPV'                    : False    ,
+
         'DiMuonLowMass_MuonPT'                     :   650.   ,  # MeV
         'DiMuonLowMass_MuonP'                      : -8000.   ,  # MeV, no cut now
         'DiMuonLowMass_MuonTRCHI2DOF'              :     5.   ,
-        'DiMuonLowMass_MuonPIDCut'                 :    ""    , 
+        'DiMuonLowMass_MuonPIDCut'                 :    ""    ,
         'DiMuonLowMass_MinMass'                    :   500.   ,  # MeV
-        'DiMuonLowMass_VCHI2PDOF'                  :    20.   ,       
+        'DiMuonLowMass_VCHI2PDOF'                  :    20.   ,
         'DiMuonLowMass_PT'                         : -1000.   ,  # MeV, no cut now
         'DiMuonLowMass_HLTFILTER'                : "(HLT_PASS('Hlt2DiMuonLowMassDecision'))",
 
@@ -164,11 +164,11 @@ default_config = {
         'Jpsi2MuMu_Prescale'                       :     1.   ,
         'Jpsi2MuMu_Postscale'                      :     1.   ,
         'Jpsi2MuMu_checkPV'                        : False    ,
-        
+
         'Jpsi2MuMu_MuonPT'                         :   650.   ,  # MeV
         'Jpsi2MuMu_MuonP'                          : 10000.   ,  # MeV
-        'Jpsi2MuMu_MuonPIDmu'                      :     0.   , 
-        'Jpsi2MuMu_MuonTRCHI2DOF'                  :     5.   , 
+        'Jpsi2MuMu_MuonPIDmu'                      :     0.   ,
+        'Jpsi2MuMu_MuonTRCHI2DOF'                  :     5.   ,
         'Jpsi2MuMu_MinMass'                        :  3010.   ,  # MeV
         'Jpsi2MuMu_MaxMass'                        :  3170.   ,  # MeV
         'Jpsi2MuMu_VCHI2PDOF'                      :    20.   ,
@@ -182,39 +182,39 @@ default_config = {
         'Psi2MuMu_Postscale'                       :     1.   ,
         'Psi2MuMu_checkPV'                         : False    ,
 
-        'Psi2MuMu_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"   
+        'Psi2MuMu_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"
         'Psi2MuMu_MuonPT'                          :  1000.   ,  # MeV
         'Psi2MuMu_MuonP'                           : 10000.   ,  # MeV
-        'Psi2MuMu_MuonPIDmu'                       :     0.   , 
-        'Psi2MuMu_MuonTRCHI2DOF'                   :     5.   , 
+        'Psi2MuMu_MuonPIDmu'                       :     0.   ,
+        'Psi2MuMu_MuonTRCHI2DOF'                   :     5.   ,
         'Psi2MuMu_MassWindow'                      :   100.   ,  # MeV
         'Psi2MuMu_VCHI2PDOF'                       :    20.   ,
         'Psi2MuMu_PT'                              :  3000.   ,   # MeV
         'Psi2MuMu_TisTosSpecs'                     : { "L0.*Mu.*Decision%TOS":0,
                                                        "Hlt1DiMuonHighMassDecision%TOS" : 0,
                                                        "Hlt2DiMuonPsi2SHighPTDecision%TOS" : 0 },
-        
+
         # DiMuonDetached line
         'DiMuonDetached_Prescale'                 :     0.   ,
         'DiMuonDetached_Postscale'                :     1.   ,
-        
+
         'DiMuonDetached_MuonPT'                   :   500.   ,  # MeV
         'DiMuonDetached_MuonP'                    : -8000.   ,  # MeV, no cut now
         'DiMuonDetached_MuonPIDmu'                :    -5.   ,
-        'DiMuonDetached_MuonTRCHI2DOF'            :     5.   , 
+        'DiMuonDetached_MuonTRCHI2DOF'            :     5.   ,
         'DiMuonDetached_MinMass'                  :  2950.   ,
         'DiMuonDetached_VCHI2PDOF'                :    20.   ,
-        'DiMuonDetached_PT'                       : -1000.   ,  # MeV, no cut now 
-        'DiMuonDetached_LTCuts'                   :   " & ((BPVDLS>3)|(BPVDLS<-3))"    , 
-        
+        'DiMuonDetached_PT'                       : -1000.   ,  # MeV, no cut now
+        'DiMuonDetached_LTCuts'                   :   " & ((BPVDLS>3)|(BPVDLS<-3))"    ,
+
         # Jpsi2MuMuDetached line
         'Jpsi2MuMuDetached_Prescale'                       :     1.   ,
         'Jpsi2MuMuDetached_Postscale'                      :     1.   ,
-        
+
         'Jpsi2MuMuDetached_MuonPT'                         :   500.   ,  # MeV
         'Jpsi2MuMuDetached_MuonP'                          : -8000.   ,  # MeV, no cut now
-        'Jpsi2MuMuDetached_MuonPIDmu'                      :     0.   , 
-        'Jpsi2MuMuDetached_MuonTRCHI2DOF'                  :     5.   , 
+        'Jpsi2MuMuDetached_MuonPIDmu'                      :     0.   ,
+        'Jpsi2MuMuDetached_MuonTRCHI2DOF'                  :     5.   ,
         'Jpsi2MuMuDetached_MinMass'                        :  2996.916,  # MeV
         'Jpsi2MuMuDetached_MaxMass'                        :  3196.916,  # MeV
         'Jpsi2MuMuDetached_VCHI2PDOF'                      :    20.   ,
@@ -225,11 +225,11 @@ default_config = {
         'Psi2MuMuDetached_Prescale'                        :     1.   ,
         'Psi2MuMuDetached_Postscale'                       :     1.   ,
 
-        'Psi2MuMuDetached_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"   
+        'Psi2MuMuDetached_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"
         'Psi2MuMuDetached_MuonPT'                          :   500.   ,  # MeV
         'Psi2MuMuDetached_MuonP'                           : -8000.   ,  # MeV, no cut now
-        'Psi2MuMuDetached_MuonPIDmu'                       :     0.   , 
-        'Psi2MuMuDetached_MuonTRCHI2DOF'                   :     5.   , 
+        'Psi2MuMuDetached_MuonPIDmu'                       :     0.   ,
+        'Psi2MuMuDetached_MuonTRCHI2DOF'                   :     5.   ,
         'Psi2MuMuDetached_MassWindow'                      :   100.   ,  # MeV
         'Psi2MuMuDetached_VCHI2PDOF'                       :    20.   ,
         'Psi2MuMuDetached_PT'                              : -1000.   ,   # MeV, no cut now
@@ -243,7 +243,7 @@ default_config = {
     "StrippingTestFullDSTDiMuonDiMuonNoPVLine",
     'StrippingTestFullDSTDiMuonDiMuonHighMassLine',
     'StrippingTestFullDSTDiMuonDiMuonHighMassSameSignLine'
-    
+
     ]},
     'WGs'    : [ 'BandQ' ]
     },
@@ -252,24 +252,24 @@ default_config = {
     'BUILDERTYPE' : 'DiMuonConf',
     'CONFIG' : {
         'MicroDST'                                 :   True   ,
-    
+
         # DiMuon line
         'DiMuon_Prescale'                          :     1.   ,
         'DiMuon_Postscale'                         :     1.   ,
-        'DiMuon_checkPV'                           : False    ,  
-        
+        'DiMuon_checkPV'                           : False    ,
+
         'DiMuon_MuonPT'                            :   650.   ,  # MeV
-        'DiMuon_MuonP'                             : -8000.   ,  # MeV, no cut now 
-        'DiMuon_MuonTRCHI2DOF'                     :     5.   , 
+        'DiMuon_MuonP'                             : -8000.   ,  # MeV, no cut now
+        'DiMuon_MuonTRCHI2DOF'                     :     5.   ,
         'DiMuon_MinMass'                           :  3000.   ,  # MeV
         'DiMuon_MaxMass'                           :  1.0e+8  ,  # MeV
-        'DiMuon_VCHI2PDOF'                         :    20.   , 
+        'DiMuon_VCHI2PDOF'                         :    20.   ,
         'DiMuon_PT'                                : -1000.   ,  # MeV
 
         # DiMuonTIS line
         'DiMuonTIS_Prescale'                       :     1.   ,
         'DiMuonTIS_Postscale'                      :     1.   ,
-        'DiMuonTIS_checkPV'                        : False    ,  
+        'DiMuonTIS_checkPV'                        : False    ,
         'DiMuonTIS_TisTosSpecs'                    : { "L0(Muon|DiMuon|Electron|Photon|Hadron).*Decision%TIS":0,
                                                        "Hlt1(?!ODIN)(?!L0)(?!Lumi)(?!Tell1)(?!MB)(?!NZS)(?!Velo)(?!BeamGas)(?!Incident).*Decision%TIS" : 0,
                                                        "Hlt2(?!Forward)(?!DebugEvent)(?!Express)(?!Lumi)(?!Transparent)(?!PassThrough).*Decision%TIS" : 0 },
@@ -283,45 +283,45 @@ default_config = {
         'DiMuonPrescaled_Prescale'                 :     0.1  ,
         'DiMuonPrescaled_Postscale'                :     1.   ,
         'DiMuonPrescaled_checkPV'                  : False    ,
-        
+
         'DiMuonPrescaled_MuonPT'                   :   650.   ,  # MeV
-        'DiMuonPrescaled_MuonP'                    : -8000.   ,  # MeV, no cut now 
+        'DiMuonPrescaled_MuonP'                    : -8000.   ,  # MeV, no cut now
         'DiMuonPrescaled_MuonTRCHI2DOF'            :     5.   ,
         'DiMuonPrescaled_MinMass'                  :  3000.   ,  # MeV
         'DiMuonPrescaled_MaxMass'                  :  1.0e+8  ,  # MeV
-        'DiMuonPrescaled_VCHI2PDOF'                :    20.   , 
-        'DiMuonPrescaled_PT'                       : -1000.   ,  # MeV, no cut now 
+        'DiMuonPrescaled_VCHI2PDOF'                :    20.   ,
+        'DiMuonPrescaled_PT'                       : -1000.   ,  # MeV, no cut now
 
         # DiMuonExclusive line
         'DiMuonExclusive_Prescale'                 :     1.   ,
         'DiMuonExclusive_Postscale'                :     1.   ,
         'DiMuonExclusive_checkPV'                  :  True    ,
-        
+
         'DiMuonExclusive_MuonPT'                   :   650.   ,  # MeV
-        'DiMuonExclusive_MuonP'                    : -8000.   ,  # MeV, no cut now 
+        'DiMuonExclusive_MuonP'                    : -8000.   ,  # MeV, no cut now
         'DiMuonExclusive_MuonTRCHI2DOF'            :     5.   ,
         'DiMuonExclusive_MuonPIDCut'               :    ""    ,
         'DiMuonExclusive_MinMass'                  :  2900.   ,
         'DiMuonExclusive_VCHI2PDOF'                :    20.   ,
-        'DiMuonExclusive_PT'                       : -1000.   ,  # MeV, no cut now 
+        'DiMuonExclusive_PT'                       : -1000.   ,  # MeV, no cut now
         'DiMuonExclusive_DZ'                       :    -1.   ,  # mm, upstream of any PV
 
         # DiMuonNoPV line
         'DiMuonNoPV_Prescale'                      :     1.   ,
         'DiMuonNoPV_Postscale'                     :     1.   ,
-               
+
         # DiMuon High Mass line
         'DiMuonHighMass_Prescale'                  :     1.   ,
         'DiMuonHighMass_Postscale'                 :     1.   ,
         'DiMuonHighMass_checkPV'                   :  True    ,
-        
+
         'DiMuonHighMass_MuonPT'                    :   650.   , # MeV
-        'DiMuonHighMass_MuonP'                     : -8000.   , 
+        'DiMuonHighMass_MuonP'                     : -8000.   ,
         'DiMuonHighMass_MuonTRCHI2DOF'             :     5.   ,
         'DiMuonHighMass_MuonPIDCut'                : " & (MINTREE('mu+'==ABSID,PIDmu)>0)",
         'DiMuonHighMass_MinMass'                   :  8000.   , # MeV
         'DiMuonHighMass_VCHI2PDOF'                 :    20.   ,
-        'DiMuonHighMass_PT'                        : -1000.   , # MeV, no cut now 
+        'DiMuonHighMass_PT'                        : -1000.   , # MeV, no cut now
 
         # DiMuon High Mass Same Sign line
         'DiMuonHighMassSameSign_Prescale'          :     1.   ,
@@ -331,14 +331,14 @@ default_config = {
         # DiMuon Low Mass line
         'DiMuonLowMass_Prescale'                   :     1.   ,
         'DiMuonLowMass_Postscale'                  :     1.   ,
-        'DiMuonLowMass_checkPV'                    :  True    , 
-        
+        'DiMuonLowMass_checkPV'                    :  True    ,
+
         'DiMuonLowMass_MuonPT'                     :   650.   ,  # MeV
         'DiMuonLowMass_MuonP'                      : -8000.   ,  # MeV, no cut now
-        'DiMuonLowMass_MuonPIDCut'                 : ""       , 
-        'DiMuonLowMass_MuonTRCHI2DOF'              :     5.   , 
+        'DiMuonLowMass_MuonPIDCut'                 : ""       ,
+        'DiMuonLowMass_MuonTRCHI2DOF'              :     5.   ,
         'DiMuonLowMass_MinMass'                    :   500.   ,  # MeV
-        'DiMuonLowMass_VCHI2PDOF'                  :    20.   ,       
+        'DiMuonLowMass_VCHI2PDOF'                  :    20.   ,
         'DiMuonLowMass_PT'                         : -1000.   ,  # MeV, no cut now
         'DiMuonLowMass_HLTFILTER'                : "(HLT_PASS('Hlt2DiMuonLowMassDecision'))",
 
@@ -346,11 +346,11 @@ default_config = {
         'Jpsi2MuMu_Prescale'                       :     1.   ,
         'Jpsi2MuMu_Postscale'                      :     1.   ,
         'Jpsi2MuMu_checkPV'                        :  True    ,
-        
+
         'Jpsi2MuMu_MuonPT'                         :   650.   ,  # MeV
         'Jpsi2MuMu_MuonP'                          : -8000.   ,  # MeV, no cut now
-        'Jpsi2MuMu_MuonPIDmu'                      :    -5.   ,  
-        'Jpsi2MuMu_MuonTRCHI2DOF'                  :     5.   , 
+        'Jpsi2MuMu_MuonPIDmu'                      :    -5.   ,
+        'Jpsi2MuMu_MuonTRCHI2DOF'                  :     5.   ,
         'Jpsi2MuMu_MinMass'                        :  2976.916,  # MeV
         'Jpsi2MuMu_MaxMass'                        :  3216.916,  # MeV
         'Jpsi2MuMu_VCHI2PDOF'                      :    20.   ,
@@ -364,39 +364,39 @@ default_config = {
         'Psi2MuMu_Postscale'                       :     1.   ,
         'Psi2MuMu_checkPV'                         :  True    ,
 
-        'Psi2MuMu_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"   
+        'Psi2MuMu_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"
         'Psi2MuMu_MuonPT'                          :   650.   ,  # MeV
         'Psi2MuMu_MuonP'                           : -8000.   ,  # MeV
-        'Psi2MuMu_MuonPIDmu'                       :    -5.   , 
-        'Psi2MuMu_MuonTRCHI2DOF'                   :     5.   , 
+        'Psi2MuMu_MuonPIDmu'                       :    -5.   ,
+        'Psi2MuMu_MuonTRCHI2DOF'                   :     5.   ,
         'Psi2MuMu_MassWindow'                      :   120.   ,  # MeV
         'Psi2MuMu_VCHI2PDOF'                       :    20.   ,
         'Psi2MuMu_PT'                              :  3000.   ,  # MeV
         'Psi2MuMu_TisTosSpecs'                     : { "L0.*Mu.*Decision%TOS":0,
                                                        "Hlt1DiMuonHighMassDecision%TOS" : 0,
-                                                       "Hlt2DiMuonPsi2SHighPTDecision%TOS" : 0 }, 
+                                                       "Hlt2DiMuonPsi2SHighPTDecision%TOS" : 0 },
 
         # DiMuonDetached line
         'DiMuonDetached_Prescale'                 :     1.   ,
         'DiMuonDetached_Postscale'                :     1.   ,
-        
+
         'DiMuonDetached_MuonPT'                   :   500.   ,  # MeV
         'DiMuonDetached_MuonP'                    : -8000.   ,  # MeV, no cut now
         'DiMuonDetached_MuonPIDmu'                :    -5.   ,
-        'DiMuonDetached_MuonTRCHI2DOF'            :     5.   , 
+        'DiMuonDetached_MuonTRCHI2DOF'            :     5.   ,
         'DiMuonDetached_MinMass'                  :  2950.   ,
         'DiMuonDetached_VCHI2PDOF'                :    20.   ,
-        'DiMuonDetached_PT'                       : -1000.   ,  # MeV, no cut now 
+        'DiMuonDetached_PT'                       : -1000.   ,  # MeV, no cut now
         'DiMuonDetached_LTCuts'                   :    " & ((BPVDLS>5) | (BPVDLS<-3))"   ,  # mm,
-        
+
         # Jpsi2MuMuDetached line
         'Jpsi2MuMuDetached_Prescale'                       :     1.   ,
         'Jpsi2MuMuDetached_Postscale'                      :     1.   ,
-        
+
         'Jpsi2MuMuDetached_MuonPT'                         :   500.   ,  # MeV
         'Jpsi2MuMuDetached_MuonP'                          : -8000.   ,  # MeV, no cut now
-        'Jpsi2MuMuDetached_MuonPIDmu'                      :    -5.   , 
-        'Jpsi2MuMuDetached_MuonTRCHI2DOF'                  :     5.   , 
+        'Jpsi2MuMuDetached_MuonPIDmu'                      :    -5.   ,
+        'Jpsi2MuMuDetached_MuonTRCHI2DOF'                  :     5.   ,
         'Jpsi2MuMuDetached_MinMass'                        :  2976.916,  # MeV
         'Jpsi2MuMuDetached_MaxMass'                        :  3216.916,  # MeV
         'Jpsi2MuMuDetached_VCHI2PDOF'                      :    20.   ,
@@ -407,16 +407,16 @@ default_config = {
         'Psi2MuMuDetached_Prescale'                        :     1.   ,
         'Psi2MuMuDetached_Postscale'                       :     1.   ,
 
-        'Psi2MuMuDetached_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"   
+        'Psi2MuMuDetached_ParticleName'                    : "'psi(2S)'", # Particle Name, like "'psi(2S)'"
         'Psi2MuMuDetached_MuonPT'                          :   500.   ,  # MeV
         'Psi2MuMuDetached_MuonP'                           : -8000.   ,  # MeV, no cut now
-        'Psi2MuMuDetached_MuonPIDmu'                       :    -5.   , 
-        'Psi2MuMuDetached_MuonTRCHI2DOF'                   :     5.   , 
+        'Psi2MuMuDetached_MuonPIDmu'                       :    -5.   ,
+        'Psi2MuMuDetached_MuonTRCHI2DOF'                   :     5.   ,
         'Psi2MuMuDetached_MassWindow'                      :   120.   ,  # MeV
         'Psi2MuMuDetached_VCHI2PDOF'                       :    20.   ,
         'Psi2MuMuDetached_PT'                              : -1000.   ,   # MeV, no cut now
-        'Psi2MuMuDetached_LTCuts'                          :   " & ((BPVDLS>3) | (BPVDLS<-3))"    
-        }, 
+        'Psi2MuMuDetached_LTCuts'                          :   " & ((BPVDLS>3) | (BPVDLS<-3))"
+        },
     'STREAMS' : {'Leptonic' :[
                       "StrippingTestMicroDSTDiMuonDiMuonSameSignLine",
                       "StrippingTestMicroDSTDiMuonDiMuonIncLine"
@@ -434,20 +434,20 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class DiMuonConf(LineBuilder):
-    
+
     __configuration_keys__ = (
         "MicroDST",
-        
+
         # DiMuon line
         'DiMuon_Prescale',
         'DiMuon_Postscale',
         'DiMuon_checkPV',
-        
+
         'DiMuon_MuonPT',
         'DiMuon_MuonP',
-        'DiMuon_MuonTRCHI2DOF', 
+        'DiMuon_MuonTRCHI2DOF',
         'DiMuon_MinMass',
-        'DiMuon_MaxMass',   
+        'DiMuon_MaxMass',
         'DiMuon_VCHI2PDOF',
         'DiMuon_PT',
 #        'DiMuon_PT_oldTh',
@@ -462,25 +462,25 @@ class DiMuonConf(LineBuilder):
         'DiMuonSameSign_Prescale',
         'DiMuonSameSign_Postscale',
         'DiMuonSameSign_checkPV',
-        
+
         # DiMuonPrescaled line
         'DiMuonPrescaled_Prescale',
         'DiMuonPrescaled_Postscale',
         'DiMuonPrescaled_checkPV',
-        
+
         'DiMuonPrescaled_MuonPT',
         'DiMuonPrescaled_MuonP',
-        'DiMuonPrescaled_MuonTRCHI2DOF', 
+        'DiMuonPrescaled_MuonTRCHI2DOF',
         'DiMuonPrescaled_MinMass',
-        'DiMuonPrescaled_MaxMass',   
+        'DiMuonPrescaled_MaxMass',
         'DiMuonPrescaled_VCHI2PDOF',
-        'DiMuonPrescaled_PT', 
-        
+        'DiMuonPrescaled_PT',
+
         # DiMuonExclusive line
         'DiMuonExclusive_Prescale',
         'DiMuonExclusive_Postscale',
         'DiMuonExclusive_checkPV',
-        
+
         'DiMuonExclusive_MuonPT',
         'DiMuonExclusive_MuonP',
         'DiMuonExclusive_MuonTRCHI2DOF',
@@ -493,12 +493,12 @@ class DiMuonConf(LineBuilder):
         # DiMuonNoPV line
         'DiMuonNoPV_Prescale',
         'DiMuonNoPV_Postscale',
-        
+
         # DiMuon High Mass line
         'DiMuonHighMass_Prescale',
         'DiMuonHighMass_Postscale',
         'DiMuonHighMass_checkPV',
-        
+
         'DiMuonHighMass_MuonPT',
         'DiMuonHighMass_MuonP',
         'DiMuonHighMass_MuonTRCHI2DOF',
@@ -516,78 +516,78 @@ class DiMuonConf(LineBuilder):
         'DiMuonLowMass_Prescale',
         'DiMuonLowMass_Postscale',
         'DiMuonLowMass_checkPV',
-        
+
         'DiMuonLowMass_MuonPT',
         'DiMuonLowMass_MuonP',
         'DiMuonLowMass_MuonTRCHI2DOF',
         'DiMuonLowMass_MuonPIDCut',
         'DiMuonLowMass_MinMass',
-        'DiMuonLowMass_VCHI2PDOF',       
+        'DiMuonLowMass_VCHI2PDOF',
         'DiMuonLowMass_PT',
         'DiMuonLowMass_HLTFILTER',
         # Tight Jpsi line
         'Jpsi2MuMu_Prescale',
         'Jpsi2MuMu_Postscale',
         'Jpsi2MuMu_checkPV',
-        
+
         'Jpsi2MuMu_MuonPT',
         'Jpsi2MuMu_MuonP',
         'Jpsi2MuMu_MuonPIDmu',
-        'Jpsi2MuMu_MuonTRCHI2DOF', 
+        'Jpsi2MuMu_MuonTRCHI2DOF',
         'Jpsi2MuMu_MinMass',
         'Jpsi2MuMu_MaxMass',
         'Jpsi2MuMu_VCHI2PDOF',
         'Jpsi2MuMu_PT',
         'Jpsi2MuMu_TisTosSpecs',
-        
+
         # Tight Psi(2S) line
         'Psi2MuMu_Prescale',
         'Psi2MuMu_Postscale',
         'Psi2MuMu_checkPV',
 
-        'Psi2MuMu_ParticleName', 
+        'Psi2MuMu_ParticleName',
         'Psi2MuMu_MuonPT',
         'Psi2MuMu_MuonP',
         'Psi2MuMu_MuonPIDmu',
-        'Psi2MuMu_MuonTRCHI2DOF', 
+        'Psi2MuMu_MuonTRCHI2DOF',
         'Psi2MuMu_MassWindow',
         'Psi2MuMu_VCHI2PDOF',
         'Psi2MuMu_PT',
-        'Psi2MuMu_TisTosSpecs', 
-        
+        'Psi2MuMu_TisTosSpecs',
+
         # DiMuonDetached line
         'DiMuonDetached_Prescale',
         'DiMuonDetached_Postscale',
-        
+
         'DiMuonDetached_MuonPT',
         'DiMuonDetached_MuonP',
         'DiMuonDetached_MuonPIDmu',
-        'DiMuonDetached_MuonTRCHI2DOF', 
+        'DiMuonDetached_MuonTRCHI2DOF',
         'DiMuonDetached_MinMass',
         'DiMuonDetached_VCHI2PDOF',
         'DiMuonDetached_PT',
         'DiMuonDetached_LTCuts',
-        
+
         # Jpsi2MuMuDetached line
         'Jpsi2MuMuDetached_Prescale',
         'Jpsi2MuMuDetached_Postscale',
-        
+
         'Jpsi2MuMuDetached_MuonPT',
         'Jpsi2MuMuDetached_MuonP',
         'Jpsi2MuMuDetached_MuonPIDmu',
-        'Jpsi2MuMuDetached_MuonTRCHI2DOF', 
+        'Jpsi2MuMuDetached_MuonTRCHI2DOF',
         'Jpsi2MuMuDetached_MinMass',
         'Jpsi2MuMuDetached_MaxMass',
         'Jpsi2MuMuDetached_VCHI2PDOF',
         'Jpsi2MuMuDetached_PT',
         'Jpsi2MuMuDetached_LTCuts',
 #        'Jpsi2MuMuDetached_MinusLTCuts',
-        
+
         # Psi2MuMuDetached line
         'Psi2MuMuDetached_Prescale',
         'Psi2MuMuDetached_Postscale',
 
-        'Psi2MuMuDetached_ParticleName',  
+        'Psi2MuMuDetached_ParticleName',
         'Psi2MuMuDetached_MuonPT',
         'Psi2MuMuDetached_MuonP',
         'Psi2MuMuDetached_MuonPIDmu',
@@ -596,24 +596,24 @@ class DiMuonConf(LineBuilder):
         'Psi2MuMuDetached_VCHI2PDOF',
         'Psi2MuMuDetached_PT',
         'Psi2MuMuDetached_LTCuts',
-#        'Psi2MuMuDetached_MinusLTCuts'       
+#        'Psi2MuMuDetached_MinusLTCuts'
         )
-    
 
 
 
-    
+
+
     def __init__(self, name, config):
-        
+
         LineBuilder.__init__(self, name, config)
 
-        # if name not set outside, set it to empty 
+        # if name not set outside, set it to empty
         if name == None:
-            name = ""        
+            name = ""
+
 
-            
         """
-        DiMuon line 
+        DiMuon line
         """
         self.SelDiMuon = filterDiMuonWMax( name + 'DiMuon',
                                            MuonPT        = config['DiMuon_MuonPT'],
@@ -678,14 +678,14 @@ class DiMuonConf(LineBuilder):
                                           DiMuonInput = self.SelDiMuon,
                                           myTisTosSpecs = config['DiMuonTIS_TisTosSpecs']
                                           )
-        
+
         self.DiMuonTISLine = StrippingLine( name + 'DiMuonTIS' + 'Line',
                                                prescale  = config['Jpsi2MuMu_Prescale'],
                                                postscale = config['Jpsi2MuMu_Postscale'],
                                                checkPV   = config['Jpsi2MuMu_checkPV'],
                                                selection = self.DiMuonTISSel
                                                )
-        
+
         """
         DiMuonPrescaled line
         """
@@ -698,15 +698,15 @@ class DiMuonConf(LineBuilder):
                                                     MuMuVCHI2PDOF = config['DiMuonPrescaled_VCHI2PDOF'],
                                                     MuMuPT        = config['DiMuonPrescaled_PT']
                                                     )
-        
+
         self.DiMuonPrescaledLine = StrippingLine( name + 'DiMuonPrescaled' + 'Line',
                                                   prescale  = config['DiMuonPrescaled_Prescale'],
                                                   postscale = config['DiMuonPrescaled_Postscale'],
                                                   checkPV   = config['DiMuonPrescaled_checkPV'],
                                                   selection = self.SelDiMuonPrescaled
                                                   )
-        
-        
+
+
         """
         DiMuonExclusiveline
         """
@@ -719,7 +719,7 @@ class DiMuonConf(LineBuilder):
                                                      MuMuPT        = config['DiMuonExclusive_PT'],
                                                      MuMuDZ        = config['DiMuonExclusive_DZ']
                                                      )
-                
+
         self.DiMuonExclusiveLine = StrippingLine( name + 'DiMuonExclusive' + 'Line',
                                                   prescale  = config['DiMuonExclusive_Prescale'],
                                                   postscale = config['DiMuonExclusive_Postscale'],
@@ -734,7 +734,7 @@ class DiMuonConf(LineBuilder):
                                            MuonPT        = config['DiMuonExclusive_MuonPT'],
                                            MuonP         = config['DiMuonExclusive_MuonP'],
                                            MuonTRCHI2DOF = config['DiMuonExclusive_MuonTRCHI2DOF'],
-                                           MuonPIDCut    = config['DiMuonExclusive_MuonPIDCut'], 
+                                           MuonPIDCut    = config['DiMuonExclusive_MuonPIDCut'],
                                            MuMuMinMass   = config['DiMuonExclusive_MinMass'],
                                            MuMuVCHI2PDOF = config['DiMuonExclusive_VCHI2PDOF'],
                                            MuMuPT        = config['DiMuonExclusive_PT']
@@ -744,14 +744,14 @@ class DiMuonConf(LineBuilder):
                                              prescale  = config['DiMuonNoPV_Prescale'],
                                              postscale = config['DiMuonNoPV_Postscale'],
                                              checkPV   = False,
-                                             FILTER = { 'Code'       : "recSummary(LHCb.RecSummary.nPVs, 'Rec/Vertex/Primary')<0.5" , 
+                                             FILTER = { 'Code'       : "recSummary(LHCb.RecSummary.nPVs, 'Rec/Vertex/Primary')<0.5" ,
                                                         'Preambulo'  : [ 'from LoKiTracks.decorators import *' ,
                                                                          'from LoKiNumbers.decorators    import *',
                                                                          'from LoKiCore.functions    import *' ]
                                                         },
                                              selection = self.SelDiMuonNoPV
-                                             )       
-        
+                                             )
+
         """
         DiMuon High Mass line
         """
@@ -762,7 +762,7 @@ class DiMuonConf(LineBuilder):
                                                MuonPIDCut    = config['DiMuonHighMass_MuonPIDCut'],
                                                MuMuMinMass   = config['DiMuonHighMass_MinMass'],
                                                MuMuVCHI2PDOF = config['DiMuonHighMass_VCHI2PDOF'],
-                                               MuMuPT        = config['DiMuonHighMass_PT']                                               
+                                               MuMuPT        = config['DiMuonHighMass_PT']
                                                )
         self.DiMuonHighMassLine = StrippingLine( name + 'DiMuonHighMass' + 'Line',
                                                  prescale  = config['DiMuonHighMass_Prescale'],
@@ -772,7 +772,7 @@ class DiMuonConf(LineBuilder):
                                                  )
 
 
-        
+
         """
         DiMuon High Mass Same Sign line
         """
@@ -784,7 +784,7 @@ class DiMuonConf(LineBuilder):
                                                                MuMuVCHI2PDOF = config['DiMuonHighMass_VCHI2PDOF'],
                                                                MuMuPT        = config['DiMuonHighMass_PT']
                                                                )
-        
+
         self.DiMuonHighMassSameSignLine = StrippingLine( name + 'DiMuonHighMassSameSign' + 'Line',
                                                          prescale  = config['DiMuonHighMassSameSign_Prescale'],
                                                          postscale = config['DiMuonHighMassSameSign_Postscale'],
@@ -793,7 +793,7 @@ class DiMuonConf(LineBuilder):
                                                          )
 
 
-        
+
         """
         DiMuon Low Mass line
         """
@@ -801,7 +801,7 @@ class DiMuonConf(LineBuilder):
                                               MuonPT        = config['DiMuonLowMass_MuonPT'],
                                               MuonP         = config['DiMuonLowMass_MuonP'],
                                               MuonTRCHI2DOF = config['DiMuonLowMass_MuonTRCHI2DOF'],
-                                              MuonPIDCut    = config['DiMuonLowMass_MuonPIDCut'], 
+                                              MuonPIDCut    = config['DiMuonLowMass_MuonPIDCut'],
                                               MuMuMinMass   = config['DiMuonLowMass_MinMass'],
                                               MuMuVCHI2PDOF = config['DiMuonLowMass_VCHI2PDOF'],
                                               MuMuPT        = config['DiMuonLowMass_PT']
@@ -811,9 +811,9 @@ class DiMuonConf(LineBuilder):
                                                 prescale  = config['DiMuonLowMass_Prescale'],
                                                 postscale = config['DiMuonLowMass_Postscale'],
                                                 checkPV   = config['DiMuonLowMass_checkPV'],
-                                                selection = self.SelDiMuonLowMass 
+                                                selection = self.SelDiMuonLowMass
                                                 )
-        
+
         """
         Jpsi-> mumu tight line
         """
@@ -841,7 +841,7 @@ class DiMuonConf(LineBuilder):
                                           DiMuonInput = self.SelJpsi2MuMu,
                                           myTisTosSpecs = config['Jpsi2MuMu_TisTosSpecs']
                                           )
-        
+
         self.Jpsi2MuMuTOSLine = StrippingLine( name + 'Jpsi2MuMuTOS' + 'Line',
                                                prescale  = config['Jpsi2MuMu_Prescale'],
                                                postscale = config['Jpsi2MuMu_Postscale'],
@@ -856,9 +856,9 @@ class DiMuonConf(LineBuilder):
                                          ParticleName  = config['Psi2MuMu_ParticleName'],
                                          MuonPT        = config['Psi2MuMu_MuonPT'],
                                          MuonP         = config['Psi2MuMu_MuonP'],
-                                         MuonPIDmu     = config['Psi2MuMu_MuonPIDmu'],  
+                                         MuonPIDmu     = config['Psi2MuMu_MuonPIDmu'],
                                          MuonTRCHI2DOF = config['Psi2MuMu_MuonTRCHI2DOF'],
-                                         MuMuMassWindow= config['Psi2MuMu_MassWindow'],                                          
+                                         MuMuMassWindow= config['Psi2MuMu_MassWindow'],
                                          MuMuVCHI2PDOF = config['Psi2MuMu_VCHI2PDOF'],
                                          MuMuPT        = config['Psi2MuMu_PT']
                                          )
@@ -870,7 +870,7 @@ class DiMuonConf(LineBuilder):
                                            selection = self.SelPsi2MuMu
                                            )
 
-        
+
         """
         Psi2MuMuTOS
         """
@@ -878,15 +878,15 @@ class DiMuonConf(LineBuilder):
                                          DiMuonInput = self.SelPsi2MuMu,
                                          myTisTosSpecs = config['Psi2MuMu_TisTosSpecs']
                                          )
-        
+
         self.Psi2MuMuTOSLine = StrippingLine( name + 'Psi2MuMuTOS' + 'Line',
                                               prescale  = config['Psi2MuMu_Prescale'],
                                               postscale = config['Psi2MuMu_Postscale'],
                                               checkPV   = config['Psi2MuMu_checkPV'],
                                               selection = self.TOSPsi2MuMu
                                               )
-        
-        
+
+
         """
         DiMuonDetachedline
         """
@@ -900,7 +900,7 @@ class DiMuonConf(LineBuilder):
                                                        MuMuPT        = config['DiMuonDetached_PT'],
                                                        MuMuLTCuts    = config['DiMuonDetached_LTCuts']
                                                        )
-                
+
         self.DiMuonDetachedLine = StrippingLine( name + 'DiMuonDetached' + 'Line',
                                                  prescale  = config['DiMuonDetached_Prescale'],
                                                  postscale = config['DiMuonDetached_Postscale'],
@@ -931,8 +931,8 @@ class DiMuonConf(LineBuilder):
                                                     selection = self.SelJpsi2MuMuDetached
                                                     )
 
-#        """                               
-#        Jpsi2MuMuDetached tight line. negative value for lifetime cut.      
+#        """
+#        Jpsi2MuMuDetached tight line. negative value for lifetime cut.
 #        """
 #        self.SelJpsi2MuMuDetachedMinus = filterJpsi2MuMuDetached( name + 'Jpsi2MuMuDetachedMinus',
 #                                                             MuonPT        = config['Jpsi2MuMuDetached_MuonPT'],
@@ -959,7 +959,7 @@ class DiMuonConf(LineBuilder):
                                                          ParticleName  = config['Psi2MuMuDetached_ParticleName'],
                                                          MuonPT        = config['Psi2MuMuDetached_MuonPT'],
                                                          MuonP         = config['Psi2MuMuDetached_MuonP'],
-                                                         MuonPIDmu     = config['Psi2MuMuDetached_MuonPIDmu'],  
+                                                         MuonPIDmu     = config['Psi2MuMuDetached_MuonPIDmu'],
                                                          MuonTRCHI2DOF = config['Psi2MuMuDetached_MuonTRCHI2DOF'],
                                                          MuMuMassWindow= config['Psi2MuMuDetached_MassWindow'],
                                                          MuMuVCHI2PDOF = config['Psi2MuMuDetached_VCHI2PDOF'],
@@ -973,25 +973,25 @@ class DiMuonConf(LineBuilder):
                                                    checkPV   = True,
                                                    #RequiredRawEvents = [ "Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker" ],
                                                    selection = self.SelPsi2MuMuDetached
-                                                   ) 
+                                                   )
 
 
-# 
+#
 #        """
 #        Psi2MuMuDetached line. negative value for lifetime cut.
-#        """                                      
+#        """
 #        self.SelPsi2MuMuDetachedMinus = filterSignalDetached( name + 'Psi2MuMuDetachedMinus',
 #                                                         ParticleName  = config['Psi2MuMuDetached_ParticleName'],
 #                                                         MuonPT        = config['Psi2MuMuDetached_MuonPT'],
 #                                                         MuonP         = config['Psi2MuMuDetached_MuonP'],
-#                                                         MuonPIDmu     = config['Psi2MuMuDetached_MuonPIDmu'],  
+#                                                         MuonPIDmu     = config['Psi2MuMuDetached_MuonPIDmu'],
 #                                                         MuonTRCHI2DOF = config['Psi2MuMuDetached_MuonTRCHI2DOF'],
 #                                                         MuMuMassWindow= config['Psi2MuMuDetached_MassWindow'],
 #                                                         MuMuVCHI2PDOF = config['Psi2MuMuDetached_VCHI2PDOF'],
 #                                                         MuMuPT        = config['Psi2MuMuDetached_PT'],
 ##                                                         MuMuLTCuts    = config['Psi2MuMuDetached_MinusLTCuts']
 #                                                         )
-#           
+#
 #        self.Psi2MuMuDetachedMinusLine = StrippingLine( name + 'Psi2MuMuDetachedMinus' + 'Line',
 #                                                   prescale  = config['Psi2MuMuDetached_Prescale'],
 #                                                   postscale = config['Psi2MuMuDetached_Postscale'],
@@ -999,7 +999,7 @@ class DiMuonConf(LineBuilder):
 #                                                   selection = self.SelPsi2MuMuDetachedMinus
 #                                                   )
 
-        
+
 
         if config['MicroDST']:
             self.registerLine( self.DiMuonLine )
@@ -1010,7 +1010,7 @@ class DiMuonConf(LineBuilder):
             self.registerLine( self.Psi2MuMuLine )
             self.registerLine( self.DiMuonTISLine )
 
-        else:    
+        else:
             #self.registerLine( self.DiMuonExclusiveLine )
             self.registerLine( self.DiMuonNoPVLine )
             self.registerLine( self.DiMuonHighMassLine )
@@ -1033,15 +1033,15 @@ def filterDiMuon( name,
                   MuonPIDCut,
                   MuMuMinMass,
                   MuMuVCHI2PDOF,
-                  MuMuPT 
+                  MuMuPT
                   ):
-    
+
     _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(MM > %(MuMuMinMass)s) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut + MuonPIDCut )
 
     return Selection( name + "_SelMuMu",
@@ -1058,15 +1058,15 @@ def filterDiMuonSameSign( name,
                           MuMuVCHI2PDOF,
                           MuMuPT
                           ):
-    
+
     _StdLooseDiMuonSameSign = DataOnDemand( Location = 'Phys/StdLooseDiMuonSameSign/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(MM > %(MuMuMinMass)s) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s *MeV)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
-    
+
     return Selection( name + "_SelMuMuSS",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseDiMuonSameSign ]
@@ -1083,16 +1083,16 @@ def filterDiMuonWMax( name,
                       MuMuPT,
                       reversePtCut = False
                       ):
-    
+
     _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(in_range( %(MuMuMinMass)s *MeV, MM, %(MuMuMaxMass)s *MeV)) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s)" % locals()
 
     if (reversePtCut):
       MuMuCut = "(in_range( %(MuMuMinMass)s *MeV, MM, %(MuMuMaxMass)s *MeV)) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT < %(MuMuPT)s)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
 
     return Selection( name + "_SelMuMu",
@@ -1108,19 +1108,19 @@ def filterJpsi2MuMu( name,
                      MuonPIDmu,
                      MuonTRCHI2DOF,
                      MuMuMinMass,
-                     MuMuMaxMass, 
+                     MuMuMaxMass,
                      MuMuVCHI2PDOF,
                      MuMuPT
                      ):
-    
+
     _StdLooseJpsi2MuMu = DataOnDemand( Location = 'Phys/StdLooseJpsi2MuMu/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MINTREE('mu+'==ABSID,PIDmu) > %(MuonPIDmu)s) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(MM > %(MuMuMinMass)s) & (MM < %(MuMuMaxMass)s) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
-    
+
     return Selection( name + "_SelJpsi2MuMu",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseJpsi2MuMu ]
@@ -1128,24 +1128,24 @@ def filterJpsi2MuMu( name,
 
 
 def filterSignal( name,
-                  ParticleName, 
+                  ParticleName,
                   MuonPT,
                   MuonP,
                   MuonPIDmu,
                   MuonTRCHI2DOF,
-                  MuMuMassWindow, 
+                  MuMuMassWindow,
                   MuMuVCHI2PDOF,
                   MuMuPT
                   ):
-        
+
     _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MINTREE('mu+'==ABSID,PIDmu) > %(MuonPIDmu)s) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(ADMASS(%(ParticleName)s) < %(MuMuMassWindow)s *MeV) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s *MeV)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
-    
+
     return Selection( name + "_SelP2MuMu",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseDiMuon ]
@@ -1153,12 +1153,12 @@ def filterSignal( name,
 
 
 def filterDZ( name,
-              DZAnyPV, 
+              DZAnyPV,
               MySelection ):
-    
+
     return EventSelection (
         #
-        LoKi__VoidFilter( name + 'filterDZ', 
+        LoKi__VoidFilter( name + 'filterDZ',
                           Code =  " ( minMyZ - minPVZ ) < %(DZAnyPV)s*mm " % locals() ,
                           Preambulo = [ "from LoKiPhys.decorators import *",
                                         "minMyZ = SOURCE('%s') >> min_value( VFASPF(VZ) )"  %(MySelection.outputLocation()) ,
@@ -1166,7 +1166,7 @@ def filterDZ( name,
                                         ]
                           )
         )
-        
+
 
 
 def filterDiMuonAndDZ( name,
@@ -1178,13 +1178,13 @@ def filterDiMuonAndDZ( name,
                        MuMuPT,
                        MuMuDZ
                        ):
-    
+
     _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(MM > %(MuMuMinMass)s) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s) & (BPVVDZ < %(MuMuDZ)s*mm)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut )
 
     return Selection( name + "_SelMuMu",
@@ -1203,13 +1203,13 @@ def filterDiMuonDetached( name,
                           MuMuPT,
                           MuMuLTCuts
                           ):
-    
+
     _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s) & (MINTREE('mu+'==ABSID,PIDmu) > %(MuonPIDmu)s)" % locals()
-    
+
     MuMuCut = "(MM > %(MuMuMinMass)s) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut + MuMuLTCuts )
 
     return Selection( name + "_SelMuMu",
@@ -1224,20 +1224,20 @@ def filterJpsi2MuMuDetached( name,
                              MuonPIDmu,
                              MuonTRCHI2DOF,
                              MuMuMinMass,
-                             MuMuMaxMass, 
+                             MuMuMaxMass,
                              MuMuVCHI2PDOF,
                              MuMuPT,
                              MuMuLTCuts
                              ):
-    
+
     _StdLooseJpsi2MuMu = DataOnDemand( Location = 'Phys/StdLooseJpsi2MuMu/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s) & (MINTREE('mu+'==ABSID,PIDmu) > %(MuonPIDmu)s)" % locals()
-    
+
     MuMuCut = "(MM > %(MuMuMinMass)s) & (MM < %(MuMuMaxMass)s) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut + MuMuLTCuts  )
-    
+
     return Selection( name + "_SelJpsi2MuMu",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseJpsi2MuMu ]
@@ -1245,25 +1245,25 @@ def filterJpsi2MuMuDetached( name,
 
 
 def filterSignalDetached( name,
-                          ParticleName, 
+                          ParticleName,
                           MuonPT,
                           MuonP,
                           MuonPIDmu,
                           MuonTRCHI2DOF,
-                          MuMuMassWindow, 
+                          MuMuMassWindow,
                           MuMuVCHI2PDOF,
                           MuMuPT,
                           MuMuLTCuts
                           ):
-    
+
     _StdLooseDiMuon = DataOnDemand( Location = 'Phys/StdLooseDiMuon/Particles' )
-    
+
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s *MeV) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s *MeV) & (MINTREE('mu+'==ABSID,PIDmu) > %(MuonPIDmu)s) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(MuonTRCHI2DOF)s)" % locals()
-    
+
     MuMuCut = "(ADMASS(%(ParticleName)s) < %(MuMuMassWindow)s *MeV) & (VFASPF(VCHI2PDOF)< %(MuMuVCHI2PDOF)s) & (PT > %(MuMuPT)s *MeV)" % locals()
-    
+
     _MuMu = FilterDesktop( Code = MuonCut + " & " + MuMuCut + MuMuLTCuts )
-    
+
     return Selection( name + "_SelP2MuMu",
                       Algorithm = _MuMu,
                       RequiredSelections = [ _StdLooseDiMuon ]
@@ -1275,17 +1275,16 @@ def filterTisTos(name,
                  DiMuonInput,
                  myTisTosSpecs ) :
     from Configurables import TisTosParticleTagger
-    
+
     myTagger = TisTosParticleTagger(name + "_TisTosTagger")
     myTagger.TisTosSpecs = myTisTosSpecs
-    
+
     # To speed it up, TisTos only with tracking system
     myTagger.ProjectTracksToCalo = False
     myTagger.CaloClustForCharged = False
     myTagger.CaloClustForNeutral = False
     myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-    
+
     return Selection(name + "_SelTisTos",
                      Algorithm = myTagger,
                      RequiredSelections = [ DiMuonInput ] )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py
index 048a7999fef56cb3afa50e2411adac8dbaa84896..5aff2beb467c94e1ca1cb74abd59191dd1ec7b9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -32,57 +32,57 @@ default_config =  {
                'EtapMuonP'         : 0. ,    #MeV
                'EtapMuonPT'        : 0.  ,    #MeV
                'EtapMuonMINIPCHI2' : 5     ,    #adminensional
-               'EtapMuonPIDmu'     : -5,   #adimensional    
-               
+               'EtapMuonPIDmu'     : -5,   #adimensional
+
                'EtapPionP'         : 0. ,    #MeV
                'EtapPionPT'        : 0.  ,    #MeV
                'EtapPionMINIPCHI2' : 5     ,    #adminensional
-               
+
                ## Ds decay
                'DsPionP'         : 200. ,    #MeV
                'DsPionPT'        : 25.  ,    #MeV
                'DsPionMINIPCHI2' : 5     ,    #adminensional
-               
+
                ## B+ decay
                'BuKaonP'         : 2000. ,    #MeV
                'BuKaonPT'        : 300.  ,    #MeV
                'BuKaonMINIPCHI2' : 5     ,    #adminensional
                'BuKaonPIDk'      : -5,   #adimensional
-               
+
                #eta' -> pipimumu
-               'Etap_PT'         : 100 , #MeV                  
-               'Etap_VCHI2DOF'   : 10    ,    #adminensional         
+               'Etap_PT'         : 100 , #MeV
+               'Etap_VCHI2DOF'   : 10    ,    #adminensional
                'Etap_MAXDOCA'   : 1  ,    #mm
                'Etap_FDCHI2'     : 5     ,   #adimensional
                'Etap_IPCHI2'     : 5    ,    #adimensional
                'Etap_MASSWIN'    : 50    ,    #MeV
-               
+
                #Ds+ -> pi+eta and pi+pi-pi+phi
-               'Ds_PT'         : 300 , #MeV                  
-               'Ds_VCHI2DOF'   : 15     ,    #adminensional         
+               'Ds_PT'         : 300 , #MeV
+               'Ds_VCHI2DOF'   : 15     ,    #adminensional
                'Ds_FDCHI2'     : 10     ,   #adimensional
                'Ds_IPCHI2'     : 10    ,    #adimensional, should be close to 0
                'Ds_MASSWIN'    : 100    ,    #MeV
-                           
+
                #B+->eta'K+ and J/PsiK+
-               'Bu_PT'         : 300 , #MeV                  
-               'Bu_VCHI2DOF'   : 8     ,    #adminensional         
+               'Bu_PT'         : 300 , #MeV
+               'Bu_VCHI2DOF'   : 8     ,    #adminensional
                'Bu_FDCHI2'     : 36     ,   #adimensional
                'Bu_IPCHI2'     : 20    ,    #adimensional
                'Bu_MASSWIN'    : 100    ,    #MeV
-               
+
                #normalization
                #phi -> mumu
-               'Phi_PT'         : 100 , #MeV                  
-               'Phi_VCHI2DOF'   : 10     ,    #adminensional         
+               'Phi_PT'         : 100 , #MeV
+               'Phi_VCHI2DOF'   : 10     ,    #adminensional
                'Phi_MAXDOCA'   : 1  ,    #mm
                'Phi_FDCHI2'     : 5     ,   #adimensional
                'Phi_IPCHI2'     : 5    ,    #adimensional
                'Phi_MASSWIN'    : 75    ,    #MeV
-               
+
                #J/Psi -> mumu
-               'JPsi_PT'         : 100 , #MeV                  
-               'JPsi_VCHI2DOF'   : 10     ,    #adminensional         
+               'JPsi_PT'         : 100 , #MeV
+               'JPsi_VCHI2DOF'   : 10     ,    #adminensional
                'JPsi_MAXDOCA'   : 1  ,    #mm
                'JPsi_FDCHI2'     : 5     ,   #adimensional
                'JPsi_IPCHI2'     : 5    ,    #adimensional
@@ -90,16 +90,16 @@ default_config =  {
 
                'Ds2Etap2PiPiMuMuLinePrescale'      : 1 ,
                'Ds2Etap2PiPiMuMuLinePostscale'     : 1 ,
-               
+
                'Ds2Phi3PiLineForEtapPrescale'      : 1 ,
                'Ds2Phi3PiLineForEtapPostscale'     : 1 ,
-               
+
                'Bu2Etap2PiPiMuMuLinePrescale'      : 1 ,
                'Bu2Etap2PiPiMuMuLinePostscale'     : 1 ,
-               
+
                'Bu2JPsiKForEtapLinePrescale'      : 1 ,
                'Bu2JPsiKForEtapLinePostscale'     : 1 ,
-               
+
                'RelatedInfoTools': [{'Type'              : 'RelInfoVertexIsolation',
                                      'Location'          : 'RelInfoVertexIsolation'
     }, {
@@ -142,46 +142,46 @@ class StrippingEtap2pipimumuConf(LineBuilder) :
     """
     Builder for Ds2etap2pipimumu
     """
-            
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
 
         LineBuilder.__init__(self, name, config)
-        
+
         Ds2EtapLine_name = name+"_Ds2Etap"
         Bu2EtapLine_name = name+"_Bu2Etap"
         Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
         Bu2JPsiKLine_name = name+"_Bu2JPsiK"
-        
+
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(name="PionsEtaFor"+name
                                     , P = config['EtapPionP']
-                                    , PT = config['EtapPionPT']               
+                                    , PT = config['EtapPionPT']
                                     , MINIPCHI2 = config['EtapPionMINIPCHI2']
                                     , decid = 211)
-        
-        
+
+
         selPionsDs = makeDaughters(name="PionsDsFor"+name
                                    , P = config['DsPionP']
                                    , PT = config['DsPionPT']
                                    , MINIPCHI2 = config['DsPionMINIPCHI2']
                                    , decid = 211)
 
-        
+
         selKaonsBu = makeDaughters(name="KaonsBuFor"+name
                                    , P = config['BuKaonP']
                                    , PT = config['BuKaonPT']
                                    , MINIPCHI2 = config['BuKaonMINIPCHI2']
                                    , PID = config['BuKaonPIDk'],decid = 321)
-        
+
         # 2 : Make muons
         selMuonsEta = makeDaughters(name="MuonsEtaFor"+name
                                     , P = config['EtapMuonP']
-                                    , PT = config['EtapMuonPT']               
+                                    , PT = config['EtapMuonPT']
                                     , MINIPCHI2 = config['EtapMuonMINIPCHI2']
                                     , PID = config['EtapMuonPIDmu'],decid = 13)
-        
+
         # 4 : makeEtaP
         selEtap  = makeEtap("EtapFor"+name, [selPionsEta,selMuonsEta],
                             config['Etap_MASSWIN'],config['Etap_MAXDOCA'],
@@ -200,7 +200,7 @@ class StrippingEtap2pipimumuConf(LineBuilder) :
                             config['JPsi_PT'],config['JPsi_VCHI2DOF'],
                             config['JPsi_FDCHI2'],config['JPsi_IPCHI2'],
                             config['JPsi_MASSWIN'])
-        
+
         # 6: make Ds
         selDs2Etap = make2body("DsEtapFor"+name,[selPionsDs,selEtap],
                                "DsSig",
@@ -208,7 +208,7 @@ class StrippingEtap2pipimumuConf(LineBuilder) :
                                config['Ds_FDCHI2'],config['Ds_IPCHI2'],
                                config['Ds_MASSWIN'])
 
-        
+
         ## add cuts to ensure alignment of at least one pion with the pion in the Ds signal decay
         selDs2Phi = makeDsNorm("DsPhiFor"+name, [selPionsEta,selPhi],
                                config['Ds_PT'],config['Ds_VCHI2DOF'],
@@ -217,7 +217,7 @@ class StrippingEtap2pipimumuConf(LineBuilder) :
                                config['DsPionMINIPCHI2'],config['DsPionPT'],
                                config['DsPionP'])
 
-        # 7: make B+        
+        # 7: make B+
         selBu2Etap = make2body("BuEtapFor"+name,[selKaonsBu,selEtap],
                                "B+Sig",
                                config['Bu_PT'],config['Bu_VCHI2DOF'],
@@ -229,9 +229,9 @@ class StrippingEtap2pipimumuConf(LineBuilder) :
                                config['Bu_PT'],config['Bu_VCHI2DOF'],
                                config['Bu_FDCHI2'],config['Bu_IPCHI2'],
                                config['Bu_MASSWIN'])
-        
-        
-       
+
+
+
         # 8 : Declare Lines
         self.Ds2EtaPLine = StrippingLine(name+"Ds2EtaPLine",
                                          prescale = config['Ds2Etap2PiPiMuMuLinePrescale'],
@@ -245,9 +245,9 @@ class StrippingEtap2pipimumuConf(LineBuilder) :
                                         postscale = config['Ds2Phi3PiLineForEtapPostscale'],
                                         selection = selDs2Phi,
                                         RelatedInfoTools = config['RelatedInfoTools'])
-        
 
-        
+
+
         self.Bu2EtapLine = StrippingLine(name+"Bu2EtapLine",
                                          prescale = config['Bu2Etap2PiPiMuMuLinePrescale'],
                                          postscale = config['Bu2Etap2PiPiMuMuLinePostscale'],
@@ -278,7 +278,7 @@ def makeDaughters(name, P, PT, MINIPCHI2, PID=0,decid=0):
     """
     Daughters selection
     """
-    
+
     _code = "(P > %(P)s *MeV) & "\
             "(PT > %(PT)s *MeV) & "\
             "(MIPCHI2DV(PRIMARY) > %(MINIPCHI2)s)" % locals()
@@ -292,7 +292,7 @@ def makeDaughters(name, P, PT, MINIPCHI2, PID=0,decid=0):
     else: mysel = StdAllLoosePions
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ mysel] )
@@ -301,7 +301,7 @@ def makeDaughters(name, P, PT, MINIPCHI2, PID=0,decid=0):
 #####################################################
 
 def makeEtap(name, inputs,
-             MASSWIN, MAXDOCA, VCHI2DOF,PT, FDCHI2, IPCHI2): 
+             MASSWIN, MAXDOCA, VCHI2DOF,PT, FDCHI2, IPCHI2):
 
     """
     Makes the eta' -> pi+ pi- mu+ mu-
@@ -309,7 +309,7 @@ def makeEtap(name, inputs,
 
     _combcut = "(ADAMASS('eta_prime') < %(MASSWIN)s *MeV) & "\
                "(AMAXDOCA('')<%(MAXDOCA)s) " %locals()
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(VCHI2DOF)s) & "\
               "(PT > %(PT)s *MeV) &"\
               "(BPVVDCHI2>%(FDCHI2)s) & (BPVIPCHI2()> %(IPCHI2)s) " %locals()
@@ -341,7 +341,7 @@ def make2body(name, inputs, decaycode,
         if decaycode == "DsSig": decay = "[D_s+ -> eta_prime pi+ ]cc";mom = "D_s+"
         if decaycode == "B+Sig": decay = "[B+ -> eta_prime K+ ]cc";mom = "B+"
         if decaycode == "B+Norm": decay = "[B+ -> J/psi(1S) K+ ]cc";mom = "B+"
-        
+
     else:
         _bcut+= "(BPVIPCHI2()> %(IPCHI2)s) " %locals()
         refitpv = 0
@@ -349,7 +349,7 @@ def make2body(name, inputs, decaycode,
         if decaycode == "Phi": decay = "phi(1020) -> mu+ mu-";mom = "phi(1020)"
 
     _combcut = "(ADAMASS('"+mom+"') < %(MASSWIN)s *MeV) " %locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = decay,
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -359,13 +359,13 @@ def make2body(name, inputs, decaycode,
     return Selection(name,
                      Algorithm = _Combine,
                      RequiredSelections = inputs)
-       
+
 
 #####################################################
 def makeDsNorm(name, inputs,
                PT,VCHI2DOF,FDCHI2,IPCHI2,MASSWIN,
                IPCHI2DSPI,PTDSPI,PDSPI):
-       
+
     """
     Makes the D_s- -> phi pi+ pi- pi+
     """
@@ -375,18 +375,16 @@ def makeDsNorm(name, inputs,
     ## ensure one of the pions is similar to the Ds one
     _combcut+= "& ( AHASCHILD( (MIPCHI2DV(PRIMARY)>%(IPCHI2DSPI)s) &  "\
                "(PT>%(PTDSPI)s) & (P>%(PDSPI)s) ) )" %locals()
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(VCHI2DOF)s) & "\
               "(PT > %(PT)s *MeV) & (BPVVDCHI2>%(FDCHI2)s) & "\
               "(BPVIPCHI2()< %(IPCHI2)s) " %locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D_s+ -> phi(1020) pi+ pi+ pi- ]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
-    
+
     _Combine.ReFitPVs = True
     return Selection(name,
                      Algorithm = _Combine,
                      RequiredSelections = inputs)
-       
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py
index db1cdbd734d31e937012654f3100269a57eb1116..4a2337ceaf33e7aace49c8f03d81b5cb112d317e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py
@@ -56,22 +56,22 @@ class HeavyBaryonsConf(LineBuilder) :
            LineBuilder.__init__(self, name, config)
            self.name = name
            self.config = config
-	
+
            # define input daughter lists for various selections
            self.WideJpsiList = DataOnDemand(Location = "Phys/StdMassConstrainedJpsi2MuMu/Particles")
            self.JpsiList = self.createSubSel( OutputList = 'MassConstrainedJpsiForHeavyBaryons' + self.name,
                                               InputList = self.WideJpsiList,
                                               Cuts = "(PFUNA(ADAMASS('J/psi(1S)')) < %(JpsiMassWindow)s)" % self.config)
 
-           #make a merged list for pions 
+           #make a merged list for pions
            self.MergedPionsList = MergedSelection( "MergedPionsFor" + self.name,
                                                    #RequiredSelections =  [DataOnDemand(Location = "Phys/StdLoosePions/Particles"),
                                                    #                       DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")])
                                                    RequiredSelections =  [DataOnDemand(Location = "Phys/StdAllLoosePions/Particles"), # take all long tracks
                                                                           DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")]) # take all downstream tracks
-           
-        
-           
+
+
+
            self.MergedKaonsList = MergedSelection( "MergedKaonsFor" + self.name,
                                                    #RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseKaons/Particles"),
                                                    #                       DataOnDemand(Location = "Phys/StdLooseDownKaons/Particles")])
@@ -84,9 +84,9 @@ class HeavyBaryonsConf(LineBuilder) :
            self.KaonsList = self.createSubSel( OutputList = "KaonsFor" + self.name,
                                                InputList = self.MergedKaonsList,
                                                Cuts = "(TRCHI2DOF < %(TRCHI2DOF)s ) & (PIDK > %(KaonPIDK)s)" % self.config )
-           
-           
-           
+
+
+
            self.LambdaListLoose = MergedSelection("StdLooseLambdaMergedFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles"),
                                                                          DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")])
@@ -95,15 +95,15 @@ class HeavyBaryonsConf(LineBuilder) :
                                                 Cuts = "(MAXTREE('p+'==ABSID, PT) > 500.*MeV) "\
                                                 "& (MAXTREE('pi-'==ABSID, PT) > 100.*MeV) " \
                                                 "& (ADMASS('Lambda0') < 15.*MeV) & (VFASPF(VCHI2) < 20 )  & (BPVDLS> %(DLSForLongLived)s ) " % self.config)
-           
-           
-           
+
+
+
            self.XiminusList = self.makeXiminus()
            self.OmegaminusList = self.makeOmegaminus()
            self.makeXibminus2JpsiXi()
            self.makeXibzero2JpsiXistar    ()
            self.makeOmegabminus2JpsiOmega()
-           
+
        def createSubSel( self, OutputList, InputList, Cuts ) :
            '''create a selection using a FilterDesktop'''
            filter = FilterDesktop(Code = Cuts)
@@ -126,13 +126,13 @@ class HeavyBaryonsConf(LineBuilder) :
            return Selection ( OutputList,
                               Algorithm = combiner,
                               RequiredSelections = DaughterLists)
-       
+
 
 
 #------------------------------------------------------------------------------------------
 
        def makeXiminus( self ):
-            
+
               ''' Make a Xi minus candidate '''
               Ximinus2LambdaPi = self.createCombinationSel(OutputList = "Ximinus2LambdaPi"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -143,7 +143,7 @@ class HeavyBaryonsConf(LineBuilder) :
               return Ximinus2LambdaPi
 
 
-       def makeOmegaminus( self ): 
+       def makeOmegaminus( self ):
                ''' Make an Omega minus candidate '''
                Omegaminus2LambdaK = self.createCombinationSel(OutputList = "Omegaminus2LambdaK"+ self.name,
                                                               DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -151,13 +151,13 @@ class HeavyBaryonsConf(LineBuilder) :
                                                               DaughterCuts = {"K-"      : "(PT>0.1*GeV) & (BPVIPCHI2()>9)"},
                                                               PreVertexCuts = "(ADAMASS('Omega-') < %(OmegaMassWindow)s*MeV)"%self.config,
                                                               PostVertexCuts = "(VFASPF(VCHI2/VDOF)<25) & (BPVDLS> %(DLSForLongLived)s) " %self.config)
-               
-             
-               return Omegaminus2LambdaK	       
+
+
+               return Omegaminus2LambdaK
 
 
        def makeXibminus2JpsiXi( self ):
-             
+
                Xibminus2JpsiXi = self.createCombinationSel (OutputList = "Xibminus2JpsiXi" + self.name,
                                                             DecayDescriptor = "[Xi_b- -> Xi- J/psi(1S)]cc",
                                                             DaughterLists = [self.JpsiList , self.XiminusList ],
@@ -178,10 +178,10 @@ class HeavyBaryonsConf(LineBuilder) :
               Xibzero2JpsiXistarLine = StrippingLine (self.name + "Xibzero2JpsiXistar",
                                                       algos = [Xibzero2JpsiXistar])
               self.registerLine (Xibzero2JpsiXistarLine)
-              
+
 
        def makeOmegabminus2JpsiOmega( self ):
-              
+
               Omegabminus2JpsiOmega = self.createCombinationSel (OutputList = "Omegabminus2JpsiOmega" + self.name,
                                                               DecayDescriptor = "[Omega_b- -> Omega- J/psi(1S)]cc",
                                                               DaughterLists = [self.JpsiList , self.OmegaminusList ],
@@ -190,4 +190,3 @@ class HeavyBaryonsConf(LineBuilder) :
               Omegabminus2JpsiOmegaLine = StrippingLine (self.name + "Omegab2JpsiOmega",
                                                          algos = [Omegabminus2JpsiOmega])
               self.registerLine (Omegabminus2JpsiOmegaLine)
-              
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index c7a0b4dbf03e9ac4075a61d0ee6969221a7b1c2b..21e5e85e31e831792f96333cf35b0cf7a187adf1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -38,7 +38,7 @@ import math
 default_config = {
   'NAME' : 'InclusiveCharmBaryons',
   'BUILDERTYPE' : 'InclusiveCharmBaryonsConf',
-  'CONFIG' : {    
+  'CONFIG' : {
     'pi' : {
       'TES'    : 'Phys/StdAllNoPIDsPions/Particles',
       'Filter' : "(P>1000*MeV) & (MIPCHI2DV(PRIMARY)>4.0)"
@@ -106,7 +106,7 @@ default_config = {
                                (ADOCA(1,4)<0.5*mm) & (ADOCA(2,4)<0.5*mm) & (ADOCA(3,4)<0.5*mm)""",
         'MotherCut'       : "(CHI2VXNDF<10) & (BPVVDCHI2>36) & (BPVDIRA>0) & (ADMASS('Omega_c0') < 24*MeV)",
       },
-    },    
+    },
   },
   'STREAMS' : {
     'BhadronCompleteEvent':[
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py
index 7da98da5dbc369d56c359ecf177004c49dfb8c43..5bf9a780cc53a5d9d7a26c0834b5e1f28b133e99 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -39,7 +39,7 @@ import math
 default_config = {
   'NAME' : 'InclusiveDoubleD',
   'BUILDERTYPE' : 'InclusiveDoubleDConf',
-  'CONFIG' : {    
+  'CONFIG' : {
     'pi' : {
       'TES'    : 'Phys/StdAllNoPIDsPions/Particles',
       'Filter' : "(P>1000*MeV) & (MIPCHI2DV(PRIMARY)>4.0)"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py
index 4b3d0eb7001485f2403f00d8afc6e99c3a8cdba6..2d6fa7f624cf749063038985088ba5f614544cea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py
@@ -27,7 +27,7 @@ default_config = {
     'BUILDERTYPE'       :  'Lb2EtacKpConf',
     'CONFIG'    : {
         'KaonCuts'      : "(PROBNNk > 0.1) & (PT > 300*MeV) & (TRGHOSTPROB<0.4)",
-        'ProtonCuts'    : "(PROBNNp > 0.1) & (PT > 300*MeV) & (P > 10*GeV) & (TRGHOSTPROB<0.4)",        
+        'ProtonCuts'    : "(PROBNNp > 0.1) & (PT > 300*MeV) & (P > 10*GeV) & (TRGHOSTPROB<0.4)",
         'PionCuts'      : "(PROBNNpi > 0.1) & (PT > 250*MeV) & (TRGHOSTPROB<0.4)",
         'EtacComAMCuts' : "(AM<3.35*GeV)",
         'EtacComN4Cuts' : """
@@ -36,10 +36,10 @@ default_config = {
                           & ( (ACHILD(MIPCHI2DV(), 1) + ACHILD(MIPCHI2DV(), 2) + ACHILD(MIPCHI2DV(), 3) + ACHILD(MIPCHI2DV(), 4))>30)
                           """,
         'EtacMomN4Cuts' : """
-                           (VFASPF(VCHI2/VDOF) < 9.) 
-                           & (in_range(2.7*GeV, MM, 3.3*GeV)) 
-                           & (MIPCHI2DV(PRIMARY) > 0.) 
-                           & (BPVVDCHI2>10) 
+                           (VFASPF(VCHI2/VDOF) < 9.)
+                           & (in_range(2.7*GeV, MM, 3.3*GeV))
+                           & (MIPCHI2DV(PRIMARY) > 0.)
+                           & (BPVVDCHI2>10)
                            & (BPVDIRA>0.9)
                            """,
         'EtacComCuts'   : "(in_range(2.65*GeV, AM, 3.35*GeV))",
@@ -53,11 +53,11 @@ default_config = {
         'KsCuts'        : "(ADMASS('KS0') < 30.*MeV) & (BPVDLS>5)",
         'LbComCuts'     : "(ADAMASS('Lambda_b0') < 500 *MeV)",
         'LbMomCuts'     : """
-                          (VFASPF(VCHI2/VDOF) < 10.) 
-                          & (BPVDIRA> 0.9999) 
-                          & (BPVIPCHI2()<25) 
+                          (VFASPF(VCHI2/VDOF) < 10.)
+                          & (BPVDIRA> 0.9999)
+                          & (BPVIPCHI2()<25)
                           & (BPVVDCHI2>250)
-                          & (BPVVDRHO>0.1*mm) 
+                          & (BPVVDRHO>0.1*mm)
                           & (BPVVDZ>2.0*mm)
                           """,
         'Prescale'      : 1.,
@@ -70,19 +70,19 @@ default_config = {
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 1.0,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_1.0'
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 1.5,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_1.5'
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 2.0,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_2.0'
-                  }]        
+                  }]
         },
     'STREAMS'           : ['Bhadron' ],
     'WGs'               : ['BandQ'],
@@ -90,7 +90,7 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
@@ -98,28 +98,28 @@ from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class Lb2EtacKpConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, name, config ): 
-        
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         self.SelKaons = self.createSubSel( OutputList = self.name + "SelKaons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ),
                                            Cuts = config['KaonCuts']
                                            )
 
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ),
                                            Cuts = config['PionCuts']
                                            )
 
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseProtons/Particles' ),
                                            Cuts = config['ProtonCuts']
                                            )
 
@@ -130,7 +130,7 @@ class Lb2EtacKpConf(LineBuilder):
                                                     DaughterLists = [ self.SelKaons, self.SelPions ],
                                                     DecayDescriptor = "eta_c(1S) -> K+ K- pi+ pi-",
                                                     ComAMCuts      = config['EtacComAMCuts'],
-                                                    PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                    PreVertexCuts  = config['EtacComN4Cuts'],
                                                     PostVertexCuts = config['EtacMomN4Cuts']
                                                     )
 
@@ -141,11 +141,11 @@ class Lb2EtacKpConf(LineBuilder):
                                                   DaughterLists = [ self.SelKaons ],
                                                   DecayDescriptor = "eta_c(1S) -> K+ K- K+ K-",
                                                   ComAMCuts      = config['EtacComAMCuts'],
-                                                  PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                  PreVertexCuts  = config['EtacComN4Cuts'],
                                                   PostVertexCuts = config['EtacMomN4Cuts']
                                                   )
 
-        
+
         """
         Etac-> Pi Pi Pi Pi
         """
@@ -153,7 +153,7 @@ class Lb2EtacKpConf(LineBuilder):
                                                       DaughterLists = [ self.SelPions ],
                                                       DecayDescriptor = "eta_c(1S) -> pi+ pi- pi+ pi-",
                                                       ComAMCuts      = config['EtacComAMCuts'],
-                                                      PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                      PreVertexCuts  = config['EtacComN4Cuts'],
                                                       PostVertexCuts = config['EtacMomN4Cuts']
                                                       )
 
@@ -164,7 +164,7 @@ class Lb2EtacKpConf(LineBuilder):
                                                       DaughterLists = [ self.SelPions, self.SelProtons ],
                                                       DecayDescriptor = "eta_c(1S) -> p+ p~- pi+ pi-",
                                                       ComAMCuts      = config['EtacComAMCuts'],
-                                                      PreVertexCuts  = config['EtacComN4Cuts'], 
+                                                      PreVertexCuts  = config['EtacComN4Cuts'],
                                                       PostVertexCuts = config['EtacMomN4Cuts']
                                                       )
 
@@ -173,8 +173,8 @@ class Lb2EtacKpConf(LineBuilder):
         """
         self.SelEtac2PPbar = self.createCombinationSel( OutputList = self.name + "SelEtac2PPbar",
                                                         DecayDescriptor = "eta_c(1S) -> p+ p~-",
-                                                        DaughterLists = [ self.SelProtons ],                                                        
-                                                        PreVertexCuts  = config['EtacComCuts'], 
+                                                        DaughterLists = [ self.SelProtons ],
+                                                        PreVertexCuts  = config['EtacComCuts'],
                                                         PostVertexCuts = config['EtacMomN4Cuts']
                                                         )
         """
@@ -183,104 +183,104 @@ class Lb2EtacKpConf(LineBuilder):
         from PhysSelPython.Wrappers import MergedSelection
 
         self.SelEtac = MergedSelection( self.name + "SelEtac",
-                                        RequiredSelections =  [ self.SelEtac2KKPiPi, 
+                                        RequiredSelections =  [ self.SelEtac2KKPiPi,
                                                                 self.SelEtac2KKKK,
                                                                 self.SelEtac2PiPiPiPi,
                                                                 self.SelEtac2PPbarPiPi,
                                                                 ])
-        
+
         """
         Lambda*
         """
         self.SelLambdaS = self.createCombinationSel( OutputList = self.name + "SelLambdaS",
-                                         DecayDescriptor = "[Lambda(1520)0 -> p+ K-]cc", 
+                                         DecayDescriptor = "[Lambda(1520)0 -> p+ K-]cc",
                                          DaughterLists = [self.SelProtons, self.SelKaons],
-                                         PreVertexCuts  = config['LambdaSComCuts'],     
+                                         PreVertexCuts  = config['LambdaSComCuts'],
                                          PostVertexCuts = config['LambdaSMomCuts']
                                          )
-        
+
         """
-        Kshort 
+        Kshort
         """
-        # Both LL and DD 
+        # Both LL and DD
         self.InputKs = MergedSelection( self.name + "InputKs",
                                         RequiredSelections = [DataOnDemand(Location = "Phys/StdLooseKsDD/Particles"),
                                                               DataOnDemand(Location = "Phys/StdLooseKsLL/Particles")] )
 
         self.SelKs = self.createSubSel( OutputList = self.name + "SelKs",
                                         InputList = self.InputKs,
-                                        Cuts = config['KsCuts'] ) 
+                                        Cuts = config['KsCuts'] )
 
-        # Eta_c -> KS0 K Pi 
+        # Eta_c -> KS0 K Pi
         self.SelEtac2KsKPi = self.createCombinationSel( OutputList = self.name + "SelEtac2KsKPi",
                                                         DecayDescriptor = "[eta_c(1S) -> KS0 K+ pi-]cc",
-                                                        DaughterLists = [ self.SelKs, self.SelKaons, self.SelPions ],                                                        
-                                                        PreVertexCuts  = config['EtacComCuts'], 
+                                                        DaughterLists = [ self.SelKs, self.SelKaons, self.SelPions ],
+                                                        PreVertexCuts  = config['EtacComCuts'],
                                                         PostVertexCuts = config['EtacMomN4Cuts']
                                                         )
 
         """
-        Lb->Eta_c(KsKPi) Lambda* 
+        Lb->Eta_c(KsKPi) Lambda*
         """
         self.SelLb2EtacKp_KsKPi = self.createCombinationSel( OutputList = self.name + "SelLb2EtacKp_KsKPi",
                                                               DecayDescriptor = "[Lambda_b0 -> eta_c(1S) Lambda(1520)0]cc",
-                                                              DaughterLists = [ self.SelLambdaS, self.SelEtac2KsKPi ],                    
+                                                              DaughterLists = [ self.SelLambdaS, self.SelEtac2KsKPi ],
                                                               PreVertexCuts  = config['LbComCuts'],
                                                               PostVertexCuts = config['LbMomCuts'] )
 
-        self.Lb2EtacKp_KsKPiLine = StrippingLine( self.name + '_KsKPiLine',                                                
+        self.Lb2EtacKp_KsKPiLine = StrippingLine( self.name + '_KsKPiLine',
                                                    prescale  = config['Prescale'],
                                                  #  HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelLb2EtacKp_KsKPi ],
                                                    EnableFlavourTagging = False,
                                                    MDSTFlag = False,
-                                                   RelatedInfoTools = self.config['RelatedInfoTools']                                                   
+                                                   RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
 
         self.registerLine( self.Lb2EtacKp_KsKPiLine )
-        
+
         """
-        Lb->Eta_c(p pbar) Lambda* 
+        Lb->Eta_c(p pbar) Lambda*
         """
         self.SelLb2EtacKp_PPbar = self.createCombinationSel( OutputList = self.name + "SelLb2EtacKp_PPbar",
                                                               DecayDescriptor = "[Lambda_b0 -> eta_c(1S) Lambda(1520)0]cc",
-                                                              DaughterLists = [ self.SelLambdaS, self.SelEtac2PPbar ],                    
+                                                              DaughterLists = [ self.SelLambdaS, self.SelEtac2PPbar ],
                                                               PreVertexCuts  = config['LbComCuts'],
                                                               PostVertexCuts = config['LbMomCuts'] )
 
-        self.Lb2EtacKp_PPbarLine = StrippingLine( self.name + '_PPbarLine',                                                
+        self.Lb2EtacKp_PPbarLine = StrippingLine( self.name + '_PPbarLine',
                                                    prescale  = config['Prescale'],
                                                   # HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelLb2EtacKp_PPbar ],
                                                    EnableFlavourTagging = False,
                                                    MDSTFlag = False,
-                                                   RelatedInfoTools = self.config['RelatedInfoTools']                                                   
+                                                   RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
 
         self.registerLine( self.Lb2EtacKp_PPbarLine )
-        
+
 
 
         """
-        Lb->Eta_c Lambda* 
+        Lb->Eta_c Lambda*
         """
         self.SelLb2EtacKp = self.createCombinationSel( OutputList = self.name + "SelLb2EtacKp",
                                                         DecayDescriptor = "[Lambda_b0 -> eta_c(1S) Lambda(1520)0]cc",
-                                                        DaughterLists = [ self.SelLambdaS, self.SelEtac ],                    
+                                                        DaughterLists = [ self.SelLambdaS, self.SelEtac ],
                                                         PreVertexCuts  = config['LbComCuts'],
                                                         PostVertexCuts = config['LbMomCuts'] )
 
-        self.Lb2EtacKp_4hLine            = StrippingLine( self.name + '_4hLine',                                                
+        self.Lb2EtacKp_4hLine            = StrippingLine( self.name + '_4hLine',
                                                    prescale  = config['Prescale'],
                                                  #  HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelLb2EtacKp ],
                                                    EnableFlavourTagging = False,
                                                    MDSTFlag = False,
-                                                   RelatedInfoTools = self.config['RelatedInfoTools']                                                   
+                                                   RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
 
         self.registerLine( self.Lb2EtacKp_4hLine )
-        
+
 
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
@@ -316,7 +316,7 @@ class Lb2EtacKpConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
@@ -326,9 +326,9 @@ class Lb2EtacKpConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
 
-    def applyMVA( self, name, 
+
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -344,7 +344,7 @@ class Lb2EtacKpConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py
index 2c31e3a214c868843e9a96c902f3b517dae60481..33dd15494ea33070f2ca3922a33c62b926726fbb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py
@@ -46,15 +46,15 @@ default_config = {
                    # Omegab
                    'MinOmegabMass'       : 5500.     # MeV
                    ,'MaxOmegabMass'       : 6700.     # MeV
-                   ,'Omegab_PT'           : 3500.     # MeV 
-                   ,'OmegabVertChi2DOF'   : 10        # Dimensionless 
+                   ,'Omegab_PT'           : 3500.     # MeV
+                   ,'OmegabVertChi2DOF'   : 10        # Dimensionless
                    ,'OmegabLT'            : 0.2       # ps
                    ,'OmegabIPCHI2'        : 25        # Dimensionless
                    ,'OmegabDIRA'          : 0.999     # Dimensionless
                    ,'KaonProbNN'          : 0.1       # Dimensionless
                    ,'PionProbNN'          : 0.1       # Dimensionless
                    ,'ProtProbNN'          : 0.1       # Dimensionless
-                   ,'TrackMinIPCHI2'      : 4         # Dimensionless  
+                   ,'TrackMinIPCHI2'      : 4         # Dimensionless
                    ,'XicPT'               : 1800      # MeV
                    ,'XicBPVVDCHI2'        : 36
                    ,'XicDIRA'             : 0.        # Dimensionless
@@ -73,7 +73,7 @@ default_config = {
 class OmegabDecaysConf(LineBuilder):
     """
     Definition of Omegab -> Xic K pi stripping
-    
+
     Constructs Omegab -> Xic K pi Selections and StrippingLines from
     a configuration dictionary.
     Usage:
@@ -104,7 +104,7 @@ class OmegabDecaysConf(LineBuilder):
     lines                  : List of lines
 
     Exports as class data member:
-    StrippingB2XGammaConf.__configuration_keys__ : List of required configuration parameters.    
+    StrippingB2XGammaConf.__configuration_keys__ : List of required configuration parameters.
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
@@ -114,7 +114,7 @@ class OmegabDecaysConf(LineBuilder):
 
         # if name not set outside, set it to empty
         #if name == None:
-        #    name = ""   
+        #    name = ""
 
         # Selection of Omegab daughters: Xic
 
@@ -166,7 +166,7 @@ class OmegabDecaysConf(LineBuilder):
                                                   config['Omegab_PT'],
                                                   config['OmegabDIRA'],
                                                   config['TrackMinIPCHI2'])
-        
+
         self.selOmegab2XicKpiWS = makeOmegab2XicKpi('Omegab2XicKpiWSFor%s' % name,
                                                     self.selXic,
                                                     '[Omega_b- -> Xi_c+ K- pi+]cc',
@@ -240,7 +240,7 @@ class OmegabDecaysConf(LineBuilder):
                                                        config['Omegab_PT'],
                                                        config['OmegabDIRA'],
                                                        config['TrackMinIPCHI2'])
-        
+
         # Omegab -> Omegac pi selections
         self.selOmegab2Omegacpi = makeOmegab2Omegacpi('Omegab2OmegacpiFor%s' % name,
                                                       self.selOmegac,
@@ -339,7 +339,7 @@ class OmegabDecaysConf(LineBuilder):
                                                           config['Omegab_PT'],
                                                           config['OmegabDIRA'],
                                                           config['TrackMinIPCHI2'])
-        
+
 
         self.selOmegab2OmegacpipipiWS = makeOmegab2Omegacpi('Omegab2OmegacpipipiWSFor%s' % name,
                                                             self.selOmegac,
@@ -353,13 +353,13 @@ class OmegabDecaysConf(LineBuilder):
                                                             config['Omegab_PT'],
                                                             config['OmegabDIRA'],
                                                             config['TrackMinIPCHI2'])
-        
+
         # Create and register stripping lines
         self.Omegab2XicKpiLine = StrippingLine("%sXicKpiLine" % name,
                                                prescale=config['OmegabDecaysPreScale'],
                                                postscale=config['OmegabDecaysPostScale'],
                                                selection=self.selOmegab2XicKpi)
-#                                               selection=self.selXic) 
+#                                               selection=self.selXic)
         self.registerLine(self.Omegab2XicKpiLine)
 
         self.Omegab2XicKpiLineWS = StrippingLine("%sXicKpiWSLine" % name,
@@ -391,7 +391,7 @@ class OmegabDecaysConf(LineBuilder):
                                                     postscale=config['OmegabDecaysPostScale'],
                                                     selection=self.selOmegab2Xic0piKpiWS)
         self.registerLine(self.Omegab2Xic0piKpiLineWS)
-                
+
         self.Omegab2OmegacpiLine = StrippingLine("%sOmegacpiLine" % name,
                                                  prescale=config['OmegabDecaysPreScale'],
                                                  postscale=config['OmegabDecaysPostScale'],
@@ -440,7 +440,7 @@ class OmegabDecaysConf(LineBuilder):
                                                        postscale=config['OmegabDecaysPostScale'],
                                                        selection=self.selOmegab2OmegacpipipiWS)
         self.registerLine(self.Omegab2OmegacpipipiLineWS)
-        
+
 def makeXic(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, MaxXicVertChi2DOF, XicBPVVDCHI2, XicDIRA, TrackMinIPCHI2):
     """
     Create and return a Xic+ -> p K- pi+ Selection object, starting with the daughters' selections.
@@ -452,7 +452,7 @@ def makeXic(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, Ma
     @arg XicPT:      Min PT of Xic
     @arg XicDeltaMassWin: Mass difference m(pKpi)-m(Xic)
     @arg MaxXicVertChi2DOF: chi2/NDOF
-    @arg XicBPVVDCHI2: Flight distance chi2 
+    @arg XicBPVVDCHI2: Flight distance chi2
     @arg XicDIRA:    DIRA of Xic
     @arg TrackMinIPCHI2: Min IPCHI2 for kaons and pions
     @return: Selection object
@@ -469,18 +469,18 @@ def makeXic(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, Ma
                                              "p+"  : _daughterpCut},
                             CombinationCut = _combinationCut,
                             MotherCut=_motherCut)
-    
+
     _stdANNKaon    = DataOnDemand(Location="Phys/StdLooseANNKaons/Particles")
     _stdANNPion    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
     _stdANNProtons = DataOnDemand(Location="Phys/StdLooseANNProtons/Particles")
-    
+
     return Selection(name, Algorithm=_Xic, RequiredSelections=[_stdANNKaon, _stdANNPion, _stdANNProtons])
 
 
 def makeOmegac(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, MaxXicVertChi2DOF, XicBPVVDCHI2, XicDIRA, TrackMinIPCHI2):
     """
     Create and return a Omegac0 -> p K- K- pi+ Selection object, starting with the daughters' selections.
-    
+
     @arg name: name of the Selection.
     @arg KaonProbNN: PID of Kaon
     @arg PionProbNN: PID of pion
@@ -496,7 +496,7 @@ def makeOmegac(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin,
     _daughterKCut  = "(PROBNNk  > %(KaonProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
     _daughterpCut  = "(PROBNNp  > %(ProtProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (P>10000) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(ASUM(PT)> %(XicPT)s*MeV) & (ADAMASS('Omega_c0') < 1.25*%(XicDeltaMassWin)s*MeV) & (ACUTDOCA(0.5*mm,'LoKi::DistanceCalculator'))" % locals()
     _motherCut = "(ADMASS('Omega_c0') < %(XicDeltaMassWin)s*MeV) & (VFASPF(VCHI2/VDOF)<%(MaxXicVertChi2DOF)s) & (BPVVDCHI2>%(XicBPVVDCHI2)s) & (BPVDIRA>%(XicDIRA)s)" % locals()
     _Omegac = CombineParticles(DecayDescriptor = "[Omega_c0 -> p+ K- K- pi+]cc",
@@ -505,18 +505,18 @@ def makeOmegac(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin,
                                              "p+"  : _daughterpCut},
                             CombinationCut = _combinationCut,
                             MotherCut=_motherCut)
-    
+
     _stdANNKaon    = DataOnDemand(Location="Phys/StdLooseANNKaons/Particles")
     _stdANNPion    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
     _stdANNProtons = DataOnDemand(Location="Phys/StdLooseANNProtons/Particles")
-    
+
     return Selection(name, Algorithm=_Omegac, RequiredSelections=[_stdANNKaon, _stdANNPion, _stdANNProtons])
-                                            
+
 
 def makeXic0(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, MaxXicVertChi2DOF, XicBPVVDCHI2, XicDIRA, TrackMinIPCHI2):
     """
     Create and return a Xic0 -> p K- K- pi+ Selection object, starting with the daughters' selections.
-    
+
     @arg name: name of the Selection.
     @arg KaonProbNN: PID of Kaon
     @arg PionProbNN: PID of pion
@@ -532,7 +532,7 @@ def makeXic0(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, M
     _daughterKCut  = "(PROBNNk  > %(KaonProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5) " % locals()
     _daughterpCut  = "(PROBNNp  > %(ProtProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (P>10000) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(ASUM(PT)> %(XicPT)s*MeV) & (ADAMASS('Xi_c0') < 1.25*%(XicDeltaMassWin)s*MeV) & (ACUTDOCA(0.5*mm,'LoKi::DistanceCalculator'))" % locals()
     _motherCut = "(ADMASS('Xi_c0') < %(XicDeltaMassWin)s*MeV) & (VFASPF(VCHI2/VDOF)<%(MaxXicVertChi2DOF)s) & (BPVVDCHI2>%(XicBPVVDCHI2)s) & (BPVDIRA>%(XicDIRA)s)" % locals()
     _Omegac = CombineParticles(DecayDescriptor = "[Xi_c0 -> p+ K- K- pi+]cc",
@@ -541,13 +541,13 @@ def makeXic0(name, KaonProbNN, PionProbNN, ProtProbNN, XicPT, XicDeltaMassWin, M
                                                 "p+"  : _daughterpCut},
                                CombinationCut = _combinationCut,
                                MotherCut=_motherCut)
-    
+
     _stdANNKaon    = DataOnDemand(Location="Phys/StdLooseANNKaons/Particles")
     _stdANNPion    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
     _stdANNProtons = DataOnDemand(Location="Phys/StdLooseANNProtons/Particles")
-    
+
     return Selection(name, Algorithm=_Omegac, RequiredSelections=[_stdANNKaon, _stdANNPion, _stdANNProtons])
-                                
+
 def makeOmegab2XicKpi(name, XicSel, DecDescr, KaonProbNN, PionProbNN, MaxOmegabMass, MinOmegabMass, OmegabVertChi2DOF, OmegabIPCHI2, OmegabLT, Omegab_PT, OmegabDIRA, TrackMinIPCHI2):
     """
     Create and return a Omegab- -> Xic+ K- pi- or Omegab- -> Xic0 pi+ K- pi- Selection object, starting with the daughters' selections.
@@ -558,14 +558,14 @@ def makeOmegab2XicKpi(name, XicSel, DecDescr, KaonProbNN, PionProbNN, MaxOmegabM
     @arg KaonProbNN: PID of Kaon
     @arg PionProbNN: PID of pion
     @arg MaxOmegabMass: Max value of Omegab mass window
-    @arg MinOmegabMass: Max value of Omegab mass window 
+    @arg MinOmegabMass: Max value of Omegab mass window
     @arg OmegabVertChi2DOF: chi2/NDOF
     @arg OmegabIPCHI2:  Omegab IP chi2
     @arg OmegabLT:      Omegab lifetime
     @arg Omegab_PT:     Omegab PT
     @arg OmegabDIRA:    Omegab DIRA
     @arg TrackMinIPCHI2: Min IPCHI2 for kaons and pions
-    @return: Selection object   
+    @return: Selection object
     """
 
     _stdANNKaonAll    = DataOnDemand(Location="Phys/StdLooseANNKaons/Particles")
@@ -573,11 +573,11 @@ def makeOmegab2XicKpi(name, XicSel, DecDescr, KaonProbNN, PionProbNN, MaxOmegabM
 
     _daughterKCut  = "(PROBNNk  > %(KaonProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(AM < %(MaxOmegabMass)s*MeV+100*MeV) & (AM > %(MinOmegabMass)s*MeV-100*MeV) & (APT>%(Omegab_PT)s*MeV-300*MeV)" % locals()
     #_combinationCut = "(AM < %(MaxOmegabMass)s*MeV) & (AM > %(MinOmegabMass)s*MeV)" % locals()
     _motherCut = "(M < %(MaxOmegabMass)s*MeV) & (M > %(MinOmegabMass)s*MeV) & (VFASPF(VCHI2/VDOF)<%(OmegabVertChi2DOF)s) & (BPVIPCHI2() < %(OmegabIPCHI2)s) & (BPVLTIME()>%(OmegabLT)s*ps) & (PT>%(Omegab_PT)s*MeV) & (BPVDIRA>%(OmegabDIRA)s)" % locals()
-        
+
     _Omegab = CombineParticles(DecayDescriptor = DecDescr,
                                DaughtersCuts = {"K+"  : _daughterKCut,
                                                 "pi+" : _daughterpiCut
@@ -590,7 +590,7 @@ def makeOmegab2XicKpi(name, XicSel, DecDescr, KaonProbNN, PionProbNN, MaxOmegabM
 def makeOmegab2XicgammaKpi(name, XicSel, DecDescr, KaonProbNN, PionProbNN, MaxOmegabMass, MinOmegabMass, OmegabVertChi2DOF, OmegabIPCHI2, OmegabLT, Omegab_PT, OmegabDIRA, TrackMinIPCHI2, XicprDeltaMassWin):
     """
     Create and return a Omegab- -> Xic+ gamma K- pi- Selection object, starting with the daughters' selections.
-    
+
     @arg name: name of the Selection.
     @arg XicSel: Xic selection.
     @arg DecDescr: Decay descriptor
@@ -607,31 +607,31 @@ def makeOmegab2XicgammaKpi(name, XicSel, DecDescr, KaonProbNN, PionProbNN, MaxOm
     @arg XicprDeltaMassWin : Delta Mass m(Xic') - m(Xic)
     @return: Selection object
     """
-    
+
     _stdANNKaonAll    = DataOnDemand(Location="Phys/StdLooseANNKaons/Particles")
     _stdANNPionAll    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
     _stdPhotonAll     = DataOnDemand(Location="Phys/StdLooseAllPhotons/Particles")
-    
+
     _daughterKCut  = "(PROBNNk  > %(KaonProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(AM < %(MaxOmegabMass)s*MeV+100*MeV) & (AM > %(MinOmegabMass)s*MeV-100*MeV) & (AM12 - AM1 < %(XicprDeltaMassWin)s) & (APT>%(Omegab_PT)s*MeV-300*MeV)" % locals()
     #_combinationCut = "(AM < %(MaxOmegabMass)s*MeV) & (AM > %(MinOmegabMass)s*MeV)" % locals()
     _motherCut = "(M < %(MaxOmegabMass)s*MeV) & (M > %(MinOmegabMass)s*MeV) & (VFASPF(VCHI2/VDOF)<%(OmegabVertChi2DOF)s) & (BPVIPCHI2() < %(OmegabIPCHI2)s) & (BPVLTIME()>%(OmegabLT)s*ps) & (PT>%(Omegab_PT)s*MeV) & (BPVDIRA>%(OmegabDIRA)s)" % locals()
-    
+
     _Omegab = CombineParticles(DecayDescriptor = DecDescr,
                                DaughtersCuts = {"K+"  : _daughterKCut,
                                                 "pi+" : _daughterpiCut
                                                 },
                                CombinationCut = _combinationCut,
                                MotherCut=_motherCut)
-    
+
     return Selection(name, Algorithm=_Omegab, RequiredSelections=[XicSel, _stdANNKaonAll, _stdANNPionAll, _stdPhotonAll])
 
 def makeOmegab2Omegacpi(name, OmegacSel, DecDescr, PionProbNN, MaxOmegabMass, MinOmegabMass, OmegabVertChi2DOF, OmegabIPCHI2, OmegabLT, Omegab_PT, OmegabDIRA, TrackMinIPCHI2):
     """
     Create and return a Omegab- -> Omegac0 pi- or Omegab- -> Omegac0 pi- pi+ pi- Selection object, starting with the daughters' selections.
-    
+
     @arg name: name of the Selection.
     @arg OmegacSel: Xic selection.
     @arg DecDescr: Decay descriptor
@@ -646,27 +646,27 @@ def makeOmegab2Omegacpi(name, OmegacSel, DecDescr, PionProbNN, MaxOmegabMass, Mi
     @arg TrackMinIPCHI2: Min IPCHI2 for kaons and pions
     @return: Selection object
     """
-    
+
     _stdANNPionAll    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
-        
+
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(AM < %(MaxOmegabMass)s*MeV+100*MeV) & (AM > %(MinOmegabMass)s*MeV-100*MeV) & (APT>%(Omegab_PT)s*MeV-300*MeV)" % locals()
 
     _motherCut = "(M < %(MaxOmegabMass)s*MeV) & (M > %(MinOmegabMass)s*MeV) & (VFASPF(VCHI2/VDOF)<%(OmegabVertChi2DOF)s) & (BPVIPCHI2() < %(OmegabIPCHI2)s) & (BPVLTIME()>%(OmegabLT)s*ps) & (PT>%(Omegab_PT)s*MeV) & (BPVDIRA>%(OmegabDIRA)s)" % locals()
-    
+
     _Omegab = CombineParticles(DecayDescriptor = DecDescr,
                                DaughtersCuts = {"pi+" : _daughterpiCut
                                                 },
                                CombinationCut = _combinationCut,
                                MotherCut=_motherCut)
-    
+
     return Selection(name, Algorithm=_Omegab, RequiredSelections=[OmegacSel, _stdANNPionAll])
 
 def makeOmegab2Omegacpi0pi(name, OmegacSel, DecDescr, PionProbNN, MaxOmegabMass, MinOmegabMass, OmegabVertChi2DOF, OmegabIPCHI2, OmegabLT, Omegab_PT, OmegabDIRA, TrackMinIPCHI2):
     """
     Create and return a Omegab- -> Omegac0 pi0 pi- Selection object, starting with the daughters' selections.
-    
+
     @arg name: name of the Selection.
     @arg OmegacSel: Xic selection.
     @arg DecDescr: Decay descriptor
@@ -681,28 +681,28 @@ def makeOmegab2Omegacpi0pi(name, OmegacSel, DecDescr, PionProbNN, MaxOmegabMass,
     @arg TrackMinIPCHI2: Min IPCHI2 for kaons and pions
     @return: Selection object
     """
-    
+
     _stdANNPionAll    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
     _stdPi0Resolved   = DataOnDemand(Location="Phys/StdLooseResolvedPi0/Particles")
 
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(AM < %(MaxOmegabMass)s*MeV+100*MeV) & (AM > %(MinOmegabMass)s*MeV-100*MeV) & (APT>%(Omegab_PT)s*MeV-300*MeV)" % locals()
-    
+
     _motherCut = "(M < %(MaxOmegabMass)s*MeV) & (M > %(MinOmegabMass)s*MeV) & (VFASPF(VCHI2/VDOF)<%(OmegabVertChi2DOF)s) & (BPVIPCHI2() < %(OmegabIPCHI2)s) & (BPVLTIME()>%(OmegabLT)s*ps) & (PT>%(Omegab_PT)s*MeV) & (BPVDIRA>%(OmegabDIRA)s)" % locals()
-    
+
     _Omegab = CombineParticles(DecayDescriptor = DecDescr,
                                DaughtersCuts = {"pi+" : _daughterpiCut
                                                 },
                                CombinationCut = _combinationCut,
                                MotherCut=_motherCut)
-    
+
     return Selection(name, Algorithm=_Omegab, RequiredSelections=[OmegacSel, _stdANNPionAll, _stdPi0Resolved])
 
 def makeOmegab2Omegacgammapi(name, OmegacSel, DecDescr, PionProbNN, MaxOmegabMass, MinOmegabMass, OmegabVertChi2DOF, OmegabIPCHI2, OmegabLT, Omegab_PT, OmegabDIRA, TrackMinIPCHI2, OmegacstDeltaMassWin):
     """
     Create and return a Omegab- -> Omegac0 gamma pi- Selection object, starting with the daughters' selections.
-    
+
     @arg name: name of the Selection.
     @arg OmegacSel: Xic selection.
     @arg DecDescr: Decay descriptor
@@ -715,25 +715,25 @@ def makeOmegab2Omegacgammapi(name, OmegacSel, DecDescr, PionProbNN, MaxOmegabMas
     @arg Omegab_PT:     Omegab PT
     @arg OmegabDIRA:    Omegab DIRA
     @arg TrackMinIPCHI2: Min IPCHI2 for kaons and pions
-    @arg OmegacstDeltaMassWin: Delta Mass m(Omegac*) - m(Omegac)  
+    @arg OmegacstDeltaMassWin: Delta Mass m(Omegac*) - m(Omegac)
     @return: Selection object
     """
-    
+
     _stdANNPionAll    = DataOnDemand(Location="Phys/StdLooseANNPions/Particles")
     _stdPhotonAll     = DataOnDemand(Location="Phys/StdLooseAllPhotons/Particles")
-    
+
     _daughterpiCut = "(PROBNNpi > %(PionProbNN)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPCHI2)s) & (TRGHOSTPROB < 0.5)" % locals()
-    
+
     _combinationCut = "(AM < %(MaxOmegabMass)s*MeV+100*MeV) & (AM > %(MinOmegabMass)s*MeV-100*MeV) & (AM12 - AM1 < %(OmegacstDeltaMassWin)s) & (APT>%(Omegab_PT)s*MeV-300*MeV)" % locals()
     #_combinationCut = "(AM < %(MaxOmegabMass)s*MeV) & (AM > %(MinOmegabMass)s*MeV)" % locals()
     _motherCut = "(M < %(MaxOmegabMass)s*MeV) & (M > %(MinOmegabMass)s*MeV) & (VFASPF(VCHI2/VDOF)<%(OmegabVertChi2DOF)s) & (BPVIPCHI2() < %(OmegabIPCHI2)s) & (BPVLTIME()>%(OmegabLT)s*ps) & (PT>%(Omegab_PT)s*MeV) & (BPVDIRA>%(OmegabDIRA)s)" % locals()
-    
+
     _Omegab = CombineParticles(DecayDescriptor = DecDescr,
                                DaughtersCuts = {"pi+" : _daughterpiCut
         },
                                CombinationCut = _combinationCut,
                                MotherCut=_motherCut)
-    
+
     return Selection(name, Algorithm=_Omegab, RequiredSelections=[OmegacSel, _stdANNPionAll, _stdPhotonAll])
-        
+
 # EOF
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py
index 8d3fbdf5b010852b7630655cb353621d8ebcd687..287f43533f84003dc3f4ce787057718fafdb59b4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py
@@ -52,14 +52,14 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class PPMuMuConf(LineBuilder):
-    
+
     __configuration_keys__ = (
         'HcProtonCuts',
         'HcMuonCuts',
@@ -81,101 +81,101 @@ class PPMuMuConf(LineBuilder):
         'Prescale'
         )
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         """
-        Prompt Hc -> p pbar Mu Mu 
+        Prompt Hc -> p pbar Mu Mu
         """
 
         self.SelHcProtons = self.createSubSel( OutputList = self.name + "SelHcProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ),
                                            Cuts = config['HcProtonCuts']
                                            )
         self.SelHcMuons = self.createSubSel( OutputList = self.name + "HcSelMuons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseMuons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseMuons/Particles' ),
                                            Cuts = config['HcMuonCuts']
                                            )
         self.SelHc2PPMuMu = self.createN4BodySel( OutputList = self.name + "SelHc2PPMuMu",
                                                      DaughterLists = [ self.SelHcProtons, self.SelHcMuons ],
                                                      DecayDescriptor = "h_c(1P) -> p+ p~- mu+ mu-",
                                                      ComAMCuts      = config['HcComAMCuts'],
-                                                     PreVertexCuts  = config['HcComN4Cuts'], 
+                                                     PreVertexCuts  = config['HcComN4Cuts'],
                                                      PostVertexCuts = config['HcMomN4Cuts']
                                                      )
-        self.Hc2PPMuMuLine = StrippingLine( self.name + 'HcLine',                                                
-                                               prescale  = config['Prescale'],                                               
+        self.Hc2PPMuMuLine = StrippingLine( self.name + 'HcLine',
+                                               prescale  = config['Prescale'],
                                                algos     = [ self.SelHc2PPMuMu ],
                                                MDSTFlag  = False
                                                )
         self.registerLine( self.Hc2PPMuMuLine )
 
-        
+
         """
-        Prompt B -> p pbar Mu Mu 
+        Prompt B -> p pbar Mu Mu
         """
 
         self.SelHighProtons = self.createSubSel( OutputList = self.name + "SelHighProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ),
                                            Cuts = config['HighProtonCuts']
                                            )
         self.SelHighMuons = self.createSubSel( OutputList = self.name + "HighSelMuons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseMuons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseMuons/Particles' ),
                                            Cuts = config['HighMuonCuts']
                                            )
         self.SelHigh2PPMuMu = self.createN4BodySel( OutputList = self.name + "SelHigh2PPMuMu",
                                                      DaughterLists = [ self.SelHighProtons, self.SelHighMuons ],
                                                      DecayDescriptor = "h_c(1P) -> p+ p~- mu+ mu-",
                                                      ComAMCuts      = config['HighComAMCuts'],
-                                                     PreVertexCuts  = config['HighComN4Cuts'], 
+                                                     PreVertexCuts  = config['HighComN4Cuts'],
                                                      PostVertexCuts = config['HighMomN4Cuts']
                                                      )
-        self.High2PPMuMuLine = StrippingLine( self.name + 'HighLine',                                                
-                                               prescale  = config['Prescale'],                                               
+        self.High2PPMuMuLine = StrippingLine( self.name + 'HighLine',
+                                               prescale  = config['Prescale'],
                                                algos     = [ self.SelHigh2PPMuMu ],
                                                MDSTFlag  = False
                                                )
         self.registerLine( self.High2PPMuMuLine )
 
         """
-        Detached X -> p pbar Mu Mu 
+        Detached X -> p pbar Mu Mu
         """
 
         self.SelDetachedProtons = self.createSubSel( OutputList = self.name + "SelDetachedProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseANNProtons/Particles' ),
                                            Cuts = config['DetachedProtonCuts']
                                            )
         self.SelDetachedMuons = self.createSubSel( OutputList = self.name + "DetachedSelMuons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseMuons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLooseMuons/Particles' ),
                                            Cuts = config['DetachedMuonCuts']
                                            )
         self.SelDetached2PPMuMu = self.createN4BodySel( OutputList = self.name + "SelDetached2PPMuMu",
                                                      DaughterLists = [ self.SelDetachedProtons, self.SelDetachedMuons ],
                                                      DecayDescriptor = "h_c(1P) -> p+ p~- mu+ mu-",
                                                      ComAMCuts      = config['DetachedComAMCuts'],
-                                                     PreVertexCuts  = config['DetachedComN4Cuts'], 
+                                                     PreVertexCuts  = config['DetachedComN4Cuts'],
                                                      PostVertexCuts = config['DetachedMomN4Cuts']
                                                      )
-        self.Detached2PPMuMuLine = StrippingLine( self.name + 'DetachedLine',                                                
-                                               prescale  = config['Prescale'],                                               
+        self.Detached2PPMuMuLine = StrippingLine( self.name + 'DetachedLine',
+                                               prescale  = config['Prescale'],
                                                algos     = [ self.SelDetached2PPMuMu ],
                                                MDSTFlag  = False
                                                )
         self.registerLine( self.Detached2PPMuMuLine )
 
 
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createN4BodySel( self, OutputList,
                          DecayDescriptor,
                          DaughterLists,
@@ -184,7 +184,7 @@ class PPMuMuConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
@@ -194,4 +194,3 @@ class PPMuMuConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiX0.py
index 0e22e88f8247fa246c152a6dc08160338adc6a4a..5043365385f9d15f1aa86e2a87e065f421f069d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiX0.py
@@ -13,11 +13,11 @@
 # $Id:$
 # =============================================================================
 ## @file
-# 
+#
 #  The attempt for coherent stripping for B -> psi(') X0 modes,
 #  where  X0 :  eta   -> gamma gamma ,
 #               eta   -> pi+ pi- pi0 ,
-#               eta'  -> rho0 gamma 
+#               eta'  -> rho0 gamma
 #               eta'  -> pi+ pi- ( eta -> gamma gamma )
 #               omega -> pi+ pi- pi0
 #
@@ -37,7 +37,7 @@
 
 - eta   -> gamma gamma ,
 - eta   -> pi+ pi- pi0 ,
-- eta'  -> rho0 gamma 
+- eta'  -> rho0 gamma
 - eta'  -> pi+ pi- ( eta -> gamma gamma )
 - omega -> pi+ pi- pi0
 
@@ -54,10 +54,10 @@ __version__ = '$Revision$'
 # =============================================================================
 __all__ = (
     'PsiX0Conf'      ,
-    'default_config' , 
+    'default_config' ,
     )
 # =============================================================================
-from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer 
+from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer
 from StrippingUtils.Utils                  import LineBuilder
 # =============================================================================
 ## logging
@@ -67,12 +67,12 @@ logger = logging.getLogger(__name__)
 if not logger.handlers : logging.basicConfig()
 logger.setLevel(logging.INFO)
 # =============================================================================
-## Define the default configuration 
+## Define the default configuration
 _default_configuration_ = {
     #
-    'NOPIDHADRONS'   : False ,  ## USE FOR SUIMULATION 
+    'NOPIDHADRONS'   : False ,  ## USE FOR SUIMULATION
     ## use for B&Q wg production
-    'DIMUONLINES'    : []    ,  ## USE FOR B&Q WG-selection 
+    'DIMUONLINES'    : []    ,  ## USE FOR B&Q WG-selection
     #
     ## PV-requiremens
     #
@@ -80,13 +80,13 @@ _default_configuration_ = {
     #
     ## the transverse momentum of X0
     'X0PT'      : 1.2  * GeV        ,
-    ## the transverse momentum of X0, when accompanied with K(K) 
+    ## the transverse momentum of X0, when accompanied with K(K)
     'X0PTK'     : 0.7  * GeV        ,
     #
     ## c*tau cut for B-candidates
     #
     'CTAU'      : 100  * micrometer ,
-    'CTAU_Kst'  : 150  * micrometer , ## for B->J/psi K*+ line 
+    'CTAU_Kst'  : 150  * micrometer , ## for B->J/psi K*+ line
     #
     ## photon selection for eta' -> rho gamma
     #
@@ -95,13 +95,13 @@ _default_configuration_ = {
     ## pi0 selection for  eta/omega -> pi+ pi- pi0 ,
     #
     'Pi0Cut'    : """
-    ( 250    * MeV < MINTREE ( 'gamma' == ID , PT ) ) 
+    ( 250    * MeV < MINTREE ( 'gamma' == ID , PT ) )
     """ ,
     #
     ## eta -> gamma gamma selection for eta' -> pi+ pi- eta
     #
     'EtaCut'    :"""
-    ( 250    * MeV < MINTREE ( 'gamma' == ID , PT ) ) 
+    ( 250    * MeV < MINTREE ( 'gamma' == ID , PT ) )
     """ ,
     #
     ## muon selection for  psi(') -> mu+ mu-
@@ -110,16 +110,16 @@ _default_configuration_ = {
     ISMUON &
     ( PT            >  550 * MeV ) &
     ( PIDmu - PIDpi >    0       ) &
-    ( CLONEDIST     > 5000       )     
-    """ , 
+    ( CLONEDIST     > 5000       )
+    """ ,
     #
     ## pions and kaons
-    # 
+    #
     'PionCut'   : """
-    ( PT          > 200 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 200 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
-    ( TRCHI2DOF   < 4         ) & 
+    ( TRCHI2DOF   < 4         ) &
     in_range ( 2          , ETA , 5         ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
     HASRICH                     &
@@ -127,10 +127,10 @@ _default_configuration_ = {
     """ ,
     #
     'KaonCut'   : """
-    ( PT          > 200 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 200 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
-    ( TRCHI2DOF   < 4         ) & 
+    ( TRCHI2DOF   < 4         ) &
     in_range ( 2          , ETA , 5         ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
     HASRICH                     &
@@ -139,17 +139,17 @@ _default_configuration_ = {
     #
     ##
     'ProtonCut'   : """
-    ( PT           > 200 * MeV ) & 
-    ( CLONEDIST    > 5000      ) & 
-    ( TRCHI2DOF    < 4         ) & 
-    ( TRGHOSTPROB  < 0.5       ) & 
+    ( PT           > 200 * MeV ) &
+    ( CLONEDIST    > 5000      ) &
+    ( TRCHI2DOF    < 4         ) &
+    ( TRGHOSTPROB  < 0.5       ) &
     in_range ( 2         , ETA , 5         ) &
     in_range ( 10 * GeV  , P   , 150 * GeV ) &
     HASRICH                     &
-    ( MIPCHI2DV()  > 4        ) 
+    ( MIPCHI2DV()  > 4        )
     """ ,
     #
-    ## PID-cuts for hadrons 
+    ## PID-cuts for hadrons
     #
     'PionPIDCut'   : " PROBNNpi > 0.1 " ,
     'KaonPIDCut'   : " PROBNNk  > 0.1 " ,
@@ -158,30 +158,30 @@ _default_configuration_ = {
     ## useful shortcuts:
     #
     'Preambulo' : [
-    ## shortcut for chi2 of vertex fit 
-    'chi2vx    = VFASPF(VCHI2)     '                           , 
-    'chi2vxNDF = VFASPF(VCHI2PDOF) '                           , 
+    ## shortcut for chi2 of vertex fit
+    'chi2vx    = VFASPF(VCHI2)     '                           ,
+    'chi2vxNDF = VFASPF(VCHI2PDOF) '                           ,
     'chi2vxndf = chi2vxNDF         '                           ,
     ## shortcut for the c*tau
-    "from GaudiKernel.PhysicalConstants import c_light"        , 
+    "from GaudiKernel.PhysicalConstants import c_light"        ,
     ## use the embedded cut for chi2(LifetimeFit)<25
     "ctau      = BPVLTIME ( 25 ) * c_light "                   ,
     "ctau_9    = BPVLTIME (  9 ) * c_light "                   ,
     "ctau_16   = BPVLTIME ( 16 ) * c_light "                   ,
     "APT23     = LoKi.AParticles.TransverseMomentum ( 2 , 3 )" ,
-    ## Combination mass-cut for beauty particles 
+    ## Combination mass-cut for beauty particles
     "mb0_acut   = in_range ( 4.50 * GeV , AM , 6.00 * GeV ) "  ,
     "mbu_acut   = in_range ( 4.50 * GeV , AM , 6.00 * GeV ) "  ,
     "mbl_acut   = in_range ( 5.00 * GeV , AM , 6.50 * GeV ) "  ,
     "mbc_acut   = in_range ( 4.50 * GeV , AM , 6.75 * GeV ) "  ,
-    ## mass-cut for beauty particles 
+    ## mass-cut for beauty particles
     "mb0_cut    = in_range ( 4.55 * GeV ,  M , 5.95 * GeV ) "  ,
     "mbu_cut    = in_range ( 4.55 * GeV ,  M , 5.95 * GeV ) "  ,
     "mbl_cut    = in_range ( 5.05 * GeV ,  M , 6.45 * GeV ) "  ,
     "mbc_cut    = in_range ( 4.55 * GeV ,  M , 6.70 * GeV ) "  ,
     ] ,
     # =========================================================================
-    ## Prescales 
+    ## Prescales
     # =========================================================================
     'B2EtaPrescale'             : 1.0 ,
     'B2EtaPrimePrescale'        : 1.0 ,
@@ -216,30 +216,30 @@ _default_configuration_ = {
     'B2ChicKPiPrescale'         : 1.0 ,
     'B2ChicKPiPiPrescale'       : 1.0 ,
     'B2ChicPiPiPrescale'        : 1.0 ,
-    ## Bc * Lb  
+    ## Bc * Lb
     'Bc2ChicPiPrescale'         : 1.0 ,
     'Lb2ChicPKPrescale'         : 1.0 ,
     # =========================================================================
     }
 ## ============================================================================
-## the mandatory element for stripping framework 
+## the mandatory element for stripping framework
 default_config = {
     #
     'NAME'        :   'PsiX0'                ,
     'WGs'         : [ 'BandQ' ]              ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'PsiX0Conf'            ,
     'STREAMS'     : { 'Bhadron'    : [ 'StrippingB2PsiEtaForPsiX0'          ,
                                        'StrippingB2PsiEtaPrimeForPsiX0'     ,
                                        'StrippingB2PsiOmegaForPsiX0'        ,
                                        'StrippingB2PsiKEtaForPsiX0'         ,
                                        'StrippingB2PsiPiEtaForPsiX0'        ,
-                                       'StrippingB2PsiKKEtaForPsiX0'        , 
+                                       'StrippingB2PsiKKEtaForPsiX0'        ,
                                        'StrippingB2PsiKPiEtaForPsiX0'       ,
-                                       'StrippingB2PsiPiPiEtaForPsiX0'      , 
+                                       'StrippingB2PsiPiPiEtaForPsiX0'      ,
                                        'StrippingB2PsiKEtaPrimeForPsiX0'    ,
-                                       'StrippingB2PsiPiEtaPrimeForPsiX0'   , 
-                                       'StrippingB2PsiKKEtaPrimeForPsiX0'   , 
+                                       'StrippingB2PsiPiEtaPrimeForPsiX0'   ,
+                                       'StrippingB2PsiKKEtaPrimeForPsiX0'   ,
                                        'StrippingB2PsiKPiEtaPrimeForPsiX0'  ,
                                        'StrippingB2PsiPiPiEtaPrimeForPsiX0' ,
                                        'StrippingB2PsiKOmegaForPsiX0'       ,
@@ -247,7 +247,7 @@ default_config = {
                                        'StrippingB2PsiKKOmegaForPsiX0'      ,
                                        'StrippingB2PsiKPiOmegaForPsiX0'     ,
                                        'StrippingB2PsiPiPiOmegaForPsiX0'    ,
-                                       'StrippingBu2PsiKstarForPsiX0'       , ## CALIB ? 
+                                       'StrippingBu2PsiKstarForPsiX0'       , ## CALIB ?
                                        'StrippingBu2PsiKstarMergedForPsiX0' , ## CALIB ?
                                        'StrippingBc2PsiRhoForPsiX0'         ,
                                        'StrippingB2ChicKForPsiX0'           ,
@@ -260,7 +260,7 @@ default_config = {
     }
 # =============================================================================
 ## @class  PsiX0Conf
-#  B-> psi(') X0 configuration file 
+#  B-> psi(') X0 configuration file
 #  @author Vanya BELYAEV Ivan.Belyaev@itep.ru
 #  @date 2012-02-19
 class PsiX0Conf(LineBuilder) :
@@ -268,30 +268,30 @@ class PsiX0Conf(LineBuilder) :
     Helper class to configure 'PsiX0'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    ## get the default configuration 
+
+    ## get the default configuration
     @staticmethod
     def defaultConfiguration( key = None ) :
         """
         Get the default/recommended configurtaion
-        
+
         >>> conf = PsiX0.defaultConfiguration()
-        
+
         """
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__ ( self , name , config ) :
         """
         Constructor
         """
-        # check the names 
+        # check the names
         if 'PsiX0' != name :
-            logger.warning ( 'The non-default name is specified "%s"' % name  ) 
-            
+            logger.warning ( 'The non-default name is specified "%s"' % name  )
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
 
@@ -301,68 +301,68 @@ class PsiX0Conf(LineBuilder) :
         else :
             LineBuilder.__init__( self , name ,  config )
 
-        ## private set of selections 
+        ## private set of selections
         self.__selections_ = {}
 
 
         if not self.__selections_.has_key ( self.name() ) :
             self.__selections_[ self.name() ] = {}
-            
-        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config ) 
-        
+
+        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config )
+
         keys = _config.keys()
         for key in keys :
-            
+
             if not key in _default_configuration_ :
                 raise KeyError("Invalid key is specified: '%s'" % key )
-            
+
             val = _config[key]
-            if val != _default_configuration_ [ key ] : 
+            if val != _default_configuration_ [ key ] :
                 logger.debug ('new configuration: %-16s : %s ' % ( key , _config[key] ) )
-                
+
         self._name         = name
-                
+
         for line in self._lines_psiX0 () :
             self.registerLine(line)
-            logger.debug ( "Register line: %s" %  line.name () ) 
-            
-    ## get the selection, associated with some nickname name 
+            logger.debug ( "Register line: %s" %  line.name () )
+
+    ## get the selection, associated with some nickname name
     def _selection ( self, nick ) :
         """
         Get the selection, associated with some nickname name
         """
-        
+
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-            
-        return self.__selections_[ self.name() ].get( nick , None ) 
-    
-    ## add the selection, associated with some nickname name 
+            self.__selections_[ self.name() ] = {}
+
+        return self.__selections_[ self.name() ].get( nick , None )
+
+    ## add the selection, associated with some nickname name
     def _add_selection ( self , nick , sel ) :
         """
         add the selection, associated with some nickname name
         """
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-        
+            self.__selections_[ self.name() ] = {}
+
         if self.__selections_[ self.name()].has_key( nick ) :
             raise AttributeError , "Selection '%s'already exists " % nick
-        
+
         self.__selections_[ self.name() ][ nick ] = sel
-        
-        return sel 
-    
+
+        return sel
+
     # =========================================================================
     ## pure technical method for creation of selections
     # =========================================================================
     def make_selection ( self      ,
-                         tag       , 
+                         tag       ,
                          algotype  ,
-                         inputs    , 
+                         inputs    ,
                          *args     ,
                          **kwargs  ) :
         """
-        Technical method for creation of 1-step selections 
+        Technical method for creation of 1-step selections
         """
         sel_tag  = '%s_Selection' % tag
         sel_name = 'Sel%sFor%s'   % ( tag , self.name() )
@@ -370,7 +370,7 @@ class PsiX0Conf(LineBuilder) :
         ## check existing selection
         #
         sel      = self._selection ( sel_tag )
-        if sel : return sel 
+        if sel : return sel
 
         #
         ## adjust a bit the arguments
@@ -378,27 +378,27 @@ class PsiX0Conf(LineBuilder) :
             kwargs ['Preambulo'        ] = self['Preambulo']
 
         if not kwargs.has_key( 'ParticleCombiners' ) :
-            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' } 
-            
-        # 
+            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' }
+
+        #
         ## use "simple-selection"
         #
         from PhysSelPython.Wrappers import SimpleSelection
         sel = SimpleSelection (
             sel_name ,
             algotype ,
-            inputs   , 
+            inputs   ,
             *args    ,
             **kwargs )
-        # 
-        return self._add_selection( sel_tag , sel ) 
+        #
+        return self._add_selection( sel_tag , sel )
 
     ## get the selections
     def _selections_private ( self ) :
-        
+
         sel = self._selection ( 'Selections' )
         if sel : return sel
-        
+
         sel =  [
             #
             ## basic
@@ -414,41 +414,41 @@ class PsiX0Conf(LineBuilder) :
             self.eta0             () ,
             self.eta_prime        () ,
             #
-            ## local 
+            ## local
             self.psi              () ,
             self.eta2gg           () ,
             self.eta23pi          () ,
             self.etap2rhog        () ,
             self.etap2pipieta     () ,
             self.omega            () ,
-            self.chi_c            () , 
+            self.chi_c            () ,
             #
             ## beauty
             #
             self.b2eta            () ,
             self.b2etap           () ,
-            self.b2omega          () , 
+            self.b2omega          () ,
+            #
+            ##
             #
-            ## 
-            # 
             self.b2Keta           () ,
             self.b2KKeta          () ,
             self.b2Kpieta         () ,
             self.b2pieta          () ,
             self.b2pipieta        () ,
-            ## 
+            ##
             self.b2Ketap          () ,
             self.b2KKetap         () ,
             self.b2Kpietap        () ,
             self.b2pietap         () ,
             self.b2pipietap       () ,
-            ## 
+            ##
             self.b2Komega         () ,
             self.b2KKomega        () ,
             self.b2Kpiomega       () ,
             self.b2piomega        () ,
             self.b2pipiomega      () ,
-            ## 
+            ##
             self.bc2rho           () ,
             self.bu2Kstar         () , ## for extraction of photon efficiency
             self.bu2KstarM        () ,  ## for merged pi0s
@@ -459,19 +459,19 @@ class PsiX0Conf(LineBuilder) :
             self.b2chicKpi        () ,
             self.b2chicKpipi      () ,
             self.b2chicpipi       () ,
-            # 
+            #
             self.bc2chicpi        () ,
             ]
-        
+
         return self._add_selection ( 'Selections' , sel )
 
 
     # =========================================================================
-    ## get all lines  
+    ## get all lines
     # =========================================================================
     def _lines_psiX0   ( self ) :
         """
-        Get all psiX0 lines 
+        Get all psiX0 lines
         """
         sel = self._selection ( 'PsiX0Lines' )
         if sel : return sel
@@ -479,7 +479,7 @@ class PsiX0Conf(LineBuilder) :
         from StrippingConf.StrippingLine  import StrippingLine
         sel = [
             #
-            ## B -> psi(') X0  
+            ## B -> psi(') X0
             #
             StrippingLine (
             "B2PsiEtaFor" + self.name()       ,
@@ -487,14 +487,14 @@ class PsiX0Conf(LineBuilder) :
             checkPV  = self['CheckPV']        ,
             algos    = [ self.b2eta ()      ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "B2PsiEtaPrimeFor" + self.name()     ,
             prescale = self['B2EtaPrimePrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'            ] ,
             algos    = [ self.b2etap ()          ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "B2PsiOmegaFor" + self.name ()       ,
             prescale = self['B2OmegaPrescale' ]  , ## ATTENTION! Prescale here !!
@@ -502,7 +502,7 @@ class PsiX0Conf(LineBuilder) :
             algos    = [ self.b2omega ()      ]
             ) ,
             #
-            ## B -> psi(') [...] eta 
+            ## B -> psi(') [...] eta
             #
             StrippingLine (
             "B2PsiKEtaFor" + self.name()        ,
@@ -510,7 +510,7 @@ class PsiX0Conf(LineBuilder) :
             checkPV  = self['CheckPV'         ] ,
             algos    = [ self.b2Keta ()       ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "B2PsiPiEtaFor" + self.name()        ,
             prescale = self['B2PiEtaPrescale'  ] , ## ATTENTION! Prescale here !!
@@ -539,7 +539,7 @@ class PsiX0Conf(LineBuilder) :
             algos    = [ self.b2pipieta ()       ]
             ) ,
             #
-            ## B -> psi(') [...] eta' 
+            ## B -> psi(') [...] eta'
             #
             StrippingLine (
             "B2PsiKEtaPrimeFor" + self.name()        ,
@@ -547,7 +547,7 @@ class PsiX0Conf(LineBuilder) :
             checkPV  = self['CheckPV'              ] ,
             algos    = [ self.b2Ketap ()           ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "B2PsiPiEtaPrimeFor" + self.name()        ,
             prescale = self['B2PiEtaPrimePrescale'  ] , ## ATTENTION! Prescale here !!
@@ -583,7 +583,7 @@ class PsiX0Conf(LineBuilder) :
             checkPV  = self['CheckPV'              ] ,
             algos    = [ self.b2Komega ()          ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "B2PsiPiOmegaFor" + self.name()        ,
             prescale = self['B2PiOmegaPrescale'  ] , ## ATTENTION! Prescale here !!
@@ -610,21 +610,21 @@ class PsiX0Conf(LineBuilder) :
             checkPV  = self['CheckPV'              ] ,
             algos    = [ self.b2pipiomega ()       ]
             ) ,
-            ##            
+            ##
             StrippingLine (
             "Bu2PsiKstarFor" + self.name()              ,
             prescale = self['Bu2PsiKstarPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'              ] ,
             algos    = [ self.bu2Kstar ()          ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "Bu2PsiKstarMergedFor" + self.name()     ,
             prescale = self['Bu2PsiKstarMPrescale' ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'              ] ,
             algos    = [ self.bu2KstarM ()         ]
             ) ,
-            ##            
+            ##
             StrippingLine (
             "Bc2PsiRhoFor" + self.name()             ,
             prescale = self['Bc2PsiRhoPrescale'    ] , ## ATTENTION! Prescale here !!
@@ -685,14 +685,14 @@ class PsiX0Conf(LineBuilder) :
             #
             ]
         #
-        return self._add_selection ( 'PsiX0Lines' , sel ) 
-    
+        return self._add_selection ( 'PsiX0Lines' , sel )
+
     # ========================================================================
     ## pions :
     # ========================================================================
     def pions    ( self ) :
         """
-        Pions for   B -> psi X lines 
+        Pions for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         ##
@@ -701,7 +701,7 @@ class PsiX0Conf(LineBuilder) :
             pioncut = self['PionCut']
         else                    :
             from StandardParticles import StdAllLooseANNPions as inpts
-            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] ) 
+            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] )
         ##
         return self.make_selection (
             'Pion'                 ,
@@ -709,22 +709,22 @@ class PsiX0Conf(LineBuilder) :
             [ inpts ]              ,
             Code = pioncut         ,
             )
-    
+
     # ========================================================================
     ## kaons :
     # ========================================================================
     def kaons     ( self ) :
         """
-        Kaons for   B -> psi X lines 
+        Kaons for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        ## 
+        ##
         if self['NOPIDHADRONS'] :
             from StandardParticles import   StdAllNoPIDsKaons as inpts
             kaoncut = self['KaonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNKaons as inpts 
-            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNKaons as inpts
+            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] )
         #
         ##
         return self.make_selection (
@@ -739,15 +739,15 @@ class PsiX0Conf(LineBuilder) :
     # ========================================================================
     def protons    ( self ) :
         """
-        protons for   B -> psi X lines 
+        protons for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         if self['NOPIDHADRONS'] :
             from StandardParticles import   StdAllNoPIDsProtons as inpts
             protoncut = self['ProtonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNProtons as inpts 
-            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNProtons as inpts
+            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] )
         ##
         return self.make_selection (
             'Proton'                 ,
@@ -757,28 +757,28 @@ class PsiX0Conf(LineBuilder) :
             )
 
     # =========================================================================
-    ## muons 
+    ## muons
     # =========================================================================
     def muons  ( self ) :
         from   StandardParticles  import StdLooseMuons as muons_
         return muons_
 
     # =========================================================================
-    ## gamma 
+    ## gamma
     # =========================================================================
     def gamma  ( self ) :
         from   StandardParticles  import StdLooseAllPhotons as photons_
-        return photons_ 
-    
+        return photons_
+
     # =========================================================================
-    ## define proper pi0 
+    ## define proper pi0
     # =========================================================================
     def pi0  ( self ) :
         """
         Define proper pi0
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdLoosePi02gg as inpts 
+        from StandardParticles                     import StdLoosePi02gg as inpts
         ##
         return self.make_selection (
             'Pi0'                  ,
@@ -786,16 +786,16 @@ class PsiX0Conf(LineBuilder) :
             [ inpts ]              ,
             Code = self['Pi0Cut']  ,
             )
-    
+
     # =========================================================================
     ## define proper eta
     # =========================================================================
     def eta_  ( self ) :
         """
-        Define proper eta -> gamma gamma 
+        Define proper eta -> gamma gamma
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdLooseEta2gg as inpts 
+        from StandardParticles                     import StdLooseEta2gg as inpts
         ##
         return self.make_selection (
             'EtaStd'               ,
@@ -803,10 +803,10 @@ class PsiX0Conf(LineBuilder) :
             [ inpts ]              ,
             Code = self['EtaCut']  ,
             )
-    
-    
+
+
     # =========================================================================
-    ## selection for  eta -> gamma gamma 
+    ## selection for  eta -> gamma gamma
     # =========================================================================
     def eta2gg ( self ) :
         """
@@ -820,8 +820,8 @@ class PsiX0Conf(LineBuilder) :
             [ self.eta_ () ]       ,
             Code = """
             ( ADMASS ('eta') < 100 * MeV ) &
-            ( PT > %s ) 
-            """ % min ( self['X0PT'] , self['X0PTK'] ) 
+            ( PT > %s )
+            """ % min ( self['X0PT'] , self['X0PTK'] )
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
@@ -831,9 +831,9 @@ class PsiX0Conf(LineBuilder) :
             [ pre_eta  ]               ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25015     ## unique ! 
+            ExtraInfoIndex = 25015     ## unique !
             )
-    
+
     # =========================================================================
     ## (selection for  eta -> pipipi
     # =========================================================================
@@ -842,20 +842,20 @@ class PsiX0Conf(LineBuilder) :
         Selection for Eta -> pipipi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-        ## 
+        ##
         pre_eta = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreEta3Pi'                   ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.pi0 ()  ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor = " eta -> pi+ pi- pi0" ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 700 * MeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 12 )
+            """ ,
             ##
             CombinationCut  = """
             ( APT > %s ) & ( ADAMASS ( 'eta' ) < 100 * MeV )
@@ -863,27 +863,27 @@ class PsiX0Conf(LineBuilder) :
             ##
             MotherCut       = """
             ( PT     > %s ) &
-            ( chi2vx <  9 ) 
+            ( chi2vx <  9 )
             """ % min ( self['X0PT'] , self['X0PTK'] )
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Eta23pi'                  ,
             Pi0Veto__Tagger2g          ,
             [ pre_eta ]                ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25016     ## unique ! 
+            ExtraInfoIndex = 25016     ## unique !
             )
 
     # =========================================================================
-    ## all etas 
+    ## all etas
     # =========================================================================
     def eta0 ( self ) :
         """
-        All etas 
+        All etas
         """
         tag      = 'Eta0_selection'
         sel      = self._selection ( tag )
@@ -895,37 +895,37 @@ class PsiX0Conf(LineBuilder) :
             RequiredSelections = [ self.eta2gg  () ,
                                    self.eta23pi () ]
             )
-        
-        return self._add_selection ( tag , sel ) 
-    
-    
+
+        return self._add_selection ( tag , sel )
+
+
     # ===========================================================================
-    ## selection for  etap -> rho0 gamma 
+    ## selection for  etap -> rho0 gamma
     # ===========================================================================
     def etap2rhog ( self ) :
         """
-        Selection for Eta' -> rho gamma        
+        Selection for Eta' -> rho gamma
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         pre_etap = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreEtapRhoG'                 ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.gamma ()  ] ,
             ##
             DecayDescriptor = " eta_prime -> pi+ pi- gamma" ,
             ##
             DaughtersCuts   = { 'gamma' :  self['GammaCut'] } ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 950 * MeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 12 )
+            """ ,
             CombinationCut  = """
-            ( APT > %s ) & 
-            in_range  ( 500 * MeV , AM12 , 950 * MeV ) & 
-            ( ADAMASS ( 'eta_prime' ) <    100 * MeV ) 
+            ( APT > %s ) &
+            in_range  ( 500 * MeV , AM12 , 950 * MeV ) &
+            ( ADAMASS ( 'eta_prime' ) <    100 * MeV )
             """ % ( 0.9 * min ( self['X0PT'] , self['X0PTK'] ) ),
             ##
             MotherCut       = """
@@ -933,43 +933,43 @@ class PsiX0Conf(LineBuilder) :
             ( chi2vx <  9 )
             """ % min ( self['X0PT'] , self['X0PTK'] )
             )
-        ##         
+        ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-        ## 
+        ##
         return self.make_selection (
             'Etap2rhogamma'               ,
             Pi0Veto__Tagger               ,
             [ pre_etap ]                  ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25017     ## unique ! 
+            ExtraInfoIndex = 25017     ## unique !
             )
-    
+
     # ============================================================================
     ## selection for  etap -> pi+ pi- eta
-    # ============================================================================ 
+    # ============================================================================
     def etap2pipieta ( self ) :
         """
-        Selection for Eta' -> pi+ pi- eta         
+        Selection for Eta' -> pi+ pi- eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
         pre_etap = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreEtapPiPiEta'               ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.eta_ ()  ] ,
             ##
             DecayDescriptor = " eta_prime -> pi+ pi- eta" ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 600 * MeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 12 )
+            """ ,
             CombinationCut  = """
-            ( APT > %s ) & 
-            ( ADAMASS ( 'eta_prime' ) <    100 * MeV ) 
+            ( APT > %s ) &
+            ( ADAMASS ( 'eta_prime' ) <    100 * MeV )
             """ % ( 0.9 * min ( self['X0PT'] , self['X0PTK'] ) ),
             ##
             MotherCut       = """
@@ -977,24 +977,24 @@ class PsiX0Conf(LineBuilder) :
             ( chi2vx <  9 )
             """ % min ( self['X0PT'] , self['X0PTK'] )
             )
-        
+
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Etap2pipieta'                ,
             Pi0Veto__Tagger2g             ,
             [ pre_etap ]                  ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25018     ## unique ! 
+            ExtraInfoIndex = 25018     ## unique !
             )
-    
+
     # =========================================================================
-    ## all etas 
+    ## all etas
     # =========================================================================
     def eta_prime ( self ) :
         """
-        All eta's 
+        All eta's
         """
         tag      = 'EtaPrime_selection'
         sel      = self._selection ( tag )
@@ -1006,33 +1006,33 @@ class PsiX0Conf(LineBuilder) :
             RequiredSelections = [ self.etap2rhog    () ,
                                    self.etap2pipieta () ]
             )
-        
-        return self._add_selection ( tag , sel ) 
-    
-    
+
+        return self._add_selection ( tag , sel )
+
+
     # =========================================================================
-    ## omega -> 3 pi 
+    ## omega -> 3 pi
     # =========================================================================
     def omega ( self ) :
         """
-        omega -> 3 pi selection 
+        omega -> 3 pi selection
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
         pre_omega = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreOmega'                ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.pi0 ()  ] ,
             ##
             DecayDescriptor = " omega(782) -> pi+ pi- pi0" ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 1 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
+            ( ACHI2DOCA(1,2) < 12 )
             """ ,
-            ## 
+            ##
             CombinationCut  = """
             ( APT > %s ) & ( ADAMASS ( 'omega(782)' ) < 100 * MeV )
             """ % ( 0.9 * min ( self['X0PT'] , self['X0PTK'] ) ),
@@ -1040,78 +1040,78 @@ class PsiX0Conf(LineBuilder) :
             MotherCut       = """
             ( PT     > %s ) &
             ( chi2vx <  9 )
-            """ % min ( self['X0PT'] , self['X0PTK'] ) 
+            """ % min ( self['X0PT'] , self['X0PTK'] )
             )
-        
+
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Omega'                       ,
             Pi0Veto__Tagger2g             ,
             [ pre_omega ]                 ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25019     ## unique ! 
+            ExtraInfoIndex = 25019     ## unique !
             )
-    
+
     # =========================================================================
     ## psi(') -> mu+ mu-
     # =========================================================================
     def psi ( self ) :
         """
-        psi(') -> mu+ mu- 
+        psi(') -> mu+ mu-
         """
         psi_name = 'Psi'
         sel_name = 'Sel%sFor%s' % ( psi_name , self.name() )
         sel_tag  = '%s_Selection'
-        sel      = self._selection( sel_tag ) 
-        if sel  : return sel 
-        
+        sel      = self._selection( sel_tag )
+        if sel  : return sel
+
         dimu_lines = self['DIMUONLINES']
         if not dimu_lines :
-            ## 
+            ##
             from GaudiConfUtils.ConfigurableGenerators import CombineParticles
             ##
             return self.make_selection (
                 psi_name         ,
                 CombineParticles ,
                 [ self.muons() ] ,
-                ## 
+                ##
                 DecayDescriptor = " J/psi(1S) -> mu+ mu- " ,
                 ##
                 DaughtersCuts   = {
-                'mu+'   :  self [ 'MuonCut' ] 
+                'mu+'   :  self [ 'MuonCut' ]
                 } ,
-                ## 
+                ##
                 CombinationCut  = """
-                ( ADAMASS  ( 'J/psi(1S)' ) < 120 * MeV ) | 
-                ( ADAMASS  (   'psi(2S)' ) < 120 * MeV ) 
+                ( ADAMASS  ( 'J/psi(1S)' ) < 120 * MeV ) |
+                ( ADAMASS  (   'psi(2S)' ) < 120 * MeV )
                 """ ,
                 ##
                 MotherCut       = """
                 chi2vx < 20
-                """ 
+                """
                 )
 
-        ## list of lines 
-        from PhysSelPython.Wrappers import AutomaticData 
+        ## list of lines
+        from PhysSelPython.Wrappers import AutomaticData
         if 1 < len( dimu_lines ) :
-            lines = [ AutomaticData ( l ) for l in dimu_lines ] 
+            lines = [ AutomaticData ( l ) for l in dimu_lines ]
             from PhysSelPython.Wrappers import MergedSelection
-            sel = MergedSelection ( sel_name , RequiredSelections = lines ) 
-            return self._add_selection ( sel_tag , sel ) 
+            sel = MergedSelection ( sel_name , RequiredSelections = lines )
+            return self._add_selection ( sel_tag , sel )
 
-        ## single line  
+        ## single line
         dimu_line = dimu_lines[0]
-        sel = AutomaticData ( dimu_line ) 
-        return self._add_selection ( sel_tag , sel ) 
-        
+        sel = AutomaticData ( dimu_line )
+        return self._add_selection ( sel_tag , sel )
+
     # =========================================================================
-    ## chi_c -> J/psi gamma 
+    ## chi_c -> J/psi gamma
     # =========================================================================
     def chi_c ( self ) :
         """
-        chi_c -> J/psi gamma 
+        chi_c -> J/psi gamma
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         ##
@@ -1119,39 +1119,39 @@ class PsiX0Conf(LineBuilder) :
             'PreChic' ,
             CombineParticles ,
             [ self.psi() , self.gamma()  ] ,
-            ## 
+            ##
             DecayDescriptor = " chi_c1(1P) -> J/psi(1S) gamma " ,
             ##
             DaughtersCuts   = {
             'J/psi(1S)'   :  " M  < ( 3.100 + 0.120 ) * GeV " ,
             'gamma'       :  " PT > 400 * MeV "
             } ,
-            ## 
+            ##
             CombinationCut  = """
             ( AM - AM1 ) < 650 * MeV
             """ ,
             ##
             MotherCut       = " PALL "
             )
-        
-        ##         
+
+        ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-        ## 
+        ##
         return self.make_selection (
             'Chic'                        ,
             Pi0Veto__Tagger               ,
             [ pre_chic ]                  ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25030     ## unique ! 
+            ExtraInfoIndex = 25030     ## unique !
             )
-    
+
     # ============================================================================
     ## Beauty -> psi(') X0
     # ============================================================================
-    
+
     # ============================================================================
-    # B -> psi(') eta 
+    # B -> psi(') eta
     # ============================================================================
     def b2eta ( self ) :
         """
@@ -1163,7 +1163,7 @@ class PsiX0Conf(LineBuilder) :
             'B2PsiEta2gg'  ,
             CombineParticles ,
             [ self.psi() , self.eta0()  ] ,
-            ## 
+            ##
             DecayDescriptor = "B_s0 -> J/psi(1S) eta" ,
             ##
             Preambulo       = self['Preambulo'] ,
@@ -1172,12 +1172,12 @@ class PsiX0Conf(LineBuilder) :
             CombinationCut  = "mb0_acut" ,
             ##
             MotherCut       = """
-            mb0_cut     & 
-            ( ctau > %s ) 
+            mb0_cut     &
+            ( ctau > %s )
             """ % self['CTAU']
             ##
             )
-    
+
     # =========================================================================
     # B -> psi(')  eta'
     # =========================================================================
@@ -1191,7 +1191,7 @@ class PsiX0Conf(LineBuilder) :
             'B2PsiEtaPrime'  ,
             CombineParticles  ,
             [ self.psi()      , self.eta_prime () ] ,
-            ## 
+            ##
             DecayDescriptor = "B_s0 -> J/psi(1S) eta_prime" ,
             ##
             Preambulo       = self['Preambulo'] ,
@@ -1200,19 +1200,19 @@ class PsiX0Conf(LineBuilder) :
             CombinationCut  = "mb0_acut" ,
             ##
             MotherCut       = """
-            mb0_cut            & 
-            ( chi2vxndf < 10 ) &  
-            ( ctau      > %s ) 
+            mb0_cut            &
+            ( chi2vxndf < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU']
             ##
             )
-    
+
     # =========================================================================
-    # B -> psi(') (omega -> 3pi  ) 
+    # B -> psi(') (omega -> 3pi  )
     # =========================================================================
     def b2omega ( self ) :
         """
-        B -> psi(') (omega -> 3pi  ) 
+        B -> psi(') (omega -> 3pi  )
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         ##
@@ -1220,7 +1220,7 @@ class PsiX0Conf(LineBuilder) :
             'B2PsiOmega'  ,
             CombineParticles  ,
             [ self.psi()      , self.omega () ] ,
-            ## 
+            ##
             DecayDescriptor = "B0 -> J/psi(1S) omega(782)" ,
             ##
             DaughtersCuts   = { 'omega(782)' : ' PT > %s ' % self['X0PT'] } ,
@@ -1229,32 +1229,32 @@ class PsiX0Conf(LineBuilder) :
             ##
             MotherCut       = """
             mb0_cut            &
-            ( chi2vxndf < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxndf < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU']
             ##
             )
 
 
     # ============================================================================
-    ## Beauty -> chi_c  X 
+    ## Beauty -> chi_c  X
     # ============================================================================
 
     # ============================================================================
-    # B -> chi_c K 
+    # B -> chi_c K
     # ============================================================================
     def b2chicK ( self ) :
         """
-        B -> chic K 
+        B -> chic K
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2ChicK'                   ,
             ## algorithm type to be used
             CombineParticles            ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.kaons()  ] ,
             #
             ## algorithm configuration
@@ -1263,31 +1263,31 @@ class PsiX0Conf(LineBuilder) :
             ##
             CombinationCut = """ mbu_acut &
             ( ACHI2DOCA(1,2) < 20 )
-            """ , 
-            ## 
+            """ ,
+            ##
             MotherCut        = """
             mbu_cut                 &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
 
 
     # ============================================================================
-    # Bs -> chi_c K K 
+    # Bs -> chi_c K K
     # ============================================================================
     def b2chicKK ( self ) :
         """
         B -> chic K K
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2ChicKK'                    ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.kaons()  ] ,
             #
             ## algorithm configuration
@@ -1295,36 +1295,36 @@ class PsiX0Conf(LineBuilder) :
             DecayDescriptor = "B_s0 -> chi_c1(1P) K- K+" ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 ) 
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             CombinationCut   = """ mb0_acut &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
-            ## 
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
+            """ ,
+            ##
             MotherCut        = """
             mbu_cut                 &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
-    # B0 -> chi_c K- pi+ 
+    # B0 -> chi_c K- pi+
     # ============================================================================
     def b2chicKpi ( self ) :
         """
         B -> chic K- pi+
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2ChicKPi'                   ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.kaons() , self.pions ()  ] ,
             #
             ## algorithm configuration
@@ -1332,37 +1332,37 @@ class PsiX0Conf(LineBuilder) :
             DecayDescriptor = "[B0 -> chi_c1(1P) K- pi+]cc" ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 ) 
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             CombinationCut   = """ mb0_acut &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
-            ## 
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
+            """ ,
+            ##
             MotherCut        = """
             mbu_cut                 &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
 
 
     # ============================================================================
-    # B- -> chi_c K+ pi+ pi-  
+    # B- -> chi_c K+ pi+ pi-
     # ============================================================================
     def b2chicKpipi ( self ) :
         """
         B -> chic K+ pi+ pi-
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2ChicKPiPi'                   ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.kaons() , self.pions ()  ] ,
             #
             ## algorithm configuration
@@ -1370,43 +1370,43 @@ class PsiX0Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> chi_c1(1P) K+ pi+ pi-]cc" ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 ) 
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 ) 
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
+            ##
             CombinationCut   = """ mb0_acut &
-            ( ACHI2DOCA(1,4) < 20 ) & 
+            ( ACHI2DOCA(1,4) < 20 ) &
             ( ACHI2DOCA(2,4) < 20 ) &
-            ( ACHI2DOCA(3,4) < 20 ) 
-            """ , 
-            ## 
+            ( ACHI2DOCA(3,4) < 20 )
+            """ ,
+            ##
             MotherCut        = """
             mbu_cut                 &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
 
 
     # ============================================================================
-    # Bs -> chi_c pi pi 
+    # Bs -> chi_c pi pi
     # ============================================================================
     def b2chicpipi ( self ) :
         """
-        B -> chic pi pi 
+        B -> chic pi pi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2ChicPiPi'                  ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.pions()  ] ,
             #
             ## algorithm configuration
@@ -1414,36 +1414,36 @@ class PsiX0Conf(LineBuilder) :
             DecayDescriptor = "B_s0 -> chi_c1(1P) pi- pi+" ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 ) 
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             CombinationCut   = """ mb0_acut &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
-            ## 
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
+            """ ,
+            ##
             MotherCut        = """
             mbu_cut                 &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # Bc -> chi_c pi
     # ============================================================================
     def bc2chicpi ( self ) :
         """
-        Bc -> chic pi+ 
+        Bc -> chic pi+
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Bc2ChicPi'                 ,
             ## algorithm type to be used
             CombineParticles            ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.pions()  ] ,
             #
             ## algorithm configuration
@@ -1452,30 +1452,30 @@ class PsiX0Conf(LineBuilder) :
             ##
             CombinationCut = """ mbc_acut &
             ( ACHI2DOCA(1,2) < 20 )
-            """ , 
-            ## 
+            """ ,
+            ##
             MotherCut        = """
             mbc_cut                 &
-            ( chi2vxNDF < 10      ) &  
+            ( chi2vxNDF < 10      ) &
             in_range ( 75   * um  , ctau ,  5 * mm     )
             """
             )
 
     # ============================================================================
-    # Lb -> chi_c p K 
+    # Lb -> chi_c p K
     # ============================================================================
     def lb2chicpK ( self ) :
         """
-        Lambda_b -> chic p K 
+        Lambda_b -> chic p K
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Lb2ChicPK'                   ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.chi_c () , self.protons() , self.kaons () ] ,
             #
             ## algorithm configuration
@@ -1485,34 +1485,34 @@ class PsiX0Conf(LineBuilder) :
             Combination12Cut = """ ( AM < 6 * GeV  ) &
             ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             CombinationCut   = """ mbl_acut &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 ) 
-            """ , 
-            ## 
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
+            """ ,
+            ##
             MotherCut        = """
             mbl_cut                 &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') K eta
     # ============================================================================
     def b2Keta ( self ) :
         """
-        B -> psi(') K eta 
+        B -> psi(') K eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKEta'                   ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons()   , self.eta0 () ] ,
             #
             ## algorithm configuration
@@ -1522,71 +1522,71 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'eta' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mbu_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mbu_acut " ,
+            ##
             MotherCut        = """
             mbu_cut                 &
             ( PT        > 1 * GeV ) &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') pi  eta
     # ============================================================================
     def b2pieta ( self ) :
         """
-        B -> psi(') pi eta 
+        B -> psi(') pi eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiPiEta'                ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() , self.eta0 () ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptor = "[B+ -> J/psi(1S) pi+ eta]cc" ,
-            ## 
+            ##
             DaughtersCuts   = { 'eta' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mbu_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mbu_acut " ,
+            ##
             MotherCut        = """
             mbu_cut                 &
             ( PT        > 1 * GeV ) &
-            ( chi2vxNDF < 10      ) &  
-            ( ctau      > %s      ) 
+            ( chi2vxNDF < 10      ) &
+            ( ctau      > %s      )
             """ % self['CTAU'],
             )
-        
+
     # ============================================================================
     # B -> psi(') K K eta
     # ============================================================================
     def b2KKeta ( self ) :
         """
-        B -> psi(') K K eta 
+        B -> psi(') K K eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKKEta'                   ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons()   , self.eta0 () ] ,
             #
             ## algorithm configuration
@@ -1596,78 +1596,78 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'eta' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut  = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
             Combination123Cut = """ ( AM < 6 * GeV  ) &
             ( ACHI2DOCA(1,3) < 20 )  &
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') pi pi  eta
     # ============================================================================
     def b2pipieta ( self ) :
         """
-        B -> psi(') pi pi eta 
+        B -> psi(') pi pi eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiPiPiEta'                ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() , self.eta0 () ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptor = "B_s0 -> J/psi(1S) pi+ pi- eta" ,
-            ## 
+            ##
             DaughtersCuts   = { 'eta' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') K pi eta
     # ============================================================================
     def b2Kpieta ( self ) :
         """
-        B -> psi(') K pi eta 
+        B -> psi(') K pi eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKPiEta'                 ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons() , self.pions() , self.eta0 () ] ,
             #
             ## algorithm configuration
@@ -1677,23 +1677,23 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'eta' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut  = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
-    
+
+
 
     # ============================================================================
     # B -> psi(') K eta'
@@ -1702,14 +1702,14 @@ class PsiX0Conf(LineBuilder) :
         """
         B -> psi(') K eta'
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKEtaPrime'               ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons()   , self.eta_prime () ] ,
             #
             ## algorithm configuration
@@ -1719,15 +1719,15 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'eta_prime' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 7 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mbc_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mbc_acut " ,
+            ##
             MotherCut        = """
             mbc_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
 
@@ -1738,50 +1738,50 @@ class PsiX0Conf(LineBuilder) :
         """
         B -> psi(') pi eta'
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiPiEtaPrime'                ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() , self.eta_prime () ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptor = "[B+ -> J/psi(1S) pi+ eta_prime]cc" ,
-            ## 
+            ##
             DaughtersCuts   = { 'eta_prime' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 7 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mbc_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mbc_acut " ,
+            ##
             MotherCut        = """
             mbc_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-        
+
     # ============================================================================
     # B -> psi(') K K eta'
     # ============================================================================
     def b2KKetap ( self ) :
         """
-        B -> psi(') K K eta' 
+        B -> psi(') K K eta'
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKKEtaPrime'             ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons()   , self.eta_prime () ] ,
             #
             ## algorithm configuration
@@ -1791,22 +1791,22 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'eta_prime' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut  = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') pi pi  eta'
     # ============================================================================
@@ -1814,55 +1814,55 @@ class PsiX0Conf(LineBuilder) :
         """
         B -> psi(') pi pi eta'
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiPiPiEtaPrime'           ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() , self.eta_prime () ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptor = "B_s0 -> J/psi(1S) pi+ pi- eta_prime " ,
-            ## 
+            ##
             DaughtersCuts   = { 'eta_prime' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') K pi eta'
     # ============================================================================
     def b2Kpietap ( self ) :
         """
-        B -> psi(') K pi eta' 
+        B -> psi(') K pi eta'
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKPiEtaPrime'            ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons() , self.pions() , self.eta_prime () ] ,
             #
             ## algorithm configuration
@@ -1872,22 +1872,22 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'eta_prime' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut  = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 )  & 
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(1,3) < 20 )  &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-        
+
 
     # ============================================================================
     # B -> psi(') K omega
@@ -1896,14 +1896,14 @@ class PsiX0Conf(LineBuilder) :
         """
         B -> psi(') K omega
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKOmega'               ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons()   , self.omega () ] ,
             #
             ## algorithm configuration
@@ -1913,15 +1913,15 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'omega(782)' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 7 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mbc_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mbc_acut " ,
+            ##
             MotherCut        = """
             mbc_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
 
@@ -1932,50 +1932,50 @@ class PsiX0Conf(LineBuilder) :
         """
         B -> psi(') pi omega
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiPiOmega'                ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() , self.omega () ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptor = "[B+ -> J/psi(1S) pi+ omega(782) ]cc" ,
-            ## 
+            ##
             DaughtersCuts   = { 'omega(782)' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 7 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mbc_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mbc_acut " ,
+            ##
             MotherCut        = """
             mbc_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
-    # B -> psi(') K K omega 
+    # B -> psi(') K K omega
     # ============================================================================
     def b2KKomega ( self ) :
         """
         B -> psi(') K K omega
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKKOmega'                ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons()   , self.omega () ] ,
             #
             ## algorithm configuration
@@ -1985,22 +1985,22 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'omega(782)' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut  = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
             Combination123Cut = """ ( AM < 6 * GeV  ) &
             ( ACHI2DOCA(1,3) < 20 ) &
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
     # B -> psi(') pi pi  omega
     # ============================================================================
@@ -2008,55 +2008,55 @@ class PsiX0Conf(LineBuilder) :
         """
         B -> psi(') pi pi omega
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiPiPiOmega'           ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() , self.omega () ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptor = "B_s0 -> J/psi(1S) pi+ pi- omega(782)" ,
-            ## 
+            ##
             DaughtersCuts   = { 'omega(782)' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
-            ## 
+            ##
             Combination123Cut = """ ( AM < 6 * GeV  ) &
             ( ACHI2DOCA(1,3) < 20 )  &
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU'],
             )
-    
+
     # ============================================================================
-    # B -> psi(') K pi omega 
+    # B -> psi(') K pi omega
     # ============================================================================
     def b2Kpiomega ( self ) :
         """
         B -> psi(') K pi omega
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'B2PsiKPiOmega'               ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons() , self.pions() , self.omega () ] ,
             #
             ## algorithm configuration
@@ -2066,22 +2066,22 @@ class PsiX0Conf(LineBuilder) :
             DaughtersCuts   = { 'omega(782)' : ' PT > %s ' % self['X0PTK'] } ,
             ##
             Combination12Cut  = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 20 )  
+            ( ACHI2DOCA(1,2) < 20 )
             """  ,
             Combination123Cut = """ ( AM < 6 * GeV  ) &
-            ( ACHI2DOCA(1,3) < 20 ) & 
-            ( ACHI2DOCA(2,3) < 20 )  
+            ( ACHI2DOCA(1,3) < 20 ) &
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            CombinationCut   = " mb0_acut " , 
-            ## 
+            ##
+            CombinationCut   = " mb0_acut " ,
+            ##
             MotherCut        = """
             mb0_cut            &
-            ( chi2vxNDF < 10 ) &  
-            ( ctau      > %s ) 
+            ( chi2vxNDF < 10 ) &
+            ( ctau      > %s )
             """ % self['CTAU']
             )
-    
+
     # =========================================================================
     # B+ -> psi ( K*+ -> K+ pi0)
     # =========================================================================
@@ -2089,47 +2089,47 @@ class PsiX0Conf(LineBuilder) :
         """
         This is just a control line to study
         the reconstruction efficiency for pi0 and gamma
-        see LHCb-INT-2012-001 
-        
+        see LHCb-INT-2012-001
+
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         pre_bkst = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreBu2PsiKstar'              ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## inputs 
+            ## inputs
             [ self.psi   () , self.kaons () , self.pi0  () ] ,
             ## configuration:
             DecayDescriptor = "[B+ -> J/psi(1S) K+ pi0 ]cc" ,
-            ## keep only J/psi 
+            ## keep only J/psi
             DaughtersCuts = { 'J/psi(1S)' : " M < 3.3 * GeV " } ,
-            ## 
+            ##
             Combination12Cut = """  ( AM < 5.75 * GeV ) &
             ( ACHI2DOCA (1,2) < 20 )
-            """ ,             
+            """ ,
             CombinationCut = """
             in_range ( 4.90 * GeV , AM   , 5.80 * GeV ) &
             in_range ( 750  * MeV , AM23 , 1250 * MeV ) &
-            ( APT23 > 1 * GeV ) 
-            """ , 
-            ## 
+            ( APT23 > 1 * GeV )
+            """ ,
+            ##
             MotherCut = """
-            in_range ( 4.95 * GeV , M , 5.75 * GeV ) & 
+            in_range ( 4.95 * GeV , M , 5.75 * GeV ) &
             ( chi2vxndf < 10 ) &
-            ( ctau_9    > %s ) 
-            """ % self['CTAU_Kst'] 
+            ( ctau_9    > %s )
+            """ % self['CTAU_Kst']
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Bu2PsiKstar'              ,
             Pi0Veto__Tagger2g          ,
             [ pre_bkst ]               ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25020     ## unique ! 
+            ExtraInfoIndex = 25020     ## unique !
             )
 
     # =========================================================================
@@ -2137,145 +2137,144 @@ class PsiX0Conf(LineBuilder) :
     # =========================================================================
     def bu2KstarM ( self ) :
         """
-        B+ -> psi ( K* -> K+ pi0-merged )        
+        B+ -> psi ( K* -> K+ pi0-merged )
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from StandardParticles                     import StdLooseMergedPi0 as pi0_merged
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Bu2PsiKstarMerged'           ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## inputs 
+            ## inputs
             [ self.psi   () , self.kaons () , pi0_merged ] ,
             ## configuration:
             DecayDescriptor = "[B+ -> J/psi(1S) K+ pi0 ]cc" ,
-            ## keep only J/psi 
+            ## keep only J/psi
             DaughtersCuts = { 'J/psi(1S)' : " M < 3.3 * GeV " } ,
-            ## 
+            ##
             Combination12Cut = """ ( AM < 7.1 * GeV ) &
-            ( ACHI2DOCA (1,2) < 20 ) 
-            """ ,             
+            ( ACHI2DOCA (1,2) < 20 )
+            """ ,
             CombinationCut = """
             in_range ( 4.40 * GeV , AM , 7.10 * GeV ) &
-            ( AM23 < 2.5 * GeV ) 
-            """ , 
+            ( AM23 < 2.5 * GeV )
+            """ ,
             ##
             MotherCut = """
-            in_range ( 4.45 * GeV , M , 7.05 * GeV ) & 
-            ( chi2vxndf < 10 ) 
+            in_range ( 4.45 * GeV , M , 7.05 * GeV ) &
+            ( chi2vxndf < 10 )
             """
             )
-    ## ( ctau_9 > %s ) 
-    ## """ % self['CTAU_Kst'] 
+    ## ( ctau_9 > %s )
+    ## """ % self['CTAU_Kst']
 
     # =========================================================================
     # B(c) -> psi ( rho+ -> pi+ pi0 )
     # =========================================================================
     def bc2rho ( self ) :
         """
-        Bc+ -> psi ( rho+ -> pi+ pi0 ) in very wide window 
+        Bc+ -> psi ( rho+ -> pi+ pi0 ) in very wide window
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
         pre_rho = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreBc2PsiRho'                ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## inputs 
+            ## inputs
             [ self.psi   () , self.pions() , self.pi0  () ] ,
             ## configuration:
             DecayDescriptor  = "[B_c+ -> J/psi(1S) pi+ pi0 ]cc" ,
-            ## 
+            ##
             DaughtersCuts    = {
-            'J/psi(1S)' :   "    M   < 3.3 * GeV " , ## keep only J/psi 
+            'J/psi(1S)' :   "    M   < 3.3 * GeV " , ## keep only J/psi
             'pi+'       :   "   PT   > 500 * MeV " ,
             'pi0'       : """
             (             PT   > 500 * MeV ) &
             ( CHILD ( 1 , PT ) > 300 * MeV ) &
-            ( CHILD ( 2 , PT ) > 300 * MeV ) 
+            ( CHILD ( 2 , PT ) > 300 * MeV )
             """
             } ,
-            ## 
+            ##
             Combination12Cut = """
-            ( AM < 7.6 * GeV    )  & 
-            ( ACHI2DOCA ( 1 , 2 )  < 10 )  
+            ( AM < 7.6 * GeV    )  &
+            ( ACHI2DOCA ( 1 , 2 )  < 10 )
             """ ,
             ##
             CombinationCut   = """
             in_range ( 4.4  * GeV , AM , 7.6 * GeV ) &
-            ( AM23 < 2.5 * GeV ) 
+            ( AM23 < 2.5 * GeV )
             """ ,
             ##
             MotherCut        = """
-            ( chi2vx < 16  ) & 
-            in_range ( 4.45 * GeV , M      ,  7.55 * GeV ) & 
+            ( chi2vx < 16  ) &
+            in_range ( 4.45 * GeV , M      ,  7.55 * GeV ) &
             in_range ( 90   * um  , ctau_9 ,  5 * mm     )
             """
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Bc2PsiRho'                ,
             Pi0Veto__Tagger2g          ,
             [ pre_rho ]                ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25025     ## unique ! 
+            ExtraInfoIndex = 25025     ## unique !
             )
-    
+
 # =============================================================================
 if '__main__' == __name__ :
-    
-    
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
+
+
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
     logger.info ( ' Date   :  %s' % __date__   )
     ##
-    clines = set() 
+    clines = set()
     logger.info ( ' Lines declared in default_config["STREAMS"] are' )
     for stream in default_config['STREAMS'] :
-        lines = default_config['STREAMS'][stream] 
+        lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s : %-50s ' % ( stream , l ) )
             clines.add ( l )
     ##
     logger.info ( ' The output locations for the default configuration: ' )
     ##
-    _conf = PsiX0Conf ( 'PsiX0' , 
+    _conf = PsiX0Conf ( 'PsiX0' ,
                         config = default_config['CONFIG']  )
     ##
     _ln   = ' ' + 61*'-' + '+' + 30*'-'
-    logger.info ( _ln ) 
-    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) ) 
+    logger.info ( _ln )
+    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
-        lname = l.name() 
+        lname = l.name()
         logger.info ( '  %-60s| %-30s  ' % ( lout, lname ) )
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-        
+
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiXForBandQ.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiXForBandQ.py
index 42abe9426975b004b139bca81afdf023ebf7db92..9575e03de25011536604ec9b8bbb3c0435261343 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiXForBandQ.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPsiXForBandQ.py
@@ -13,8 +13,8 @@
 # $Id:$
 # =============================================================================
 ## @file
-# 
-#   The coherent (miroDST) stripping for B -> psi(') + X for B&Q 
+#
+#   The coherent (miroDST) stripping for B -> psi(') + X for B&Q
 #
 #   @author Vanya BELYAEV Ivan.Belyaev@itep.ru
 #   @date   2012-02-19
@@ -39,9 +39,9 @@ __all__ = (
 # =============================================================================
 
 # =============================================================================
-from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer 
+from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer
 from StrippingUtils.Utils                  import LineBuilder
-from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g 
+from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
 # =============================================================================
 ## logging
 # =============================================================================
@@ -50,28 +50,28 @@ logger = logging.getLogger(__name__)
 if not logger.handlers : logging.basicConfig()
 logger.setLevel(logging.INFO)
 # =============================================================================
-## Define the default configuration 
+## Define the default configuration
 _default_configuration_ = {
     #
-    'NOPIDHADRONS'   : False ,  ## USE FOR SUIMULATION 
+    'NOPIDHADRONS'   : False ,  ## USE FOR SUIMULATION
     ## use for B&Q wg production
-    'DIMUONLINES'    : []    ,  ## USE FOR B&Q WG-selection 
+    'DIMUONLINES'    : []    ,  ## USE FOR B&Q WG-selection
     #
     ## PV-requiremens
     #
     'CheckPV'   : True ,
     #
     ## Global filter
-    # 
-    'FILTER'    : None ,   ## VOID filter 
-    'ODIN'      : None ,   ## ODIN filter 
-    'L0DU'      : None ,   ## L0   filter 
+    #
+    'FILTER'    : None ,   ## VOID filter
+    'ODIN'      : None ,   ## ODIN filter
+    'L0DU'      : None ,   ## L0   filter
     'HLT'       : None ,   ## HLT  filter
     #
-    ## c*tau cut for B-hadrons 
+    ## c*tau cut for B-hadrons
     #
-    'CTAU'      :  75 * micrometer , 
-    'CTAU_BC'   :  50 * micrometer , 
+    'CTAU'      :  75 * micrometer ,
+    'CTAU_BC'   :  50 * micrometer ,
     #
     ## muon selection for  psi(') -> mu+ mu-
     #
@@ -79,16 +79,16 @@ _default_configuration_ = {
     ISMUON &
     ( PT            >  550 * MeV ) &
     ( PIDmu - PIDpi >    0       ) &
-    ( CLONEDIST     > 5000       )     
-    """ , 
+    ( CLONEDIST     > 5000       )
+    """ ,
     #
     ## pions and kaons
-    # 
+    #
     'PionCut'   : """
-    ( PT          > 200 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 200 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
-    ( TRCHI2DOF   < 4         ) & 
+    ( TRCHI2DOF   < 4         ) &
     in_range ( 2          , ETA , 5         ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
     HASRICH                     &
@@ -96,10 +96,10 @@ _default_configuration_ = {
     """ ,
     #
     'KaonCut'   : """
-    ( PT          > 200 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 200 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
-    ( TRCHI2DOF   < 4         ) & 
+    ( TRCHI2DOF   < 4         ) &
     in_range ( 2          , ETA , 5         ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
     HASRICH                     &
@@ -107,17 +107,17 @@ _default_configuration_ = {
     """ ,
     #
     'ProtonCut'   : """
-    ( PT           > 200 * MeV ) & 
-    ( CLONEDIST    > 5000      ) & 
-    ( TRCHI2DOF    < 4         ) & 
-    ( TRGHOSTPROB  < 0.5       ) & 
+    ( PT           > 200 * MeV ) &
+    ( CLONEDIST    > 5000      ) &
+    ( TRCHI2DOF    < 4         ) &
+    ( TRGHOSTPROB  < 0.5       ) &
     in_range ( 2         , ETA , 5         ) &
     in_range ( 10 * GeV  , P   , 150 * GeV ) &
     HASRICH                     &
-    ( MIPCHI2DV()  > 4        ) 
+    ( MIPCHI2DV()  > 4        )
     """ ,
     #
-    ## PID-cuts for hadrons 
+    ## PID-cuts for hadrons
     #
     'PionPIDCut'   : " PROBNNpi > 0.1 " ,
     'KaonPIDCut'   : " PROBNNk  > 0.1 " ,
@@ -127,33 +127,33 @@ _default_configuration_ = {
     ## useful shortcuts:
     #
     'Preambulo' : [
-    ## shortcut for chi2 of vertex fit 
-    'chi2vx    = VFASPF(VCHI2)     '                           , 
-    'chi2vxndf = VFASPF(VCHI2PDOF) '                           , 
+    ## shortcut for chi2 of vertex fit
+    'chi2vx    = VFASPF(VCHI2)     '                           ,
+    'chi2vxndf = VFASPF(VCHI2PDOF) '                           ,
     ## shortcut for the c*tau
-    "from GaudiKernel.PhysicalConstants import c_light"        , 
+    "from GaudiKernel.PhysicalConstants import c_light"        ,
     ## use the embedded cut for chi2(LifetimeFit)<16
     "ctau      = BPVLTIME ( 25 ) * c_light "                   ,
     "ctau_9    = BPVLTIME (  9 ) * c_light "                   ,
     "ctau_16   = BPVLTIME ( 16 ) * c_light "                   ,
     "APT23     = LoKi.AParticles.TransverseMomentum ( 2 , 3 )" ,
     ## Combination mass-cut for neutral beauty particles
-    "mb0_ahigh = 5.550 * GeV " , 
-    "mbu_ahigh = mb0_ahigh   " , 
-    "mlb_ahigh = 5.850 * GeV " , 
-    "mxb_ahigh = 6.460 * GeV " , 
-    "mbc_ahigh = 6.555 * GeV " , 
+    "mb0_ahigh = 5.550 * GeV " ,
+    "mbu_ahigh = mb0_ahigh   " ,
+    "mlb_ahigh = 5.850 * GeV " ,
+    "mxb_ahigh = 6.460 * GeV " ,
+    "mbc_ahigh = 6.555 * GeV " ,
     "mb0_acut  = in_range ( 5.100 * GeV , AM , mb0_ahigh   ) " ,
     "mbu_acut  = in_range ( 5.100 * GeV , AM , mbu_ahigh   ) " ,
     "mlb_acut  = in_range ( 5.350 * GeV , AM , mlb_ahigh   ) " ,
     "mxb_acut  = in_range ( 5.350 * GeV , AM , mxb_ahigh   ) " ,
     "mbc_acut  = in_range ( 6.050 * GeV , AM , mbc_ahigh   ) " ,
     "mbp_acut  = mbu_acut    " ,
-    ## mass-cut for beauty particles 
-    "mb0_high  = 5.510 * GeV " , 
-    "mbu_high  = mb0_high    " , 
-    "mlb_high  = 5.810 * GeV " , 
-    "mxb_high  = 6.410 * GeV " , 
+    ## mass-cut for beauty particles
+    "mb0_high  = 5.510 * GeV " ,
+    "mbu_high  = mb0_high    " ,
+    "mlb_high  = 5.810 * GeV " ,
+    "mxb_high  = 6.410 * GeV " ,
     "mb0_cut   = in_range ( 5.140 * GeV ,  M , mb0_high    ) " ,
     "mbu_cut   = in_range ( 5.140 * GeV ,  M , mbu_high    ) " ,
     "mlb_cut   = in_range ( 5.390 * GeV ,  M , mlb_high   ) " ,
@@ -161,7 +161,7 @@ _default_configuration_ = {
     "mbc_cut   = in_range ( 6.090 * GeV ,  M , 6.510 * GeV ) " ,
     ] ,
     # =========================================================================
-    ## Prescales 
+    ## Prescales
     # =========================================================================
     'B2PsiPiPrescale'   : 1.0 ,
     'B2PsiKPrescale'    : 1.0 ,
@@ -194,8 +194,8 @@ _default_configuration_ = {
     'Lb2PsiPPiPiPiPrescale' : 1.0 ,
     #
     'Xib2PsiPKKPrescale'       : 1.0 ,
-    'Xib2PsiPKKpiPrescale'     : 1.0 ,    
-    'Omegab2PsiPKKKpiPrescale' : 1.0 ,    
+    'Xib2PsiPKKpiPrescale'     : 1.0 ,
+    'Omegab2PsiPKKKpiPrescale' : 1.0 ,
     #
     'B2PsiPPPrescale'       : 1.0 ,
     'B2PsiPPPiPrescale'     : 1.0 ,
@@ -206,15 +206,15 @@ _default_configuration_ = {
     # =========================================================================
     }
 ## ============================================================================
-## the mandatory element for stripping framework 
+## the mandatory element for stripping framework
 default_config = {
     #
     'NAME'        :   'PsiX'         ,
     'WGs'         : [ 'BandQ' ]              ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'PsiX_BQ_Conf'         ,
     'STREAMS'     : { 'Bhadron'    : [ 'StrippingB2PsiPiForPsiX'       ,
-                                       'StrippingB2PsiKForPsiX'        ,                                       
+                                       'StrippingB2PsiKForPsiX'        ,
                                        'StrippingB2Psi2PiForPsiX'      ,
                                        'StrippingB2Psi2KPiForPsiX'     ,
                                        'StrippingB2Psi2KForPsiX'       ,
@@ -242,14 +242,14 @@ default_config = {
                                        #
                                        'StrippingB2PsiPPForPsiX'       ,
                                        'StrippingB2PsiPPPiForPsiX'     ,
-                                       'StrippingB2PsiPPKForPsiX'      , 
+                                       'StrippingB2PsiPPKForPsiX'      ,
                                        'StrippingB2PsiPPPiPiForPsiX'   ,
                                        'StrippingB2PsiPPKPiPiForPsiX'  ,
-                                       'StrippingB2PsiPPPiPiPiForPsiX' ] } 
+                                       'StrippingB2PsiPPPiPiPiForPsiX' ] }
     }
 ## ============================================================================
 ## @class  PsiX_BQ_Conf
-#  psi(') X configuration file 
+#  psi(') X configuration file
 #  @author Vanya BELYAEV Ivan.Belyaev@itep.ru
 #  @date 2012-02-19
 class PsiX_BQ_Conf(LineBuilder) :
@@ -257,30 +257,30 @@ class PsiX_BQ_Conf(LineBuilder) :
     Helper class to configure 'PsiX'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    ## get the default configuration 
+
+    ## get the default configuration
     @staticmethod
     def defaultConfiguration( key = None ) :
         """
         Get the default/recommended configurtaion
-        
+
         >>> conf = PsiX.defaultConfiguration()
-        
+
         """
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__ ( self , name , config ) :
         """
         Constructor
         """
-        # check the names 
+        # check the names
         if 'PsiX' != name :
-            logger.warning ( 'The non-default name is specified "%s"' % name  ) 
-            
+            logger.warning ( 'The non-default name is specified "%s"' % name  )
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
 
@@ -290,57 +290,57 @@ class PsiX_BQ_Conf(LineBuilder) :
         else :
             LineBuilder.__init__( self , name ,  config )
 
-        ## private set of selections 
+        ## private set of selections
         self.__selections_ = {}
-        
+
         if not self.__selections_.has_key ( self.name() ) :
             self.__selections_[ self.name() ] = {}
-            
-        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config ) 
-        
+
+        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config )
+
         keys = _config.keys()
         for key in keys :
-            
+
             if not key in _default_configuration_ :
                 raise KeyError("Invalid key is specified: '%s'" % key )
-            
+
             val = _config[key]
-            if val != _default_configuration_ [ key ] : 
+            if val != _default_configuration_ [ key ] :
                 logger.debug ('new configuration: %-16s : %s ' % ( key , _config[key] ) )
-                
+
         self._name         = name
 
         for line in self._lines_psiX () :
             self.registerLine(line)
-            logger.debug ( "Register line: %s" %  line.name () ) 
-            
-            
-    ## get the selection, associated with some nickname name 
+            logger.debug ( "Register line: %s" %  line.name () )
+
+
+    ## get the selection, associated with some nickname name
     def _selection ( self , nick ) :
         """
         Get the selection, associated with some nickname name
         """
-        
+
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-            
-        return self.__selections_[ self.name() ].get( nick , None ) 
-    
-    ## add the selection, associated with some nickname name 
+            self.__selections_[ self.name() ] = {}
+
+        return self.__selections_[ self.name() ].get( nick , None )
+
+    ## add the selection, associated with some nickname name
     def _add_selection ( self , nick , sel ) :
         """
         add the selection, associated with some nickname name
         """
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-        
+            self.__selections_[ self.name() ] = {}
+
         if self.__selections_[ self.name()].has_key( nick ) :
             raise AttributeError , "Selection '%s'already exists " % nick
-        
+
         self.__selections_[ self.name() ][ nick ] = sel
-        
+
         return sel
-    
+
     ## the basic Mother cuts for all charged modea
     def _chargedB ( self ) :
         """
@@ -348,9 +348,9 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         return """
         ( chi2vxndf < 12  ) &
-        ( ( mbu_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) ) 
-        """ % ( self['CTAU'] , self['CTAU_BC'] ) 
-    
+        ( ( mbu_cut & ( ctau > %s ) ) | ( mbc_cut & ( ctau > %s ) ) )
+        """ % ( self['CTAU'] , self['CTAU_BC'] )
+
     ## the basic Mother cuts for all charged modea
     def _neutralB ( self ) :
         """
@@ -359,35 +359,35 @@ class PsiX_BQ_Conf(LineBuilder) :
         return """
         mb0_cut            &
         ( chi2vxndf < 10 ) &
-        ( ctau      > %s ) 
+        ( ctau      > %s )
         """ % self['CTAU']
-    
-    ## the basic Mother cuts for baryons 
+
+    ## the basic Mother cuts for baryons
     def _lambdaB ( self ) :
         """
-        The basic MotherCuts for baruons 
+        The basic MotherCuts for baruons
         """
         return """
         mlb_cut            &
         ( chi2vxndf < 10 ) &
-        ( ctau      > %s ) 
+        ( ctau      > %s )
         """ % self['CTAU']
-    
-    ## the basic Mother cuts for baryons 
+
+    ## the basic Mother cuts for baryons
     def _xiB ( self ) :
         """
-        The basic MotherCuts for baruons 
+        The basic MotherCuts for baruons
         """
         return """
         mxb_cut            &
         ( chi2vxndf < 10 ) &
-        ( ctau      > %s ) 
-        """ % self['CTAU'] 
+        ( ctau      > %s )
+        """ % self['CTAU']
 
-    ## get all single charm lines 
+    ## get all single charm lines
     def _lines_psiX   ( self ) :
         """
-        Get all psiX lines 
+        Get all psiX lines
         """
         sel = self._selection ( 'PsiX_Lines' )
         if sel : return sel
@@ -397,20 +397,20 @@ class PsiX_BQ_Conf(LineBuilder) :
             # =================================================================
             #
             ## 1h
-            #            
+            #
             StrippingLine (
             "B2PsiPiFor"    + self.name()              ,
-            prescale        = self ['B2PsiPiPrescale'] , 
+            prescale        = self ['B2PsiPiPrescale'] ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
             L0DU            = self ['L0DU'   ]         ,
             HLT             = self ['L0DU'   ]         ,
             algos           = [ self.psi_pi ()      ]  ) ,
-            ## 
+            ##
             StrippingLine (
             "B2PsiKFor"     + self.name()              ,
-            prescale        = self ['B2PsiKPrescale' ] , 
+            prescale        = self ['B2PsiKPrescale' ] ,
             checkPV         = self ['CheckPV']         ,
             FILTER          = self ['FILTER' ]         ,
             ODIN            = self ['ODIN'   ]         ,
@@ -422,17 +422,17 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi2PiFor"   + self.name()                ,
-            prescale        = self ['B2Psi2PiPrescale' ] , 
+            prescale        = self ['B2Psi2PiPrescale' ] ,
             checkPV         = self ['CheckPV']           ,
             FILTER          = self ['FILTER' ]           ,
             ODIN            = self ['ODIN'   ]           ,
             L0DU            = self ['L0DU'   ]           ,
             HLT             = self ['L0DU'   ]           ,
-            algos           = [ self.psi_2pi ()       ]  ) ,            
+            algos           = [ self.psi_2pi ()       ]  ) ,
             ##
             StrippingLine (
             "B2Psi2KPiFor"  + self.name()                 ,
-            prescale        = self ['B2Psi2KPiPrescale' ] , 
+            prescale        = self ['B2Psi2KPiPrescale' ] ,
             checkPV         = self ['CheckPV']            ,
             FILTER          = self ['FILTER' ]            ,
             ODIN            = self ['ODIN'   ]            ,
@@ -442,7 +442,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi2KFor"    + self.name()               ,
-            prescale        = self ['B2Psi2KPrescale' ] , 
+            prescale        = self ['B2Psi2KPrescale' ] ,
             checkPV         = self ['CheckPV']          ,
             FILTER          = self ['FILTER' ]          ,
             ODIN            = self ['ODIN'   ]          ,
@@ -454,17 +454,17 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi3KFor"    + self.name()               ,
-            prescale        = self ['B2Psi3KPrescale' ] , 
+            prescale        = self ['B2Psi3KPrescale' ] ,
             checkPV         = self ['CheckPV']          ,
             FILTER          = self ['FILTER' ]          ,
             ODIN            = self ['ODIN'   ]          ,
             L0DU            = self ['L0DU'   ]          ,
             HLT             = self ['L0DU'   ]          ,
-            algos           = [ self.psi_3K ()       ]  ) ,  
+            algos           = [ self.psi_3K ()       ]  ) ,
             ##
             StrippingLine (
             "B2Psi3PiFor"   + self.name()                ,
-            prescale        = self ['B2Psi3PiPrescale' ] , 
+            prescale        = self ['B2Psi3PiPrescale' ] ,
             checkPV         = self ['CheckPV']           ,
             FILTER          = self ['FILTER' ]           ,
             ODIN            = self ['ODIN'   ]           ,
@@ -474,7 +474,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             StrippingLine (
             "B2Psi3KPiFor"  + self.name()                 ,
-            prescale        = self ['B2Psi3KPiPrescale' ] , 
+            prescale        = self ['B2Psi3KPiPrescale' ] ,
             checkPV         = self ['CheckPV']            ,
             FILTER          = self ['FILTER' ]            ,
             ODIN            = self ['ODIN'   ]            ,
@@ -486,7 +486,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi4PiFor"   + self.name()                ,
-            prescale        = self ['B2Psi4PiPrescale' ] , 
+            prescale        = self ['B2Psi4PiPrescale' ] ,
             checkPV         = self ['CheckPV']           ,
             FILTER          = self ['FILTER' ]           ,
             ODIN            = self ['ODIN'   ]           ,
@@ -496,7 +496,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             StrippingLine (
             "B2Psi4KPiFor"  + self.name()                 ,
-            prescale        = self ['B2Psi4KPiPrescale' ] , 
+            prescale        = self ['B2Psi4KPiPrescale' ] ,
             checkPV         = self ['CheckPV']            ,
             FILTER          = self ['FILTER' ]            ,
             ODIN            = self ['ODIN'   ]            ,
@@ -506,7 +506,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             StrippingLine (
             "B2Psi4KFor"    + self.name()               ,
-            prescale        = self ['B2Psi4KPrescale' ] , 
+            prescale        = self ['B2Psi4KPrescale' ] ,
             checkPV         = self ['CheckPV']          ,
             FILTER          = self ['FILTER' ]          ,
             ODIN            = self ['ODIN'   ]          ,
@@ -518,7 +518,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi5PiFor"   + self.name()                ,
-            prescale        = self ['B2Psi5PiPrescale' ] , 
+            prescale        = self ['B2Psi5PiPrescale' ] ,
             checkPV         = self ['CheckPV']           ,
             FILTER          = self ['FILTER' ]           ,
             ODIN            = self ['ODIN'   ]           ,
@@ -528,7 +528,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             StrippingLine (
             "B2Psi5KPiFor"  + self.name()                 ,
-            prescale        = self ['B2Psi5KPiPrescale' ] , 
+            prescale        = self ['B2Psi5KPiPrescale' ] ,
             checkPV         = self ['CheckPV']            ,
             FILTER          = self ['FILTER' ]            ,
             ODIN            = self ['ODIN'   ]            ,
@@ -538,7 +538,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi5KFor"    + self.name()                 ,
-            prescale        = self ['B2Psi5KPrescale'   ] , 
+            prescale        = self ['B2Psi5KPrescale'   ] ,
             checkPV         = self ['CheckPV']            ,
             FILTER          = self ['FILTER' ]            ,
             ODIN            = self ['ODIN'   ]            ,
@@ -550,7 +550,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi6PiFor"   + self.name()                ,
-            prescale        = self ['B2Psi6PiPrescale' ] , 
+            prescale        = self ['B2Psi6PiPrescale' ] ,
             checkPV         = self ['CheckPV']           ,
             FILTER          = self ['FILTER' ]           ,
             ODIN            = self ['ODIN'   ]           ,
@@ -560,7 +560,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             StrippingLine (
             "B2Psi6KPiFor"  + self.name()                 ,
-            prescale        = self [ 'B2Psi6KPiPrescale' ], 
+            prescale        = self [ 'B2Psi6KPiPrescale' ],
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -573,7 +573,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2Psi7PiFor"   + self.name()                ,
-            prescale        = self ['B2Psi7PiPrescale' ] , 
+            prescale        = self ['B2Psi7PiPrescale' ] ,
             checkPV         = self ['CheckPV']           ,
             FILTER          = self ['FILTER' ]           ,
             ODIN            = self ['ODIN'   ]           ,
@@ -583,7 +583,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             StrippingLine (
             "B2Psi7KPiFor"  + self.name()                 ,
-            prescale        = self [ 'B2Psi7KPiPrescale' ], 
+            prescale        = self [ 'B2Psi7KPiPrescale' ],
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -595,17 +595,17 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "Lb2PsiPKFor"   + self.name()                 ,
-            prescale        = self [ 'Lb2PsiPKPrescale'  ] , 
+            prescale        = self [ 'Lb2PsiPKPrescale'  ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
             L0DU            = self [ 'L0DU'    ]          ,
             HLT             = self [ 'L0DU'    ]          ,
             algos           = [ self.psi_pK ()         ]  ) ,
-            #            
+            #
             StrippingLine (
             "Lb2PsiPPiFor"  + self.name()                 ,
-            prescale        = self [ 'Lb2PsiPPiPrescale' ] , 
+            prescale        = self [ 'Lb2PsiPPiPrescale' ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -615,7 +615,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "Lb2PsiPKPiPiFor"  + self.name()                 ,
-            prescale        = self [ 'Lb2PsiPKPiPiPrescale' ] , 
+            prescale        = self [ 'Lb2PsiPKPiPiPrescale' ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -626,7 +626,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "Lb2PsiPPiPiPiFor"  + self.name()                 ,
-            prescale        = self [ 'Lb2PsiPPiPiPiPrescale' ] , 
+            prescale        = self [ 'Lb2PsiPPiPiPiPrescale' ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -636,17 +636,17 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "Xib2PsiPKKFor"  + self.name()                  ,
-            prescale        = self [ 'Xib2PsiPKKPrescale' ] , 
+            prescale        = self [ 'Xib2PsiPKKPrescale' ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
             L0DU            = self [ 'L0DU'    ]          ,
             HLT             = self [ 'L0DU'    ]          ,
             algos           = [ self.psi_pKK   ()      ]  ) ,
-            #            
+            #
             StrippingLine (
             "Xib2PsiPKKpiFor"  + self.name()                  ,
-            prescale        = self [ 'Xib2PsiPKKpiPrescale' ] , 
+            prescale        = self [ 'Xib2PsiPKKpiPrescale' ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -656,7 +656,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "Omegab2PsiPKKKpiFor"  + self.name()                  ,
-            prescale        = self [ 'Omegab2PsiPKKKpiPrescale' ] , 
+            prescale        = self [ 'Omegab2PsiPKKKpiPrescale' ] ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -668,7 +668,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2PsiPPFor"    + self.name()                 ,
-            prescale        = self [ 'B2PsiPPPrescale' ]  , 
+            prescale        = self [ 'B2PsiPPPrescale' ]  ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -678,7 +678,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2PsiPPPiFor"  + self.name()                 ,
-            prescale        = self [ 'B2PsiPPPiPrescale' ]  , 
+            prescale        = self [ 'B2PsiPPPiPrescale' ]  ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -688,7 +688,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2PsiPPKFor"  + self.name()                 ,
-            prescale        = self [ 'B2PsiPPKPrescale' ]  , 
+            prescale        = self [ 'B2PsiPPKPrescale' ]  ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -698,7 +698,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2PsiPPPiPiFor"  + self.name()                 ,
-            prescale        = self [ 'B2PsiPPPiPiPrescale' ]  , 
+            prescale        = self [ 'B2PsiPPPiPiPrescale' ]  ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -708,7 +708,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2PsiPPKPiPiFor"  + self.name()                 ,
-            prescale        = self [ 'B2PsiPPKPiPiPrescale' ]  , 
+            prescale        = self [ 'B2PsiPPKPiPiPrescale' ]  ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
@@ -718,40 +718,40 @@ class PsiX_BQ_Conf(LineBuilder) :
             #
             StrippingLine (
             "B2PsiPPPiPiPiFor"  + self.name()                 ,
-            prescale        = self [ 'B2PsiPPPiPiPiPrescale' ]  , 
+            prescale        = self [ 'B2PsiPPPiPiPiPrescale' ]  ,
             checkPV         = self [ 'CheckPV' ]          ,
             FILTER          = self [ 'FILTER'  ]          ,
             ODIN            = self [ 'ODIN'    ]          ,
             L0DU            = self [ 'L0DU'    ]          ,
             HLT             = self [ 'L0DU'    ]          ,
-            algos           = [ self.psi_pppipipi ()       ]  ) 
-            #            
+            algos           = [ self.psi_pppipipi ()       ]  )
+            #
             ]
-            ## 
-        return self._add_selection ( 'PsiX_Lines' , sel ) 
-    
+            ##
+        return self._add_selection ( 'PsiX_Lines' , sel )
+
     ## get the selections
     def _selections_private ( self ) :
-        
+
         sel = self._selection ( 'Selections' )
         if sel : return sel
-        
+
         sel =  [
-            ## basic 
+            ## basic
             self.muons        () ,
             self.pions        () ,
             self.kaons        () ,
             self.protons      () ,
             ## composite
             self.psi          () ,
-            ## beauty 
+            ## beauty
             self.psi_pi       () ,
             self.psi_K        () ,
             #
             self.psi_2pi      () ,
             self.psi_2Kpi     () ,
             self.psi_2K       () ,
-            ## 
+            ##
             self.psi_3pi      () ,
             self.psi_3K       () ,
             self.psi_3Kpi     () ,
@@ -778,7 +778,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             self.psi_pKK      () ,
             self.psi_pKKpi    () ,
             self.psi_pKKKpi   () ,
-            ## 
+            ##
             self.psi_pp       () ,
             self.psi_pppi     () ,
             self.psi_ppK      () ,
@@ -786,20 +786,20 @@ class PsiX_BQ_Conf(LineBuilder) :
             self.psi_ppKpipi  () ,
             self.psi_pppipipi () ,
             ]
-        
+
         return self._add_selection ( 'Selections' , sel )
-    
+
     # =========================================================================
     ## pure technical method for creation of selections
     # =========================================================================
     def make_selection ( self      ,
-                         tag       , 
+                         tag       ,
                          algotype  ,
-                         inputs    , 
+                         inputs    ,
                          *args     ,
                          **kwargs  ) :
         """
-        Technical method for creation of 1-step selections 
+        Technical method for creation of 1-step selections
         """
         sel_tag  = '%s_Selection' % tag
         sel_name = 'Sel%sFor%s'   % ( tag , self.name() )
@@ -807,7 +807,7 @@ class PsiX_BQ_Conf(LineBuilder) :
         ## check existing selection
         #
         sel      = self._selection ( sel_tag )
-        if sel : return sel 
+        if sel : return sel
 
         #
         ## adjust a bit the arguments
@@ -815,32 +815,32 @@ class PsiX_BQ_Conf(LineBuilder) :
             kwargs ['Preambulo'        ] = self['Preambulo']
 
         if not kwargs.has_key ( 'ParticleCombiners' ) :
-            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' } 
-                          
-        # 
+            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' }
+
+        #
         ## use "simple-selection"
         #
         from PhysSelPython.Wrappers import SimpleSelection
         sel = SimpleSelection (
             sel_name ,
             algotype ,
-            inputs   , 
+            inputs   ,
             *args    ,
             **kwargs )
-        # 
-        return self._add_selection( sel_tag , sel ) 
-        
-    ## muons 
-    def muons     ( self ) :    
+        #
+        return self._add_selection( sel_tag , sel )
+
+    ## muons
+    def muons     ( self ) :
         from StandardParticles import StdLooseMuons
         return StdLooseMuons
-    
+
     # ========================================================================
     ## pions :
     # ========================================================================
     def pions    ( self ) :
         """
-        Pions for   B -> psi X lines 
+        Pions for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         ##
@@ -849,7 +849,7 @@ class PsiX_BQ_Conf(LineBuilder) :
             pioncut = self['PionCut']
         else                    :
             from StandardParticles import StdAllLooseANNPions as inpts
-            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] ) 
+            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] )
         ##
         return self.make_selection (
             'Pion'                 ,
@@ -857,22 +857,22 @@ class PsiX_BQ_Conf(LineBuilder) :
             [ inpts ]              ,
             Code = pioncut         ,
             )
-    
+
     # ========================================================================
     ## kaons :
     # ========================================================================
     def kaons     ( self ) :
         """
-        Kaons for   B -> psi X lines 
+        Kaons for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        ## 
+        ##
         if self['NOPIDHADRONS'] :
             from StandardParticles import   StdAllNoPIDsKaons as inpts
             kaoncut = self['KaonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNKaons as inpts 
-            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNKaons as inpts
+            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] )
         #
         ##
         return self.make_selection (
@@ -887,15 +887,15 @@ class PsiX_BQ_Conf(LineBuilder) :
     # ========================================================================
     def protons    ( self ) :
         """
-        protons for   B -> psi X lines 
+        protons for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         if self['NOPIDHADRONS'] :
             from StandardParticles import   StdAllNoPIDsProtons as inpts
             protoncut = self['ProtonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNProtons as inpts 
-            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNProtons as inpts
+            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] )
         ##
         return self.make_selection (
             'Proton'                 ,
@@ -909,53 +909,53 @@ class PsiX_BQ_Conf(LineBuilder) :
     # =========================================================================
     def psi ( self ) :
         """
-        psi(') -> mu+ mu- 
+        psi(') -> mu+ mu-
         """
         psi_name = 'Psi'
         sel_name = 'Sel%sFor%s' % ( psi_name , self.name() )
         sel_tag  = '%s_Selection'
-        sel      = self._selection ( sel_tag ) 
-        if sel  : return sel 
-        
+        sel      = self._selection ( sel_tag )
+        if sel  : return sel
+
         dimu_lines = self['DIMUONLINES']
         if not dimu_lines :
-            ## 
+            ##
             from GaudiConfUtils.ConfigurableGenerators import CombineParticles
             ##
             return self.make_selection (
                 psi_name         ,
                 CombineParticles ,
                 [ self.muons() ] ,
-                ## 
+                ##
                 DecayDescriptor = " J/psi(1S) -> mu+ mu- " ,
                 ##
                 DaughtersCuts   = {
-                'mu+'   :  self [ 'MuonCut' ] 
+                'mu+'   :  self [ 'MuonCut' ]
                 } ,
-                ## 
+                ##
                 CombinationCut  = """
-                ( ADAMASS  ( 'J/psi(1S)' ) < 120 * MeV ) | 
-                ( ADAMASS  (   'psi(2S)' ) < 120 * MeV ) 
+                ( ADAMASS  ( 'J/psi(1S)' ) < 120 * MeV ) |
+                ( ADAMASS  (   'psi(2S)' ) < 120 * MeV )
                 """ ,
                 ##
                 MotherCut       = """
                 chi2vx < 20
-                """ 
+                """
                 )
 
-        ## list of lines 
-        from PhysSelPython.Wrappers import AutomaticData 
+        ## list of lines
+        from PhysSelPython.Wrappers import AutomaticData
         if 1 < len( dimu_lines ) :
-            lines = [ AutomaticData ( l ) for l in dimu_lines ] 
+            lines = [ AutomaticData ( l ) for l in dimu_lines ]
             from PhysSelPython.Wrappers import MergedSelection
-            sel = MergedSelection ( sel_name , RequiredSelections = lines ) 
-            return self._add_selection ( sel_tag , sel ) 
+            sel = MergedSelection ( sel_name , RequiredSelections = lines )
+            return self._add_selection ( sel_tag , sel )
 
-        ## single line  
+        ## single line
         dimu_line = dimu_lines[0]
-        sel = AutomaticData ( dimu_line ) 
-        return self._add_selection ( sel_tag , sel ) 
-        
+        sel = AutomaticData ( dimu_line )
+        return self._add_selection ( sel_tag , sel )
+
     # =========================================================================
     # B -> psi(') K
     # =========================================================================
@@ -965,11 +965,11 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiK'                        ,
-            ## algorithm type to be used 
+            ## algorithm type to be used
             CombineParticles              ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons() ] ,
             #
             ## algorithm configuration
@@ -977,25 +977,25 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) K+ ]cc" ,
             ##
             CombinationCut  = " mbu_acut | mbc_acut "    ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
-    
+
     # =========================================================================
     ## B -> psi(') pi
     # =========================================================================
     def psi_pi ( self ) :
         """
-        B -> psi(') pi 
+        B -> psi(') pi
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPi'                       ,
-            ## algorithm type to be used 
+            ## algorithm type to be used
             CombineParticles              ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -1003,25 +1003,25 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) pi+ ]cc"  ,
             ##
             CombinationCut  = " mbu_acut | mbc_acut "     ,
-            ## 
-            MotherCut       = self._chargedB() 
             ##
-            )    
-    
+            MotherCut       = self._chargedB()
+            ##
+            )
+
     # =========================================================================
-    # B -> psi(') K+ K- 
+    # B -> psi(') K+ K-
     # =========================================================================
     def psi_2K ( self ) :
         """
         B -> psi(') K+ K-
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi2K'                       ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons() ] ,
             #
             ## algorithm configuration
@@ -1029,30 +1029,30 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = " B0 -> J/psi(1S) K+ K- " ,
             ##
             Combination12Cut = """ ( AM < mb0_ahigh )   &
-            ( ACHI2DOCA(1,2) < 20 )  
-            """  , 
+            ( ACHI2DOCA(1,2) < 20 )
+            """  ,
             CombinationCut   = """        mb0_acut      &
             ( ACHI2DOCA(1,3) < 20 ) &
-            ( ACHI2DOCA(2,3) < 20 ) 
+            ( ACHI2DOCA(2,3) < 20 )
             """  ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
-    
+
     # =========================================================================
-    # B -> psi(') K+ pi- 
+    # B -> psi(') K+ pi-
     # =========================================================================
     def psi_2Kpi ( self ) :
         """
         B -> psi(') K+ K-
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi2KPi'                     ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -1060,30 +1060,30 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[ B0 -> J/psi(1S) K+ pi-]cc" ,
             ##
             Combination12Cut = """ ( AM < mb0_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             CombinationCut   = """        mb0_acut     &
-            ( ACHI2DOCA(1,3) <  20 ) &   
-            ( ACHI2DOCA(2,3) <  20 )   
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
-    
+
     # =========================================================================
-    # B -> psi(') pi+ pi- 
+    # B -> psi(') pi+ pi-
     # =========================================================================
     def psi_2pi ( self ) :
         """
         B -> psi(') pi+ pi-
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi2Pi'                      ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -1091,14 +1091,14 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "B0 -> J/psi(1S) pi+ pi-"  ,
             ##
             Combination12Cut = """ ( AM < mb0_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             CombinationCut   = """        mb0_acut     &
-            ( ACHI2DOCA(1,3) <  20 ) &   
-            ( ACHI2DOCA(2,3) <  20 )   
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
     # ========================================================================
@@ -1106,16 +1106,16 @@ class PsiX_BQ_Conf(LineBuilder) :
     # ========================================================================
     def psi_3K ( self ) :
         """
-        B -> psi(') 3K        
+        B -> psi(') 3K
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi3K'                       ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () ] ,
             #
             ## algorithm configuration
@@ -1123,19 +1123,19 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) K+ K+ K-]cc"  ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) &  
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
     # ========================================================================
@@ -1146,13 +1146,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 3Kpi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi3KPi'                     ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1164,19 +1164,19 @@ class PsiX_BQ_Conf(LineBuilder) :
             ],
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
 
@@ -1188,13 +1188,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 3pi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi3Pi'                      ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1202,19 +1202,19 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) pi+ pi+ pi-]cc" ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
 
@@ -1227,13 +1227,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 4K
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi4k'                       ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () ] ,
             #
             ## algorithm configuration
@@ -1241,25 +1241,25 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor    = "B_s0 -> J/psi(1S) K+ K+ K- K-"  ,
             ##
             Combination12Cut   = """ ( AM < mb0_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut  = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut  = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
             CombinationCut   = """  mb0_acut  &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
     # ========================================================================
@@ -1270,13 +1270,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 4Kpi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi4KPi'                     ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1288,25 +1288,25 @@ class PsiX_BQ_Conf(LineBuilder) :
             ],
             ##
             Combination12Cut  = """  ( AM < mb0_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut  = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut  = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
             CombinationCut   = """  mb0_acut  &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
     # ========================================================================
@@ -1317,13 +1317,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 4pi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi4Pi'                      ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1331,25 +1331,25 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor   = "B0 -> J/psi(1S) pi+ pi+ pi- pi-" ,
             ##
             Combination12Cut  = """  ( AM < mb0_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut  = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) & 
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ ,            
-            Combination1234Cut = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,4) <  20 ) & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut  = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
             CombinationCut   = """  mb0_acut &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
-            ( ACHI2DOCA(3,5) <  20 ) & 
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(3,5) <  20 ) &
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
 
@@ -1358,16 +1358,16 @@ class PsiX_BQ_Conf(LineBuilder) :
     # ========================================================================
     def psi_5K ( self ) :
         """
-        B -> psi(') 5K        
+        B -> psi(') 5K
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi5K'                       ,
             ## algorithm type to be used
             DaVinci__N6BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () ] ,
             #
             ## algorithm configuration
@@ -1375,32 +1375,32 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B_c+ -> J/psi(1S) K+ K+ K+ K- K-]cc"  ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) &  
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,4) <  20 ) &  
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ ,            
-            Combination12345Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,5) <  20 ) &  
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
-            ( ACHI2DOCA(3,5) <  20 ) &  
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(3,5) <  20 ) &
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
-            ( ACHI2DOCA(1,6) <  20 ) &  
+            ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
-            ( ACHI2DOCA(3,6) <  20 ) &  
+            ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
             ##
-            MotherCut       = self._chargedB() 
+            MotherCut       = self._chargedB()
             )
 
     # ========================================================================
@@ -1411,13 +1411,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 5Kpi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi5KPi'                     ,
             ## algorithm type to be used
             DaVinci__N6BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1426,36 +1426,36 @@ class PsiX_BQ_Conf(LineBuilder) :
             "[B+ -> J/psi(1S) K+ pi+ pi+ pi- pi-]cc" ,
             "[B+ -> J/psi(1S) K+ pi+ pi+ K-  pi-]cc" ,
             "[B+ -> J/psi(1S) K+ K+  pi+ K-  pi-]cc" ,
-            "[B+ -> J/psi(1S) K+ K+  pi+ K-  K- ]cc" 
+            "[B+ -> J/psi(1S) K+ K+  pi+ K-  K- ]cc"
             ],
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) &  
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,4) <  20 ) &  
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ ,            
-            Combination12345Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,5) <  20 ) &  
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
-            ( ACHI2DOCA(3,5) <  20 ) &  
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(3,5) <  20 ) &
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
-            ( ACHI2DOCA(1,6) <  20 ) &  
+            ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
-            ( ACHI2DOCA(3,6) <  20 ) &  
+            ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
 
@@ -1468,13 +1468,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 5pi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi5Pi'                      ,
             ## algorithm type to be used
             DaVinci__N6BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1483,39 +1483,39 @@ class PsiX_BQ_Conf(LineBuilder) :
             ##
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )    &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )    & 
-            ( ACHI2DOCA(1,3) <  20 ) &  
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mbc_ahigh )    & 
-            ( ACHI2DOCA(1,4) <  20 ) &  
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )    &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mbc_ahigh )    &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ ,            
-            Combination12345Cut = """ ( AM < mbc_ahigh )    & 
-            ( ACHI2DOCA(1,5) <  20 ) &  
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut = """ ( AM < mbc_ahigh )    &
+            ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
-            ( ACHI2DOCA(3,5) <  20 ) &  
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(3,5) <  20 ) &
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
-            ( ACHI2DOCA(1,6) <  20 ) &  
+            ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
-            ( ACHI2DOCA(3,6) <  20 ) &  
+            ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
-    
+
     # ========================================================================
     # B -> psi(') 6K
     # ========================================================================
-    
+
     # ========================================================================
     # B -> psi(') 6Kpi
     # ========================================================================
@@ -1524,13 +1524,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 6Kpi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N7BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi6KPi'                     ,
             ## algorithm type to be used
             DaVinci__N7BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1543,40 +1543,40 @@ class PsiX_BQ_Conf(LineBuilder) :
             ],
             ##
             Combination12Cut     = """  ( AM < mb0_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut    = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut    = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut   = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut   = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ , 
-            Combination12345Cut  = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut  = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
-            """ , 
-            Combination123456Cut = """ ( AM < mb0_ahigh )      & 
+            ( ACHI2DOCA(4,5) <  20 )
+            """ ,
+            Combination123456Cut = """ ( AM < mb0_ahigh )      &
             ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
-            ( ACHI2DOCA(3,6) <  20 ) & 
+            ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(5,6) <  20 )
+            """ ,
             CombinationCut   = """  mb0_acut  &
             ( ACHI2DOCA(1,7) <  20 ) &
             ( ACHI2DOCA(2,7) <  20 ) &
             ( ACHI2DOCA(3,7) <  20 ) &
             ( ACHI2DOCA(4,7) <  20 ) &
             ( ACHI2DOCA(5,7) <  20 ) &
-            ( ACHI2DOCA(6,7) <  20 ) 
+            ( ACHI2DOCA(6,7) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
     # ========================================================================
@@ -1587,13 +1587,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 6pi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N7BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi6Pi'                      ,
             ## algorithm type to be used
             DaVinci__N7BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1601,40 +1601,40 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor   = "B0 -> J/psi(1S) pi+ pi+ pi+ pi- pi- pi-" ,
             ##
             Combination12Cut  = """  ( AM < mb0_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut  = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) & 
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ ,            
-            Combination1234Cut = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,4) <  20 ) & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut  = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            Combination12345Cut = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,5) <  20 ) & 
+            Combination12345Cut = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
-            Combination123456Cut = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,6) <  20 ) & 
+            Combination123456Cut = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
             ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
             CombinationCut   = """  mb0_acut &
-            ( ACHI2DOCA(1,7) <  20 ) & 
+            ( ACHI2DOCA(1,7) <  20 ) &
             ( ACHI2DOCA(2,7) <  20 ) &
             ( ACHI2DOCA(3,7) <  20 ) &
             ( ACHI2DOCA(4,7) <  20 ) &
-            ( ACHI2DOCA(5,7) <  20 ) & 
+            ( ACHI2DOCA(5,7) <  20 ) &
             ( ACHI2DOCA(6,7) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
 
@@ -1647,13 +1647,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 6Kpi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N8BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi7KPi'                     ,
             ## algorithm type to be used
             DaVinci__N8BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.kaons () , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1662,44 +1662,44 @@ class PsiX_BQ_Conf(LineBuilder) :
             "[B_c+ -> J/psi(1S) K+ pi+ pi+ pi+ pi- pi- pi-]cc" , ## 1K
             "[B_c+ -> J/psi(1S) K+ pi+ pi+ pi+  K- pi- pi-]cc" , ## 2K
             "[B_c+ -> J/psi(1S) K+ K+  pi+ pi+  K- pi- pi-]cc" , ## 3K
-            "[B_c+ -> J/psi(1S) K+ K+  pi+ pi+  K-  K- pi-]cc" , ## 4K 
-            "[B_c+ -> J/psi(1S) K+ K+  K+  pi+  K-  K- pi-]cc" , ## 5K 
+            "[B_c+ -> J/psi(1S) K+ K+  pi+ pi+  K-  K- pi-]cc" , ## 4K
+            "[B_c+ -> J/psi(1S) K+ K+  K+  pi+  K-  K- pi-]cc" , ## 5K
             "[B_c+ -> J/psi(1S) K+ K+  K+  pi+  K-  K-  K-]cc" , ## 6K
             ],
             ##
             Combination12Cut     = """ ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut    = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut    = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut   = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut   = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ , 
-            Combination12345Cut  = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut  = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
-            """ , 
-            Combination123456Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(4,5) <  20 )
+            """ ,
+            Combination123456Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
-            ( ACHI2DOCA(3,6) <  20 ) & 
+            ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
-            """ , 
-            Combination1234567Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(5,6) <  20 )
+            """ ,
+            Combination1234567Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,7) <  20 ) &
             ( ACHI2DOCA(2,7) <  20 ) &
-            ( ACHI2DOCA(3,7) <  20 ) & 
+            ( ACHI2DOCA(3,7) <  20 ) &
             ( ACHI2DOCA(4,7) <  20 ) &
             ( ACHI2DOCA(5,7) <  20 ) &
-            ( ACHI2DOCA(6,7) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(6,7) <  20 )
+            """ ,
             CombinationCut   = """  mbc_acut  &
             ( ACHI2DOCA(1,8) <  20 ) &
             ( ACHI2DOCA(2,8) <  20 ) &
@@ -1707,10 +1707,10 @@ class PsiX_BQ_Conf(LineBuilder) :
             ( ACHI2DOCA(4,8) <  20 ) &
             ( ACHI2DOCA(5,8) <  20 ) &
             ( ACHI2DOCA(6,8) <  20 ) &
-            ( ACHI2DOCA(7,8) <  20 ) 
+            ( ACHI2DOCA(7,8) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
 
@@ -1722,13 +1722,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         B -> psi(') 7pi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N8BodyDecays
-        ## 
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'Psi7Pi'                      ,
             ## algorithm type to be used
             DaVinci__N8BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.pions () ] ,
             #
             ## algorithm configuration
@@ -1736,56 +1736,56 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor   = "[B_c+ -> J/psi(1S) pi+ pi+ pi+ pi+ pi- pi- pi-]cc" ,
             ##
             Combination12Cut  = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut  = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) & 
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ ,            
-            Combination1234Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,4) <  20 ) & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut  = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            Combination12345Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,5) <  20 ) & 
+            Combination12345Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
-            Combination123456Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,6) <  20 ) & 
+            Combination123456Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
             ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
-            Combination1234567Cut = """ ( AM < mbc_ahigh )      & 
-            ( ACHI2DOCA(1,7) <  20 ) & 
+            Combination1234567Cut = """ ( AM < mbc_ahigh )      &
+            ( ACHI2DOCA(1,7) <  20 ) &
             ( ACHI2DOCA(2,7) <  20 ) &
             ( ACHI2DOCA(3,7) <  20 ) &
             ( ACHI2DOCA(4,7) <  20 ) &
             ( ACHI2DOCA(5,7) <  20 ) &
-            ( ACHI2DOCA(6,7) <  20 ) 
+            ( ACHI2DOCA(6,7) <  20 )
             """ ,
             CombinationCut   = """  mbc_acut &
-            ( ACHI2DOCA(1,8) <  20 ) & 
+            ( ACHI2DOCA(1,8) <  20 ) &
             ( ACHI2DOCA(2,8) <  20 ) &
             ( ACHI2DOCA(3,8) <  20 ) &
             ( ACHI2DOCA(4,8) <  20 ) &
-            ( ACHI2DOCA(5,8) <  20 ) & 
-            ( ACHI2DOCA(6,8) <  20 ) & 
+            ( ACHI2DOCA(5,8) <  20 ) &
+            ( ACHI2DOCA(6,8) <  20 ) &
             ( ACHI2DOCA(7,8) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
 
     # ===========================================================================
-    # make use of protons 
+    # make use of protons
     # =========================================================================
-    
+
     # =========================================================================
     # Lb -> psi(') pK
     # =========================================================================
@@ -1793,13 +1793,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         Lb -> psi(') pK
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPK'                      ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() ] ,
             #
             ## algorithm configuration
@@ -1807,14 +1807,14 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[Lambda_b0 -> J/psi(1S) p+ K-]cc" ,
             ##
             Combination12Cut = """ ( AM < mlb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             CombinationCut   = """        mlb_acut     &
-            ( ACHI2DOCA(1,3) <  20 ) &   
-            ( ACHI2DOCA(2,3) <  20 )   
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
             """   ,
             ##
-            MotherCut       = self._lambdaB() 
+            MotherCut       = self._lambdaB()
             )
 
     # =========================================================================
@@ -1824,13 +1824,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         Lb -> psi(') p pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPPi'                      ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -1838,14 +1838,14 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[Lambda_b0 -> J/psi(1S) p+ pi-]cc" ,
             ##
             Combination12Cut = """ ( AM < mlb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             CombinationCut   = """        mlb_acut     &
-            ( ACHI2DOCA(1,3) <  20 ) &   
-            ( ACHI2DOCA(2,3) <  20 )   
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._lambdaB() 
+            ##
+            MotherCut       = self._lambdaB()
             )
 
     # =========================================================================
@@ -1855,13 +1855,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         Lb -> psi(') pK pi pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPKpipi'                   ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -1869,25 +1869,25 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor    = "[Lambda_b0 -> J/psi(1S) p+ K- pi+ pi- ]cc" ,
             ##
             Combination12Cut   = """ ( AM < mlb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             Combination123Cut  = """ ( AM < mlb_ahigh )  &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """  ,
             Combination1234Cut = """ ( AM < mlb_ahigh )  &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(3,4) <  20 )
+            """  ,
             CombinationCut   = """        mlb_acut       &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._lambdaB() 
+            ##
+            MotherCut       = self._lambdaB()
             )
 
 
@@ -1901,13 +1901,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         The signal observed by Anton Polurkotov
         see https://indico.cern.ch/event/350830/
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPKK'                   ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() ] ,
             #
             ## algorithm configuration
@@ -1915,22 +1915,22 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptors   = [
             "[Xi_b- -> J/psi(1S) p+ K- K- ]cc" ,
             "[Xi_b- -> J/psi(1S) p+ K- K+ ]cc" , ## and wrong sign also
-            ] , 
+            ] ,
             ##
             Combination12Cut   = """ ( AM < mxb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             Combination123Cut  = """ ( AM < mxb_ahigh )  &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """  ,
             CombinationCut   = """          mxb_acut     &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._xiB() 
+            ##
+            MotherCut       = self._xiB()
             )
 
     # =========================================================================
@@ -1939,13 +1939,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         Xib0 -> psi(') pKK pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPKKpi'                   ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -1954,28 +1954,28 @@ class PsiX_BQ_Conf(LineBuilder) :
             "[Xi_b0 -> J/psi(1S) p+ K- K- pi+ ]cc" ,
             "[Xi_b0 -> J/psi(1S) p+ K- K+ pi+ ]cc" , ## and wrong sign also
             "[Xi_b0 -> J/psi(1S) p+ K- K+ pi- ]cc" , ## and wrong sign also
-            ] , 
+            ] ,
             ##
             Combination12Cut   = """ ( AM < mxb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             Combination123Cut  = """ ( AM < mxb_ahigh )  &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """  ,
             Combination1234Cut = """ ( AM < mxb_ahigh )  &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(3,4) <  20 )
+            """  ,
             CombinationCut   = """          mxb_acut     &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._xiB() 
+            ##
+            MotherCut       = self._xiB()
             )
 
     # =========================================================================
@@ -1984,51 +1984,51 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         Omega_b0 -> psi(') pKKK pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPKKKpi'                   ,
             ## algorithm type to be used
             DaVinci__N6BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() , self.pions() ] ,
             #
             ## algorithm configuration
             #
             DecayDescriptors   = [
             "[Omega_b- -> J/psi(1S) p+ K- K- K- pi+ ]cc" ,
-            "[Omega_b- -> J/psi(1S) p+ K- K- K+ pi- ]cc" , ## wrong sign 
+            "[Omega_b- -> J/psi(1S) p+ K- K- K+ pi- ]cc" , ## wrong sign
             ] ,
             ##
             Combination12Cut   = """ ( AM < mxb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             Combination123Cut  = """ ( AM < mxb_ahigh )  &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """  ,
             Combination1234Cut = """ ( AM < mxb_ahigh )  &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(3,4) <  20 )
+            """  ,
             Combination12345Cut = """ ( AM < mxb_ahigh )  &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """   ,
             CombinationCut   = """          mxb_acut     &
             ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
             ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._xiB() 
+            ##
+            MotherCut       = self._xiB()
             )
-    
+
     # =========================================================================
     # Lb -> psi(') p pipipi
     # =========================================================================
@@ -2036,13 +2036,13 @@ class PsiX_BQ_Conf(LineBuilder) :
         """
         Lb -> psi(') p pipipi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPpipipi'                  ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -2050,42 +2050,42 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor    = "[Lambda_b0 -> J/psi(1S) p+ pi+ pi- pi- ]cc" ,
             ##
             Combination12Cut   = """ ( AM < mlb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             Combination123Cut  = """ ( AM < mlb_ahigh )  &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """  ,
             Combination1234Cut = """ ( AM < mlb_ahigh )  &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(3,4) <  20 )
+            """  ,
             CombinationCut   = """        mlb_acut       &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._lambdaB() 
+            ##
+            MotherCut       = self._lambdaB()
             )
-    
-    
+
+
     # =========================================================================
     # B -> psi(') pp
-    # =========================================================================    
+    # =========================================================================
     def psi_pp ( self ) :
         """
         B -> psi(') pp
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPP'                       ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() ] ,
             #
             ## algorithm configuration
@@ -2093,30 +2093,30 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "B_s0 -> J/psi(1S) p+ p~-" ,
             ##
             Combination12Cut = """ ( AM < mlb_ahigh )  &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """  , 
+            ( ACHI2DOCA(1,2) <  20 )
+            """  ,
             CombinationCut   = """        mlb_acut     &
-            ( ACHI2DOCA(1,3) <  20 ) &   
-            ( ACHI2DOCA(2,3) <  20 )   
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
             """   ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
-    
+
     # =========================================================================
     # B -> psi(') pp pi
-    # =========================================================================    
+    # =========================================================================
     def psi_pppi( self ) :
         """
         B -> psi(') pp pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPPpi'                     ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -2124,35 +2124,35 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) p+ p~- pi+]cc" ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
     # =========================================================================
     # B -> psi(') pp pi
-    # =========================================================================    
+    # =========================================================================
     def psi_ppK( self ) :
         """
         B -> psi(') pp K
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPPK'                   ,
             ## algorithm type to be used
             DaVinci__N4BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() ] ,
             #
             ## algorithm configuration
@@ -2160,36 +2160,36 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) p+ p~- K+]cc" ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
 
     # =========================================================================
     # B -> psi(') pp pipi
-    # =========================================================================    
+    # =========================================================================
     def psi_pppipi( self ) :
         """
         B -> psi(') pp pi pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPPpipi'                   ,
             ## algorithm type to be used
             DaVinci__N5BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -2197,42 +2197,42 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "B_s0 -> J/psi(1S) p+ p~- pi+ pi-" ,
             ##
             Combination12Cut  = """  ( AM < mb0_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut  = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,3) <  20 ) & 
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ ,            
-            Combination1234Cut = """ ( AM < mb0_ahigh )      & 
-            ( ACHI2DOCA(1,4) <  20 ) & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut  = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,3) <  20 ) &
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mb0_ahigh )      &
+            ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
+            ( ACHI2DOCA(3,4) <  20 )
             """ ,
             CombinationCut   = """  mb0_acut &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
-            ( ACHI2DOCA(3,5) <  20 ) & 
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(3,5) <  20 ) &
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._neutralB() 
+            ##
+            MotherCut       = self._neutralB()
             )
 
 
     # =========================================================================
     # B -> psi(') pp pipipi
-    # =========================================================================    
+    # =========================================================================
     def psi_pppipipi( self ) :
         """
         B -> psi(') pp pi pi pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPPpipipi'                     ,
             ## algorithm type to be used
             DaVinci__N6BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -2240,48 +2240,48 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor = "[B+ -> J/psi(1S) p+ p~- pi+ pi+ pi-]cc" ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ , 
-            Combination12345Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
-            """ , 
+            ( ACHI2DOCA(4,5) <  20 )
+            """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
             ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
 
     # =========================================================================
     # B -> psi(') pp Kpipi
-    # =========================================================================    
+    # =========================================================================
     def psi_ppKpipi( self ) :
         """
         B -> psi(') pp K pi pi
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N6BodyDecays
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PsiPPKpipi'                  ,
             ## algorithm type to be used
             DaVinci__N6BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.psi() , self.protons() , self.kaons() , self.pions() ] ,
             #
             ## algorithm configuration
@@ -2289,105 +2289,105 @@ class PsiX_BQ_Conf(LineBuilder) :
             DecayDescriptor  = "[B+ -> J/psi(1S) p+ p~- K+ pi+ pi-]cc" ,
             ##
             Combination12Cut = """  ( AM < mbc_ahigh )      &
-            ( ACHI2DOCA(1,2) <  20 ) 
-            """ , 
-            Combination123Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(1,2) <  20 )
+            """ ,
+            Combination123Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,3) <  20 ) &
-            ( ACHI2DOCA(2,3) <  20 ) 
-            """ , 
-            Combination1234Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(2,3) <  20 )
+            """ ,
+            Combination1234Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,4) <  20 ) &
             ( ACHI2DOCA(2,4) <  20 ) &
-            ( ACHI2DOCA(3,4) <  20 ) 
-            """ , 
-            Combination12345Cut = """ ( AM < mbc_ahigh )      & 
+            ( ACHI2DOCA(3,4) <  20 )
+            """ ,
+            Combination12345Cut = """ ( AM < mbc_ahigh )      &
             ( ACHI2DOCA(1,5) <  20 ) &
             ( ACHI2DOCA(2,5) <  20 ) &
             ( ACHI2DOCA(3,5) <  20 ) &
-            ( ACHI2DOCA(4,5) <  20 ) 
+            ( ACHI2DOCA(4,5) <  20 )
             """ ,
             CombinationCut   = """  ( mbp_acut | mbc_acut ) &
             ( ACHI2DOCA(1,6) <  20 ) &
             ( ACHI2DOCA(2,6) <  20 ) &
             ( ACHI2DOCA(3,6) <  20 ) &
             ( ACHI2DOCA(4,6) <  20 ) &
-            ( ACHI2DOCA(5,6) <  20 ) 
+            ( ACHI2DOCA(5,6) <  20 )
             """ ,
-            ## 
-            MotherCut       = self._chargedB() 
+            ##
+            MotherCut       = self._chargedB()
             )
-    
-    
+
+
     # =========================================================================
-    ## merged few basic B-hadrons: B+ , B- & Bs 
+    ## merged few basic B-hadrons: B+ , B- & Bs
     # =========================================================================
     def beauty ( self ) :
         """
-        Merged selection of B-, B+ & Bs  
+        Merged selection of B-, B+ & Bs
         """
         sel = self._selection ( 'Beauty_Selection')
         if sel : return sel
-        
+
         from PhysSelPython.Wrappers import MergedSelection
         sel = MergedSelection (
             'SelBeautyFor' + self.name() ,
             RequiredSelections = [ self.psi_K    () ,  ## B+
-                                   self.psi_2Kpi () ,  ## B0 
-                                   self.psi_2K   () ,  ## B_s0 
-                                   self.psi_3K   () ,  ## B+ 
-                                   self.psi_3Kpi () ]  ## B+ 
+                                   self.psi_2Kpi () ,  ## B0
+                                   self.psi_2K   () ,  ## B_s0
+                                   self.psi_3K   () ,  ## B+
+                                   self.psi_3Kpi () ]  ## B+
             )
         #
         return self._add_selection ( 'Beauty_Selection' , sel )
-        
+
 # =============================================================================
 if '__main__' == __name__ :
 
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
     logger.info ( ' Date   :  %s' % __date__   )
     ##
-    clines = set() 
+    clines = set()
     logger.info ( ' Lines declared in default_config["STREAMS"] are' )
     for stream in default_config['STREAMS'] :
-        lines = default_config['STREAMS'][stream] 
+        lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s : %-50s ' % ( stream , l ) )
             clines.add ( l )
     ##
     logger.info ( ' The output locations for the default configuration: ' )
     ##
-    _conf = PsiX_BQ_Conf ( 'PsiX' , 
+    _conf = PsiX_BQ_Conf ( 'PsiX' ,
                            config = default_config['CONFIG']  )
     ##
     _ln   = ' ' + 61*'-' + '+' + 30*'-'
-    logger.info ( _ln ) 
-    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) ) 
+    logger.info ( _ln )
+    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
-        lname = l.name() 
+        lname = l.name()
         logger.info ( '  %-60s| %-30s  ' % ( lout, lname ) )
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-    
+
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingUpsilonExotic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingUpsilonExotic.py
index 843da132b166c056eb19a1a5b9c4b2dd7e1cc658..4bd35e311f63ea21883f317643b73d9bfa9a77b0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingUpsilonExotic.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingUpsilonExotic.py
@@ -13,8 +13,8 @@
 # $Id:$
 # =============================================================================
 ## @file
-# 
-#  The attempt for coherent stripping for X -> Upsilon X0 
+#
+#  The attempt for coherent stripping for X -> Upsilon X0
 #
 #  @author Vanya BELYAEV Ivan.Belyaev@itep.ru
 #  @date   2015-03-22
@@ -24,15 +24,15 @@
 # Last modification $Date: 2012-02-19 15:18:08 +0100 (Sun, 19 Feb 2012) $
 #                by $Author: ibelyaev $
 # =============================================================================
-""" The attempt for coherent stripping for X -> Upsilon X0 
+""" The attempt for coherent stripping for X -> Upsilon X0
 
-- phi 
-- eho 
-- eta 
+- phi
+- eho
+- eta
 - eta'
-- omega 
+- omega
 - proton
-- prton + kaon 
+- prton + kaon
 """
 # =============================================================================
 __author__  = 'Vanya BELYAEV Ivan.Belyaev@itep.ru'
@@ -41,10 +41,10 @@ __version__ = '$Revision:$'
 # =============================================================================
 __all__ = (
     'UpsilonExoticConf' ,
-    'default_config'    , 
+    'default_config'    ,
     )
 # =============================================================================
-from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer 
+from GaudiKernel.SystemOfUnits             import GeV, MeV, mm, micrometer
 from StrippingUtils.Utils                  import LineBuilder
 # =============================================================================
 ## logging
@@ -54,16 +54,16 @@ logger = logging.getLogger(__name__)
 if not logger.handlers : logging.basicConfig()
 logger.setLevel(logging.INFO)
 # =============================================================================
-## Define the default configuration 
+## Define the default configuration
 _default_configuration_ = {
-    #    
+    #
     'NOPIDHADRONS'   : False ,  ## USE FOR SIMULATION "True"
     ## use for B&Q wg production
-    'DIMUONLINE'     : None  ,  ## USE FOR B&Q WG-selection  
+    'DIMUONLINE'     : None  ,  ## USE FOR B&Q WG-selection
     #
     'ETA_PT'    : 1.5 * GeV ,
     'ETAP_PT'   : 1.5 * GeV ,
-    'OMEGA_PT'  : 1.5 * GeV ,    
+    'OMEGA_PT'  : 1.5 * GeV ,
     #
     #
     ## photon selection for eta' -> rho gamma
@@ -73,12 +73,12 @@ _default_configuration_ = {
     ## pi0 selection for  eta/omega -> pi+ pi- pi0 ,
     #
     'Pi0Cut'    : """
-    ( 250    * MeV < MINTREE ( 'gamma' == ID , PT ) ) 
+    ( 250    * MeV < MINTREE ( 'gamma' == ID , PT ) )
     """ ,
     #
     ## eta -> gamma gamma selection for eta' -> pi+ pi- eta
     #
-    'Eta2ggCut' : " 250    * MeV < MINTREE ( 'gamma' == ID , PT ) " , 
+    'Eta2ggCut' : " 250    * MeV < MINTREE ( 'gamma' == ID , PT ) " ,
     #
     ## muon selection for  Y -> mu+ mu-
     #
@@ -86,61 +86,61 @@ _default_configuration_ = {
     ISMUON &
     ( PT            >  750 * MeV ) &
     ( PIDmu - PIDpi >    0       ) &
-    ( CLONEDIST     > 5000       )     
+    ( CLONEDIST     > 5000       )
     """ ,
     #
-    ## pions 
-    # 
+    ## pions
+    #
     'PionCut'   : """
-    ( PT          > 200 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 200 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
-    ( TRCHI2DOF   < 4         ) & 
+    ( TRCHI2DOF   < 4         ) &
     in_range ( 2          , ETA , 5         ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
-    HASRICH                     
+    HASRICH
     """ ,
     #
     ## kaons
-    # 
+    #
     'KaonCut'   : """
-    ( PT          > 200 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 200 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
-    ( TRCHI2DOF   < 4         ) & 
+    ( TRCHI2DOF   < 4         ) &
     in_range ( 2          , ETA , 5         ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
-    HASRICH                     
+    HASRICH
     """ ,
     #
-    ## protons 
+    ## protons
     #
     'ProtonCut'   : """
-    ( PT           > 200 * MeV ) & 
-    ( CLONEDIST    > 5000      ) & 
-    ( TRCHI2DOF    < 4         ) & 
-    ( TRGHOSTPROB  < 0.5       ) & 
+    ( PT           > 200 * MeV ) &
+    ( CLONEDIST    > 5000      ) &
+    ( TRCHI2DOF    < 4         ) &
+    ( TRGHOSTPROB  < 0.5       ) &
     in_range ( 2         , ETA , 5         ) &
     in_range ( 10 * GeV  , P   , 150 * GeV ) &
-    HASRICH                      
+    HASRICH
     """ ,
     #
     'UpsilonCut' : """
-    ( M > 7 * GeV ) & 
+    ( M > 7 * GeV ) &
     DECTREE   ('Meson -> mu+ mu-'  )                      &
     CHILDCUT( 1 , HASMUON & ISMUON )                      &
-    CHILDCUT( 2 , HASMUON & ISMUON )                      & 
+    CHILDCUT( 2 , HASMUON & ISMUON )                      &
     ( MINTREE ( 'mu+' == ABSID , PT ) > 1 * GeV         ) &
-    ( MAXTREE ( ISBASIC & HASTRACK , TRCHI2DOF ) < 4    ) & 
-    ( MINTREE ( ISBASIC & HASTRACK , CLONEDIST ) > 5000 ) & 
-    ( VFASPF  ( VPCHI2 ) > 0.5/100 ) 
-    & ( abs ( BPV ( VZ    ) ) <  0.5 * meter     ) 
-    & (       BPV ( vrho2 )   < ( 10 * mm ) ** 2 ) 
+    ( MAXTREE ( ISBASIC & HASTRACK , TRCHI2DOF ) < 4    ) &
+    ( MINTREE ( ISBASIC & HASTRACK , CLONEDIST ) > 5000 ) &
+    ( VFASPF  ( VPCHI2 ) > 0.5/100 )
+    & ( abs ( BPV ( VZ    ) ) <  0.5 * meter     )
+    & (       BPV ( vrho2 )   < ( 10 * mm ) ** 2 )
     """ ,
- 
+
     #
     #
-    ## PID-cuts for hadrons 
+    ## PID-cuts for hadrons
     #
     'PionPIDCut'   : " PROBNNpi > 0.1 " ,
     'KaonPIDCut'   : " PROBNNk  > 0.1 " ,
@@ -149,26 +149,26 @@ _default_configuration_ = {
     ## useful shortcuts:
     #
     'Preambulo' : [
-    ## shortcut for chi2 of vertex fit 
-    'chi2vx    = VFASPF(VCHI2)     '                           , 
-    'chi2vxNDF = VFASPF(VCHI2PDOF) '                           , 
+    ## shortcut for chi2 of vertex fit
+    'chi2vx    = VFASPF(VCHI2)     '                           ,
+    'chi2vxNDF = VFASPF(VCHI2PDOF) '                           ,
     'chi2vxndf = chi2vxNDF         '                           ,
-    'vrho2     = VX**2 + VY**2'                                , 
+    'vrho2     = VX**2 + VY**2'                                ,
     ] ,
     }
 ## ============================================================================
-## the mandatory element for stripping framework 
+## the mandatory element for stripping framework
 default_config = {
     #
     'NAME'        :   'UpsilonExotic'        ,
     'WGs'         : [ 'BandQ' ]              ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'UpsilonExoticConf'    ,
     'STREAMS'     : { 'Dimuon'    : [] }
     }
 # =============================================================================
 ## @class  UpsilonExoticConf
-#  B-> psi(') X0 configuration file 
+#  B-> psi(') X0 configuration file
 #  @author Vanya BELYAEV Ivan.Belyaev@itep.ru
 #  @date 2012-02-19
 class UpsilonExoticConf(LineBuilder) :
@@ -176,30 +176,30 @@ class UpsilonExoticConf(LineBuilder) :
     Helper class to configure 'PsiX0'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    ## get the default configuration 
+
+    ## get the default configuration
     @staticmethod
     def defaultConfiguration( key = None ) :
         """
         Get the default/recommended configurtaion
-        
+
         >>> conf = PsiX0.defaultConfiguration()
-        
+
         """
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__ ( self , name , config ) :
         """
         Constructor
         """
-        # check the names 
+        # check the names
         if 'UpsilonExotic' != name :
-            logger.warning ( 'The non-default name is specified "%s"' % name  ) 
-            
+            logger.warning ( 'The non-default name is specified "%s"' % name  )
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
 
@@ -209,71 +209,71 @@ class UpsilonExoticConf(LineBuilder) :
         else :
             LineBuilder.__init__( self , name ,  config )
 
-        ## private set of selections 
+        ## private set of selections
         self.__selections_ = {}
 
 
         if not self.__selections_.has_key ( self.name() ) :
             self.__selections_[ self.name() ] = {}
-            
-        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config ) 
-        
+
+        self.__selections_[ self.name() ]['CONFIG'] = deepcopy ( _config )
+
         keys = _config.keys()
         for key in keys :
-            
+
             if not key in _default_configuration_ :
                 raise KeyError("Invalid key is specified: '%s'" % key )
-            
+
             val = _config[key]
-            if val != _default_configuration_ [ key ] : 
+            if val != _default_configuration_ [ key ] :
                 logger.debug ('new configuration: %-16s : %s ' % ( key , _config[key] ) )
-                
+
         self._name         = name
-        
+
         for line in self._lines_UpsilonExotic () :
             self.registerLine(line)
-            logger.debug ( "Register line: %s" %  line.name () ) 
-            
-    ## get the selection, associated with some nickname name 
+            logger.debug ( "Register line: %s" %  line.name () )
+
+    ## get the selection, associated with some nickname name
     def _selection ( self, nick ) :
         """
         Get the selection, associated with some nickname name
         """
-        
+
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-            
-        return self.__selections_[ self.name() ].get( nick , None ) 
-    
-    ## add the selection, associated with some nickname name 
+            self.__selections_[ self.name() ] = {}
+
+        return self.__selections_[ self.name() ].get( nick , None )
+
+    ## add the selection, associated with some nickname name
     def _add_selection ( self , nick , sel ) :
         """
         add the selection, associated with some nickname name
         """
         if not self.__selections_.has_key ( self.name() ) :
-            self.__selections_[ self.name() ] = {} 
-        
+            self.__selections_[ self.name() ] = {}
+
         if self.__selections_[ self.name()].has_key( nick ) :
             raise AttributeError , "Selection '%s'already exists " % nick
-        
+
         self.__selections_[ self.name() ][ nick ] = sel
-        
-        return sel 
-    
-    ## empty, no real stripping lines here 
-    def _lines_UpsilonExotic ( self ) : return [] 
+
+        return sel
+
+    ## empty, no real stripping lines here
+    def _lines_UpsilonExotic ( self ) : return []
 
     # =========================================================================
     ## pure technical method for creation of selections
     # =========================================================================
     def make_selection ( self      ,
-                         tag       , 
+                         tag       ,
                          algotype  ,
-                         inputs    , 
+                         inputs    ,
                          *args     ,
                          **kwargs  ) :
         """
-        Technical method for creation of 1-step selections 
+        Technical method for creation of 1-step selections
         """
         sel_tag  = '%s_Selection' % tag
         sel_name = 'Sel%sFor%s'   % ( tag , self.name() )
@@ -281,7 +281,7 @@ class UpsilonExoticConf(LineBuilder) :
         ## check existing selection
         #
         sel      = self._selection ( sel_tag )
-        if sel : return sel 
+        if sel : return sel
 
         #
         ## adjust a bit the arguments
@@ -289,27 +289,27 @@ class UpsilonExoticConf(LineBuilder) :
             kwargs ['Preambulo'        ] = self['Preambulo']
 
         if not kwargs.has_key( 'ParticleCombiners' ) :
-            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' } 
-            
-        # 
+            kwargs ['ParticleCombiners'] = { '' : 'LoKi::VertexFitter:PUBLIC' }
+
+        #
         ## use "simple-selection"
         #
         from PhysSelPython.Wrappers import SimpleSelection
         sel = SimpleSelection (
             sel_name ,
             algotype ,
-            inputs   , 
+            inputs   ,
             *args    ,
             **kwargs )
-        # 
-        return self._add_selection( sel_tag , sel ) 
+        #
+        return self._add_selection( sel_tag , sel )
 
     ## get the selections
     def _selections_private ( self ) :
-        
+
         sel = self._selection ( 'Selections' )
         if sel : return sel
-        
+
         sel =  [
             #
             self.upsilons          () ,
@@ -325,18 +325,18 @@ class UpsilonExoticConf(LineBuilder) :
             self.upsilon_eta_prime () ,
             self.upsilon_omega     () ,
             self.upsilon_proton    () ,
-            self.upsilon_pK        () 
+            self.upsilon_pK        ()
             #
             ]
-        
+
         return self._add_selection ( 'Selections' , sel )
-    
+
     # ========================================================================
     ## pions :
     # ========================================================================
     def pions    ( self ) :
         """
-        Pions for  X -> Upsilon X lines 
+        Pions for  X -> Upsilon X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         ##
@@ -345,7 +345,7 @@ class UpsilonExoticConf(LineBuilder) :
             pioncut = self['PionCut']
         else                    :
             from StandardParticles import StdAllLooseANNPions as inpts
-            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] ) 
+            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] )
         ##
         return self.make_selection (
             'Pion'                 ,
@@ -353,22 +353,22 @@ class UpsilonExoticConf(LineBuilder) :
             [ inpts ]              ,
             Code = pioncut         ,
             )
-    
+
     # ========================================================================
     ## kaons :
     # ========================================================================
     def kaons     ( self ) :
         """
-        Kaons for X -> Upsilon X 
+        Kaons for X -> Upsilon X
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        ## 
+        ##
         if self['NOPIDHADRONS'] :
             from StandardParticles import   StdAllNoPIDsKaons as inpts
             kaoncut = self['KaonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNKaons as inpts 
-            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNKaons as inpts
+            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] )
         #
         ##
         return self.make_selection (
@@ -379,20 +379,20 @@ class UpsilonExoticConf(LineBuilder) :
             )
 
     # ========================================================================
-    ## protons 
+    ## protons
     # ========================================================================
     def protons     ( self ) :
         """
-        Kaons for X -> Upsilon P 
+        Kaons for X -> Upsilon P
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        ## 
+        ##
         if self['NOPIDHADRONS'] :
             from StandardParticles import   StdAllNoPIDsProtons as inpts
             protoncut = self['ProtonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNProtons as inpts 
-            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNProtons as inpts
+            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] )
         #
         ##
         return self.make_selection (
@@ -401,16 +401,16 @@ class UpsilonExoticConf(LineBuilder) :
             [ inpts ]              ,
             Code = protoncut       ,
             )
-    
+
     # ========================================================================
-    ## muons 
+    ## muons
     # ========================================================================
     def muons    ( self ) :
         """
         Muons for  Upsilon -> mu+ mu-
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdAllLooseMuons  as inpts 
+        from StandardParticles                     import StdAllLooseMuons  as inpts
         ##
         return self.make_selection (
             'Muons'                 ,
@@ -420,7 +420,7 @@ class UpsilonExoticConf(LineBuilder) :
             )
 
     # =========================================================================
-    ## make heavy dimuons 
+    ## make heavy dimuons
     # =========================================================================
     def dimuon ( self ) :
         """
@@ -430,26 +430,26 @@ class UpsilonExoticConf(LineBuilder) :
         ups_name = 'HeavyDiMion'
         sel_name = 'Sel%sFor%s' % ( ups_name , self.name() )
         sel_tag  = '%s_Selection'
-        sel      = self._selection( sel_tag )        
+        sel      = self._selection( sel_tag )
         if sel  : return sel
         #
         dimu_line = self[ 'DIMUONLINE']
         if dimu_line :
-            ## list of lines 
-            from PhysSelPython.Wrappers import AutomaticData 
-            sel = AutomaticData( dimu_line ) 
-            return self._add_selection ( sel_tag , sel ) 
-        
+            ## list of lines
+            from PhysSelPython.Wrappers import AutomaticData
+            sel = AutomaticData( dimu_line )
+            return self._add_selection ( sel_tag , sel )
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         return self.make_selection (
             ups_name         ,
             CombineParticles ,
             [ self.muons() ] ,
             DecayDescriptor = " J/psi -> mu+ mu- " ,
-            CombinationCut  = "in_range ( 6.5 * GeV , AM , 20 * GeV ) ", 
-            MotherCut       = "chi2vx < 20" 
+            CombinationCut  = "in_range ( 6.5 * GeV , AM , 20 * GeV ) ",
+            MotherCut       = "chi2vx < 20"
             )
-    
+
     # =========================================================================
     ## get good upsilons
     # =========================================================================
@@ -462,31 +462,31 @@ class UpsilonExoticConf(LineBuilder) :
         ##
         return self.make_selection  (
             'Upsilon'           ,
-            FilterDesktop       , 
-            [ self.dimuon () ]  , 
-            ## algorithm parameters 
+            FilterDesktop       ,
+            [ self.dimuon () ]  ,
+            ## algorithm parameters
             Code     = self['UpsilonCut'] ,
-            ## 
+            ##
             ReFitPVs = True
             ##
             )
-    
+
     # =========================================================================
-    ## gamma 
+    ## gamma
     # =========================================================================
     def gamma  ( self ) :
         from   StandardParticles  import StdLooseAllPhotons as photons_
-        return photons_ 
-    
+        return photons_
+
     # =========================================================================
-    ## define proper pi0 
+    ## define proper pi0
     # =========================================================================
     def pi0  ( self ) :
         """
         Define proper pi0
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdLoosePi02gg as inpts 
+        from StandardParticles                     import StdLoosePi02gg as inpts
         ##
         return self.make_selection (
             'Pi0'                  ,
@@ -494,16 +494,16 @@ class UpsilonExoticConf(LineBuilder) :
             [ inpts ]              ,
             Code = self['Pi0Cut']  ,
             )
-    
+
     # =========================================================================
     ## define proper eta
     # =========================================================================
     def eta_  ( self ) :
         """
-        Define proper eta -> gamma gamma 
+        Define proper eta -> gamma gamma
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdLooseEta2gg as inpts 
+        from StandardParticles                     import StdLooseEta2gg as inpts
         ##
         return self.make_selection (
             'EtaStd'                  ,
@@ -511,9 +511,9 @@ class UpsilonExoticConf(LineBuilder) :
             [ inpts ]                 ,
             Code = self['Eta2ggCut']  ,
             )
-    
+
     # =========================================================================
-    ## selection for  eta -> gamma gamma 
+    ## selection for  eta -> gamma gamma
     # =========================================================================
     def eta2gg ( self ) :
         """
@@ -527,8 +527,8 @@ class UpsilonExoticConf(LineBuilder) :
             [ self.eta_ () ]       ,
             Code = """
             ( ADMASS ('eta') < 100 * MeV ) &
-            ( PT > %s ) 
-            """ % self['ETA_PT']  
+            ( PT > %s )
+            """ % self['ETA_PT']
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
@@ -538,9 +538,9 @@ class UpsilonExoticConf(LineBuilder) :
             [ pre_eta  ]               ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25015     ## unique ! 
+            ExtraInfoIndex = 25015     ## unique !
             )
-    
+
     # =========================================================================
     ## (selection for  eta -> pipipi
     # =========================================================================
@@ -549,20 +549,20 @@ class UpsilonExoticConf(LineBuilder) :
         Selection for Eta -> pipipi
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-        ## 
+        ##
         pre_eta = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreEta3Pi'                   ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.pi0 ()  ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor = " eta -> pi+ pi- pi0" ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 700 * MeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 12 )
+            """ ,
             ##
             CombinationCut  = """
             ( APT > %s ) & ( ADAMASS ( 'eta' ) < 100 * MeV )
@@ -570,27 +570,27 @@ class UpsilonExoticConf(LineBuilder) :
             ##
             MotherCut       = """
             ( PT     > %s ) &
-            ( chi2vx <  9 ) 
+            ( chi2vx <  9 )
             """ %         self['ETA_PT']
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Eta23pi'                  ,
             Pi0Veto__Tagger2g          ,
             [ pre_eta ]                ,
             MassWindow     = 25 * MeV  ,
             MassChi2       = -1        ,
-            ExtraInfoIndex = 25016     ## unique ! 
+            ExtraInfoIndex = 25016     ## unique !
             )
 
     # =========================================================================
-    ## all etas 
+    ## all etas
     # =========================================================================
     def eta0 ( self ) :
         """
-        All etas 
+        All etas
         """
         tag      = 'Eta0_selection'
         sel      = self._selection ( tag )
@@ -604,106 +604,106 @@ class UpsilonExoticConf(LineBuilder) :
             )
         #
         return self._add_selection ( tag , sel )
-    
+
     # ===========================================================================
-    ## selection for  etap -> rho0 gamma 
+    ## selection for  etap -> rho0 gamma
     # ===========================================================================
     def etap2rhog ( self ) :
         """
-        Selection for Eta' -> rho gamma        
+        Selection for Eta' -> rho gamma
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         pre_etap = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreEtapRhoG'                 ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.gamma ()  ] ,
             ##
             DecayDescriptor = " eta_prime -> pi+ pi- gamma" ,
             ##
             DaughtersCuts   = { 'gamma' :  self['GammaCut'] } ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 950 * MeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 12 )
+            """ ,
             CombinationCut  = """
-            ( APT > %s ) & 
-            in_range  ( 500 * MeV , AM12 , 950 * MeV ) & 
-            ( ADAMASS ( 'eta_prime' ) <    100 * MeV ) 
+            ( APT > %s ) &
+            in_range  ( 500 * MeV , AM12 , 950 * MeV ) &
+            ( ADAMASS ( 'eta_prime' ) <    100 * MeV )
             """ % ( 0.9 * self['ETAP_PT'] ),
             ##
             MotherCut       = """
             ( PT     > %s ) &
             ( chi2vx <  9 )
-            """ %         self['ETAP_PT'] 
+            """ %         self['ETAP_PT']
             )
-        ##         
+        ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-        ## 
+        ##
         return self.make_selection (
             'Etap2rhogamma'               ,
             Pi0Veto__Tagger               ,
             [ pre_etap ]                  ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25017     ## unique ! 
+            ExtraInfoIndex = 25017     ## unique !
             )
-    
+
     # ============================================================================
     ## selection for  etap -> pi+ pi- eta
-    # ============================================================================ 
+    # ============================================================================
     def etap2pipieta ( self ) :
         """
-        Selection for Eta' -> pi+ pi- eta         
+        Selection for Eta' -> pi+ pi- eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
         pre_etap = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreEtapPiPiEta'               ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.eta_ ()  ] ,
             ##
             DecayDescriptor = " eta_prime -> pi+ pi- eta" ,
             DaughtersCuts   = {
             'eta' : " ( ADMASS ('eta') < 100 * MeV ) "
             } ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 600 * MeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 12 )
+            """ ,
             CombinationCut  = """
-            ( APT > %s ) & 
-            ( ADAMASS ( 'eta_prime' ) <    100 * MeV ) 
+            ( APT > %s ) &
+            ( ADAMASS ( 'eta_prime' ) <    100 * MeV )
             """ % ( 0.9 * self['ETAP_PT'] ),
             ##
             MotherCut       = """
             ( PT     > %s ) &
             ( chi2vx <  9 )
-            """ %         self['ETAP_PT'] 
+            """ %         self['ETAP_PT']
             )
-        
+
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Etap2pipieta'                ,
             Pi0Veto__Tagger2g             ,
             [ pre_etap ]                  ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25018     ## unique ! 
+            ExtraInfoIndex = 25018     ## unique !
             )
-    
+
     # =========================================================================
-    ## all eta's 
+    ## all eta's
     # =========================================================================
     def eta_prime ( self ) :
         """
-        All eta's 
+        All eta's
         """
         tag      = 'EtaPrime_selection'
         sel      = self._selection ( tag )
@@ -715,32 +715,32 @@ class UpsilonExoticConf(LineBuilder) :
             RequiredSelections = [ self.etap2rhog    () ,
                                    self.etap2pipieta () ]
             )
-        
-        return self._add_selection ( tag , sel ) 
-    
+
+        return self._add_selection ( tag , sel )
+
     # =========================================================================
-    ## omega -> 3 pi 
+    ## omega -> 3 pi
     # =========================================================================
     def omega ( self ) :
         """
-        omega -> 3 pi selection 
+        omega -> 3 pi selection
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
         pre_omega = self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'PreOmega'                ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays         ,
-            ## input selections 
+            ## input selections
             [ self.pions () , self.pi0 ()  ] ,
             ##
             DecayDescriptor = " omega(782) -> pi+ pi- pi0" ,
-            ## 
+            ##
             Combination12Cut  = """  ( AM < 1 * GeV  ) &
-            ( ACHI2DOCA(1,2) < 12 ) 
+            ( ACHI2DOCA(1,2) < 12 )
             """ ,
-            ## 
+            ##
             CombinationCut  = """
             ( APT > %s ) & ( ADAMASS ( 'omega(782)' ) < 100 * MeV )
             """ % ( 0.9 * self['OMEGA_PT'] ),
@@ -750,18 +750,18 @@ class UpsilonExoticConf(LineBuilder) :
             ( chi2vx <  9 )
             """ %         self['OMEGA_PT']
             )
-        
+
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger2g
-        ## 
+        ##
         return self.make_selection (
             'Omega'                       ,
             Pi0Veto__Tagger2g             ,
             [ pre_omega ]                 ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25019     ## unique ! 
+            ExtraInfoIndex = 25019     ## unique !
             )
-    
+
     # =========================================================================
     # X -> Upsilon phi(K+K-)
     # =========================================================================
@@ -769,13 +769,13 @@ class UpsilonExoticConf(LineBuilder) :
         """
         X -> Upsilon phi(K+ K-)
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         #
         return self.make_selection  (
             'Y&KK'                ,
             DaVinci__N3BodyDecays ,
             [ self.upsilons() , self.kaons() ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor  = " Upsilon(4S) -> J/psi(1S) K+ K-" ,
             Combination12Cut = """
             ( AM < 15 * GeV       ) &
@@ -783,28 +783,28 @@ class UpsilonExoticConf(LineBuilder) :
             """ ,
             CombinationCut = """
             ( AM                  < 15   * GeV ) &
-            ( AM23                < 1050 * MeV ) & 
+            ( AM23                < 1050 * MeV ) &
             ( ( AM - AM1 - AM23 ) < 2.5  * GeV ) &
             ( ACHI2DOCA(1,3)      < 16  ) &
             ( ACHI2DOCA(2,3)      < 16  )
             """ ,
             MotherCut      = " chi2vxndf<10" ,
             )
-    
+
     # =========================================================================
-    # X -> Upsilon rho0 
+    # X -> Upsilon rho0
     # =========================================================================
     def  upsilon_rho( self ) :
         """
         X -> Upsilon rho0
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         #
         return self.make_selection  (
             'Y&pipi'              ,
             DaVinci__N3BodyDecays ,
             [ self.upsilons() , self.pions() ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor  = " Upsilon(4S) -> J/psi(1S) pi+ pi-" ,
             Combination12Cut = """
             ( AM < 15 * GeV       ) &
@@ -812,7 +812,7 @@ class UpsilonExoticConf(LineBuilder) :
             """ ,
             CombinationCut = """
             ( AM                  < 15   * GeV ) &
-            ( AM23                < 1050 * MeV ) & 
+            ( AM23                < 1050 * MeV ) &
             ( ( AM - AM1 - AM23 ) < 2.5  * GeV ) &
             ( ACHI2DOCA(1,3)      < 16         ) &
             ( ACHI2DOCA(2,3)      < 16         )
@@ -821,7 +821,7 @@ class UpsilonExoticConf(LineBuilder) :
             )
 
     # =========================================================================
-    # X -> Upsilon proton 
+    # X -> Upsilon proton
     # =========================================================================
     def  upsilon_proton ( self ) :
         """
@@ -833,22 +833,22 @@ class UpsilonExoticConf(LineBuilder) :
             'Y&p'             ,
             CombineParticles  ,
             [ self.upsilons() , self.protons() ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor  = "[Upsilon(4S) -> J/psi(1S) p+]cc" ,
             CombinationCut   = """
             ( AM                 < 13   * GeV ) &
             ( ( AM - AM1 - AM2 ) < 2.5  * GeV ) &
-            ( ACHI2DOCA(1,2)     < 16  ) 
+            ( ACHI2DOCA(1,2)     < 16  )
             """ ,
             MotherCut      = " chi2vxndf<10" ,
             )
 
     # =========================================================================
-    # X -> Upsilon proton kaon 
+    # X -> Upsilon proton kaon
     # =========================================================================
     def  upsilon_pK ( self ) :
         """
-        X -> Upsilon proton kaon 
+        X -> Upsilon proton kaon
         """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         #
@@ -856,7 +856,7 @@ class UpsilonExoticConf(LineBuilder) :
             'Y&pK'                  ,
             DaVinci__N3BodyDecays   ,
             [ self.upsilons() , self.protons() , self.kaons() ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor  = "[Upsilon(4S) -> J/psi(1S) p+ K-]cc" ,
             Combination12Cut = """
             ( AM < 15 * GeV       ) &
@@ -864,14 +864,14 @@ class UpsilonExoticConf(LineBuilder) :
             """ ,
             CombinationCut = """
             ( AM                  < 15   * GeV ) &
-            ( AM23                < 2000 * MeV ) & 
+            ( AM23                < 2000 * MeV ) &
             ( ( AM - AM1 - AM23 ) < 2.5  * GeV ) &
             ( ACHI2DOCA(1,3)      < 16         ) &
             ( ACHI2DOCA(2,3)      < 16         )
             """ ,
             MotherCut      = " chi2vxndf< 10 " ,
-            )            
-    
+            )
+
     # =========================================================================
     # X -> Upsilon eta
     # =========================================================================
@@ -879,21 +879,21 @@ class UpsilonExoticConf(LineBuilder) :
         """
         X -> Upsilon eta
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         #
         return self.make_selection  (
             'Y&eta'                ,
             CombineParticles       ,
             [ self.upsilons() , self.eta0() ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor = " chi_b0(1P) -> J/psi(1S) eta" ,
             CombinationCut  = """
             (   AM               < 14  * GeV ) &
             ( ( AM - AM1 - AM2 ) < 2.5 * GeV )
             """,
-            MotherCut      = " chi2vxndf< 10 " 
+            MotherCut      = " chi2vxndf< 10 "
             )
-    
+
     # =========================================================================
     # X -> Upsilon eta'
     # =========================================================================
@@ -901,21 +901,21 @@ class UpsilonExoticConf(LineBuilder) :
         """
         X -> Upsilon eta'
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         #
         return self.make_selection  (
             'Y&eta_prime'          ,
             CombineParticles       ,
             [ self.upsilons() , self.eta_prime () ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor = " chi_b1(1P) -> J/psi(1S) eta_prime" ,
             CombinationCut  = """
             (   AM               < 14  * GeV ) &
             ( ( AM - AM1 - AM2 ) < 2.5 * GeV )
             """,
-            MotherCut      = " chi2vxndf< 10 " 
+            MotherCut      = " chi2vxndf< 10 "
             )
-    
+
     # =========================================================================
     # X -> Upsilon omega
     # =========================================================================
@@ -923,72 +923,71 @@ class UpsilonExoticConf(LineBuilder) :
         """
         X -> Upsilon omega
         """
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         #
         return self.make_selection  (
             'Y&omega'              ,
             CombineParticles       ,
             [ self.upsilons() , self.omega () ] ,
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptor = " chi_b2(1P) -> J/psi(1S) omega(782)" ,
             CombinationCut  = """
             (   AM               < 14  * GeV ) &
             ( ( AM - AM1 - AM2 ) < 2.5 * GeV )
             """,
-            MotherCut      = " chi2vxndf< 10 " 
+            MotherCut      = " chi2vxndf< 10 "
             )
 
-    
+
 # =============================================================================
 if '__main__' == __name__ :
-    
-    
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
+
+
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
     logger.info ( ' Date   :  %s' % __date__   )
     ##
-    clines = set() 
+    clines = set()
     logger.info ( ' Lines declared in default_config["STREAMS"] are' )
     for stream in default_config['STREAMS'] :
-        lines = default_config['STREAMS'][stream] 
+        lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s : %-50s ' % ( stream , l ) )
             clines.add ( l )
     ##
     logger.info ( ' The output locations for the default configuration: ' )
     ##
-    _conf = UpsilonExoticConf ( 'UpsilonExotic' , 
+    _conf = UpsilonExoticConf ( 'UpsilonExotic' ,
                                 config = default_config['CONFIG']  )
     ##
     _ln   = ' ' + 61*'-' + '+' + 30*'-'
-    logger.info ( _ln ) 
-    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) ) 
+    logger.info ( _ln )
+    logger.info ( '  %-60s| %-30s  ' % ( 'Output location', 'Stripping line name' ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
-        lname = l.name() 
+        lname = l.name()
         logger.info ( '  %-60s| %-30s  ' % ( lout, lname ) )
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-   
+
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
- 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXB2DPiP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXB2DPiP.py
index eca314e9dced5c845d00e9986cf5421708f664f2..71f179981d297c0f24a0206d836730ba6c3d7025 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXB2DPiP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXB2DPiP.py
@@ -41,11 +41,11 @@ default_config = {
                  ,       'ProtonPIDp'                      :       5
                  ,       'ProtonPIDpK'                     :      -3
                  ,        'MomCuts'     : """
-                          (VFASPF(VCHI2/VDOF) < 10.) 
-                          & (BPVDIRA> 0.9999) 
-                          & (BPVIPCHI2()<25) 
+                          (VFASPF(VCHI2/VDOF) < 10.)
+                          & (BPVDIRA> 0.9999)
+                          & (BPVIPCHI2()<25)
                           & (BPVVDCHI2>250)
-                          & (BPVVDRHO>0.1*mm) 
+                          & (BPVVDRHO>0.1*mm)
                           & (BPVVDZ>2.0*mm)
                           & (MINTREE(((ABSID=='D+') | (ABSID=='D0') | (ABSID=='Lambda_c+')) , VFASPF(VZ))-VFASPF(VZ) > 0.0 *mm )
                           """
@@ -58,20 +58,20 @@ default_config = {
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 1.0,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_1.0'
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 1.5,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_1.5'
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 2.0,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_2.0'
                   }]
-                  }    
+                  }
     }
 
 ### Lines stored in this file:
@@ -84,13 +84,13 @@ class XB2DPiPConf(LineBuilder) :
         LineBuilder.__init__(self, name, config)
         self.name = name
         self.config = config
-	
+
         #### Input selections:
         #------------------------------------------------------------- D- + Ds-
         self.DplusList = DataOnDemand(Location = "Phys/StdLooseDplus2KPiPi/Particles")
         self.DsList = DataOnDemand(Location = "Phys/StdLooseDplus2KKPi/Particles")
         self.DstarList = DataOnDemand(Location = "Phys/StdLooseDstarWithD02KPi/Particles")
-        
+
         from PhysSelPython.Wrappers import MergedSelection
 
         self.DpDsList = MergedSelection( self.name + "SelDpDs",
@@ -106,17 +106,17 @@ class XB2DPiPConf(LineBuilder) :
                                               Cuts = "((MAXTREE(TRGHOSTPROB, ISBASIC) < %(TRGHOSTPROB)s))" % self.config)
 
         #------------------------------------------------------------- Protons
-        
+
         self.PionList = self.createSubSel( OutputList = "PionsForXB2DPiP" + self.name,
-                                           InputList = DataOnDemand(Location = "Phys/StdLoosePions/Particles"),                                                
-                                           Cuts = "(MIPCHI2DV(PRIMARY) > %(MIPCHI2)s ) & (TRCHI2DOF < %(TRCHI2DOF)s ) & (TRGHOSTPROB < %(TRGHOSTPROB)s)" % self.config )                                           
+                                           InputList = DataOnDemand(Location = "Phys/StdLoosePions/Particles"),
+                                           Cuts = "(MIPCHI2DV(PRIMARY) > %(MIPCHI2)s ) & (TRCHI2DOF < %(TRCHI2DOF)s ) & (TRGHOSTPROB < %(TRGHOSTPROB)s)" % self.config )
 
         self.ProtonList = self.createSubSel( OutputList = "ProtonsForXB2DPiP" + self.name,
-                                           InputList = DataOnDemand(Location = "Phys/StdLooseProtons/Particles"),                                                
+                                           InputList = DataOnDemand(Location = "Phys/StdLooseProtons/Particles"),
                                            Cuts = "(MIPCHI2DV(PRIMARY) > %(MIPCHI2)s )" \
                                            " & (TRCHI2DOF < %(TRCHI2DOF)s ) "\
                                            " & (PIDp> %(ProtonPIDp)s) & ((PIDp-PIDK)> %(ProtonPIDpK)s)" \
-                                           "& (P>10.0*GeV) & (TRGHOSTPROB < %(TRGHOSTPROB)s)" % self.config )                                           
+                                           "& (P>10.0*GeV) & (TRGHOSTPROB < %(TRGHOSTPROB)s)" % self.config )
 
         self.makeB2DPi()
         self.makeB2DPiP()
@@ -128,10 +128,10 @@ class XB2DPiPConf(LineBuilder) :
                                 PreVertexCuts = "in_range(4200,AM,6750)",
                                 PostVertexCuts = self.config['MomCuts'] )
 
-        Bd2DPiLine = StrippingLine( self.name + "Bd2DPiLine", 
-                                    algos = [ Bd2DPi ], 
-                                    MDSTFlag = False, 
-                                    EnableFlavourTagging = False, 
+        Bd2DPiLine = StrippingLine( self.name + "Bd2DPiLine",
+                                    algos = [ Bd2DPi ],
+                                    MDSTFlag = False,
+                                    EnableFlavourTagging = False,
                                     RelatedInfoTools = self.config['RelatedInfoTools']
                                     )
 
@@ -141,11 +141,11 @@ class XB2DPiPConf(LineBuilder) :
                                 PreVertexCuts = "in_range(4200,AM,7250)",
                                 PostVertexCuts = self.config['MomCuts'] )
 
-        Bd2DstarPiLine = StrippingLine( self.name + "Bd2DstarPiLine", 
-                                        algos = [ Bd2DstarPi ], 
-                                        MDSTFlag = False, 
+        Bd2DstarPiLine = StrippingLine( self.name + "Bd2DstarPiLine",
+                                        algos = [ Bd2DstarPi ],
+                                        MDSTFlag = False,
                                         EnableFlavourTagging = False,
-                                        RelatedInfoTools = self.config['RelatedInfoTools']                                        
+                                        RelatedInfoTools = self.config['RelatedInfoTools']
                                          )
 
         self.registerLine(Bd2DPiLine)
@@ -159,11 +159,11 @@ class XB2DPiPConf(LineBuilder) :
                                 PreVertexCuts = "in_range(4200,AM,7250) & ( ACHI2DOCA(2,3)<20 )",
                                 PostVertexCuts = self.config['MomCuts'] )
 
-        Bd2DPiPLine = StrippingLine( self.name + "Bd2DPiPLine", 
-                                     algos = [ Bd2DPiP ], 
-                                     MDSTFlag = False, 
+        Bd2DPiPLine = StrippingLine( self.name + "Bd2DPiPLine",
+                                     algos = [ Bd2DPiP ],
+                                     MDSTFlag = False,
                                      EnableFlavourTagging = False,
-                                     RelatedInfoTools = self.config['RelatedInfoTools']                                     
+                                     RelatedInfoTools = self.config['RelatedInfoTools']
                                       )
 
         Bd2DstarPiP = self.createCombinationsSel( OutputList = "Bd2DstarPiP" + self.name,
@@ -172,11 +172,11 @@ class XB2DPiPConf(LineBuilder) :
                                 PreVertexCuts = "in_range(4200,AM,7250) & ( ACHI2DOCA(2,3)<20 )",
                                 PostVertexCuts = self.config['MomCuts'] )
 
-        Bd2DstarPiPLine = StrippingLine( self.name + "Bd2DstarPiPLine", 
-                                         algos = [ Bd2DstarPiP ], 
-                                         MDSTFlag = False, 
+        Bd2DstarPiPLine = StrippingLine( self.name + "Bd2DstarPiPLine",
+                                         algos = [ Bd2DstarPiP ],
+                                         MDSTFlag = False,
                                          EnableFlavourTagging = False,
-                                         RelatedInfoTools = self.config['RelatedInfoTools']                                         
+                                         RelatedInfoTools = self.config['RelatedInfoTools']
                                           )
 
         self.registerLine(Bd2DPiPLine)
@@ -207,7 +207,7 @@ class XB2DPiPConf(LineBuilder) :
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-        
+
     def createCombinationsSel( self, OutputList,
 	                  DecayDescriptors,
                           DaughterLists,
@@ -252,4 +252,3 @@ def _format_related_info(selection, config):
             dd_index = decay_descriptor.find(' ', dd_index+1)
     print config
     return config
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py
index 2c59996072cb7561ad12277910794117893fe183..e7decf86fe8c10e9639594a0f5448d44242682a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py
@@ -16,10 +16,10 @@ The following channels are used:
  Xi_bc+ -> Lambdac+ J/psi(1S)
 
 where the daughter charmed baryon is reconstructed via:
-  Lambdac+ -> p K- pi+ 
+  Lambdac+ -> p K- pi+
   Xic0 -> Xi- pi+
 and where the Xi- is reconstructed via:
-  Xi- -> Lambda pi-, Lambda -> p pi- 
+  Xi- -> Lambda pi-, Lambda -> p pi-
 '''
 
 
@@ -51,7 +51,7 @@ __all__ = ( 'XibcBuilder'              ## LineBuilder class specialization
 from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection 
+from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -86,12 +86,12 @@ default_config = {
     , 'Muon4Jpsi_PIDmu'                   : 0
     , 'Muon4Jpsi_TRPCHI2'                 : 0#.005
     , 'Lambdac_MassWindowLarge'           : '120*MeV'
-    , 'Lambdac_MassWindowTight'           : '30*MeV'		
-    , 'Lambdac_MinAPT'                    : '1500*MeV' 
+    , 'Lambdac_MassWindowTight'           : '30*MeV'
+    , 'Lambdac_MinAPT'                    : '1500*MeV'
     , 'Lambdac_MaxADOCA'                  : '0.5*mm'
     , 'Lambdac_BPVDIRA'                   : 0.98
-    , 'Lambdac_minTAU'                    : -0.0001 	
-    , 'Lambdac_ENDVERTEXCHI2'             : 5						
+    , 'Lambdac_minTAU'                    : -0.0001
+    , 'Lambdac_ENDVERTEXCHI2'             : 5
     , 'Jpsi_MassWindowLarge'              : '150*MeV'
     , 'Jpsi_MassWindowTight'              : '50*MeV'
     , 'Muon4Jpsi_PT'                      : '650*MeV'
@@ -111,7 +111,7 @@ default_config = {
     , 'Lambda0_MassWindowLarge'           : '180*MeV'
     , 'Lambda0_MassWindowTight'           : '30*MeV'
     , 'Lambda0_APT'                       : '700*MeV'
-    , 'Lambda0_ENDVERTEXCHI2'             : 10	
+    , 'Lambda0_ENDVERTEXCHI2'             : 10
     , 'Lambda0_DownProtonTrackPvalue'     : 0
     , 'Lambda0_DownPionTrackPvalue'       : 0
     , 'Lambda0_minFD'                     : '1*mm/GeV'
@@ -133,7 +133,7 @@ default_config = {
     , 'Xic0_ENDVERTEXCHI2'                : 20
     , 'Xibc0_MassWindow'                  : '1.5*GeV'
     , 'Xibc0_ENDVERTEXCHI2'               : 20
-    ####### 
+    #######
     , 'HighMassBaryon_MassLowEdge'        : '4.5*GeV'
     , 'HighMassBaryon_MinAPT'             : '1*GeV'
     , 'ProtonsForHighMassBaryon_TRPCHI2'  : 0.#1
@@ -167,7 +167,7 @@ default_config = {
     , "JpsiKp_K_MinP"                     : 2000 #MeV/c
     ########
     , 'GlobalGhostProb_Max'               : 0.4
-    , 'LongTrackGEC'                      : 150 
+    , 'LongTrackGEC'                      : 150
     }
     }
 
@@ -190,7 +190,7 @@ _my_immutable_config = {
         , 'Kaons4JpsiKp'                  : 'Phys/StdAllNoPIDsKaons/Particles'
 				, 'Protons4HighMassBaryon'        : 'Phys/StdAllNoPIDsProtons/Particles'
 				, 'Jpsi4HighMassBaryon'           : 'Phys/StdLooseJpsi2MuMu/Particles'
-        } 
+        }
 
 
 class XibcBuilder(LineBuilder) :
@@ -227,12 +227,12 @@ class XibcBuilder(LineBuilder) :
         ######################################## Xibc+ Exclusive Line ##################################
 
         self._pions4Lambdac = AutomaticData(_my_immutable_config ['PionsForLambdacLocation'])
-        self._protons4Lambdac = AutomaticData(_my_immutable_config['ProtonsForLambdacLocation']) 
+        self._protons4Lambdac = AutomaticData(_my_immutable_config['ProtonsForLambdacLocation'])
         self._kaons4Lambdac = AutomaticData(_my_immutable_config['KaonsForLambdacLocation'])
 
 
-        self._Lambdac = makeLambdac(name, 
-                                    [self._protons4Lambdac, self._kaons4Lambdac, self._pions4Lambdac], 
+        self._Lambdac = makeLambdac(name,
+                                    [self._protons4Lambdac, self._kaons4Lambdac, self._pions4Lambdac],
                                     config);
 
         self._Xibc = makeXibc(name, [self._Jpsi, self._Lambdac], config);
@@ -251,19 +251,19 @@ class XibcBuilder(LineBuilder) :
 
         self._Lambda0 = makeLambda0(name, [] , config)
         #Note: the Jpsi requirement is added to quickly skip events without a Jpsi saving CPU time
-        self._XiminusL = makeXi(name+"LongPi", 
+        self._XiminusL = makeXi(name+"LongPi",
                       [self._Lambda0, AutomaticData(_my_immutable_config['LongPionsForXi']), self._Jpsi]
                       , config )
 
-        self._XiminusD = makeXi(name+"DownPi", 
+        self._XiminusD = makeXi(name+"DownPi",
                       [self._Lambda0, AutomaticData(_my_immutable_config['DownPionsForXi']), self._Jpsi]
                       , config )
 
-        self._Ximinus = MergedSelection(name+"MergedXiminus", 
+        self._Ximinus = MergedSelection(name+"MergedXiminus",
                                         RequiredSelections = [self._XiminusL, self._XiminusD]);
 
-        self._Xic0 = makeXic(name, 
-                            [self._Ximinus, AutomaticData(_my_immutable_config['PionsForXic'])], 
+        self._Xic0 = makeXic(name,
+                            [self._Ximinus, AutomaticData(_my_immutable_config['PionsForXic'])],
                             config);
 
         self._Xibc0 = makeXibc0(name, [self._Jpsi, self._Xic0], config);
@@ -280,13 +280,13 @@ class XibcBuilder(LineBuilder) :
 
         ########################################## Xibc -> J/psi K p  Line #######################
 
-        self._Xibc2JpsiKpi = makeXibc2JpsiKp(name, 
-            [ self._Jpsi, 
+        self._Xibc2JpsiKpi = makeXibc2JpsiKp(name,
+            [ self._Jpsi,
               AutomaticData( _my_immutable_config['Protons4JpsiKp']),
               AutomaticData( _my_immutable_config['Kaons4JpsiKp'])
             ],
             config)
-      
+
         self.lineXibc2JpsiKp = StrippingLine((name+'Xibc2JpsiKp'),
                                                prescale = 1.0,
                                                postscale = 1.0,
@@ -297,13 +297,13 @@ class XibcBuilder(LineBuilder) :
 
         ########################################## Xibc -> J/psi K p Control Line #######################
 
-        self._Xibc2JpsiKpiCtrl = makeXibc2JpsiKp(name+"Lb", 
-            [ self._Jpsi, 
+        self._Xibc2JpsiKpiCtrl = makeXibc2JpsiKp(name+"Lb",
+            [ self._Jpsi,
               AutomaticData( _my_immutable_config['Protons4JpsiKp']),
               AutomaticData( _my_immutable_config['Kaons4JpsiKp'])
             ],
             config, controlLine = True)
-      
+
         self.lineXibc2JpsiKp = StrippingLine((name+'Lb2JpsiKp'),
                                                prescale = config['JpsiKp_CtrlLine_Prescale'],
                                                postscale = 1.0,
@@ -315,9 +315,9 @@ class XibcBuilder(LineBuilder) :
 
         ########################################## Inclusive X -> p J/psi Line #####################
 
-        self._X = makeX (name, 
-              [	#self._Jpsi, 
-                AutomaticData (_my_immutable_config['Jpsi4HighMassBaryon']), 
+        self._X = makeX (name,
+              [	#self._Jpsi,
+                AutomaticData (_my_immutable_config['Jpsi4HighMassBaryon']),
                 AutomaticData( _my_immutable_config['Protons4HighMassBaryon'])]
                                                         , config)
 
@@ -335,16 +335,16 @@ class XibcBuilder(LineBuilder) :
         # partially reconstructed, so that the requirement of bad pointing did make sense
         # however, it forbids studies on Xibc -> J/psi p K -like decays.
         #
-        #  2014-06-04: Line "JpsiProtonGoodPointing" merged to JpsiProton 
+        #  2014-06-04: Line "JpsiProtonGoodPointing" merged to JpsiProton
         #              for Stripping21 (Lucio.Anderlini@fi.infn.it)
-        # 
+        #
 
 #####################
 # Functions
 #####################
 
-def filterJpsi (localname, 
-                _InputLocation=_my_immutable_config['JpsiForExclusiveLinesLocation'], 
+def filterJpsi (localname,
+                _InputLocation=_my_immutable_config['JpsiForExclusiveLinesLocation'],
                 config=default_config['CONFIG']):
   _filterAlgorithm = FilterDesktop(localname+"JpsiMuonFilter");
   _myCutOnMuons = ("(PIDmu > %(Muon4Jpsi_PIDmu)s) &"+
@@ -354,10 +354,10 @@ def filterJpsi (localname,
   _filterAlgorithm.Code = ("(CHILDCUT(("+_myCutOnMuons+"),1) & CHILDCUT(("+_myCutOnMuons+"),2)) &"+
                   " (VFASPF(VCHI2/VDOF)<%(Jpsi_ENDVERTEXCHI2)s) &"+
                   " (ADMASS('J/psi(1S)') < %(Jpsi_MassWindowTight)s)") % config
-	
 
-  return Selection (name = localname + 'JpsiMuonFilterSelection', 
-                  Algorithm = _filterAlgorithm, 
+
+  return Selection (name = localname + 'JpsiMuonFilterSelection',
+                  Algorithm = _filterAlgorithm,
                   RequiredSelections = [ AutomaticData(_InputLocation) ])
 
 
@@ -366,7 +366,7 @@ def makeLambdac (localname, _RequiredSelections, config=default_config['CONFIG']
   _lambdacCP = CombineParticles(localname+"lambdacAlgorithm")
   _lambdacCP.DecayDescriptor = "[Lambda_c+ -> p+ pi+ K-]cc"
   _lambdacCP.DaughtersCuts = {
-        "p+" 	: ("(TRPCHI2 > %(Protons4Lambdac_TRPCHI2)s) & " + 
+        "p+" 	: ("(TRPCHI2 > %(Protons4Lambdac_TRPCHI2)s) & " +
                   " (PROBNNp > %(Protons4Lambdac_ProbNNp)s) & " +
                   " (TRGHP < %(GlobalGhostProb_Max)s) &" +
                   " (PT > %(Protons4Lambdac_PT)s) & " +
@@ -380,11 +380,11 @@ def makeLambdac (localname, _RequiredSelections, config=default_config['CONFIG']
                   " (TRPCHI2 > %(Pion4Lambdac_TRPCHI2)s) &"+
                   " (TRGHP < %(GlobalGhostProb_Max)s) &" +
                   " (PROBNNpi > %(Pion4Lambdac_ProbNNpi)s) &"+
-                  "(PT > %(Pion4Lambdac_PT)s)") % config 
+                  "(PT > %(Pion4Lambdac_PT)s)") % config
 		}
   _lambdacCP.CombinationCut = ("(ADAMASS('Lambda_c+') < %(Lambdac_MassWindowLarge)s) & " +
                                 "(APT > %(Lambdac_MinAPT)s) & " +
-                                "(ADOCAMAX('') < %(Lambdac_MaxADOCA)s)"  
+                                "(ADOCAMAX('') < %(Lambdac_MaxADOCA)s)"
                                             ) % config
 
   _lambdacCP.MotherCut = ("(VFASPF(VCHI2/VDOF) < %(Lambdac_ENDVERTEXCHI2)s) & "+
@@ -393,8 +393,8 @@ def makeLambdac (localname, _RequiredSelections, config=default_config['CONFIG']
                           "(BPVLTIME()>%(Lambdac_minTAU)s)"
                           ) % config
 
-	
-  return Selection (name = localname + 'LcSelection', Algorithm=_lambdacCP, 
+
+  return Selection (name = localname + 'LcSelection', Algorithm=_lambdacCP,
                           RequiredSelections = _RequiredSelections);
 
 ###
@@ -402,12 +402,12 @@ def makeLambdac (localname, _RequiredSelections, config=default_config['CONFIG']
 def makeXibc (localname, _RequiredSelections ,config=default_config['CONFIG']):
   _xibcLc = CombineParticles(localname + "Xibc2LcJpsiAlgorithm")
   _xibcLc.DecayDescriptor = "[Xi_bc+ -> J/psi(1S) Lambda_c+]cc"
-  _xibcLc.CombinationCut = ("(ADAMASS('Xi_bc+') < %(Xibc_MassWindow)s) " 
+  _xibcLc.CombinationCut = ("(ADAMASS('Xi_bc+') < %(Xibc_MassWindow)s) "
 #                          "(AMAXCHILD(TRGHP, ISBASIC) < %(GlobalGhostProb_Max)s)"
                         ) % config
   _xibcLc.MotherCut = ("(VFASPF(VCHI2/VDOF)<%(Xibc_ENDVERTEXCHI2)s)" +
                         " & (MIPDV(PRIMARY) < %(Xibc_MINPVIP)s)") % config #MINIPCUT disabled
-    
+
   return Selection (name = localname+'XibcLcSelection', Algorithm = _xibcLc,
                       RequiredSelections = _RequiredSelections)
   ###############################################################
@@ -415,26 +415,26 @@ def makeXibc (localname, _RequiredSelections ,config=default_config['CONFIG']):
 
 def makeLambda0 (localname, additionalRequiredSelections=[], config=default_config['CONFIG']):
 	#Lambda combine particles
-  _protonCommonCut = ('(PROBNNp > %(Protons4Lambda0_ProbNNp)s) & ' + 
+  _protonCommonCut = ('(PROBNNp > %(Protons4Lambda0_ProbNNp)s) & ' +
                       '(PT > %(Protons4Lambda0_PT)s)'
                                                     ) % config
   _pionCommonCut = ('(PROBNNpi > %(Pions4Lambda0_ProbNNpi)s) & ' +
                     '(PT > %(Pions4Lambda0_PT)s) & ' +
                     '(MIPCHI2DV(PRIMARY) > %(Pions4Lambda0_MINIPCHI2)s)') % config
 
-  _lambdaCommonCut = ("((VFASPF(VCHI2/VDOF)<%(Lambda0_ENDVERTEXCHI2)s) &" + 
+  _lambdaCommonCut = ("((VFASPF(VCHI2/VDOF)<%(Lambda0_ENDVERTEXCHI2)s) &" +
                       "(ADMASS('Lambda0') < %(Lambda0_MassWindowTight)s) & " +
                       "(BPVVDZ/P > %(Lambda0_minFD)s))") % config
 
   _lambda = CombineParticles(localname+"lambda2ppi")
   _lambda.DecayDescriptors = ["[Lambda0 -> p+ pi-]cc", "[Lambda0 -> p+ pi+]cc"]
-  _lambda.DaughtersCuts = { "p+" : _protonCommonCut + 
+  _lambda.DaughtersCuts = { "p+" : _protonCommonCut +
                             " & (MIPCHI2DV(PRIMARY) > %(LongProtons4Lambda0_MINIPCHI2)s)" % config,
                             "pi-" : _pionCommonCut,
                             "pi+" : _pionCommonCut
                             }
-  _lambda.CombinationCut = ("(ADAMASS('Lambda0') < %(Lambda0_MassWindowLarge)s) & "+			
-                            "(APT > %(Lambda0_APT)s)"		  
+  _lambda.CombinationCut = ("(ADAMASS('Lambda0') < %(Lambda0_MassWindowLarge)s) & "+
+                            "(APT > %(Lambda0_APT)s)"
                                                       ) % config
   _lambda.MotherCut = _lambdaCommonCut
 
@@ -449,14 +449,14 @@ def makeLambda0 (localname, additionalRequiredSelections=[], config=default_conf
   _lambdaDD = CombineParticles(localname+"lambda2ppidown")
   _lambdaDD.DecayDescriptors = _lambda.DecayDescriptors;
   _lambdaDD.CombinationCut = ("(ADAMASS('Lambda0') < %(Lambda0_MassWindowLarge)s) & "+
-                              "(APT > %(Lambda0_APT)s)" 
+                              "(APT > %(Lambda0_APT)s)"
                                                                         ) % config
   _lambdaDD.DaughtersCuts = {
              "p+" 		: (	_protonCommonCut +
                         "& ( TRPCHI2 > %(Lambda0_DownProtonTrackPvalue)s )") % config,
-             "pi-"	:  ( _pionCommonCut + 
+             "pi-"	:  ( _pionCommonCut +
                         "& ( TRPCHI2 > %(Lambda0_DownPionTrackPvalue)s)" ) % config,
-             "pi+"	:  ( _pionCommonCut + 
+             "pi+"	:  ( _pionCommonCut +
                         "& ( TRPCHI2 > %(Lambda0_DownPionTrackPvalue)s)" ) % config
             }
   _lambdaDD.MotherCut = _lambdaCommonCut
@@ -465,7 +465,7 @@ def makeLambda0 (localname, additionalRequiredSelections=[], config=default_conf
   LooseLambdaDDSelection = Selection(localname+"SelLooseLambdaDown",
             Algorithm = _lambdaDD,
                       RequiredSelections = additionalRequiredSelections + [
-                                    AutomaticData(_my_immutable_config['DownProtonsForLambda']), 
+                                    AutomaticData(_my_immutable_config['DownProtonsForLambda']),
                                     AutomaticData(_my_immutable_config['DownPionsForLambda'])]);
 
 	#Lambda combine particles WITH UPSTREAM TRACKS
@@ -488,51 +488,51 @@ def makeLambda0 (localname, additionalRequiredSelections=[], config=default_conf
                               AutomaticData(_my_immutable_config['LongProtonsForLambda']),
                               AutomaticData(_my_immutable_config['UpPionsForLambda'])]);
 
-  return MergedSelection(localname+'AllLooseLambda', 
-                        RequiredSelections = [LooseLambdaSelection, 
-                                              LooseLambdaDDSelection, 
+  return MergedSelection(localname+'AllLooseLambda',
+                        RequiredSelections = [LooseLambdaSelection,
+                                              LooseLambdaDDSelection,
                                               LooseLambdaULSelection ] );
-                  
+
 
 def makeXi (localname, _RequiredSelections, config=default_config['CONFIG']):
 
   _xi = CombineParticles(localname+"xi2lambda")
   _xi.DecayDescriptor = "[Xi- -> Lambda0 pi-]cc"
-  _xi.DaughtersCuts = 	{ "pi-" : (	"(PT > %(Pions4Ximinus_PT)s) & " + 
+  _xi.DaughtersCuts = 	{ "pi-" : (	"(PT > %(Pions4Ximinus_PT)s) & " +
                                   "(PROBNNpi > %(Pions4Ximinus_ProbNNpi)s) & " +
                                   "(TRPCHI2 > %(Pions4Ximinus_TRPCHI2)s) & " +
                                   "(MIPCHI2DV(PRIMARY) > %(Pions4Ximinus_MINIPCHI2)s)"
-                                                                                ) % config 
+                                                                                ) % config
                           }
   _xi.CombinationCut = ("(ADAMASS('Xi-') < %(Ximinus_MassWindowLarge)s) & "+
                       "(APT > %(Ximinus_APT)s)"
                                                 ) % config
   _xi.MotherCut = ("((VFASPF(VCHI2/VDOF) < %(Ximinus_ENDVERTEXCHI2)s) "
-                    "& (ADMASS('Xi-') < %(Ximinus_MassWindowTight)s)" 
-                    "& (BPVVDZ/P > %(Ximinus_FlightDistance)s))" 
+                    "& (ADMASS('Xi-') < %(Ximinus_MassWindowTight)s)"
+                    "& (BPVVDZ/P > %(Ximinus_FlightDistance)s))"
                                                                       )% config
 
 	#Selection
   return Selection(localname+"SelLooseXi",
             Algorithm = _xi,
             RequiredSelections = _RequiredSelections);
-					
+
 
 
 def makeXic (localname, _RequiredSelections, config=default_name):
 
   _xic = CombineParticles(localname+"xic2xipi")
   _xic.DecayDescriptor = "[Xi_c0 -> Xi- pi+]cc"
-  _xic.CombinationCut = ("(ADAMASS('Xi_c0') < %(Xic0_MassWindowLarge)s) &  "+ 
+  _xic.CombinationCut = ("(ADAMASS('Xi_c0') < %(Xic0_MassWindowLarge)s) &  "+
                          "(APT > %(Xic0_APT)s)") % config
-  _xic.DaughtersCuts = { "pi+": ( 
+  _xic.DaughtersCuts = { "pi+": (
                           "(PT > %(Pions4Xic0_PT)s) & " +
                           "(TRPCHI2 > %(Pions4Xic0_TRPCHI2)s) & " +
-                          "(PROBNNpi > %(Pions4Xic0_ProbNNpi)s) ") % config			
+                          "(PROBNNpi > %(Pions4Xic0_ProbNNpi)s) ") % config
                       }
 
   _xic.MotherCut = ("((VFASPF(VCHI2/VDOF)< %(Xic0_ENDVERTEXCHI2)s) & "+
-                          "(ADMASS('Xi_c0') < %(Xic0_MassWindowTight)s))  " 
+                          "(ADMASS('Xi_c0') < %(Xic0_MassWindowTight)s))  "
                           )% config
 
   return Selection(localname+"SelLooseXic0",
@@ -540,16 +540,16 @@ def makeXic (localname, _RequiredSelections, config=default_name):
             RequiredSelections = _RequiredSelections);
 
 def makeXibc0 (localname, _RequiredSelections, config=default_name):
-	
+
   _xibc = CombineParticles(localname + "xibc2xijpsi")
   _xibc.DecayDescriptor = "[Xi_bc0 -> Xi_c0 J/psi(1S)]cc"
   _xibc.CombinationCut = ("(ADAMASS('Xi_bc0') < %(Xibc0_MassWindow)s) & " +
                           "(AMAXCHILD(TRGHP, ISBASIC) < %(GlobalGhostProb_Max)s)"
                           ) % config
-  _xibc.MotherCut = ("(VFASPF(VCHI2/VDOF)< %(Xibc0_ENDVERTEXCHI2)s)" 
+  _xibc.MotherCut = ("(VFASPF(VCHI2/VDOF)< %(Xibc0_ENDVERTEXCHI2)s)"
 #                    " & (MAXTREE(TRGHP, ISBASIC) < %(GlobalGhostProb_Max)s)"
                                                                   )% config
-                  
+
 
   #Selection
   return Selection(localname + "SelLooseXibc0",
@@ -578,8 +578,8 @@ def makeX (localname, _RequiredSelections, config=default_config['CONFIG']):
                                                                             ) % config
      }
   _combinex.MotherCut = "(ALL)" #No cut
-	
-  return Selection(localname + "SelHighMassBaryonicStates", Algorithm =_combinex, 
+
+  return Selection(localname + "SelHighMassBaryonicStates", Algorithm =_combinex,
                         RequiredSelections = _RequiredSelections);
 
 
@@ -588,12 +588,12 @@ def makeXibc2JpsiKp (localname, _RequiredSelections, config=default_config['CONF
   myXibc = CombineParticles(localname+"Xibc2JpsipK");
   myXibc.DecayDescriptor = "[Xi_bc0 -> J/psi(1S) p+ K-]cc"
   if (controlLine == True):
-    myXibc.CombinationCut = ("(AM > %(JpsiKp_MassMin)s ) & " 
+    myXibc.CombinationCut = ("(AM > %(JpsiKp_MassMin)s ) & "
                              "(AM < %(JpsiKp_MassLbThreshold)s)  " )%config
   else:
-    myXibc.CombinationCut = ("(AM > %(JpsiKp_MassLbThreshold)s ) & " 
+    myXibc.CombinationCut = ("(AM > %(JpsiKp_MassLbThreshold)s ) & "
                              "(AM < %(JpsiKp_MassMax)s  )  " )%config
-                                                                          
+
   myXibc.MotherCut = ("(VFASPF(VCHI2/VDOF)< %(JpsiKp_MaxVertexChi2)s) & "
                       "(BPVLTIME()> %(JpsiKp_MinTAU)s)"
                       ) %config
@@ -613,9 +613,9 @@ def makeXibc2JpsiKp (localname, _RequiredSelections, config=default_config['CONF
                                   "(P > %(JpsiKp_K_MinP)s)") %config}
 
 
-  return Selection(localname + "Xibc2JpsipKSel", Algorithm=myXibc, 
+  return Selection(localname + "Xibc2JpsipKSel", Algorithm=myXibc,
                       RequiredSelections = _RequiredSelections)
-                                
+
 
 
 ###################################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py
index ced3c225c4a09ca093fe211d740020b0537fa6f9..96d5eb746d66bcf577920cf5dbe3b22301da5c2b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py
@@ -9,13 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for the Doublely Heavy Flavour Baryons, Xibc,  
+Module for the Doublely Heavy Flavour Baryons, Xibc,
 Note:
 *. CPU-intensive cuts like IPCHI2 are not re-applied
    if being identical to those in the common particles
 
 Include the following lines:
-Xibc+  -> p+ K- pi+ 
+Xibc+  -> p+ K- pi+
 Xibc+  -> D0 p+ K- pi+
 Xibc+  -> D+ p+ K-
 Xibc+  -> Lc+ K- pi+
@@ -49,7 +49,7 @@ default_config = {
 
         'DplusCuts'     : "(ADMASS('D+')<75*MeV) & (VFASPF(VCHI2/VDOF) < 25.) & (PT>1.0*GeV) & (BPVVDCHI2>100)",
         'D0Cuts'        : "(ADMASS('D0')<75*MeV) & (VFASPF(VCHI2/VDOF) < 25.) & (PT>1.0*GeV) & (BPVVDCHI2>64)",
-    
+
         'LcComCuts'     : "(APT>1.0*GeV) & (ADAMASS('Lambda_c+')<50*MeV) & (ADOCACHI2CUT(30, ''))",
         'LcMomCuts'     : "(ADMASS('Lambda_c+')<30*MeV) & (VFASPF(VCHI2/VDOF) < 25.) & (BPVVDCHI2>16)",
 
@@ -63,13 +63,13 @@ default_config = {
                           & (INTREE( (ID=='K-') & (PT>200*MeV) & (TRGHOSTPROB<0.4) ))
                           """ ,
 
-        'UnPionCuts'    : "(PROBNNpi> 0.2) & (PT>200*MeV) & (TRGHOSTPROB<0.4)",  
+        'UnPionCuts'    : "(PROBNNpi> 0.2) & (PT>200*MeV) & (TRGHOSTPROB<0.4)",
         'UnKaonCuts'    : "(PROBNNk > 0.1) & (PT>250*MeV) & (TRGHOSTPROB<0.4)",
         'UnProtonCuts'  : "(PROBNNp> 0.05) & (PT>300*MeV) & (TRGHOSTPROB<0.4)",
 
-        'UnPTPionCuts'    : "(PROBNNpi> 0.2) & (PT>500*MeV) & (TRGHOSTPROB<0.4)",  
+        'UnPTPionCuts'    : "(PROBNNpi> 0.2) & (PT>500*MeV) & (TRGHOSTPROB<0.4)",
         'UnPTKaonCuts'    : "(PROBNNk > 0.1) & (PT>600*MeV) & (TRGHOSTPROB<0.4)",
-        'UnPTProtonCuts'  : "(PROBNNp> 0.05) & (PT>750*MeV) & (TRGHOSTPROB<0.4)",    
+        'UnPTProtonCuts'  : "(PROBNNp> 0.05) & (PT>750*MeV) & (TRGHOSTPROB<0.4)",
 
         'TightPionCuts'   : "(PROBNNpi> 0.2) & (PT>200*MeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>2.)",
         'TightKaonCuts'   : "(PROBNNk > 0.1) & (PT>250*MeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>2.)",
@@ -80,7 +80,7 @@ default_config = {
         'HighPTProtonCuts' : "(PROBNNp> 0.05) & (PT>1.0*GeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>1.)",
 
         'Pion4LPCuts'   : "(PROBNNpi> 0.2) & (PT>100*MeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>9.)",
-        
+
         'XibcComCuts'   : "(AM>4.8*GeV)",
         'XibcMomCuts'   : "(M>5.0*GeV) & (VFASPF(VCHI2/VDOF) < 25.) & (BPVIPCHI2()<25) & (BPVDIRA> 0.99)",
         'XibcLPMomCuts' : "(M>5.0*GeV) & (VFASPF(VCHI2/VDOF) < 25.) & (BPVIPCHI2()<25)",
@@ -125,54 +125,54 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class XibcBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
-                
+
         """
         Basic particles, long tracks
         """
         from StandardParticles import StdAllLooseANNPions, StdAllLooseANNKaons, StdAllLooseANNProtons
-        
+
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  StdAllLooseANNPions , 
+                                           InputList =  StdAllLooseANNPions ,
                                            Cuts = config['PionCuts']
                                            )
-        
+
         self.SelKaons = self.createSubSel( OutputList = self.name + "SelKaons",
-                                           InputList = StdAllLooseANNKaons, 
+                                           InputList = StdAllLooseANNKaons,
                                            Cuts = config['KaonCuts']
                                            )
-                                                   
+
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                             InputList = StdAllLooseANNProtons, 
+                                             InputList = StdAllLooseANNProtons,
                                              Cuts = config['ProtonCuts']
                                              )
 
         #from StandardParticles import StdAllLooseANNPions
         self.SelUnPions = self.createSubSel( OutputList = self.name + "SelUnPions",
-                                               InputList =  StdAllLooseANNPions , 
+                                               InputList =  StdAllLooseANNPions ,
                                                Cuts = config['UnPionCuts']
                                                )
-        
+
         self.SelUnKaons = self.createSubSel( OutputList = self.name + "SelUnKaons",
-                                               InputList =  StdAllLooseANNKaons , 
+                                               InputList =  StdAllLooseANNKaons ,
                                                Cuts = config['UnKaonCuts']
                                                )
         self.SelUnProtons = self.createSubSel( OutputList = self.name + "SelUnProtons",
-                                                 InputList =  StdAllLooseANNProtons , 
+                                                 InputList =  StdAllLooseANNProtons ,
                                                  Cuts = config['UnProtonCuts']
                                                  )
 
@@ -180,29 +180,29 @@ class XibcBDTConf(LineBuilder):
         Unbiased but with moderate PT
         """
         self.SelUnPTPions = self.createSubSel( OutputList = self.name + "SelUnPTPions",
-                                               InputList =  StdAllLooseANNPions , 
+                                               InputList =  StdAllLooseANNPions ,
                                                Cuts = config['UnPTPionCuts']
                                                )
-        
+
         self.SelUnPTKaons = self.createSubSel( OutputList = self.name + "SelUnPTKaons",
-                                               InputList =  StdAllLooseANNKaons , 
+                                               InputList =  StdAllLooseANNKaons ,
                                                Cuts = config['UnPTKaonCuts']
                                                )
         self.SelUnPTProtons = self.createSubSel( OutputList = self.name + "SelUnPTProtons",
-                                                 InputList =  StdAllLooseANNProtons , 
+                                                 InputList =  StdAllLooseANNProtons ,
                                                  Cuts = config['UnPTProtonCuts']
                                                  )
-        
+
         """
         With IPCHI2
         """
         self.SelTightPions = self.createSubSel( OutputList = self.name + "SelTightPions",
-                                                    InputList =  StdAllLooseANNPions , 
+                                                    InputList =  StdAllLooseANNPions ,
                                                     Cuts = config['TightPionCuts']
                                                     )
-        
+
         self.SelTightKaons = self.createSubSel( OutputList = self.name + "SelTightKaons",
-                                                    InputList =  StdAllLooseANNKaons , 
+                                                    InputList =  StdAllLooseANNKaons ,
                                                     Cuts = config['TightKaonCuts']
                                                     )
 
@@ -210,33 +210,33 @@ class XibcBDTConf(LineBuilder):
         With high PT cut, also IPCHI2
         """
         self.SelHighPTPions = self.createSubSel( OutputList = self.name + "SelHighPTPions",
-                                                 InputList =  StdAllLooseANNPions , 
+                                                 InputList =  StdAllLooseANNPions ,
                                                  Cuts = config['HighPTPionCuts']
                                                  )
-        
+
         self.SelHighPTKaons = self.createSubSel( OutputList = self.name + "SelHighPTKaons",
-                                                 InputList =  StdAllLooseANNKaons , 
+                                                 InputList =  StdAllLooseANNKaons ,
                                                  Cuts = config['HighPTKaonCuts']
                                                  )
 
         self.SelHighPTProtons = self.createSubSel( OutputList = self.name + "SelHighPTProtons",
-                                                 InputList =  StdAllLooseANNProtons , 
+                                                 InputList =  StdAllLooseANNProtons ,
                                                  Cuts = config['HighPTProtonCuts']
                                                  )
 
         """
-        Pion for very long lived particle 
+        Pion for very long lived particle
         """
         self.SelPions4LP = self.createSubSel( OutputList = self.name + "SelPions4LP",
-                                              InputList =  StdAllLooseANNPions , 
+                                              InputList =  StdAllLooseANNPions ,
                                               Cuts = config['Pion4LPCuts']
                                               )
-        
+
         """
-        Dplus->K pi pi 
+        Dplus->K pi pi
         """
         self.SelDplus = self.createSubSel( OutputList = self.name + "SelDplus",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseDplus2KPiPi/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseDplus2KPiPi/Particles' ),
                                            Cuts = config['DplusCuts']
                                            )
 
@@ -244,10 +244,10 @@ class XibcBDTConf(LineBuilder):
         D0->K pi
         """
         self.SelD0 = self.createSubSel( OutputList = self.name + "SelD0",
-                                        InputList =  DataOnDemand(Location = 'Phys/StdLooseD02KPi/Particles' ), 
+                                        InputList =  DataOnDemand(Location = 'Phys/StdLooseD02KPi/Particles' ),
                                         Cuts = config['D0Cuts']
                                         )
-        
+
         """
         LambdaC->p K pi
         """
@@ -255,22 +255,22 @@ class XibcBDTConf(LineBuilder):
                                                      DecayDescriptor = "[ Lambda_c+ -> p+  K-  pi+ ]cc",
                                                      DaughterLists = [ self.SelProtons,
                                                                        self.SelKaons,
-                                                                       self.SelPions ],                    
+                                                                       self.SelPions ],
                                                      PreVertexCuts  = config['LcComCuts'],
                                                      PostVertexCuts = config['LcMomCuts'] )
 
-        
+
         """
         Lambda_b -> LambdaC pi
         """
         self.SelLambdaB = self.createCombinationSel( OutputList = self.name + "SelLambdaB",
                                                      DecayDescriptor = "[ Lambda_b0 -> Lambda_c+  pi- ]cc",
                                                      DaughterLists = [ self.SelLambdaC,
-                                                                       self.SelHighPTPions ],                    
+                                                                       self.SelHighPTPions ],
                                                      PreVertexCuts  = config['LbComCuts'],
                                                      PostVertexCuts = config['LbMomCuts'] )
 
-        
+
         """
         Lambda, both LL and DD
         """
@@ -282,29 +282,29 @@ class XibcBDTConf(LineBuilder):
 
         self.SelLambdaLL = self.createCombinationSel( OutputList = self.name + "SelLambdaLL",
                                                       DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
-                                                      DaughterLists = [ self.SelProtons, self.SelPions4LP ],   
+                                                      DaughterLists = [ self.SelProtons, self.SelPions4LP ],
                                                       PreVertexCuts  = config['LambdaLLComCuts'],
                                                       PostVertexCuts = config['LambdaLLCuts'] )
-        
+
         self.SelLambda = MergedSelection( self.name + "SelLambda",
                                           RequiredSelections = [ self.SelLambdaDD,
                                                                  self.SelLambdaLL ] )
 
 
         """
-        Phi 
+        Phi
         """
         from StandardParticles import StdLoosePhi2KK
-        
+
         self.SelPhi = self.createSubSel( OutputList = self.name + "SelPhi",
-                                         InputList =  StdLoosePhi2KK, 
+                                         InputList =  StdLoosePhi2KK,
                                          Cuts = config['PhiCuts']
                                          )
 
 
         #
-        # Stripping lines 
-        # 
+        # Stripping lines
+        #
         """
         -------------------------------------------
         Xibc+
@@ -313,23 +313,23 @@ class XibcBDTConf(LineBuilder):
         """
 
         """
-        XibcP2pKpi 
+        XibcP2pKpi
         """
         self.XibcP2pKpiVars = {
             "sqrt(P_IPCHI2_OWNPV)"        : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
             "sqrt(Kaon_IPCHI2_OWNPV)"     : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(Pion_IPCHI2_OWNPV)"     : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(P_IPCHI2_OWNPV+Kaon_IPCHI2_OWNPV+Pion_IPCHI2_OWNPV)" : "sqrt( CHILD(MIPCHI2DV(),1) + CHILD(MIPCHI2DV(),2) + CHILD(MIPCHI2DV(),3) )",
-            "sqrt(C_IPCHI2_OWNPV)"        : "sqrt(BPVIPCHI2())", 
+            "sqrt(C_IPCHI2_OWNPV)"        : "sqrt(BPVIPCHI2())",
             "log(P_PT)"                   : "log(CHILD(PT, 1))",
             "log(Kaon_PT)"                : "log(CHILD(PT, 2))",
             "log(Pion_PT)"                : "log(CHILD(PT, 3))",
             "log(P_PT+Kaon_PT+Pion_PT)"   : "log( CHILD(PT, 1) + CHILD(PT, 2) + CHILD(PT, 3) )",
             "log(C_PT)"                   : "log(PT)",
-            "sqrt(C_FDCHI2_OWNPV)"        : "sqrt(BPVVDCHI2)", 
+            "sqrt(C_FDCHI2_OWNPV)"        : "sqrt(BPVVDCHI2)",
             "C_DIRA_OWNPV"                : "BPVDIRA"
             }
-        
+
         self.SelXibcP2pKpi = self.createCombinationSel( OutputList = self.name + "SelXibcP2pKpi",
                                                         DecayDescriptor = "[ Xi_bc+ -> p+ K- pi+ ]cc",
                                                         DaughterLists = [ self.SelHighPTProtons,
@@ -337,20 +337,20 @@ class XibcBDTConf(LineBuilder):
                                                                           self.SelPions ],
                                                         PreVertexCuts  = config['XibcComCuts'],
                                                         PostVertexCuts = config['XibcMomCuts'] )
-        
-        
+
+
         self.MvaXibcP2pKpi = self.applyMVA( self.name + "MvaXibcP2pKpi",
                                            SelB        = self.SelXibcP2pKpi,
                                            MVAVars     = self.XibcP2pKpiVars,
-                                           MVACutValue = config['XibcP2pKpiMVACut'], 
+                                           MVACutValue = config['XibcP2pKpiMVACut'],
                                            MVAxmlFile  = config['XibcP2pKpiXmlFile']
                                            )
-        
-        self.XibcP2pKpiLine = StrippingLine( self.name + '_XibcP2pKpiLine',                                               
+
+        self.XibcP2pKpiLine = StrippingLine( self.name + '_XibcP2pKpiLine',
                                             algos     = [ self.MvaXibcP2pKpi ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.XibcP2pKpiLine )
 
 
@@ -366,9 +366,9 @@ class XibcBDTConf(LineBuilder):
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(XiccPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 4 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 3))",
             "log(XiccPi_PT)"             : "log(CHILD(PT, 4))",
@@ -386,19 +386,19 @@ class XibcBDTConf(LineBuilder):
                                                                             self.SelHighPTPions ],  # w/ IPchi2 cut to speed up
                                                           PreVertexCuts  = config['XibcComCuts'],
                                                           PostVertexCuts = config['XibcMomCuts'] )
-              
+
         self.MvaXibcP2D0pKpi = self.applyMVA( self.name + "MvaXibcP2D0pKpi",
                                            SelB        = self.SelXibcP2D0pKpi,
                                            MVAVars     = self.XibcP2D0pKpiVars,
-                                           MVACutValue = config['XibcP2D0pKpiMVACut'], 
+                                           MVACutValue = config['XibcP2D0pKpiMVACut'],
                                            MVAxmlFile  = config['XibcP2D0pKpiXmlFile']
                                            )
-        
-        self.XibcP2D0pKpiLine = StrippingLine( self.name + '_XibcP2D0pKpiLine',                                               
+
+        self.XibcP2D0pKpiLine = StrippingLine( self.name + '_XibcP2D0pKpiLine',
                                                  algos     = [ self.MvaXibcP2D0pKpi ],
                                                  MDSTFlag  = False
                                                )
-        
+
         self.registerLine( self.XibcP2D0pKpiLine )
 
 
@@ -414,10 +414,10 @@ class XibcBDTConf(LineBuilder):
             "sqrt(XiccP_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))", 
-            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))",
+            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 3))",
             "log(C_PT)"                  : "log(PT)",
@@ -430,22 +430,22 @@ class XibcBDTConf(LineBuilder):
                                                           DecayDescriptor = "[ Xi_bc+ -> D+ p+ K- ]cc",
                                                           DaughterLists = [ self.SelDplus,
                                                                             self.SelUnProtons,
-                                                                            self.SelUnKaons ], 
+                                                                            self.SelUnKaons ],
                                                           PreVertexCuts  = config['XibcComCuts'],
                                                           PostVertexCuts = config['XibcMomCuts'] )
-        
+
         self.MvaXibcP2DpK = self.applyMVA( self.name + "MvaXibcP2DpK",
                                            SelB        = self.SelXibcP2DpK,
                                            MVAVars     = self.XibcP2DpKVars,
-                                           MVACutValue = config['XibcP2DpKMVACut'], 
+                                           MVACutValue = config['XibcP2DpKMVACut'],
                                            MVAxmlFile  = config['XibcP2DpKXmlFile']
                                            )
-        
-        self.XibcP2DpKLine = StrippingLine( self.name + '_XibcP2DpKLine',                                               
+
+        self.XibcP2DpKLine = StrippingLine( self.name + '_XibcP2DpKLine',
                                                  algos     = [ self.MvaXibcP2DpK ],
                                                  MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.XibcP2DpKLine )
 
 
@@ -460,10 +460,10 @@ class XibcBDTConf(LineBuilder):
             "sqrt(XibcPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(XibcK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))", 
-            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(Lc_PT)"                 : "log(CHILD(PT, 1))",   
+            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))",
+            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(Lc_PT)"                 : "log(CHILD(PT, 1))",
             "log(XibcPi_PT)"             : "log(CHILD(PT, 3))",
             "log(XibcK_PT)"              : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
@@ -479,19 +479,19 @@ class XibcBDTConf(LineBuilder):
                                                                            self.SelUnPions ],
                                                          PreVertexCuts  = config['XibcComCuts'],
                                                          PostVertexCuts = config['XibcMomCuts'] )
-        
+
         self.MvaXibcP2LcKpi = self.applyMVA( self.name + "MvaXibcP2LcKpi",
                                            SelB        = self.SelXibcP2LcKpi,
                                            MVAVars     = self.XibcP2LcKpiVars,
-                                           MVACutValue = config['XibcP2LcKpiMVACut'], 
+                                           MVACutValue = config['XibcP2LcKpiMVACut'],
                                            MVAxmlFile  = config['XibcP2LcKpiXmlFile']
                                            )
-        
-        self.XibcP2LcKpiLine = StrippingLine( self.name + '_XibcP2LcKpiLine',                                               
+
+        self.XibcP2LcKpiLine = StrippingLine( self.name + '_XibcP2LcKpiLine',
                                                  algos     = [ self.MvaXibcP2LcKpi ],
                                                  MDSTFlag  = False
                                                  )
-        
+
         self.registerLine( self.XibcP2LcKpiLine )
 
 
@@ -504,33 +504,33 @@ class XibcBDTConf(LineBuilder):
             "sqrt(LPi_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 1, 2))",
             "sqrt(Pi_IPCHI2_OWNPV)"    : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "log(LP_PT)"               : "log(CHILD(PT, 1, 1))",
-            "log(LPi_PT)"              : "log(CHILD(PT, 1, 2))", 
+            "log(LPi_PT)"              : "log(CHILD(PT, 1, 2))",
             "log(Lambda_PT)"           : "log(CHILD(PT, 1))",
             "log(Pi_PT)"               : "log(CHILD(PT, 2))",
             "sqrt(Lambda_FDCHI2_OWNPV)": "sqrt(CHILD(BPVVDCHI2,1))",
             "sqrt(C_FDCHI2_OWNPV)"     : "sqrt(BPVVDCHI2)",
-            "sqrt(C_IPCHI2_OWNPV)"     : "sqrt(BPVIPCHI2())" 
+            "sqrt(C_IPCHI2_OWNPV)"     : "sqrt(BPVIPCHI2())"
             }
-        
+
         self.SelXibcP2LambdaPi = self.createCombinationSel( OutputList = self.name + "SelXibcP2LambdaPi",
                                                          DecayDescriptor = "[ Xi_bc+ -> Lambda0 pi+ ]cc",
                                                          DaughterLists = [ self.SelLambda,
                                                                            self.SelUnPions ],
                                                          PreVertexCuts  = config['XibcComCuts'],
                                                          PostVertexCuts = config['XibcLPMomCuts'] )
-        
+
         self.MvaXibcP2LambdaPi = self.applyMVA( self.name + "MvaXibcP2LambdaPi",
                                            SelB        = self.SelXibcP2LambdaPi,
                                            MVAVars     = self.XibcP2LambdaPiVars,
-                                           MVACutValue = config['XibcP2LambdaPiMVACut'], 
+                                           MVACutValue = config['XibcP2LambdaPiMVACut'],
                                            MVAxmlFile  = config['XibcP2LambdaPiXmlFile']
                                            )
-        
-        self.XibcP2LambdaPiLine = StrippingLine( self.name + '_XibcP2LambdaPiLine',                                               
+
+        self.XibcP2LambdaPiLine = StrippingLine( self.name + '_XibcP2LambdaPiLine',
                                                  algos     = [ self.MvaXibcP2LambdaPi ],
                                                  MDSTFlag  = False
                                                  )
-        
+
         self.registerLine( self.XibcP2LambdaPiLine )
 
 
@@ -543,18 +543,18 @@ class XibcBDTConf(LineBuilder):
         """
 
         """
-        Xibc2pK 
+        Xibc2pK
         """
         self.Xibc2pKVars = {
             "sqrt(P_IPCHI2_OWNPV)"        : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
             "sqrt(K_IPCHI2_OWNPV)"        : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(P_IPCHI2_OWNPV+K_IPCHI2_OWNPV)" : "sqrt( CHILD(MIPCHI2DV(),1) + CHILD(MIPCHI2DV(),2) )",
-            "sqrt(C_IPCHI2_OWNPV)"        : "sqrt(BPVIPCHI2())", 
+            "sqrt(C_IPCHI2_OWNPV)"        : "sqrt(BPVIPCHI2())",
             "log(P_PT)"                   : "log(CHILD(PT, 1))",
             "log(K_PT)"                   : "log(CHILD(PT, 2))",
             "log(P_PT+K_PT)"              : "log( CHILD(PT, 1) + CHILD(PT, 2) )",
             "log(C_PT)"                   : "log(PT)",
-            "sqrt(C_FDCHI2_OWNPV)"        : "sqrt(BPVVDCHI2)", 
+            "sqrt(C_FDCHI2_OWNPV)"        : "sqrt(BPVVDCHI2)",
             "C_DIRA_OWNPV"                : "BPVDIRA"
             }
         self.SelXibc2pK = self.createCombinationSel( OutputList = self.name + "SelXibc2pK",
@@ -564,20 +564,20 @@ class XibcBDTConf(LineBuilder):
                                                                        ],
                                                      PreVertexCuts  = config['XibcComCuts'],
                                                      PostVertexCuts = config['XibcMomCuts'] )
-        
-        
+
+
         self.MvaXibc2pK = self.applyMVA( self.name + "MvaXibc2pK",
                                            SelB        = self.SelXibc2pK,
                                            MVAVars     = self.Xibc2pKVars,
-                                           MVACutValue = config['Xibc2pKMVACut'], 
+                                           MVACutValue = config['Xibc2pKMVACut'],
                                            MVAxmlFile  = config['Xibc2pKXmlFile']
                                            )
-        
-        self.Xibc2pKLine = StrippingLine( self.name + '_Xibc2pKLine',                                               
+
+        self.Xibc2pKLine = StrippingLine( self.name + '_Xibc2pKLine',
                                             algos     = [ self.MvaXibc2pK ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.Xibc2pKLine )
 
 
@@ -591,9 +591,9 @@ class XibcBDTConf(LineBuilder):
             "sqrt(XibcP_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(XibcK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XibcP_PT)"              : "log(CHILD(PT, 2))",
             "log(XibcK_PT)"              : "log(CHILD(PT, 3))",
             "log(C_PT)"                  : "log(PT)",
@@ -606,22 +606,22 @@ class XibcBDTConf(LineBuilder):
                                                        DecayDescriptor = "[ Xi_bc0 -> D0 p+ K- ]cc",
                                                        DaughterLists = [ self.SelD0,
                                                                          self.SelUnProtons,
-                                                                         self.SelUnKaons ], 
+                                                                         self.SelUnKaons ],
                                                        PreVertexCuts  = config['XibcComCuts'],
                                                        PostVertexCuts = config['XibcMomCuts'] )
-        
+
         self.MvaXibc2D0pK = self.applyMVA( self.name + "MvaXibc2D0pK",
                                            SelB        = self.SelXibc2D0pK,
                                            MVAVars     = self.Xibc2D0pKVars,
-                                           MVACutValue = config['Xibc2D0pKMVACut'], 
+                                           MVACutValue = config['Xibc2D0pKMVACut'],
                                            MVAxmlFile  = config['Xibc2D0pKXmlFile']
                                            )
- 
-        self.Xibc2D0pKLine = StrippingLine( self.name + '_Xibc2D0pKLine',                                               
+
+        self.Xibc2D0pKLine = StrippingLine( self.name + '_Xibc2D0pKLine',
                                             algos     = [ self.MvaXibc2D0pK ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.Xibc2D0pKLine )
 
 
@@ -643,7 +643,7 @@ class XibcBDTConf(LineBuilder):
             "sqrt(Lambda_FDCHI2_OWNPV)": "sqrt(CHILD(BPVVDCHI2,1))",
             "sqrt(Phi_FDCHI2_OWNPV)"   : "sqrt(CHILD(BPVVDCHI2,2))",
             "sqrt(C_FDCHI2_OWNPV)"     : "sqrt(BPVVDCHI2)",
-            "sqrt(C_IPCHI2_OWNPV)"     : "sqrt(BPVIPCHI2())" 
+            "sqrt(C_IPCHI2_OWNPV)"     : "sqrt(BPVIPCHI2())"
             }
         self.SelXibc2LambdaPhi = self.createCombinationSel( OutputList = self.name + "SelXibc2LambdaPhi",
                                                             DecayDescriptor = "[ Xi_bc0 -> Lambda0 phi(1020) ]cc",
@@ -651,19 +651,19 @@ class XibcBDTConf(LineBuilder):
                                                                               self.SelPhi ],
                                                             PreVertexCuts  = config['XibcComCuts'],
                                                             PostVertexCuts = config['XibcLPMomCuts'] )
-        
+
         self.MvaXibc2LambdaPhi = self.applyMVA( self.name + "MvaXibc2LambdaPhi",
                                            SelB        = self.SelXibc2LambdaPhi,
                                            MVAVars     = self.Xibc2LambdaPhiVars,
-                                           MVACutValue = config['Xibc2LambdaPhiMVACut'], 
+                                           MVACutValue = config['Xibc2LambdaPhiMVACut'],
                                            MVAxmlFile  = config['Xibc2LambdaPhiXmlFile']
                                            )
-        
-        self.Xibc2LambdaPhiLine = StrippingLine( self.name + '_Xibc2LambdaPhiLine',                                               
+
+        self.Xibc2LambdaPhiLine = StrippingLine( self.name + '_Xibc2LambdaPhiLine',
                                                  algos     = [ self.MvaXibc2LambdaPhi ],
                                                  MDSTFlag  = False
                                                  )
-        
+
         self.registerLine( self.Xibc2LambdaPhiLine )
 
 
@@ -677,9 +677,9 @@ class XibcBDTConf(LineBuilder):
             "sqrt(Lc_IPCHI2_OWNPV)"      : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
             "sqrt(XibcPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))", 
-            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))", 
+            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))",
+            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))",
             "log(Lc_PT)"                 : "log(CHILD(PT, 1))",
             "log(XibcPi_PT)"             : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
@@ -698,15 +698,15 @@ class XibcBDTConf(LineBuilder):
         self.MvaXibc2LcPi = self.applyMVA( self.name + "MvaXibc2LcPi",
                                            SelB        = self.SelXibc2LcPi,
                                            MVAVars     = self.Xibc2LcPiVars,
-                                           MVACutValue = config['Xibc2LcPiMVACut'], 
+                                           MVACutValue = config['Xibc2LcPiMVACut'],
                                            MVAxmlFile  = config['Xibc2LcPiXmlFile']
                                            )
-        
-        self.Xibc2LcPiLine = StrippingLine( self.name + '_Xibc2LcPiLine',                                               
+
+        self.Xibc2LcPiLine = StrippingLine( self.name + '_Xibc2LcPiLine',
                                             algos     = [ self.MvaXibc2LcPi ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.Xibc2LcPiLine )
 
 
@@ -720,21 +720,21 @@ class XibcBDTConf(LineBuilder):
                                                                         self.SelUnKaons ],
                                                       PreVertexCuts  = config['XibcComCuts'],
                                                       PostVertexCuts = config['XibcMomCuts'] )
-              
+
         self.MvaXibc2LcK = self.applyMVA( self.name + "MvaXibc2LcK",
                                            SelB        = self.SelXibc2LcK,
                                            MVAVars     = self.Xibc2LcPiVars,
-                                           MVACutValue = config['Xibc2LcKMVACut'], 
+                                           MVACutValue = config['Xibc2LcKMVACut'],
                                            MVAxmlFile  = config['Xibc2LcPiXmlFile']
                                            )
-        
-        self.Xibc2LcKLine = StrippingLine( self.name + '_Xibc2LcKLine',                                               
+
+        self.Xibc2LcKLine = StrippingLine( self.name + '_Xibc2LcKLine',
                                             algos     = [ self.MvaXibc2LcK ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.Xibc2LcKLine )
-        
+
 
 
         """
@@ -750,12 +750,12 @@ class XibcBDTConf(LineBuilder):
             "sqrt(XibcPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(XibcK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1, 1))", 
-            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 1, 3))", 
-            "log(LcK_PT)"                : "log(CHILD(PT, 1, 1, 2))",            
+            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1, 1))",
+            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 1, 3))",
+            "log(LcK_PT)"                : "log(CHILD(PT, 1, 1, 2))",
             "log(Lc_PT)"                 : "log(CHILD(PT, 1, 1))",
             "log(LbPi_PT)"               : "log(CHILD(PT, 1, 2))",
-            "log(Lb_PT)"                 : "log(CHILD(PT, 1))",  
+            "log(Lb_PT)"                 : "log(CHILD(PT, 1))",
             "log(XibcPi_PT)"             : "log(CHILD(PT, 3))",
             "log(XibcK_PT)"              : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
@@ -772,21 +772,21 @@ class XibcBDTConf(LineBuilder):
                                                                           self.SelUnPions ],
                                                         PreVertexCuts  = config['XibcComCuts'],
                                                         PostVertexCuts = config['XibcMomCuts'] )
-        
+
         self.MvaXibc2LbKpi = self.applyMVA( self.name + "MvaXibc2LbKpi",
                                            SelB        = self.SelXibc2LbKpi,
                                            MVAVars     = self.Xibc2LbKpiVars,
-                                           MVACutValue = config['Xibc2LbKpiMVACut'], 
+                                           MVACutValue = config['Xibc2LbKpiMVACut'],
                                            MVAxmlFile  = config['Xibc2LbKpiXmlFile']
                                            )
-    
-        self.Xibc2LbKpiLine = StrippingLine( self.name + '_Xibc2LbKpiLine',                                               
+
+        self.Xibc2LbKpiLine = StrippingLine( self.name + '_Xibc2LbKpiLine',
                                                  algos     = [ self.MvaXibc2LbKpi ],
                                                  MDSTFlag  = False
                                                  )
-        
+
         self.registerLine( self.Xibc2LbKpiLine )
-        
+
 
 
 
@@ -814,7 +814,7 @@ class XibcBDTConf(LineBuilder):
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
 
-    def applyMVA( self, name, 
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -830,7 +830,7 @@ class XibcBDTConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py
index f20e7093daca35966b279e1d3af3be9d4dc40225..db5657aeb75aece9086a8f0111c211a14602adba 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for the Doublely Heavy Flavour Baryons, Xicc,  
+Module for the Doublely Heavy Flavour Baryons, Xicc,
 Note:
 *. CPU-intensive cuts like IPCHI2 are not re-applied
    if being identical to those in the common particles
@@ -21,10 +21,10 @@ Xicc++ -> D+ p+
 Xicc++ -> D+ p+ K- pi+
 Xicc++ -> D0 p+ K- pi+ pi+
 ---------------------------
-Xicc+  -> Lc+ K- pi+ 
+Xicc+  -> Lc+ K- pi+
 Xicc+  -> D0 p+
 Xicc+  -> D0 p+ K- pi+
-Xicc+  -> D+ p+ K- 
+Xicc+  -> D+ p+ K-
 '''
 
 __author__=['Jibo He']
@@ -47,18 +47,18 @@ default_config = {
 
         'DplusCuts'     : "(ADMASS('D+')<75*MeV) & (VFASPF(VCHI2/VDOF) < 25.) & (PT>1.0*GeV) & (BPVVDCHI2>100)",
         'D0Cuts'        : "(ADMASS('D0')<75*MeV) & (VFASPF(VCHI2/VDOF) < 25.) & (PT>1.0*GeV) & (BPVVDCHI2>64)",
-    
+
         'LcComCuts'     : "(APT>1.0*GeV) & ((ADAMASS('Lambda_c+')<50*MeV) | (ADAMASS('Xi_c+')<50*MeV)) & (ADOCACHI2CUT(30, ''))",
         'LcMomCuts'     : "((ADMASS('Lambda_c+')<20*MeV) | (ADMASS('Xi_c+')<20*MeV)) & (VFASPF(VCHI2/VDOF) < 25.) & (BPVVDCHI2>16)",
-        
-        'UnPionCuts'    : "(PROBNNpi> 0.2) & (PT>200*MeV) & (TRGHOSTPROB<0.4)",  
+
+        'UnPionCuts'    : "(PROBNNpi> 0.2) & (PT>200*MeV) & (TRGHOSTPROB<0.4)",
         'UnKaonCuts'    : "(PROBNNk > 0.1) & (PT>250*MeV) & (TRGHOSTPROB<0.4)",
-        'UnProtonCuts'  : "(PROBNNp> 0.05) & (PT>300*MeV) & (TRGHOSTPROB<0.4)",  
+        'UnProtonCuts'  : "(PROBNNp> 0.05) & (PT>300*MeV) & (TRGHOSTPROB<0.4)",
 
         'TightPionCuts'   : "(PROBNNpi> 0.2) & (PT>200*MeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>2.)",
         'TightKaonCuts'   : "(PROBNNk > 0.1) & (PT>250*MeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>2.)",
         'TightProtonCuts' : "(PROBNNp> 0.05) & (PT>300*MeV) & (TRGHOSTPROB<0.4) & (MIPCHI2DV(PRIMARY)>2.)",
-         
+
         'XiccComCuts'   : "(AM<4.6*GeV) & (APT>2*GeV)",
         'XiccMomCuts'   : "(M<4.4*GeV) & (VFASPF(VCHI2/VDOF) < 25.) & (BPVDIRA> 0.99) & (BPVIPCHI2()<25)",
 
@@ -73,7 +73,7 @@ default_config = {
 
         'XiccPP2D0pKpipiMVACut'   :  "-0.1",
         'XiccPP2D0pKpipiXmlFile'  :  '$TMVAWEIGHTSROOT/data/XiccPP2D0pKpipi_BDT_v1r0.xml',
-        
+
         'XiccPP2LcKpipiMVACut'   :  "0.",
         'XiccPP2LcKpipiXmlFile'  :  '$TMVAWEIGHTSROOT/data/XiccPP2LcKpipi_BDT_v1r0.xml',
 
@@ -87,7 +87,7 @@ default_config = {
         'XiccP2D0pKpiXmlFile'  :  '$TMVAWEIGHTSROOT/data/XiccP2D0pKpi_BDT_v1r0.xml',
 
         'XiccP2DpKMVACut'   :  "0.",
-        'XiccP2DpKXmlFile'  :  '$TMVAWEIGHTSROOT/data/XiccP2DpK_BDT_v1r0.xml',       
+        'XiccP2DpKXmlFile'  :  '$TMVAWEIGHTSROOT/data/XiccP2DpK_BDT_v1r0.xml',
         },
     'STREAMS'           : ['Bhadron' ],
     'WGs'               : ['BandQ']
@@ -95,73 +95,73 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class XiccBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
-                
+
         """
         Basic particles, long tracks
         """
         from StandardParticles import StdAllLooseANNPions, StdAllLooseANNKaons, StdAllLooseANNProtons
-        
+
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  StdAllLooseANNPions , 
+                                           InputList =  StdAllLooseANNPions ,
                                            Cuts = config['PionCuts']
                                            )
-        
+
         self.SelKaons = self.createSubSel( OutputList = self.name + "SelKaons",
-                                           InputList = StdAllLooseANNKaons, 
+                                           InputList = StdAllLooseANNKaons,
                                            Cuts = config['KaonCuts']
                                            )
-                                                   
+
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                             InputList = StdAllLooseANNProtons, 
+                                             InputList = StdAllLooseANNProtons,
                                              Cuts = config['ProtonCuts']
                                              )
 
         #from StandardParticles import StdAllLooseANNPions
         self.SelUnPions = self.createSubSel( OutputList = self.name + "SelUnPions",
-                                               InputList =  StdAllLooseANNPions , 
+                                               InputList =  StdAllLooseANNPions ,
                                                Cuts = config['UnPionCuts']
                                                )
-        
+
         self.SelUnKaons = self.createSubSel( OutputList = self.name + "SelUnKaons",
-                                               InputList =  StdAllLooseANNKaons , 
+                                               InputList =  StdAllLooseANNKaons ,
                                                Cuts = config['UnKaonCuts']
                                                )
         self.SelUnProtons = self.createSubSel( OutputList = self.name + "SelUnProtons",
-                                                 InputList =  StdAllLooseANNProtons , 
+                                                 InputList =  StdAllLooseANNProtons ,
                                                  Cuts = config['UnProtonCuts']
                                                  )
-        
+
         self.SelTightPions = self.createSubSel( OutputList = self.name + "SelTightPions",
-                                                    InputList =  StdAllLooseANNPions , 
+                                                    InputList =  StdAllLooseANNPions ,
                                                     Cuts = config['TightPionCuts']
                                                     )
-        
+
         self.SelTightKaons = self.createSubSel( OutputList = self.name + "SelTightKaons",
-                                                    InputList =  StdAllLooseANNKaons , 
+                                                    InputList =  StdAllLooseANNKaons ,
                                                     Cuts = config['TightKaonCuts']
                                                     )
-        
-        
+
+
         """
-        Dplus->K pi pi 
+        Dplus->K pi pi
         """
         self.SelDplus = self.createSubSel( OutputList = self.name + "SelDplus",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseDplus2KPiPi/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseDplus2KPiPi/Particles' ),
                                            Cuts = config['DplusCuts']
                                            )
 
@@ -169,10 +169,10 @@ class XiccBDTConf(LineBuilder):
         D0->K pi
         """
         self.SelD0 = self.createSubSel( OutputList = self.name + "SelD0",
-                                        InputList =  DataOnDemand(Location = 'Phys/StdLooseD02KPi/Particles' ), 
+                                        InputList =  DataOnDemand(Location = 'Phys/StdLooseD02KPi/Particles' ),
                                         Cuts = config['D0Cuts']
                                         )
-        
+
         """
         LambdaC->p K pi
         """
@@ -180,14 +180,14 @@ class XiccBDTConf(LineBuilder):
                                                      DecayDescriptor = "[ Lambda_c+ -> p+  K-  pi+ ]cc",
                                                      DaughterLists = [ self.SelProtons,
                                                                        self.SelKaons,
-                                                                       self.SelPions ],                    
+                                                                       self.SelPions ],
                                                      PreVertexCuts  = config['LcComCuts'],
                                                      PostVertexCuts = config['LcMomCuts'] )
-        
-        
+
+
 
         #
-        # Stripping line 
+        # Stripping line
         #
         """
         -------------------------------------------
@@ -202,9 +202,9 @@ class XiccBDTConf(LineBuilder):
             "sqrt(Lc_IPCHI2_OWNPV)"      : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
             "sqrt(XiccPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))", 
-            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))", 
+            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))",
+            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))",
             "log(Lc_PT)"                 : "log(CHILD(PT, 1))",
             "log(XiccPi_PT)"             : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
@@ -212,8 +212,8 @@ class XiccBDTConf(LineBuilder):
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-        
-        
+
+
         """
         XiccPP2LcPi
         """
@@ -224,26 +224,26 @@ class XiccBDTConf(LineBuilder):
                                                          PreVertexCuts  = config['XiccComCuts'],
                                                          PostVertexCuts = config['XiccMomCuts'] )
 
-        
+
         self.MvaXiccPP2LcPi = self.applyMVA( self.name + "MvaXiccPP2LcPi",
                                            SelB        = self.SelXiccPP2LcPi,
                                            MVAVars     = self.XiccPP2LcPiVars,
-                                           MVACutValue = config['XiccPP2LcPiMVACut'], 
+                                           MVACutValue = config['XiccPP2LcPiMVACut'],
                                            MVAxmlFile  = config['XiccPP2LcPiXmlFile']
                                            )
-        
-        self.XiccPP2LcPiLine = StrippingLine( self.name + '_XiccPP2LcPiLine',                                               
+
+        self.XiccPP2LcPiLine = StrippingLine( self.name + '_XiccPP2LcPiLine',
                                             algos     = [ self.MvaXiccPP2LcPi ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.XiccPP2LcPiLine )
 
 
-        
+
         """
         XiccPP2LcKpipi
-        """       
+        """
         self.XiccPP2LcKpipiVars = {
             "sqrt(LcP_IPCHI2_OWNPV)"     : "sqrt(CHILD(MIPCHI2DV(), 1, 1))",
             "sqrt(LcPi_IPCHI2_OWNPV)"    : "sqrt(CHILD(MIPCHI2DV(), 1, 3))",
@@ -253,10 +253,10 @@ class XiccBDTConf(LineBuilder):
             "sqrt(XiccPi2_IPCHI2_OWNPV)" : "sqrt(CHILD(MIPCHI2DV(), 4 ))",
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))", 
-            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(Lc_PT)"                 : "log(CHILD(PT, 1))",   
+            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))",
+            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(Lc_PT)"                 : "log(CHILD(PT, 1))",
             "log(XiccPi1_PT)"            : "log(CHILD(PT, 3))",
             "log(XiccPi2_PT)"            : "log(CHILD(PT, 4))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 2))",
@@ -265,7 +265,7 @@ class XiccBDTConf(LineBuilder):
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-        
+
         self.SelXiccPP2LcKpipi = self.createCombinationSel( OutputList = self.name + "SelXiccPP2LcKpipi",
                                                             DecayDescriptor = "[ Xi_cc++ -> Lambda_c+ K- pi+ pi+ ]cc",
                                                             DaughterLists = [ self.SelLambdaC,
@@ -273,19 +273,19 @@ class XiccBDTConf(LineBuilder):
                                                                               self.SelTightPions ],
                                                             PreVertexCuts  = config['XiccComCuts'],
                                                             PostVertexCuts = config['XiccMomCuts'] )
-        
+
         self.MvaXiccPP2LcKpipi = self.applyMVA( self.name + "MvaXiccPP2LcKpipi",
                                            SelB        = self.SelXiccPP2LcKpipi,
                                            MVAVars     = self.XiccPP2LcKpipiVars,
-                                           MVACutValue = config['XiccPP2LcKpipiMVACut'], 
+                                           MVACutValue = config['XiccPP2LcKpipiMVACut'],
                                            MVAxmlFile  = config['XiccPP2LcKpipiXmlFile']
                                            )
-        
-        self.XiccPP2LcKpipiLine = StrippingLine( self.name + '_XiccPP2LcKpipiLine',                                               
+
+        self.XiccPP2LcKpipiLine = StrippingLine( self.name + '_XiccPP2LcKpipiLine',
                                                  algos     = [ self.MvaXiccPP2LcKpipi ],
                                                  MDSTFlag  = False
                                                  )
-        
+
         self.registerLine( self.XiccPP2LcKpipiLine )
 
 
@@ -299,17 +299,17 @@ class XiccBDTConf(LineBuilder):
             "sqrt(D_IPCHI2_OWNPV)"       : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
             "sqrt(XiccP_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))", 
-            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))",
+            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
             "sqrt(D_FDCHI2_OWNPV)"       : "sqrt(CHILD(BPVVDCHI2,1))",
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-        
+
         self.SelXiccPP2Dp = self.createCombinationSel( OutputList = self.name + "SelXiccPP2Dp",
                                                        DecayDescriptor = "[ Xi_cc++ -> D+ p+ ]cc",
                                                        DaughterLists = [ self.SelDplus,
@@ -317,23 +317,23 @@ class XiccBDTConf(LineBuilder):
                                                                          ],
                                                        PreVertexCuts  = config['XiccComCuts'],
                                                        PostVertexCuts = config['XiccMomCuts'] )
-        
+
 
         self.MvaXiccPP2Dp = self.applyMVA( self.name + "MvaXiccPP2Dp",
                                            SelB        = self.SelXiccPP2Dp,
                                            MVAVars     = self.XiccPP2DpVars,
-                                           MVACutValue = config['XiccPP2DpMVACut'], 
+                                           MVACutValue = config['XiccPP2DpMVACut'],
                                            MVAxmlFile  = config['XiccPP2DpXmlFile']
                                            )
 
-        self.XiccPP2DpLine = StrippingLine( self.name + '_XiccPP2DpLine',                                               
+        self.XiccPP2DpLine = StrippingLine( self.name + '_XiccPP2DpLine',
                                             algos     = [ self.MvaXiccPP2Dp ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.XiccPP2DpLine )
 
-        
+
         """
         XiccPP2DpKpi
         """
@@ -346,10 +346,10 @@ class XiccBDTConf(LineBuilder):
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(XiccPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 4 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))", 
-            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))",
+            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 3))",
             "log(XiccPi_PT)"             : "log(CHILD(PT, 4))",
@@ -358,7 +358,7 @@ class XiccBDTConf(LineBuilder):
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-        
+
         self.SelXiccPP2DpKpi = self.createCombinationSel( OutputList = self.name + "SelXiccPP2DpKpi",
                                                           DecayDescriptor = "[ Xi_cc++ -> D+ p+ K- pi+ ]cc",
                                                           DaughterLists = [ self.SelDplus,
@@ -367,26 +367,26 @@ class XiccBDTConf(LineBuilder):
                                                                             self.SelUnPions ],
                                                           PreVertexCuts  = config['XiccComCuts'],
                                                           PostVertexCuts = config['XiccMomCuts'] )
-        
-        
+
+
         self.MvaXiccPP2DpKpi = self.applyMVA( self.name + "MvaXiccPP2DpKpi",
                                            SelB        = self.SelXiccPP2DpKpi,
                                            MVAVars     = self.XiccPP2DpKpiVars,
-                                           MVACutValue = config['XiccPP2DpKpiMVACut'], 
+                                           MVACutValue = config['XiccPP2DpKpiMVACut'],
                                            MVAxmlFile  = config['XiccPP2DpKpiXmlFile']
                                            )
-        
-        self.XiccPP2DpKpiLine = StrippingLine( self.name + '_XiccPP2DpKpiLine',                                               
+
+        self.XiccPP2DpKpiLine = StrippingLine( self.name + '_XiccPP2DpKpiLine',
                                                  algos     = [ self.MvaXiccPP2DpKpi ],
                                                  MDSTFlag  = False
                                                )
-        
+
         self.registerLine( self.XiccPP2DpKpiLine )
 
-        
+
         """
         XiccPP2D0pKpipi
-        """        
+        """
         self.XiccPP2D0pKpipiVars = {
             "sqrt(DK_IPCHI2_OWNPV)"      : "sqrt(CHILD(MIPCHI2DV(), 1, 1))",
             "sqrt(DPi_IPCHI2_OWNPV)"     : "sqrt(CHILD(MIPCHI2DV(), 1, 2))",
@@ -396,9 +396,9 @@ class XiccBDTConf(LineBuilder):
             "sqrt(XiccPi1_IPCHI2_OWNPV)" : "sqrt(CHILD(MIPCHI2DV(), 4 ))",
             "sqrt(XiccPi2_IPCHI2_OWNPV)" : "sqrt(CHILD(MIPCHI2DV(), 5 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 3))",
             "log(XiccPi1_PT)"            : "log(CHILD(PT, 4))",
@@ -408,7 +408,7 @@ class XiccBDTConf(LineBuilder):
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-        
+
         self.SelXiccPP2D0pKpipi = self.createCombinationSel( OutputList = self.name + "SelXiccPP2D0pKpipi",
                                                           DecayDescriptor = "[ Xi_cc++ -> D0 p+ K- pi+ pi+ ]cc",
                                                           DaughterLists = [ self.SelD0,
@@ -417,19 +417,19 @@ class XiccBDTConf(LineBuilder):
                                                                             self.SelPions ],  # w/ IPchi2 cut to speed up
                                                           PreVertexCuts  = config['XiccComCuts'],
                                                           PostVertexCuts = config['XiccMomCuts'] )
-        
+
         self.MvaXiccPP2D0pKpipi = self.applyMVA( self.name + "MvaXiccPP2D0pKpipi",
                                            SelB        = self.SelXiccPP2D0pKpipi,
                                            MVAVars     = self.XiccPP2D0pKpipiVars,
-                                           MVACutValue = config['XiccPP2D0pKpipiMVACut'], 
+                                           MVACutValue = config['XiccPP2D0pKpipiMVACut'],
                                            MVAxmlFile  = config['XiccPP2D0pKpipiXmlFile']
                                            )
-        
-        self.XiccPP2D0pKpipiLine = StrippingLine( self.name + '_XiccPP2D0pKpipiLine',                                               
+
+        self.XiccPP2D0pKpipiLine = StrippingLine( self.name + '_XiccPP2D0pKpipiLine',
                                                  algos     = [ self.MvaXiccPP2D0pKpipi ],
                                                  MDSTFlag  = False
                                                   )
-        
+
         self.registerLine( self.XiccPP2D0pKpipiLine )
 
 
@@ -452,10 +452,10 @@ class XiccBDTConf(LineBuilder):
             "sqrt(XiccPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))", 
-            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(Lc_PT)"                 : "log(CHILD(PT, 1))",   
+            "log(LcP_PT)"                : "log(CHILD(PT, 1, 1))",
+            "log(LcPi_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(LcK_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(Lc_PT)"                 : "log(CHILD(PT, 1))",
             "log(XiccPi_PT)"             : "log(CHILD(PT, 3))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
@@ -463,8 +463,8 @@ class XiccBDTConf(LineBuilder):
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-         
-         
+
+
         self.SelXiccP2LcKpi = self.createCombinationSel( OutputList = self.name + "SelXiccP2LcKpi",
                                                          DecayDescriptor = "[ Xi_cc+ -> Lambda_c+ K- pi+ ]cc",
                                                          DaughterLists = [ self.SelLambdaC,
@@ -472,22 +472,22 @@ class XiccBDTConf(LineBuilder):
                                                                            self.SelUnPions ],
                                                          PreVertexCuts  = config['XiccComCuts'],
                                                          PostVertexCuts = config['XiccMomCuts'] )
-        
+
         self.MvaXiccP2LcKpi = self.applyMVA( self.name + "MvaXiccP2LcKpi",
                                            SelB        = self.SelXiccP2LcKpi,
                                            MVAVars     = self.XiccP2LcKpiVars,
-                                           MVACutValue = config['XiccP2LcKpiMVACut'], 
+                                           MVACutValue = config['XiccP2LcKpiMVACut'],
                                            MVAxmlFile  = config['XiccP2LcKpiXmlFile']
                                            )
-       
-        self.XiccP2LcKpiLine = StrippingLine( self.name + '_XiccP2LcKpiLine',                                               
+
+        self.XiccP2LcKpiLine = StrippingLine( self.name + '_XiccP2LcKpiLine',
                                                  algos     = [ self.MvaXiccP2LcKpi ],
                                                  MDSTFlag  = False
                                                  )
-        
+
         self.registerLine( self.XiccP2LcKpiLine )
 
-        
+
         """
         XiccP2D0p
         """
@@ -497,16 +497,16 @@ class XiccBDTConf(LineBuilder):
             "sqrt(D_IPCHI2_OWNPV)"       : "sqrt(CHILD(MIPCHI2DV(), 1 ))",
             "sqrt(XiccP_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(C_PT)"                  : "log(PT)",
             "sqrt(D_FDCHI2_OWNPV)"       : "sqrt(CHILD(BPVVDCHI2,1))",
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-        
+
         self.SelXiccP2D0p = self.createCombinationSel( OutputList = self.name + "SelXiccP2D0p",
                                                        DecayDescriptor = "[ Xi_cc+ -> D0 p+ ]cc",
                                                        DaughterLists = [ self.SelD0,
@@ -514,21 +514,21 @@ class XiccBDTConf(LineBuilder):
                                                                          ],
                                                        PreVertexCuts  = config['XiccComCuts'],
                                                        PostVertexCuts = config['XiccMomCuts'] )
-        
-       
+
+
         self.MvaXiccP2D0p = self.applyMVA( self.name + "MvaXiccP2D0p",
                                            SelB        = self.SelXiccP2D0p,
                                            MVAVars     = self.XiccP2D0pVars,
-                                           MVACutValue = config['XiccP2D0pMVACut'], 
+                                           MVACutValue = config['XiccP2D0pMVACut'],
                                            MVAxmlFile  = config['XiccP2D0pXmlFile']
                                            )
-    
-        self.XiccP2D0pLine = StrippingLine( self.name + '_XiccP2D0pLine',                                               
+
+        self.XiccP2D0pLine = StrippingLine( self.name + '_XiccP2D0pLine',
                                             algos     = [ self.MvaXiccP2D0p ],
                                             MDSTFlag  = False
                                             )
-        
-        self.registerLine( self.XiccP2D0pLine )        
+
+        self.registerLine( self.XiccP2D0pLine )
 
 
         """
@@ -542,9 +542,9 @@ class XiccBDTConf(LineBuilder):
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(XiccPi_IPCHI2_OWNPV)"  : "sqrt(CHILD(MIPCHI2DV(), 4 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi_PT)"                : "log(CHILD(PT, 1, 2))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 3))",
             "log(XiccPi_PT)"             : "log(CHILD(PT, 4))",
@@ -553,32 +553,32 @@ class XiccBDTConf(LineBuilder):
             "sqrt(C_FDCHI2_OWNPV)"       : "sqrt(BPVVDCHI2)" ,
             "C_DIRA_OWNPV"               : "BPVDIRA"
             }
-                
+
         self.SelXiccP2D0pKpi = self.createCombinationSel( OutputList = self.name + "SelXiccP2D0pKpi",
                                                           DecayDescriptor = "[ Xi_cc+ -> D0 p+ K- pi+ ]cc",
                                                           DaughterLists = [ self.SelD0,
                                                                             self.SelUnProtons,
                                                                             self.SelUnKaons,
-                                                                            self.SelUnPions ],  
+                                                                            self.SelUnPions ],
                                                           PreVertexCuts  = config['XiccComCuts'],
                                                           PostVertexCuts = config['XiccMomCuts'] )
-        
-        
+
+
         self.MvaXiccP2D0pKpi = self.applyMVA( self.name + "MvaXiccP2D0pKpi",
                                            SelB        = self.SelXiccP2D0pKpi,
                                            MVAVars     = self.XiccP2D0pKpiVars,
-                                           MVACutValue = config['XiccP2D0pKpiMVACut'], 
+                                           MVACutValue = config['XiccP2D0pKpiMVACut'],
                                            MVAxmlFile  = config['XiccP2D0pKpiXmlFile']
                                            )
-        
-        self.XiccP2D0pKpiLine = StrippingLine( self.name + '_XiccP2D0pKpiLine',                                               
+
+        self.XiccP2D0pKpiLine = StrippingLine( self.name + '_XiccP2D0pKpiLine',
                                                  algos     = [ self.MvaXiccP2D0pKpi ],
                                                  MDSTFlag  = False
                                                )
-        
+
         self.registerLine( self.XiccP2D0pKpiLine )
 
-        
+
         """
         XiccP2DpK
         """
@@ -590,10 +590,10 @@ class XiccBDTConf(LineBuilder):
             "sqrt(XiccP_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(XiccK_IPCHI2_OWNPV)"   : "sqrt(CHILD(MIPCHI2DV(), 3 ))",
             "sqrt(C_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
-            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))", 
-            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))", 
-            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))", 
-            "log(D_PT)"                  : "log(CHILD(PT, 1))",   
+            "log(DK_PT)"                 : "log(CHILD(PT, 1, 1))",
+            "log(DPi1_PT)"               : "log(CHILD(PT, 1, 2))",
+            "log(DPi2_PT)"               : "log(CHILD(PT, 1, 3))",
+            "log(D_PT)"                  : "log(CHILD(PT, 1))",
             "log(XiccP_PT)"              : "log(CHILD(PT, 2))",
             "log(XiccK_PT)"              : "log(CHILD(PT, 3))",
             "log(C_PT)"                  : "log(PT)",
@@ -605,23 +605,23 @@ class XiccBDTConf(LineBuilder):
                                                           DecayDescriptor = "[ Xi_cc+ -> D+ p+ K- ]cc",
                                                           DaughterLists = [ self.SelDplus,
                                                                             self.SelUnProtons,
-                                                                            self.SelUnKaons ], 
+                                                                            self.SelUnKaons ],
                                                           PreVertexCuts  = config['XiccComCuts'],
                                                           PostVertexCuts = config['XiccMomCuts'] )
-        
-        
+
+
         self.MvaXiccP2DpK = self.applyMVA( self.name + "MvaXiccP2DpK",
                                            SelB        = self.SelXiccP2DpK,
                                            MVAVars     = self.XiccP2DpKVars,
-                                           MVACutValue = config['XiccP2DpKMVACut'], 
+                                           MVACutValue = config['XiccP2DpKMVACut'],
                                            MVAxmlFile  = config['XiccP2DpKXmlFile']
                                            )
-        
-        self.XiccP2DpKLine = StrippingLine( self.name + '_XiccP2DpKLine',                                               
+
+        self.XiccP2DpKLine = StrippingLine( self.name + '_XiccP2DpKLine',
                                                  algos     = [ self.MvaXiccP2DpK ],
                                                  MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.XiccP2DpKLine )
 
 
@@ -651,7 +651,7 @@ class XiccBDTConf(LineBuilder):
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
 
-    def applyMVA( self, name, 
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -667,7 +667,7 @@ class XiccBDTConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py
index 646bce26a53a2ea9ada7b726f5da3b43b1d4600e..ce52f251b014bcdbd818e065be3cd845936adefe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py
@@ -22,7 +22,7 @@ StrippingReport                                                INFO Event 200000
  |!StrippingB24pB24pLine_TIMING                                |  0.0340|        60|  1.467|   0.169|
  |!StrippingB24pB2JpsiKpiLine_TIMING                           |  0.0600|       106|  2.349|   0.286|
  |!StrippingB24pB2PhiKhLine_TIMING                             |  0.0085|        15|  2.733|   0.215|
-   
+
 #TODO Update this rates
 MC: B2pppp (11104077)
 #######################
@@ -49,9 +49,9 @@ StrippingReport                                                INFO Event 100000
  |!StrippingB24pB2JpsiKpiLine_TIMING                           |  6.3960|      6396|  2.397|   0.609|
 
 
-    
+
 Exported symbols (use python help!):
-   - 
+   -
 """
 
 __author__  = ["Pietro Marino", "Oliver Gruenberg"]
@@ -100,10 +100,10 @@ default_config = {
     "MinDira"            : 0.0,
     "MinTau"             : 1.0, # (ps)
     # scalings
-    "Postscale"          : 1, 
-    "B24pPrescale"       : 1, 
+    "Postscale"          : 1,
+    "B24pPrescale"       : 1,
     "B2JpsiKpiPrescale"  : 1,
-    "B2PhiKhPrescale"    : 1, 
+    "B2PhiKhPrescale"    : 1,
     "CommonRelInfoTools" : [ { "Type": "RelInfoVertexIsolation", "Location":"VtxIsoInfo" },
                              { "Type": "RelInfoVertexIsolationBDT", "Location":"VtxIsoInfoBDT" },
                              { "Type" : "RelInfoBs2MuMuBIsolations",
@@ -111,14 +111,14 @@ default_config = {
                                "Location"  : "BsMuMuBIsolation",
                                "tracktype" : 3,
                                "makeTrackCuts" : False, },
-                             ] # closes CommonRelInfoTools    
+                             ] # closes CommonRelInfoTools
     } # closes CONFIG
     } # closes default_config
 
 class B24pLinesConf(LineBuilder) :
     """
     Builder
-    
+
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
@@ -126,7 +126,7 @@ class B24pLinesConf(LineBuilder) :
     def __init__(self, name = "B24p", config = default_config) :
 
         LineBuilder.__init__(self, name, config)
-        
+
         B24p_name      = name+"B24p"
         B2JpsiKpi_name = name+"B2JpsiKpi"
         B2PhiKh_name   = name+"B2PhiKh"
@@ -150,16 +150,16 @@ class B24pLinesConf(LineBuilder) :
                                (ADAMASS(5323*MeV) < %(mDiffb)s*MeV)
                                & (ADOCA(1,4) < %(MaxDoca)s*mm)
                                & (ADOCA(2,4) < %(MaxDoca)s*mm)
-                               & (ADOCA(3,4) < %(MaxDoca)s*mm)                               
+                               & (ADOCA(3,4) < %(MaxDoca)s*mm)
                                """ %config
-        
+
         self.MotherCuts = """
                           (BPVIPCHI2() < %(MaxIPChi2)s )
                           & (BPVVDCHI2 > %(MinVDChi2)s )
                           & (VFASPF(VCHI2/VDOF) < %(MaxVtxChi2Dof)s )
                           & (BPVDIRA > %(MinDira)s )
                           & (BPVLTIME() > %(MinTau)s*ps )
-                          """ %config  
+                          """ %config
 
         self.B2JpsiKpiCombi12Cut = "(ADOCA(1,2) < %(MaxDoca)s*mm) & ( in_range(2990*MeV,AM12,3200*MeV) )"
 
@@ -176,7 +176,7 @@ class B24pLinesConf(LineBuilder) :
                                        postscale = config["Postscale"],
                                        MDSTFlag = config["MDSTflag"],
                                        selection = self.selB24p,
-                                       RelatedInfoTools = [                                       
+                                       RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -185,7 +185,7 @@ class B24pLinesConf(LineBuilder) :
                                              "Beauty -> ^X  X  X  X"  : "ConeIso05p1",
                                              "Beauty ->  X ^X  X  X"  : "ConeIso05p2",
                                              "Beauty ->  X  X ^X  X"  : "ConeIso05p3",
-                                             "Beauty ->  X  X  X ^X"  : "ConeIso05p4", 
+                                             "Beauty ->  X  X  X ^X"  : "ConeIso05p4",
                                              }, },
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 1.0,
@@ -195,7 +195,7 @@ class B24pLinesConf(LineBuilder) :
                                              "Beauty -> ^X  X  X  X"  : "ConeIso10p1",
                                              "Beauty ->  X ^X  X  X"  : "ConeIso10p2",
                                              "Beauty ->  X  X ^X  X"  : "ConeIso10p3",
-                                             "Beauty ->  X  X  X ^X"  : "ConeIso10p4", 
+                                             "Beauty ->  X  X  X ^X"  : "ConeIso10p4",
                                              }, },
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 1.5,
@@ -206,7 +206,7 @@ class B24pLinesConf(LineBuilder) :
                                              "Beauty ->  X ^X  X  X"  : "ConeIso15p2",
                                              "Beauty ->  X  X ^X  X"  : "ConeIso15p3",
                                              "Beauty ->  X  X  X ^X"  : "ConeIso15p4",
-                                             }, }, 
+                                             }, },
                                            { "Type": "RelInfoTrackIsolationBDT",
                                              "Variables" : 0,
                                              "DaughterLocations" : {
@@ -226,12 +226,12 @@ class B24pLinesConf(LineBuilder) :
                                              }, },
                                            ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                        ) # closes Strippingline
-        
+
         self.B2JpsiKpi_Line = StrippingLine(B2JpsiKpi_name+"Line",
                                             prescale = config["B2JpsiKpiPrescale"],
                                             postscale = config["Postscale"],
-                                            MDSTFlag = config["MDSTflag"], 
-                                            selection = self.selB2JpsiKpi, 
+                                            MDSTFlag = config["MDSTflag"],
+                                            selection = self.selB2JpsiKpi,
                                             RelatedInfoTools = [
                                                 { "Type" : "RelInfoConeVariables",
                                                   "ConeAngle" : 0.5,
@@ -279,14 +279,14 @@ class B24pLinesConf(LineBuilder) :
                                                   "[B0 ->  p+ ^p~-  K+  pi-]CC" : "BsMuMuTrackIsop2",
                                                   "[B0 ->  p+  p~- ^K+  pi-]CC" : "BsMuMuTrackIsoK",
                                                   "[B0 ->  p+  p~-  K+ ^pi-]CC" : "BsMuMuTrackIsopi",
-                                                  }, }, 
-                                                ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                                  }, },
+                                                ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                             ) # closes Strippingline
 
         self.B2PhiKh_Line = StrippingLine(B2PhiKh_name+"Line",
                                           prescale = config["B2PhiKhPrescale"],
                                           postscale = config["Postscale"],
-                                          MDSTFlag = config["MDSTflag"], 
+                                          MDSTFlag = config["MDSTflag"],
                                           selection = self.selB2PhiKh,
                                           RelatedInfoTools = [
                                                 { "Type" : "RelInfoConeVariables",
@@ -326,7 +326,7 @@ class B24pLinesConf(LineBuilder) :
                                                   "[B0 ->  K+ ^K-  K+  pi-]CC" : "TrackIsoBDTK2",
                                                   "[B0 ->  K+  K- ^K+  pi-]CC" : "TrackIsoBDTK3",
                                                   "[B0 ->  K+  K-  K+ ^pi-]CC" : "TrackIsoBDTpi",
-                                                  }, },                                               
+                                                  }, },
                                                 { "Type" : "RelInfoBs2MuMuTrackIsolations",
                                                   "Variables" : [],
                                                   "IsoTwoBody" : True,
@@ -336,7 +336,7 @@ class B24pLinesConf(LineBuilder) :
                                                   "[B0 ->  K+  K- ^K+  pi-]CC" : "BsMuMuTrackIsoK3",
                                                   "[B0 ->  K+  K-  K+ ^pi-]CC" : "BsMuMuTrackIsopi",
                                                   }, },
-                                                ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                                ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                             ) # closes Strippingline
 
 #############################################################################
@@ -344,63 +344,63 @@ class B24pLinesConf(LineBuilder) :
         self.registerLine(self.B24p_Line)
         self.registerLine(self.B2JpsiKpi_Line)
         self.registerLine(self.B2PhiKh_Line)
-       
+
 #############################################################################
 
-    def makeB24p(self,name): # to select B(s) -> p p p p 
+    def makeB24p(self,name): # to select B(s) -> p p p p
 
         B24p = DaVinci__N4BodyDecays("Combine"+name)
         B24p.DecayDescriptors = [ "B0 -> p+ p+ p~- p~-","[B0 -> p+ p+ p+ p~-]cc" ]
         B24p.DaughtersCuts = { "p+" : self.TrackCuts + " & ((PIDp-PIDpi)>0)" + " & ((PIDp-PIDK)>-5)" }
-            
-        B24p.Combination12Cut  = self.CommonCombi12Cuts 
-        B24p.Combination123Cut = self.CommonCombi123Cuts    
-        B24p.CombinationCut    = self.CommonCombiCuts    
+
+        B24p.Combination12Cut  = self.CommonCombi12Cuts
+        B24p.Combination123Cut = self.CommonCombi123Cuts
+        B24p.CombinationCut    = self.CommonCombiCuts
         B24p.MotherCut         = self.MotherCuts
-    
+
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         #_myProtons = DataOnDemand(Location = "Phys/StdNoPIDsProtons/Particles")
-    
+
         return Selection(name, Algorithm = B24p, RequiredSelections = [ _myProtons ])
 
 #############################################################################
-        
-    def makeB2JpsiKpi(self,name,config): # to select B(s) -> J/psi K+ pi- , Bd -> J/psi K*0 , Bs -> J/psi Phi 
-        
+
+    def makeB2JpsiKpi(self,name,config): # to select B(s) -> J/psi K+ pi- , Bd -> J/psi K*0 , Bs -> J/psi Phi
+
         B2JpsiKpi = DaVinci__N4BodyDecays("Combine"+name)
         B2JpsiKpi.DecayDescriptors = [ "[B0 -> p+ p~- K+ pi-]cc" ]
         B2JpsiKpi.DaughtersCuts = { "p+"  : self.TrackCuts,
                                     "K+"  : self.TrackCuts,
                                     "pi-" : self.TrackCuts }
-    
+
         B2JpsiKpi.Combination12Cut  = self.CommonCombi12Cuts + " & ( in_range(%(mJpsiMin)s*MeV,AM12,%(mJpsiMax)s*MeV) )" %config
         B2JpsiKpi.Combination123Cut = self.CommonCombi123Cuts
         B2JpsiKpi.CombinationCut    = self.CommonCombiCuts
         B2JpsiKpi.MotherCut         = self.MotherCuts
-       
+
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-        _myKaons   = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")    
+        _myKaons   = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
         _myPions   = DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
-    
+
         return Selection(name, Algorithm = B2JpsiKpi, RequiredSelections = [ _myProtons, _myKaons, _myPions ])
 
 #############################################################################
 
     def makeB2PhiKh(self,name,config): # to select Bs -> Phi Phi and Bd -> Phi K*0
-    
+
         B2PhiKh = DaVinci__N4BodyDecays("Combine"+name)
         B2PhiKh.DecayDescriptors = [ "[B0 -> K+ K- K+ pi-]cc" ]
         B2PhiKh.DaughtersCuts = { "K+"  : self.TrackCuts,
                                   "pi-" : self.TrackCuts }
-    
+
         B2PhiKh.Combination12Cut  = self.CommonCombi12Cuts
         B2PhiKh.Combination123Cut = self.CommonCombi123Cuts + " & ( (AM12 < %(mKstMax)s*MeV) | (AM23 < %(mKstMax)s*MeV) )" %config
         B2PhiKh.CombinationCut    = self.CommonCombiCuts +    " & ( (AM14 < %(mKstMax)s*MeV) | (AM34 < %(mKstMax)s*MeV) )" %config
         B2PhiKh.MotherCut         = self.MotherCuts
-        
-        _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")    
+
+        _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
         _myPions = DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
-            
+
         return Selection(name, Algorithm = B2PhiKh, RequiredSelections = [ _myKaons, _myPions ])
-       
+
 #############################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
index eb760c668b02a5c7cf1b420c9fdcad9e8a7d3402..a8bc29c3e33e522b9ef6136729e659c720be8418 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -38,15 +38,15 @@ default_config = {
                       # Pio cuts
                       'Pi0_Res_PT_Min'  : 600.,  # Pt cut on a pi0 with is grandaughter of the B
 
-                      # KS cuts                    
+                      # KS cuts
                       'KS0_LL_MassWindow'       : 40.0,
                       'KS0_DD_MassWindow'       : 50.0,
                       'KS0_LL_FDChi2'           : 10.,
                       'KS0_DD_FDChi2'           : 90.,
                       'KS0_MinPT'               : 1500,
                       'KS0_Child_Trk_Chi2'      : 6.,
-                      
-                      
+
+
                       'Q2BTrkGhostProb' : 0.5,
                       'Q2BTrkMinIPChi2' : 16.,
                       'Q2BTrkMinPT'     : 500,
@@ -61,7 +61,7 @@ default_config = {
                       'Q2BBMaxM3pi'     : 6700.,
                       'Q2BBMaxM4pi'     : 5700.,
                       'Q2BBDIRA'        : 0.995,
-                      'Q2BBVtxChi2DOF'  : 6.            
+                      'Q2BBVtxChi2DOF'  : 6.
                       },
     'STREAMS'     : ['Bhadron']     ## This stream puts it into mDST
     }
@@ -96,7 +96,7 @@ class B2CharmlessInclusive(LineBuilder) :
         KS_LL_Cuts="(PT > %(KS0_MinPT)s*MeV) & (ADMASS('KS0')<%(KS0_LL_MassWindow)s*MeV) " % cuts
         KS_ChildCuts= "(CHILDCUT((TRCHI2DOF<%(KS0_Child_Trk_Chi2)s),1)) & (CHILDCUT((TRCHI2DOF<%(KS0_Child_Trk_Chi2)s),2))"% cuts
         KS_DD_ChildCuts= "(CHILDCUT((TRGHOSTPROB<%(Q2BTrkGhostProb)s),1)) & (CHILDCUT((TRGHOSTPROB<%(Q2BTrkGhostProb)s),2))"% cuts
-        
+
         KS_DDCuts = '&'.join([KS_DD_Cuts, KS_ChildCuts, KS_DD_ChildCuts])
         KS_LLCuts = '&'.join([KS_LL_Cuts, KS_ChildCuts])
 
@@ -138,8 +138,8 @@ class B2CharmlessInclusive(LineBuilder) :
                                            FilterDesktop,
                                            [self.LightResList],
                                            Code="(PT > %(Q2BResMinHiPT)s)" % config )
-                                           
-                                           
+
+
         ## Modified to add KS
         self.KSList_DD=SimpleSelection( 'KSList_DD'+ self.name,
                                          FilterDesktop,
@@ -185,7 +185,7 @@ class B2CharmlessInclusive(LineBuilder) :
                                          selection = tisTosSelection(self.B2CharmlessQ2B3piX0),
                                          RelatedInfoTools = getRelInfo3pi()
                                          )
-                                         
+
         B2Q2BKSX_LLName = self.name + "KSX_LLSelection"
         self.B2CharmlessQ2KSX_LL=makeB2Q2BKSX(B2Q2BKSX_LLName,
                                                       kSList       = self.KSList_LL,
@@ -195,13 +195,13 @@ class B2CharmlessInclusive(LineBuilder) :
                                                       MaxMassCut    = config['Q2BBMaxM3pi'],
                                                       DIRACut       = config['Q2BBDIRA'],
                                                       VtxChi2DOFCut = config['Q2BBVtxChi2DOF'] )
-                                                      
+
         self.Q2KSX_LL_Line=StrippingLine( B2Q2BKSX_LLName+"Line",
                                          prescale = config['Q2BPrescale'],
                                          selection = tisTosSelection(self.B2CharmlessQ2KSX_LL),
                                          RelatedInfoTools = getRelInfoKSX()
                                          )
-                                         
+
         B2Q2BKSX_DDName = self.name + "KSX_DDSelection"
         self.B2CharmlessQ2KSX_DD=makeB2Q2BKSX(B2Q2BKSX_DDName,
                                                       kSList       = self.KSList_DD,
@@ -211,13 +211,13 @@ class B2CharmlessInclusive(LineBuilder) :
                                                       MaxMassCut    = config['Q2BBMaxM3pi'],
                                                       DIRACut       = config['Q2BBDIRA'],
                                                       VtxChi2DOFCut = config['Q2BBVtxChi2DOF'] )
-                                                      
+
         self.Q2KSX_DD_Line=StrippingLine( B2Q2BKSX_DDName+"Line",
                                          prescale = config['Q2BPrescale'],
                                          selection = tisTosSelection(self.B2CharmlessQ2KSX_DD),
                                          RelatedInfoTools = getRelInfoKSX()
                                          )
-                                            
+
 
         self.registerLine(self.Q2B4piX0Line)
         self.registerLine(self.Q2B3piX0Line)
@@ -243,14 +243,14 @@ def makeLightResList( name,
                            CombinationCut = _diTrackPreVertexCuts,
                            MotherCut = _diTrackPostVertexCuts
                            )
-    
+
     PiPiGamma = SimpleSelection(name+"_gamma", CombineParticles,
                            [ trkList, gammaList ],
                            DecayDescriptors=["rho(770)0 -> pi+ pi- gamma"],
                            CombinationCut = _diTrackPreVertexCuts,
                            MotherCut = _diTrackPostVertexCuts
                            )
-    
+
     PiPiPi0 = SimpleSelection(name+"_pi0", CombineParticles,
                            [ trkList, pi0List ],
                            DecayDescriptors=["rho(770)0 -> pi+ pi- pi0"],
@@ -391,9 +391,9 @@ def getRelInfoKSX() :
              ,"ConeAngle"    : coneAngle
              ,"Variables"         : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM', 'CONEDELTAETA']
              ,'Location'          : 'ConeVar%s_B' % conestr
-             , "DaughterLocations" : { 
+             , "DaughterLocations" : {
                  "^[B0 -> (rho(770)0 -> pi+ pi- {X0}) KS0]CC" : 'ConeVar%s_B' % conestr,
-                 "[B0 -> ^(rho(770)0 -> pi+ pi- {X0}) KS0]CC" : 'ConeVar%s_X' % conestr,                      
+                 "[B0 -> ^(rho(770)0 -> pi+ pi- {X0}) KS0]CC" : 'ConeVar%s_X' % conestr,
                  "[B0 -> (rho(770)0 -> pi+ pi- {X0}) ^KS0]CC" : 'ConeVar%s_KS' % conestr,
                  "[B0 -> (rho(770)0 -> ^pi+ pi- {X0}) KS0]CC" : 'ConeVar%s_X1' % conestr,
                  "[B0 -> (rho(770)0 -> pi+ ^pi- {X0}) KS0]CC" : 'ConeVar%s_X2' % conestr
@@ -416,5 +416,3 @@ def tisTosSelection(sel):
     '''Filters Selection sel to be TOS OR TIS.'''
     tisTosFilter = makeTISTOSFilter(sel.name())
     return Selection(sel.name()+'TISTOS', Algorithm=tisTosFilter, RequiredSelections=[sel])
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py
index f6ea42ef78786e1e33c63ec7cd5cff7ba5c284ef..21eb0d427f585067ae1d4e25c44f49a37db118d5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py
@@ -82,16 +82,16 @@ class B2HHBDTLines( LineBuilder ) :
                                     config['TrGhostProb'],
                                     config['PionPT'],
                                     config['SumPT'],
-                                    config['DOCACHI2'],      
-                                    config['BIPCHI2'],       
-                                    config['BDIRA'],         
-                                    config['BPT'],           
-                                    config['BMassWinLow'],   
-                                    config['BMassWinHigh'],  
-                                    config['PionIPCHI2'],    
+                                    config['DOCACHI2'],
+                                    config['BIPCHI2'],
+                                    config['BDIRA'],
+                                    config['BPT'],
+                                    config['BMassWinLow'],
+                                    config['BMassWinHigh'],
+                                    config['PionIPCHI2'],
                                     config['BFDCHI2'],
                                     config['BMassLow'],
-                                    config['BMassHigh']       
+                                    config['BMassHigh']
                                   )
 
         #self.lineB2HHBkg = StrippingLine( B2HHBDTName+"BkgLine",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py
index 228c729738474bc6d4b3287372f9d72bc0b46a83..bbeb812515e1412b905c9b31058117071ddd63f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py
@@ -149,7 +149,7 @@ class B2KShhConf(LineBuilder) :
 
         Hlt1Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT1Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
+
         Hlt2Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT2Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
 
@@ -184,7 +184,7 @@ class B2KShhConf(LineBuilder) :
 
                     # Main Algorithm initialisation
                     _flavourFlag = config['FlavourTagging']
-                    if sign == 'SS' : 
+                    if sign == 'SS' :
                         _flavourFlag = False
 
                     _mylines[ks_type][year][sign] = StrippingLine(_linename,
@@ -194,11 +194,11 @@ class B2KShhConf(LineBuilder) :
                                            HLT1 = Hlt1Filter,
                                            HLT2 = Hlt2Filter,
                                            FILTER = GECFilter,
-                                           RelatedInfoTools = relinfo, 
+                                           RelatedInfoTools = relinfo,
                                            EnableFlavourTagging = _flavourFlag,
                                            MDSTFlag = config['MDST']
                                            )
-        
+
 
                     self.registerLine(_mylines[ks_type][year][sign])
 
@@ -289,7 +289,7 @@ class B2KShhConf(LineBuilder) :
         _B.Combination12Cut = _comb12Cuts
         _B.CombinationCut   = _combCuts
         _B.MotherCut        = _motherCuts
-        _B.ReFitPVs         = True 
+        _B.ReFitPVs         = True
 
         _selname = name + '_' + ks_type + '_' + year + '_' + sign + '_Presel'
 
@@ -325,5 +325,3 @@ class B2KShhConf(LineBuilder) :
                 , "DaughterLocations" : { "B0 -> Meson Meson ^KS0" : 'VtxIsolationVar_KS' }
                }
         return tool
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Kpi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Kpi0.py
index 424c19206eed6a96b23ed5b9353beaeb5accb08b..ea2eaa80ed64beaf3b13959e503ac380e13570f1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Kpi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Kpi0.py
@@ -111,13 +111,13 @@ class B2Kpi0Lines(LineBuilder) :
                                           { "KS0" : "ALL", "pi0" : "ALL" },
                                           { "B0 -> ^KS0 pi0" : "K0" },
                                          [ self.filteredKS0, self.filteredPi0 ] )
-        self.registerLine( self.B2K0pi0Line )        
+        self.registerLine( self.B2K0pi0Line )
 ### :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 def filterPi0( pi0Conf ) :
-    
+
     __configuration_keys__ = ("pi0PT_min", "pi0P_min")
     checkConfig( __configuration_keys__, pi0Conf )
-    
+
     particleFilter = FilterDesktop(
         Code = "(PT > %(pi0PT_min)s) & (P > %(pi0P_min)s)" % locals()["pi0Conf"] )
     return Selection("filteredPi0s", Algorithm = particleFilter,
@@ -166,7 +166,7 @@ def makeB2Kpi0Line( name,
                                "BPT_min",
                                "MTDOCAChi2_max")
     checkConfig( __configuration_keys__, lineConf )
-    
+
     _combCuts = "(in_range(%(BMass_min)s, AM, %(BMass_max)s))"\
                 " & (ASUM(PT)> %(ASumPT_min)s)" % locals()["lineConf"]
     _motherCuts = "(PT>%(BPT_min)s)"\
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py
index 129d8792500349f47453549583e436001e111ccd..6f0f491c8e7ac89ddf7fa9ee86643344cf6b0dc4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py
@@ -52,9 +52,9 @@ default_config = {
                      'B_FDwrtPV'               : 1.0,
                      'B_FDChi2'                : 50.0,
                      'GEC_MaxTracks'           : 250,
-                     'ConeAngle10'             : 1.0, 
-                     'ConeAngle15'             : 1.5, 
-                     'ConeAngle17'             : 1.7, 
+                     'ConeAngle10'             : 1.0,
+                     'ConeAngle15'             : 1.5,
+                     'ConeAngle17'             : 1.7,
                      'HLT1Dec'                 : 'Hlt1(Two)?TrackMVADecision',
                      'HLT2Dec'                 : 'Hlt2Topo[234]BodyDecision',
                      'Prescale'                : 1.0,
@@ -96,20 +96,20 @@ class B2KsthhConf(LineBuilder) :
 
         Hlt1Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT1Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
+
         Hlt2Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT2Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
-        relInfo    = [ { "Type" : "RelInfoConeVariables" 
+
+        relInfo    = [ { "Type" : "RelInfoConeVariables"
                       , "ConeAngle" : config['ConeAngle10']
-                      , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'] 
+                      , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
                       , 'Location'  : 'P2ConeVar10_B'
                       , "DaughterLocations" : { "[B0 -> ^pi+ pi- (K*(892)0 -> K+ pi-)]CC" : 'P2ConeVar10_1',
                                                 "[B0 -> pi+ ^pi- (K*(892)0 -> K+ pi-)]CC" : 'P2ConeVar10_2',
                                                 "[B0 -> pi+ pi- (K*(892)0 -> ^K+ pi-)]CC" : 'P2ConeVar10_3',
                                                 "[B0 -> pi+ pi- (K*(892)0 -> K+ ^pi-)]CC" : 'P2ConeVar10_4'} },
                       { "Type" : "RelInfoConeVariables"
-                      , "ConeAngle" : config['ConeAngle15'] 
+                      , "ConeAngle" : config['ConeAngle15']
                       , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
                       , 'Location'  : 'P2ConeVar15_B'
                       , "DaughterLocations" : { "[B0 -> ^pi+ pi- (K*(892)0 -> K+ pi-)]CC" : 'P2ConeVar15_1',
@@ -117,7 +117,7 @@ class B2KsthhConf(LineBuilder) :
                                                 "[B0 -> pi+ pi- (K*(892)0 -> ^K+ pi-)]CC" : 'P2ConeVar15_3',
                                                 "[B0 -> pi+ pi- (K*(892)0 -> K+ ^pi-)]CC" : 'P2ConeVar15_4'} },
                       { "Type" : "RelInfoConeVariables"
-                      , "ConeAngle" : config['ConeAngle17'] 
+                      , "ConeAngle" : config['ConeAngle17']
                       , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
                       , 'Location'  : 'P2ConeVar17_B'
                       , "DaughterLocations" : { "[B0 -> ^pi+ pi- (K*(892)0 -> K+ pi-)]CC" : 'P2ConeVar17_1',
@@ -140,13 +140,13 @@ class B2KsthhConf(LineBuilder) :
                                      selection = self.selB2Ksthh,
                                      HLT1 = Hlt1Filter,
                                      HLT2 = Hlt2Filter,
-                                     FILTER = GECCode, 
-                                     RelatedInfoTools = relInfo, 
+                                     FILTER = GECCode,
+                                     RelatedInfoTools = relInfo,
                                      MDSTFlag = False
                                      )
 
         self.registerLine(line)
-        
+
     def makeKst2Kpi( self, name, config ) :
         # define all the cuts
         _trkChi2Cut1      = "(CHILDCUT((TRCHI2DOF<%s),1))"   % config['Trk_Chi2']
@@ -165,7 +165,7 @@ class B2KsthhConf(LineBuilder) :
         _stdKst2Kpi = DataOnDemand(Location="Phys/StdVeryLooseDetachedKst2Kpi/Particles")
 
         # make and store the Selection object
-        self.selKst2Kpi = Selection( name, Algorithm = _filterKst2Kpi, RequiredSelections = [_stdKst2Kpi] ) 
+        self.selKst2Kpi = Selection( name, Algorithm = _filterKst2Kpi, RequiredSelections = [_stdKst2Kpi] )
 
 
     def makeB2Ksthh( self, name, config ) :
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py
index 08190c752c2d3d8ee44ac2363215abaacd7c8f20..83b10618f3dde4d491da5e5e841b535bbc609c08 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -60,12 +60,12 @@ default_config = { 'NAME'              : 'B2TwoBaryons',
  #                    	   		       "ConeAngle" : 1.4,
   #                                             "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
    #                                            "RecursionLevel" : 1,
-#					       "Location"  : 'ConeVar14'	       	 
- #                                            },		
+#					       "Location"  : 'ConeVar14'
+ #                                            },
   #                                           { "Type" : "RelInfoConeVariables",
 #				               "ConeAngle" : 1.2,
  #                                              "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
-#					       "RecursionLevel" : 1,                                               
+#					       "RecursionLevel" : 1,
 #					       "Location"  : 'ConeVar12'
  #                                            },
   #                                           { "Type" : "RelInfoConeVariables",
@@ -113,7 +113,7 @@ default_config = { 'NAME'              : 'B2TwoBaryons',
                    , 'Bs0_BPVVDCHI2_Long_Min'       : 4
                    ,
                    'Trk_Chi2'                 : 3.0,
-                   'Lambda_DD_MassWindow'     : 20.0, 
+                   'Lambda_DD_MassWindow'     : 20.0,
                    'Lambda_DD_VtxChi2'        : 12.0,
                    'Lambda_DD_FDChi2'         : 50.0,
                    'Lambda_DD_FD'             : 300.0,
@@ -153,13 +153,13 @@ default_config = { 'NAME'              : 'B2TwoBaryons',
 
 class B2TwoBaryonLines( LineBuilder ) :
     """Class defining the Bd,s -> baryon antibaryon stripping line"""
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__( self,name,config ) :        
-        
+
+    def __init__( self,name,config ) :
+
         LineBuilder.__init__(self, name, config)
-        
+
         B2PPbarName  = name + "B2PPbar"
 
         B2PPSameSignName  = name + "B2PPSameSign"
@@ -188,8 +188,8 @@ class B2TwoBaryonLines( LineBuilder ) :
                                     config['MinIPChi2B2PPbar'],
                                     config['MaxIPChi2B2PPbar'],
                                     config['CombMassWindow'],
-                                    config['MaxPTB2PPbar'], 
-                                    config['MaxDaughtPB2PPbar'],	            
+                                    config['MaxPTB2PPbar'],
+                                    config['MaxDaughtPB2PPbar'],
                                     config['VertexChi2B2PPbar'],
                                     config['BIPChi2B2PPbar'],
                                     config['BPTB2PPbar'],
@@ -205,8 +205,8 @@ class B2TwoBaryonLines( LineBuilder ) :
                                          config['MinIPChi2B2PPbar'],
                                          config['MaxIPChi2B2PPbar'],
                                          config['CombMassWindow'],
-                                         config['MaxPTB2PPbar'], 
-                                         config['MaxDaughtPB2PPbar'],	            
+                                         config['MaxPTB2PPbar'],
+                                         config['MaxDaughtPB2PPbar'],
                                          config['VertexChi2B2PPbar'],
                                          config['BIPChi2B2PPbar'],
                                          config['BPTB2PPbar'],
@@ -252,21 +252,21 @@ class B2TwoBaryonLines( LineBuilder ) :
                                              #ExtraInfoTools = config['ExtraInfoTools'],
                                              #ExtraInfoDaughters = [self.selB2LpLLMVA]
 #                                             )
-        
+
 
 
         self.lineB2PPbar = StrippingLine( B2PPbarName+"Line",
                                           prescale = config['PrescaleB2PPbar'],
                                           selection = self.B2PPbar,)
  #                                         RelatedInfoTools = config['RelatedInfoTools']
-         
+
         #self.lineB2PPSameSign = StrippingLine( B2PPSameSignName+"Line",
         #                                  prescale = config['PrescaleB2PPbar'],
         #                                  selection = self.B2PPSameSign,
         #                                  RelatedInfoTools = config['RelatedInfoTools'])
-         
 
-            
+
+
         ## Some generic cuts for Bs0.
         ## Vertex chi2 cut depends on number of daughters:
         ##      (2 dau => 1 NDF; 3 dau => 3 NDF; 4 dau => 5 NDF)
@@ -277,11 +277,11 @@ class B2TwoBaryonLines( LineBuilder ) :
                             "& (BPVVDCHI2 > %(Bs0_BPVVDCHI2_Long_Min)s)" \
                             "& (BPVIPCHI2()< %(Bs0_BPVIPCHI2_Long_Max)s)" \
                             "& (BPVDIRA > %(Bs0_BPVDIRA_Long_Min)s)" % config
-        
+
         _strChi2Moth_Long = "(VFASPF(VCHI2/VDOF)<%(Bs0_VtxChi2_NDF_Long_Max)s)" % config
-        
+
         _strCutMoth_Long = _strChi2Moth_Long + '&' + _strCutMoth_Long
-        
+
 
         #make Bs0
         """
@@ -323,7 +323,7 @@ class B2TwoBaryonLines( LineBuilder ) :
                           Algorithm = CombineB2PPbar,
                           RequiredSelections = [ StdLooseProtons ] )
 
-    ########################################################################  
+    ########################################################################
     def makeB2PPSameSign( self,
                           name,
                           minPT,
@@ -331,13 +331,13 @@ class B2TwoBaryonLines( LineBuilder ) :
                           pidPPi, pidPK, minIPChi2, maxIPChi2,
                           combMassWindow, maxPT, maxP,
                           vertexChi2, bIPChi2, bPT, bDIRA, maxGhostProb ) :
-        
+
         #_daughters_cuts = "(PT > %(minPT)s * MeV) & (TRCHI2DOF < %(trChi2)s) & ((PIDp-PIDpi) > %(pidPPi)s) & ( (PIDp-PIDK) > %(pidPK)s ) & (MIPCHI2DV(PRIMARY) > %(minIPChi2)s)" %locals()
         _daughters_cuts = "(PT > %(minPT)s * MeV) & (P < %(maxP)s * MeV) & ((PIDp-PIDpi) > %(pidPPi)s) & ( (PIDp-PIDK) > %(pidPK)s ) & (MIPCHI2DV(PRIMARY) > %(minIPChi2)s) & (TRGHP < %(maxGhostProb)s )" %locals()
         _combination_cuts = "( (ADAMASS('B0') < %(combMassWindow)s * MeV) | (ADAMASS('B_s0') < %(combMassWindow)s * MeV) ) & ( AMAXCHILD(MAXTREE('p+'==ABSID,PT)) > %(maxPT)s * MeV ) & ( AMAXCHILD(MAXTREE('p+'==ABSID,MIPCHI2DV(PRIMARY))) > %(maxIPChi2)s )" %locals()
         _mother_cuts = "(PT > %(bPT)s * MeV) & ( VFASPF(VCHI2PDOF) < %(vertexChi2)s ) & ( BPVDIRA > %(bDIRA)s ) & ( BPVIPCHI2() < %(bIPChi2)s )" %locals()
-        
-        CombineB2PPSameSign = CombineParticles( DecayDescriptor = ['B0 -> p+ p+', 'B0 -> p~- p~-'], 
+
+        CombineB2PPSameSign = CombineParticles( DecayDescriptor = ['B0 -> p+ p+', 'B0 -> p~- p~-'],
                                                 DaughtersCuts = { "p+" : _daughters_cuts },
                                                 CombinationCut = _combination_cuts,
                                                 MotherCut = _mother_cuts )
@@ -355,18 +355,18 @@ class B2TwoBaryonLines( LineBuilder ) :
         _fdChi2Cut = "(BPVVDCHI2>%s)"                  % config['Lambda_DD_FDChi2']
         _fdCut     = "(VFASPF(VMINVDDV(PRIMARY))>%s)"  % config['Lambda_DD_FD']
         _momCut    = "(P>%s*MeV)"                      % config['Lambda_DD_Pmin']
-    
+
         _allCuts = _momCut+'&'+_massCut+'&'+_vtxCut+'&'+_fdCut+'&'+_fdChi2Cut
-    
+
         # get the Lambda0's to filter
         _stdLambdaDD = DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")
-    
+
         # make the filter
         _filterLambdaDD = FilterDesktop( Code = _allCuts )
-    
+
         # make and store the Selection object
         return Selection( name, Algorithm = _filterLambdaDD, RequiredSelections = [_stdLambdaDD] )
-    
+
     def makeLambda2LL( self, name, config ) :
         # define all the cuts
         _massCut    = "(ADMASS('Lambda0')<%s*MeV)" % config['Lambda_LL_MassWindow']
@@ -375,7 +375,7 @@ class B2TwoBaryonLines( LineBuilder ) :
         _trkChi2Cut1 = "(CHILDCUT((TRCHI2DOF<%s),1))" % config['Trk_Chi2']
         _trkChi2Cut2 = "(CHILDCUT((TRCHI2DOF<%s),2))" % config['Trk_Chi2']
         _allCuts = _massCut+'&'+_trkChi2Cut1+'&'+_trkChi2Cut2+'&'+_vtxCut+'&'+_fdCut
-    
+
         # get the Lambda's to filter
         _stdLambdaLL = DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")
 
@@ -393,7 +393,7 @@ class B2TwoBaryonLines( LineBuilder ) :
         name             : name of the Selection.
         config           : config dictionary
         """
-        
+
         _massCutLow     = "(AM>(5620-%s)*MeV)"               % config['B_2bodyMlow']
         _massCutHigh    = "(AM<(5620+%s)*MeV)"               % config['B_2bodyMhigh']
         _aptCut         = "(APT>%s*MeV)"                     % config['B_APTmin']
@@ -401,25 +401,25 @@ class B2TwoBaryonLines( LineBuilder ) :
 #        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']  #Causes DaVinci to "Hang"
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))"            % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut   = "(APT1>%s*MeV)"                    % config['B_DD_PTMin']
-    
+
         #_combCuts = _aptCut+'&'+_daugPtSumCut+'&'+_daugMedPtCut+'&'+_massCutLow+'&'+_massCutHigh+'&'+_daugMaxPtIPCut+'&'+_maxDocaChi2Cut
         _combCuts = _aptCut+'&'+_daugPtSumCut+'&'+_daugMedPtCut+'&'+_massCutLow+'&'+_massCutHigh+'&'+_maxDocaChi2Cut
-    
+
         _ptCut      = "(PT>%s*MeV)"                    % config['B_PTmin']
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)"             % config['B_VtxChi2']
         _diraCut    = "(BPVDIRA>%s)"                   % config['B_DD_Dira']
         _ipChi2Cut  = "(MIPCHI2DV(PRIMARY)<%s)"        % config['B_DD_IPCHI2wrtPV']
         _fdCut      = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B_FDwrtPV']
         _fdChi2Cut  = "(BPVVDCHI2>%s)"                 % config['B_DD_FDChi2']
-        
+
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdCut+'&'+_fdChi2Cut
-    
+
         _B = CombineParticles()
         _B.DecayDescriptors = [ "B- -> p~- Lambda0", "B+ -> p+ Lambda~0"]
         _B.DaughtersCuts = { "p+" : "TRCHI2DOF<%s"% config['Trk_Chi2'] }
         _B.CombinationCut = _combCuts
         _B.MotherCut = _motherCuts
-    
+
         return Selection (name, Algorithm = _B, RequiredSelections = [self.selLambda2DD, StdLooseProtons ])
 
     def makeB2LpLL( self, name, config ) :
@@ -429,34 +429,34 @@ class B2TwoBaryonLines( LineBuilder ) :
         name             : name of the Selection.
         config           : config dictionary
         """
-    
+
         _massCutLow     = "(AM>(5279-%s)*MeV)"               % config['B_2bodyMlow']
         _massCutHigh    = "(AM<(5279+%s)*MeV)"               % config['B_2bodyMhigh']
         _aptCut         = "(APT>%s*MeV)"                     % config['B_APTmin']
         _daugMedPtCut   = "(ANUM(PT>%s*MeV)>=2)"             % config['BDaug_MedPT_PT']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))"            % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut   = "(APT1>%s*MeV)"                   % config['B_LL_PTMin']
-    
+
         _combCuts = _aptCut+'&'+_daugPtSumCut+'&'+_daugMedPtCut+'&'+_massCutLow+'&'+_massCutHigh+'&'+_maxDocaChi2Cut
-        
+
         _ptCut      = "(PT>%s*MeV)"                    % config['B_PTmin']
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)"             % config['B_VtxChi2']
         _diraCut    = "(BPVDIRA>%s)"                   % config['B_LL_Dira']
         _ipChi2Cut  = "(MIPCHI2DV(PRIMARY)<%s)"        % config['B_LL_IPCHI2wrtPV']
         _fdCut      = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B_FDwrtPV']
         _fdChi2Cut  = "(BPVVDCHI2>%s)"                 % config['B_LL_FDChi2']
-    
+
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdCut+'&'+_fdChi2Cut
-    
+
         _B = CombineParticles()
         _B.DecayDescriptors = [ "B- -> p~- Lambda0", "B+ -> p+ Lambda~0" ]
         _B.DaughtersCuts = { "p+" : "TRCHI2DOF<%s"% config['Trk_Chi2'] }
         _B.CombinationCut = _combCuts
         _B.MotherCut = _motherCuts
-        
+
         return Selection (name, Algorithm = _B, RequiredSelections = [self.selLambda2LL, StdLooseProtons  ])
-    
-                                                                                                                        
+
+
 #    def makeB2LpLLMVA( self,  name, config ):
 #        """
 #        Select B -> Lambda~0 p+ event by MVA selcetion
@@ -468,7 +468,7 @@ class B2TwoBaryonLines( LineBuilder ) :
 #        _daugPtSumCut   = "(APT1>%s*MeV)"                   % config['B_LL_PTMin']
 
         #_B.DecayDescriptors = [ "B- -> p~- ( Lambda0 -> p+ pi- )", "B+ -> p+ ( Lambda~0 -> p~- pi+ )" ]
-#        _B.DecayDescriptors = [ "B- -> p~- Lambda0", "B+ -> p+ Lambda~0" ] 
+#        _B.DecayDescriptors = [ "B- -> p~- Lambda0", "B+ -> p+ Lambda~0" ]
 #        _B.CombinationCut = "(ADAMASS('B-')<500*MeV)&"+_maxDocaChi2Cut+'&'+_daugPtSumCut
 #        _B.MotherCut = "VALUE('LoKi::Hybrid::DictValue/MVAResponse') >  %s" % config['MVAResponseLL']
 #        #_B.MotherCut = 'ALL'
@@ -497,7 +497,7 @@ class B2TwoBaryonLines( LineBuilder ) :
 #                   "log(L_LoKi_FDChi2)"      : "log(CHILD(BPVVDCHI2,2))",
 #                   "log(pL_LoKi_TrkChi2)"     : "log(CHILD(CHILD(TRCHI2DOF,2),2))",
 #                   "log(pi_LoKi_TrkChi2)"     : "log(CHILD(CHILD(TRCHI2DOF,1),2))",
-#                   } 
+#                   }
 #        addTMVAclassifierValue(Component = _B ,
 #                              XMLFile = xmldir+"B2pLambda_LL_BDT_v1r4.xml",
 #                              Variables = Vars,
@@ -522,15 +522,15 @@ class B2TwoBaryonLines( LineBuilder ) :
 #        #_B.MotherCut = 'ALL'
 #        # get the Lambda's to filter
 #        _stdLambdaDD = DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")
-#        
+#
 #        # make the filter
 #        _filterLambdaDD = FilterDesktop( Code = "ALL" )
-#        
+#
 #        #Configure tool
 #        from MVADictHelpers import addTMVAclassifierValue
 #        xmldir = "$TMVAWEIGHTSROOT/data/"
 #        #xmldir = "./"
-#        
+#
 #        Vars =    {"log(B_LoKi_VCHI2NDOF)" : "log(VFASPF(VCHI2))",
 #                   "log(B_LoKi_BPVIPCHI2)"       : "log(MIPCHI2DV(PRIMARY))",
 #                   "B_LoKi_BPVDIRA"             : "BPVDIRA",
@@ -546,7 +546,7 @@ class B2TwoBaryonLines( LineBuilder ) :
 #                   "log(pL_LoKi_TrkChi2)"     : "log(CHILD(CHILD(TRCHI2DOF,2),2))",
 #                   "log(pi_LoKi_TrkChi2)"     : "log(CHILD(CHILD(TRCHI2DOF,1),2))",
 #                                      }
-#        
+#
 #        addTMVAclassifierValue(Component = _B ,
 #                               XMLFile = xmldir+"B2pLambda_DD_BDT_v1r4.xml",
 #                               Variables = Vars,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py
index 782c3bc9537046fd9e2c93339985779266f0666f..10039f2cc18756e5f6af3da06d21eb6a48d63ffa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py
@@ -34,11 +34,11 @@ default_config = {
                   'ProbNNCut'               : 0.1,
                   'kstar_daug_PT'           : 500.,
                   'KS_DD_MassWindow'        : 23.0,
-                  'KS_DD_VtxChi2'           : 15.0, 
+                  'KS_DD_VtxChi2'           : 15.0,
                   'KS_DD_FDChi2'            : 20.0,
                   'KS_DD_PTmin'             : 1200.0,
                   'KS_LL_MassWindow'        : 14.0,
-                  'KS_LL_VtxChi2'           : 15.0,  
+                  'KS_LL_VtxChi2'           : 15.0,
                   'KS_LL_FDChi2'            : 50.0,
                   'KS_LL_PTmin'             : 1200.0,
                   'L_DD_MassWindow'         : 20.0,
@@ -63,12 +63,12 @@ default_config = {
                   'eta_prime_DOCA'          : 10.0, #15
                   'B_MassWindow'            : 750.0,
                   'B_PTmin'                 : 1500.0,
-                  'BDaug_DD_maxDocaChi2'    : 15.0, #20 
+                  'BDaug_DD_maxDocaChi2'    : 15.0, #20
                   'BDaug_LL_maxDocaChi2'    : 15.0,  #20
                   'B_VtxChi2'               : 15.0,
                   'B_Dira'                  : 0.9995,
                   'B_IPCHI2'                : 20.0,
-                  'B_eta_IPCHI2'            : 6.0, 
+                  'B_eta_IPCHI2'            : 6.0,
                   'Lb_MassWindow'           : 750.0,
                   'Lb_PTmin'                : 1000.0,
                   'LbDaug_DD_maxDocaChi2'   : 15.0, #20
@@ -121,7 +121,7 @@ class B2XEtaConf(LineBuilder) :
     """
     Builder of B->XEta stripping Selection and StrippingLine.
     Constructs B -> KS eta' and Lb -> Lambda eta' Selections and StrippingLines from a configuration dictionary.
-    
+
     Exports as instance data members:
     selKS2DD               : KS -> Down Down Selection object
     selKS2LL               : KS -> Long Long Selection object
@@ -146,7 +146,7 @@ class B2XEtaConf(LineBuilder) :
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config):
-        
+
         LineBuilder.__init__(self,name,config)
 
         B2etap_LL_name = name+'B2etapKSLL'
@@ -168,7 +168,7 @@ class B2XEtaConf(LineBuilder) :
         Lb2etap_pK_name = name+'Lb2pKetap'
         Lb2etaGG_pK_name = name+'Lb2pKetaGG'
         Lb2eta3Pi_pK_name = name+'Lb2pKeta3pi'
- 
+
         GECCode = {'Code' : "(recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %s)" % config['GEC_MaxTracks'],
                    'Preambulo' : ["from LoKiTracks.decorators import *"]}
 
@@ -176,13 +176,13 @@ class B2XEtaConf(LineBuilder) :
         #               'Preambulo' : ["from LoKiCore.functions import *"]}
         #TCKFilters  = {'Code' : "(in_range( %s, ODIN_TCK, %s ))" % config['TCKs'],
         #               'Preambulo' : ["from LoKiCore.functions import *"]}
-        
+
         Hlt1Filter = "(HLT_PASS_RE('Hlt1(Two)?TrackMVADecision'))"
         Hlt2Filter = "(HLT_PASS_RE('Hlt2Topo[234]BodyDecision'))"
 
         _tagging=True
         self.refitPVs=True
-        
+
         self.pions = Pions
         self.kaons = Kaons
         self.protons = Protons
@@ -194,7 +194,7 @@ class B2XEtaConf(LineBuilder) :
         self.daughters = MergedSelection("DaughtersFor" + name, RequiredSelections = [ self.pions, self.photons, self.pizero] )
 
         self.makeKS2LL( 'KSfor'+B2etap_LL_name, config )
-        self.makeKS2DD( 'KSfor'+B2etap_DD_name, config )        
+        self.makeKS2DD( 'KSfor'+B2etap_DD_name, config )
         self.makeL2LL( 'Lambdafor'+Lb2etap_LL_name,config)
         self.makeL2DD('Lambdafor'+Lb2etap_DD_name,config)
 
@@ -213,11 +213,11 @@ class B2XEtaConf(LineBuilder) :
         self.makeB2KSLLetaGG(B2etaGG_LL_name, config)
         self.makeB2KSDDetaGG(B2etaGG_DD_name, config)
         self.makeB2KSLLeta3Pi(B2eta3Pi_LL_name, config)
-        self.makeB2KSDDeta3Pi(B2eta3Pi_DD_name, config) 
+        self.makeB2KSDDeta3Pi(B2eta3Pi_DD_name, config)
         self.makeLb2LLLetap(Lb2etap_LL_name,config)
         self.makeLb2LDDetap(Lb2etap_DD_name,config)
         self.makeLb2LLLetaGG(Lb2etaGG_LL_name, config)
-        self.makeLb2LDDetaGG(Lb2etaGG_DD_name, config)    
+        self.makeLb2LDDetaGG(Lb2etaGG_DD_name, config)
         self.makeLb2LLLeta3Pi(Lb2eta3Pi_LL_name, config)
         self.makeLb2LDDeta3Pi(Lb2eta3Pi_DD_name, config)
 
@@ -273,7 +273,7 @@ class B2XEtaConf(LineBuilder) :
                                               HLT1 = Hlt1Filter,
                                               FILTER = GECCode,
                                               EnableFlavourTagging=_tagging
-                                              )        
+                                              )
         self.Lb2etap_LL_line = StrippingLine(Lb2etap_LL_name+'Line',
                                              prescale = config['Prescale'],
                                              postscale = config['Postscale'],
@@ -301,7 +301,7 @@ class B2XEtaConf(LineBuilder) :
                                               selection = self.selLb2LDDetaGG,
                                               FILTER = GECCode,
                                               EnableFlavourTagging=_tagging
-                                              )        
+                                              )
         self.Lb2eta3Pi_LL_line = StrippingLine(Lb2eta3Pi_LL_name+'Line',
                                                prescale = config['Prescale'],
                                                postscale = config['Postscale'],
@@ -366,13 +366,13 @@ class B2XEtaConf(LineBuilder) :
                                                FILTER = GECCode,
                                                EnableFlavourTagging=_tagging
                                                )
-        
+
         self.registerLine(self.B2etap_LL_line)
         self.registerLine(self.B2etap_DD_line)
         self.registerLine(self.B2etaGG_LL_line)
         self.registerLine(self.B2etaGG_DD_line)
         self.registerLine(self.B2eta3Pi_LL_line)
-        self.registerLine(self.B2eta3Pi_DD_line)        
+        self.registerLine(self.B2eta3Pi_DD_line)
         self.registerLine(self.Lb2etap_LL_line)
         self.registerLine(self.Lb2etap_DD_line)
         self.registerLine(self.Lb2etaGG_LL_line)
@@ -393,7 +393,7 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut  = "(VFASPF(VCHI2/VDOF)<%s)"           % config['KS_LL_VtxChi2']
         _fdCut   = "(BPVVDCHI2>%s)"                    % config['KS_LL_FDChi2']
         _momCut = "(PT>%s*MeV)"                        % config['KS_LL_PTmin']
-        
+
         _trackChi2_1 = "(CHILDCUT((TRCHI2DOF<%s),1))"  % config['Trk_Chi2']
         _trackChi2_2 = "(CHILDCUT((TRCHI2DOF<%s),2))"  % config['Trk_Chi2']
         _track_PT_1 = "(CHILDCUT((PT>%s*MeV),1))"      % config['Trk_PT']
@@ -402,19 +402,19 @@ class B2XEtaConf(LineBuilder) :
         _track_GP_2 = "(CHILDCUT((TRGHOSTPROB<%s),2))"    % config['Trk_GP']
         _track_PID_1 = "(CHILDCUT((PROBNNpi>%s),1))"      % config['ProbNNCut']
         _track_PID_2 = "(CHILDCUT((PROBNNpi>%s),2))"      % config['ProbNNCut']
-        
+
         _allCuts =_momCut+'&'+_massCut+'&'+_vtxCut+'&'+_fdCut+'&'+_trackChi2_1+'&'+_trackChi2_2+'&'+_track_PT_1+'&'+_track_PT_2+'&'+_track_GP_1+'&'+_track_GP_2+'&'+_track_PID_1+'&'+_track_PID_2
 
         _KSLLFilter=FilterDesktop(Code=_allCuts)
         self.selKS2LL=Selection( name, Algorithm=_KSLLFilter, RequiredSelections=[_KsLL])
 
     def makeKS2DD( self, name, config):
-        
+
         _massCut = "(ADMASS('KS0')<%s*MeV)"            % config['KS_DD_MassWindow']
         _vtxCut  = "(VFASPF(VCHI2/VDOF)<%s)"           % config['KS_DD_VtxChi2']
         _fdCut   = "(BPVVDCHI2>%s)"                    % config['KS_DD_FDChi2']
         _momCut  = "(PT>%s*MeV)"                       % config['KS_DD_PTmin']
-        
+
         _trackChi2_1 = "(CHILDCUT((TRCHI2DOF<%s),1))"  % config['Trk_Chi2']
         _trackChi2_2 = "(CHILDCUT((TRCHI2DOF<%s),2))"  % config['Trk_Chi2']
         _track_PT_1 = "(CHILDCUT((PT>%s*MeV),1))"      % config['Trk_PT']
@@ -423,14 +423,14 @@ class B2XEtaConf(LineBuilder) :
         _track_GP_2 = "(CHILDCUT((TRGHOSTPROB<%s),2))"    % config['Trk_GP']
         _track_PID_1 = "(CHILDCUT((PROBNNpi>%s),1))"      % config['ProbNNCut']
         _track_PID_2 = "(CHILDCUT((PROBNNpi>%s),2))"      % config['ProbNNCut']
-        
+
         _allCuts = _momCut+'&'+_massCut+'&'+_vtxCut+'&'+_fdCut+'&'+_trackChi2_1+'&'+_trackChi2_2+'&'+_track_PT_1+'&'+_track_PT_2+'&'+_track_GP_1+'&'+_track_GP_2+'&'+_track_PID_1+'&'+_track_PID_2
 
         _KSDDFilter=FilterDesktop(Code=_allCuts)
         self.selKS2DD=Selection( name, Algorithm=_KSDDFilter, RequiredSelections=[_KsDD])
 
     def makeL2LL( self, name, config):
-    
+
         _massCut = "(ADMASS('Lambda0')<%s*MeV)"        % config['L_LL_MassWindow']
         _vtxCut  = "(VFASPF(VCHI2/VDOF)<%s)"           % config['L_LL_VtxChi2']
         _momCut = "(PT>%s*MeV)"                        % config['L_LL_PTmin']
@@ -443,29 +443,29 @@ class B2XEtaConf(LineBuilder) :
         _track_GP_2 = "(CHILDCUT((TRGHOSTPROB<%s),2))"    % config['Trk_GP']
         #_track_PID_1 = "(CHILDCUT((PROBNNp>%s),1))"      % config['ProbNNCut']
         #_track_PID_2 = "(CHILDCUT((PROBNNpi>%s),2))"      % config['ProbNNCut']
-        
+
         _allCuts =_momCut+'&'+_massCut+'&'+_vtxCut+'&'+_trackChi2_1+'&'+_trackChi2_2+'&'+_track_PT_1+'&'+_track_PT_2+'&'+_track_GP_1+'&'+_track_GP_2
-        
+
         _LLLFilter=FilterDesktop(Code=_allCuts)
         self.selL2LL=Selection( name, Algorithm=_LLLFilter, RequiredSelections=[_lambdaLL])
-        
+
     def makeL2DD( self, name, config):
-        
+
         _massCut = "(ADMASS('Lambda0')<%s*MeV)"        % config['L_DD_MassWindow']
         _vtxCut  = "(VFASPF(VCHI2/VDOF)<%s)"           % config['L_DD_VtxChi2']
         _momCut  = "(PT>%s*MeV)"                       % config['L_DD_PTmin']
-        
+
         _trackChi2_1 = "(CHILDCUT((TRCHI2DOF<%s),1))"  % config['Trk_Chi2']
-        _trackChi2_2 = "(CHILDCUT((TRCHI2DOF<%s),2))"  % config['Trk_Chi2']        
+        _trackChi2_2 = "(CHILDCUT((TRCHI2DOF<%s),2))"  % config['Trk_Chi2']
         _track_PT_1 = "(CHILDCUT((PT>%s*MeV),1))"      % config['Trk_PT']
         _track_PT_2 = "(CHILDCUT((PT>%s*MeV),2))"      % config['Trk_PT']
         _track_GP_1 = "(CHILDCUT((TRGHOSTPROB<%s),1))"    % config['Trk_GP']
         _track_GP_2 = "(CHILDCUT((TRGHOSTPROB<%s),2))"    % config['Trk_GP']
         #_track_PID_1 = "(CHILDCUT((PROBNNp>%s),1))"      % config['ProbNNCut']
         #_track_PID_2 = "(CHILDCUT((PROBNNpi>%s),2))"      % config['ProbNNCut']
-        
+
         _allCuts = _momCut+'&'+_massCut+'&'+_vtxCut+'&'+_trackChi2_1+'&'+_trackChi2_2+'&'+_track_PT_1+'&'+_track_PT_2+'&'+_track_GP_1+'&'+_track_GP_2
-        
+
         _LDDFilter=FilterDesktop(Code=_allCuts)
         self.selL2DD=Selection( name, Algorithm=_LDDFilter, RequiredSelections=[_lambdaDD])
 
@@ -487,7 +487,7 @@ class B2XEtaConf(LineBuilder) :
         _GPCut = "(TRGHOSTPROB<%s)"       % config['Trk_GP']
         _PIDCut = "(PROBNNp>%s)"          % config['ProbNNCut']
         _IPChi2_Cut = "(BPVIPCHI2()>%s)"  % config['pK_IPCHI2']
-        
+
         _allCuts = _momCut+'&'+_GPCut+'&'+_PIDCut+'&'+_IPChi2_Cut
 
         _protonFilter=FilterDesktop(Code=_allCuts)
@@ -498,39 +498,39 @@ class B2XEtaConf(LineBuilder) :
         _momCut = "(PT>%s*MeV)"                                       % config['Kstar_PTmin']
         _vtxCut  = "(VFASPF(VCHI2/VDOF)<%s)"                          % config['Kstar_vtxChi2']
         _IPChi2Cut = "(BPVIPCHI2()>%s)"                               % config['Kstar_ipChi2']
-              
+
         _trackChi2_1 = "(CHILDCUT((TRCHI2DOF<%s),1))"                 % config['Trk_Chi2']
-        _trackChi2_2 = "(CHILDCUT((TRCHI2DOF<%s),2))"                 % config['Trk_Chi2']        
+        _trackChi2_2 = "(CHILDCUT((TRCHI2DOF<%s),2))"                 % config['Trk_Chi2']
         _track_PT_1 = "(CHILDCUT((PT>%s*MeV),1))"                     % config['kstar_daug_PT']
         _track_PT_2 = "(CHILDCUT((PT>%s*MeV),2))"                     % config['kstar_daug_PT']
         _track_GP_1 = "(CHILDCUT((TRGHOSTPROB<%s),1))"                % config['Trk_GP']
         _track_GP_2 = "(CHILDCUT((TRGHOSTPROB<%s),2))"                % config['Trk_GP']
         _track_PID_1 = "(INTREE((ABSID=='pi-') & (PROBNNpi>%s)))"     % config['ProbNNCut']
         _track_PID_2 = "(INTREE((ABSID=='K+') & (PROBNNk>%s)))"       % config['ProbNNCut']
-        
+
         _allCuts = _massCut+'&'+_vtxCut+'&'+_momCut+'&'+_IPChi2Cut+'&'+_trackChi2_1+'&'+_trackChi2_2+'&'+_track_PT_1+'&'+_track_PT_2+'&'+_track_GP_1+'&'+_track_GP_2+'&'+_track_PID_1+'&'+_track_PID_2
 
         _kstarFilter=FilterDesktop(Code=_allCuts)
         self.selKstar = Selection( name, Algorithm=_kstarFilter, RequiredSelections=[_kstar] )
 
     def makeEtaGG( self, name, config):
-        
+
         _etaPTCut = "(PT>%s*MeV)"                      % config['eta_PT']
         _gammaPT1 = "(CHILDCUT((PT>%s*MeV),1))"        % config['gamma_PT']
         _gammaPT2 = "(CHILDCUT((PT>%s*MeV),2))"        % config['gamma_PT']
-        
+
         _allCuts = _etaPTCut+'&'+_gammaPT1+'&'+_gammaPT2
-        
+
         _etaFilter = FilterDesktop(Code=_allCuts)
         self.selEtaGG=Selection(name, Algorithm=_etaFilter, RequiredSelections=[self.eta])
 
     def makeEtaforEtap(self, name, config):
         _etaforetapMassCut= "(ADMASS('eta')<%s*MeV)"  %config['etaforetap_MassWindow']
-        
+
         _etaforetapFilter=FilterDesktop(Code=_etaforetapMassCut)
 
         self.selEtaforEtap=Selection(name, Algorithm=_etaforetapFilter,RequiredSelections=[self.wideeta])
-        
+
     def makeEta3Pi(self,name,config):
 
         _PTCut = "(PT>%s*MeV)"                         % config['eta_PT']
@@ -542,25 +542,25 @@ class B2XEtaConf(LineBuilder) :
         _track_Chi2="(TRCHI2DOF<%s)"                   % config['Trk_Chi2']
         _track_GPCut ="(TRGHOSTPROB<%s)"               % config['Trk_GP']
         _track_PIDCut = "(PROBNNpi>%s)"                % config['ProbNNCut']
-        
+
         _allCuts = _PTCut+'&'+_vtxCut
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts=_massCut+'&'+_docaCut
         _combCut12Doca="ACHI2DOCA(1,2)<%s"                     % config['eta_DOCA']
         _combCut12Vtx="(VFASPF(VCHI2/VDOF)<%s)"            % config['eta_vtxChi2']
         _combCut12=_combCut12Doca
-        
+
         #_eta3Pi=CombineParticles("eta3Pi",
         _eta3Pi=DaVinci__N3BodyDecays(DecayDescriptor = "eta -> pi+ pi- pi0",
                                       Combination12Cut = _combCut12,
                                       CombinationCut=_combCuts,
                                       MotherCut=_allCuts,
                                       DaughtersCuts = { "pi+" : _trackCuts, "pi-" : _trackCuts})
-        
+
         self.selEta3Pi = Selection(name, Algorithm=_eta3Pi, RequiredSelections=[self.daughters])
-        
+
     def makeEtap( self, name, config):
-      
+
         _massCut = "(ADAMASS('eta_prime')<%s*MeV)"     % config['eta_prime_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['eta_prime_PT']
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['eta_prime_vtxChi2']
@@ -576,17 +576,17 @@ class B2XEtaConf(LineBuilder) :
         _combCut12Doca="ACHI2DOCA(1,2)<%s"                     % config['eta_prime_DOCA']
         _combCut12Vtx="(VFASPF(VCHI2/VDOF)<%s)"            % config['eta_prime_vtxChi2']
         _combCut12=_combCut12Doca
-        
+
         #_etap=CombineParticles("etap",
         _etap=DaVinci__N3BodyDecays(DecayDescriptors = ["eta_prime -> pi+ pi- gamma", "eta_prime -> pi+ pi- eta"],
                                     Combination12Cut = _combCut12,
                                     CombinationCut=_combCuts,
                                     MotherCut=_allCuts,
                                     DaughtersCuts = { "pi+" : _trackCuts, "pi-" : _trackCuts})
-        
+
         self.selEtap = Selection(name, Algorithm=_etap, RequiredSelections=[self.daughters,self.selEtaforEtap])
         #printable=PrintSelection(self.selEtap)
-        
+
     def makeB2KSLLetap( self, name, config):
 
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
@@ -595,10 +595,10 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['B_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['B_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
-        
+
         _b2etapksLL = CombineParticles(DecayDescriptor = "B0 -> KS0 eta_prime",
                                        CombinationCut = _combCuts,
                                        MotherCut = _allCuts,
@@ -613,10 +613,10 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['B_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['B_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
-        
+
         _b2etapksDD = CombineParticles(DecayDescriptor = "B0 -> KS0 eta_prime",
                                        CombinationCut = _combCuts,
                                        MotherCut = _allCuts,
@@ -629,31 +629,31 @@ class B2XEtaConf(LineBuilder) :
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['B_PTmin']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_eta_IPCHI2']
-                
+
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut
-        
+
         _b2etaGGksLL = CombineParticles(DecayDescriptor = "B0 -> KS0 eta",
                                         CombinationCut = _combCuts,
                                         MotherCut = _allCuts,
                                         ReFitPVs = self.refitPVs )
         self.selB2KSLLetaGG = Selection( name, Algorithm=_b2etaGGksLL, RequiredSelections=[self.selKS2LL, self.selEtaGG])
-        
+
     def makeB2KSDDetaGG( self, name, config):
-        
+
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['B_PTmin']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_eta_IPCHI2']
-                
+
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut
-        
+
         _b2etaGGksDD = CombineParticles(DecayDescriptor = "B0 -> KS0 eta",
                                         CombinationCut = _combCuts,
                                         MotherCut = _allCuts,
                                         ReFitPVs = self.refitPVs )
         self.selB2KSDDetaGG = Selection( name, Algorithm=_b2etaGGksDD, RequiredSelections=[self.selKS2DD, self.selEtaGG])
-        
+
     def makeB2KSLLeta3Pi( self, name, config):
 
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
@@ -662,16 +662,16 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['B_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['B_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_IPCHI2']
-                
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
-        
+
         _b2etaksLL = CombineParticles(DecayDescriptor = "B0 -> KS0 eta",
                                       CombinationCut = _combCuts,
                                       MotherCut = _allCuts,
                                       ReFitPVs = self.refitPVs )
         self.selB2KSLLeta3Pi = Selection( name, Algorithm=_b2etaksLL, RequiredSelections=[self.selKS2LL, self.selEta3Pi])
-        
+
     def makeB2KSDDeta3Pi( self, name, config):
 
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
@@ -680,17 +680,17 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['B_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['B_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_IPCHI2']
-                
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
-        
+
         _b2eta3PiksDD = CombineParticles(DecayDescriptor = "B0 -> KS0 eta",
                                          CombinationCut = _combCuts,
                                          MotherCut = _allCuts,
                                          ReFitPVs = self.refitPVs )
-        self.selB2KSDDeta3Pi = Selection( name, Algorithm=_b2eta3PiksDD, RequiredSelections=[self.selKS2DD, self.selEta3Pi])       
-        
-    
+        self.selB2KSDDeta3Pi = Selection( name, Algorithm=_b2eta3PiksDD, RequiredSelections=[self.selKS2DD, self.selEta3Pi])
+
+
     def makeLb2LLLetap( self, name, config):
 
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
@@ -699,16 +699,16 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['Lb_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
-                
+
         _Lb2etapLLL = CombineParticles(DecayDescriptor = "[Lambda_b0 -> Lambda0 eta_prime]cc",
                                        CombinationCut = _combCuts,
                                        MotherCut = _allCuts,
                                        ReFitPVs = self.refitPVs )
         self.selLb2LLLetap = Selection( name, Algorithm=_Lb2etapLLL, RequiredSelections=[self.selL2LL, self.selEtap])
-        
+
     def makeLb2LDDetap( self, name, config):
 
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
@@ -717,10 +717,10 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['Lb_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
-        
+
         _Lb2etapLDD = CombineParticles(DecayDescriptor = "[Lambda_b0 -> Lambda0 eta_prime]cc",
                                        CombinationCut = _combCuts,
                                        MotherCut = _allCuts )
@@ -731,31 +731,31 @@ class B2XEtaConf(LineBuilder) :
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['Lb_PTmin']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_eta_IPCHI2']
-        
+
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut
-        
+
         _Lb2etaGGLLL = CombineParticles(DecayDescriptor = "[Lambda_b0 -> Lambda0 eta]cc",
                                         CombinationCut = _combCuts,
                                         MotherCut = _allCuts,
                                         ReFitPVs = self.refitPVs )
         self.selLb2LLLetaGG = Selection( name, Algorithm=_Lb2etaGGLLL, RequiredSelections=[self.selL2LL, self.selEtaGG])
-        
+
     def makeLb2LDDetaGG( self, name, config):
 
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['Lb_PTmin']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_eta_IPCHI2']
-        
+
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut
-        
+
         _Lb2etaGGLDD = CombineParticles(DecayDescriptor = "[Lambda_b0 -> Lambda0 eta]cc",
                                         CombinationCut = _combCuts,
                                         MotherCut = _allCuts,
                                         ReFitPVs = self.refitPVs )
         self.selLb2LDDetaGG = Selection( name, Algorithm=_Lb2etaGGLDD, RequiredSelections=[self.selL2DD, self.selEtaGG])
-        
+
     def makeLb2LLLeta3Pi( self, name, config):
 
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
@@ -764,16 +764,16 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['Lb_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
-        
+
         _Lb2eta3PiLLL = CombineParticles(DecayDescriptor = "[Lambda_b0 -> Lambda0 eta]cc",
                                          CombinationCut = _combCuts,
                                          MotherCut = _allCuts,
                                          ReFitPVs = self.refitPVs )
         self.selLb2LLLeta3Pi = Selection( name, Algorithm=_Lb2eta3PiLLL, RequiredSelections=[self.selL2LL, self.selEta3Pi])
-        
+
     def makeLb2LDDeta3Pi( self, name, config):
 
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
@@ -782,10 +782,10 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['Lb_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
-        
+
         _Lb2eta3PiLDD = CombineParticles(DecayDescriptor = "[Lambda_b0 -> Lambda0 eta]cc",
                                          CombinationCut = _combCuts,
                                          MotherCut = _allCuts,
@@ -800,30 +800,30 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['B_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['B_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
-                
+
         _b2etapKst = CombineParticles(DecayDescriptor = "[B0 ->  K*(892)0 eta_prime]cc",
                                       CombinationCut = _combCuts,
                                       MotherCut = _allCuts,
                                       ReFitPVs = self.refitPVs )
         self.selB2etapKst = Selection( name, Algorithm=_b2etapKst, RequiredSelections=[self.selKstar, self.selEtap])
-        
+
     def makeB2KstetaGG(self, name, config):
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['B_PTmin']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_eta_IPCHI2']
-        
+
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut
-        
+
         _b2etaGGKst = CombineParticles(DecayDescriptor = "[B0 -> K*(892)0 eta]cc",
                                        CombinationCut = _combCuts,
                                        MotherCut = _allCuts,
                                        ReFitPVs = self.refitPVs )
         self.selB2etaGGKst = Selection( name, Algorithm=_b2etaGGKst, RequiredSelections=[self.selKstar, self.selEtaGG])
-        
+
     def makeB2Ksteta3Pi(self, name, config):
         _massCut = "(ADAMASS('B0')<%s*MeV)"            % config['B_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['B_PTmin']
@@ -831,16 +831,16 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['B_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['B_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['B_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
-                
+
         _b2eta3PiKst = CombineParticles(DecayDescriptor = "[B0 -> K*(892)0 eta]cc",
                                         CombinationCut = _combCuts,
                                         MotherCut = _allCuts,
                                         ReFitPVs = self.refitPVs )
         self.selB2eta3PiKst = Selection( name, Algorithm=_b2eta3PiKst, RequiredSelections=[self.selKstar, self.selEta3Pi])
-        
+
     def makeLb2pKetap(self, name, config):
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['Lb_PTmin']
@@ -848,36 +848,36 @@ class B2XEtaConf(LineBuilder) :
         _vtxCut = "(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)"                      % config['Lb_Dira']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_IPCHI2']
-        
+
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca="ACHI2DOCA(1,2)<%s"                     % config['LbDaug_LL_maxDocaChi2']
         _combCut12Vtx="(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _combCut12=_combCut12Doca
-        
+
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor = "[Lambda_b0 -> p+ K- eta_prime]cc",
                                            Combination12Cut = _combCut12,
                                            CombinationCut = _combCuts,
                                            MotherCut = _allCuts,
                                            ReFitPVs = self.refitPVs )
         self.selLb2pKetap = Selection( name, Algorithm=_Lb2pKetap, RequiredSelections=[self.selProtons, self.selKaons, self.selEtap])
-        
+
     def makeLb2pKetaGG(self, name, config):
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['Lb_PTmin']
         _IPChi2Cut = "(BPVIPCHI2()<%s)"                % config['Lb_eta_IPCHI2']
-        
+
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut
         _combCut12="ACHI2DOCA(1,2)<%s"                     % config['LbDaug_LL_maxDocaChi2']
-               
+
         _Lb2pKetaGG = DaVinci__N3BodyDecays(DecayDescriptor = "[Lambda_b0 -> p+ K- eta]cc",
                                             Combination12Cut = _combCut12,
                                             CombinationCut = _combCuts,
                                             MotherCut = _allCuts,
                                             ReFitPVs = self.refitPVs )
         self.selLb2pKetaGG = Selection( name, Algorithm=_Lb2pKetaGG, RequiredSelections=[self.selProtons, self.selKaons, self.selEtaGG])
-        
+
     def makeLb2pKeta3Pi(self, name, config):
         _massCut = "(ADAMASS('Lambda_b0')<%s*MeV)"     % config['Lb_MassWindow']
         _PTCut = "(PT>%s*MeV)"                         % config['Lb_PTmin']
@@ -890,7 +890,7 @@ class B2XEtaConf(LineBuilder) :
         _combCut12Doca="ACHI2DOCA(1,2)<%s"                     % config['LbDaug_LL_maxDocaChi2']
         _combCut12Vtx="(VFASPF(VCHI2/VDOF)<%s)"            % config['Lb_VtxChi2']
         _combCut12=_combCut12Doca
-        
+
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor = "[Lambda_b0 -> p+ K- eta]cc",
                                              Combination12Cut = _combCut12,
                                              CombinationCut = _combCuts,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py
index 2aa1978f4d7d1cc5023f8a0fe37f44f2dfa8f551..eb3dbd0baed0549f126362eebd743c72614f48f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py
@@ -36,14 +36,14 @@ default_config = {
                              """ ,
         'B0ComCuts'        : "(ADAMASS('B0') < 500 *MeV)",
         'B0MomCuts'        : """
-		             (VFASPF(VCHI2) < 50.) 
-			     & (BPVDIRA> 0.99) 
-			     & (BPVIPCHI2()<30) 
+		             (VFASPF(VCHI2) < 50.)
+			     & (BPVDIRA> 0.99)
+			     & (BPVIPCHI2()<30)
 			     & (VFASPF(VMINVDCHI2DV(PRIMARY)) > 10)
 			     & (PT > 2.*GeV )
 	                     """,
         'B02a1PiMVACut'    :  "-0.0",
-        'B02a1PiXmlFile'   :  "$TMVAWEIGHTSROOT/data/B02a1Pi_BDT_v1r1.xml", 
+        'B02a1PiXmlFile'   :  "$TMVAWEIGHTSROOT/data/B02a1Pi_BDT_v1r1.xml",
         'Prescale'         : 1.
         },
     'STREAMS'              : ['Bhadron'],
@@ -52,20 +52,20 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from Configurables import DaVinci__N4BodyDecays
 
 class B02a1PiBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
@@ -74,10 +74,10 @@ class B02a1PiBDTConf(LineBuilder):
         """
 
         self.Sela1Pions = self.createSubSel( OutputList = self.name + "Sela1Pions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ),
                                            Cuts = config['a1PionCuts']
                                            )
-        
+
         self.Sela12PiPiPi = self.createCombinationSel( OutputList = self.name + "Sela12PiPiPi",
                                                     DaughterLists = [ self.Sela1Pions ],
                                                     DecayDescriptor = "[a_1(1260)+ -> pi- pi+ pi+]cc",
@@ -86,22 +86,22 @@ class B02a1PiBDTConf(LineBuilder):
                                                     )
 
         """
-        Bachelor Pion 
+        Bachelor Pion
         """
         self.SelBachelorPion = self.createSubSel( OutputList = self.name + "SelBachelorPion",
-                                         InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ), 
+                                         InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ),
                                          Cuts = config['BachelorPionCuts']
                                          )
 
         """
-        B0 -> a1(1260)+ pi-  
+        B0 -> a1(1260)+ pi-
         """
         self.SelB02a1Pi = self.createCombinationSel( OutputList = self.name + "SelB02a1Pi",
                                                         DecayDescriptor = "[B0 -> pi- a_1(1260)+]cc",
-                                                        DaughterLists = [ self.SelBachelorPion, self.Sela12PiPiPi ],                    
+                                                        DaughterLists = [ self.SelBachelorPion, self.Sela12PiPiPi ],
                                                         PreVertexCuts  = config['B0ComCuts'],
                                                         PostVertexCuts = config['B0MomCuts'] )
-                
+
         """
         Apply MVA
         """
@@ -109,7 +109,7 @@ class B02a1PiBDTConf(LineBuilder):
             'Pion1_IPCHI2_OWNPV'        : " CHILD(MIPCHI2DV(), 1) ",
             'Pion2_IPCHI2_OWNPV'        : " CHILD(MIPCHI2DV(), 2, 1) ",
             'Pion3_IPCHI2_OWNPV'        : " CHILD(MIPCHI2DV(), 2, 2) ",
-            'Pion4_IPCHI2_OWNPV'        : " CHILD(MIPCHI2DV(), 2, 3) ", 
+            'Pion4_IPCHI2_OWNPV'        : " CHILD(MIPCHI2DV(), 2, 3) ",
             'Pion1_PT'                  : " CHILD(PT, 1) ",
             'Pion2_PT'                  : " CHILD(PT, 2, 1) ",
             'Pion3_PT'                  : " CHILD(PT, 2, 2) ",
@@ -120,9 +120,9 @@ class B02a1PiBDTConf(LineBuilder):
             'a1_PT'                     : " CHILD(PT, 2 ) ",
             'a1_IPCHI2_OWNPV'           : " CHILD(MIPCHI2DV(), 2 ) ",
             'a1_ENDVERTEX_CHI2'         : " CHILD(VFASPF(VCHI2), 2)",
-            
+
             'B0_PT'                     : " PT ",
-            'B0_IPCHI2_OWNPV'           : " BPVIPCHI2() ", 
+            'B0_IPCHI2_OWNPV'           : " BPVIPCHI2() ",
             'B0_ENDVERTEX_CHI2'         : " VFASPF(VCHI2) ",
             'B0_FDCHI2_OWNPV'           : " VFASPF(VMINVDCHI2DV(PRIMARY)) ",
             'B0_DIRA_OWNPV'             : " BPVDIRA "
@@ -132,18 +132,18 @@ class B02a1PiBDTConf(LineBuilder):
         self.MvaB02a1Pi = self.applyMVA( self.name + "MvaB02a1Pi",
                                              SelB        = self.SelB02a1Pi,
                                              MVAVars     = self.B02a1PiVars,
-                                             MVACutValue = config['B02a1PiMVACut'], 
+                                             MVACutValue = config['B02a1PiMVACut'],
                                              MVAxmlFile  = config['B02a1PiXmlFile']
                                              )
-        
-        self.B02a1PiBDTLine = StrippingLine( self.name + 'Line',                                                
+
+        self.B02a1PiBDTLine = StrippingLine( self.name + 'Line',
                                                 prescale  = config['Prescale'],
                                                 #algos     = [ self.SelB02a1Pi ],
                                                 algos     = [ self.MvaB02a1Pi ],
                                                 EnableFlavourTagging = True
                                                 )
         self.registerLine( self.B02a1PiBDTLine )
-        
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -178,7 +178,7 @@ class B02a1PiBDTConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<20 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<20 ) & ( ACHI2DOCA(2,3)<20 )",
@@ -190,7 +190,7 @@ class B02a1PiBDTConf(LineBuilder):
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
 
-    def applyMVA( self, name, 
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -206,7 +206,7 @@ class B02a1PiBDTConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index b443cf56489793d634d9b03029392cfd6129ebf9..307fc4faa8f873034ae8d3c6e6c89f4ee8c6d1e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -81,11 +81,11 @@ from StrippingUtils.Utils import LineBuilder
 from Configurables import DaVinci__N4BodyDecays
 
 class B2hhpipiPhsSpcCutConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config ):
-        
+
         LineBuilder.__init__(self, name, config)
         self.name = name
         self.config = config
@@ -99,7 +99,7 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
                                          Cuts = config['4PionCuts']
                                          )
         """
-        2 Pion 
+        2 Pion
         """
         self.SelBachelor2Pion = self.createSubSel( OutputList = self.name + "SelBachelor2Pion",
                                          InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ),
@@ -107,7 +107,7 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
                                          )
 
         """
-        Kaon 
+        Kaon
         """
         self.SelBachelorKaon = self.createSubSel( OutputList = self.name + "SelBachelorKaon",
                                          InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsKaons/Particles' ),
@@ -122,7 +122,7 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
                                                         DaughterLists = [ self.SelBachelorPion ],
                                                         PreVertexCuts  = config['B0ComCuts'],
                                                         PostVertexCuts = config['B0MomCuts'] )
-                
+
         """
         B0 -> K+ K- pi+ pi-
         """
@@ -146,7 +146,7 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
             'Pion4_PT'                  : " CHILD(PT, 4) ",
 
             'sqrt(Pion1_IPCHI2_OWNPV+Pion2_IPCHI2_OWNPV+Pion3_IPCHI2_OWNPV+Pion4_IPCHI2_OWNPV)'                 : "sqrt( CHILD(MIPCHI2DV(), 1)+CHILD(MIPCHI2DV(), 2)+CHILD(MIPCHI2DV(), 3)+CHILD(MIPCHI2DV(), 4))",
-            
+
             'B0_PT'                     : " PT ",
             'B0_IPCHI2_OWNPV'           : " BPVIPCHI2() ",
             'B0_ENDVERTEX_CHI2'         : " VFASPF(VCHI2) ",
@@ -161,28 +161,28 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
                                              MVACutValue = config['B24piMVACut'],
                                              MVAxmlFile  = config['B2hhpipiXmlFile']
                                              )
-        
+
         self.MvaB2KKpipi = self.applyMVA( self.name + "MvaB2KKpipi",
                                              SelB        = self.SelB2KKpipiPhsSpcCut,
                                              MVAVars     = self.B2hhpipiVars,
                                              MVACutValue = config['B2KKpipiMVACut'],
                                              MVAxmlFile  = config['B2hhpipiXmlFile']
                                              )
-        
+
         self.B24piPhsSpcCutLine = StrippingLine( self.name + '4piLine',
                                                 prescale  = config['Prescale'],
                                                 algos     = [ self.MvaB24pi ],
                                                 EnableFlavourTagging = True
                                                 )
         self.registerLine( self.B24piPhsSpcCutLine )
-        
+
         self.B2KKpipiPhsSpcCutLine = StrippingLine( self.name + 'KKpipiLine',
                                                 prescale  = config['Prescale'],
                                                 algos     = [ self.MvaB2KKpipi ],
                                                 EnableFlavourTagging = True
                                                 )
         self.registerLine( self.B2KKpipiPhsSpcCutLine )
-        
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -229,7 +229,7 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
 
-    def applyMVA( self, name, 
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -245,8 +245,7 @@ class B2hhpipiPhsSpcCutConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py
index dad49d6d776bd4f4e5ccd4daee38eef942af60be..057524172076f213002eed35e21db8e7e0e57f9b 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py
@@ -10,7 +10,7 @@
 ###############################################################################
 # $Id: StrippingBu2pphh.py,v 1.0 2013-12-19$
 '''
-Module for construction of B->pphh 
+Module for construction of B->pphh
    ppKK
    pppipi
    ppKpi
@@ -61,9 +61,9 @@ default_config = {
     'MassMax'             : 5.55,
     'MassMin'             : 5.05,
     '4h_PTSUM'            : 3000.0,
-    'B_DIRA'              : .9999 ,   
-    '4h_AMAXDOCA'                : 0.25 ,     
-    'B_CHI2'              : 25.0 ,    
+    'B_DIRA'              : .9999 ,
+    '4h_AMAXDOCA'                : 0.25 ,
+    'B_CHI2'              : 25.0 ,
     'B_PT'                 : 1000.,
     'B_MIPDV'              : 0.2,
     'PionCuts' : "HASRICH & (P > 1500*MeV) & (PT > 300*MeV) & (MIPCHI2DV(PRIMARY) > 8.0) & (TRGHOSTPROB < 0.5) & (PROBNNpi > 0.10)",
@@ -100,20 +100,20 @@ class B2pphhConf(LineBuilder) :
         self.KaonForB2pphh = self.createSubSel( OutputList = "KaonFor" + self.name,
                                                 InputList = DataOnDemand(Location = 'Phys/StdAllNoPIDsKaons/Particles'),
                                                 Cuts = config['KaonCuts'])
-        
+
         self.makeBpppipi()
         self.makeBppkpi()
         self.makeBppkk()
-        
 
-        
+
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel (self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -123,7 +123,7 @@ class B2pphhConf(LineBuilder) :
                               PreVertexCuts = "AALL",
                               PostVertexCuts = "ALL",
                               ReFitPVs = True) :
-        
+
         combiner = DaVinci__N4BodyDecays( DecayDescriptor = DecayDescriptor,
                                           DaughtersCuts = DaughterCuts,
                                           MotherCut = PostVertexCuts,
@@ -134,8 +134,8 @@ class B2pphhConf(LineBuilder) :
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
-    
+
+
 
 
     def makeBppkk(self):
@@ -147,7 +147,7 @@ class B2pphhConf(LineBuilder) :
                                            PreVertexCuts = " ((AMAXDOCA('LoKi::TrgDistanceCalculator') < %(4h_AMAXDOCA)s) & (in_range ( %(CombMassMin)s * GeV , AM , %(CombMassMax)s * GeV)) & (ACHI2DOCA(1,4) < %(d_achi2doca14)s )  & (ACHI2DOCA(2,4) < %(d_achi2doca24)s )  & (ACHI2DOCA(3,4) < %(d_achi2doca34)s ))" %self.config,
                                            PostVertexCuts ="((BPVDIRA > %(B_DIRA)s) & (VFASPF(VCHI2) < %(B_CHI2)s) & (SUMTREE(PT,((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='K+') | (ABSID=='K-')),0.0) > %(4h_PTSUM)s*MeV) & (PT > %(B_PT)s * MeV) & (MIPDV(PRIMARY) < %(B_MIPDV)s*mm) & (in_range (%(MassMin)s * GeV , M , %(MassMax)s * GeV )))" %self.config,
                                            ReFitPVs = True)
-        
+
         BppkkLine = StrippingLine( self.name + '_kkLine',
                                    prescale   = 1,
                                    #HLT = "(HLT_PASS_RE('Hlt1TrackAllL0Decision') & HLT_PASS_RE('Hlt2Topo[234]Body.*Decision'))",
@@ -156,11 +156,11 @@ class B2pphhConf(LineBuilder) :
                                    algos     = [ Bppkk ],
                                    EnableFlavourTagging = True,
                                    MDSTFlag = False)
-        
+
         self.registerLine(BppkkLine)
-        
-        
-        
+
+
+
     def makeBppkpi(self):
         Bppkpi = self.createCombinationSel (OutputList = "ppkpi" + self.name,
                                             DecayDescriptor  = "[B0 -> p+ p~- K+ pi-]cc",
@@ -169,7 +169,7 @@ class B2pphhConf(LineBuilder) :
                                             Combination123Cut = "((AM < %(CombMass123Max)s * MeV)  & (ACHI2DOCA(1,3) < %(d_achi2doca13)s )  & (ACHI2DOCA(2,3) < %(d_achi2doca23)s ))" %self.config,
                                             PreVertexCuts = "((AMAXDOCA('LoKi::TrgDistanceCalculator') < %(4h_AMAXDOCA)s) & (in_range (%(CombMassMin)s * GeV , AM , %(CombMassMax)s * GeV))  & (ACHI2DOCA(1,4) < %(d_achi2doca14)s )  & (ACHI2DOCA(2,4) < %(d_achi2doca24)s )  & (ACHI2DOCA(3, 4) < %(d_achi2doca34)s ))" %self.config,
                                             PostVertexCuts ="((BPVDIRA > %(B_DIRA)s) & (VFASPF(VCHI2) < %(B_CHI2)s) & (SUMTREE(PT,((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='K+') | (ABSID=='K-') | (ABSID=='pi+') | (ABSID=='pi-')),0.0) > %(4h_PTSUM)s*MeV) & (PT > %(B_PT)s*MeV) & (MIPDV(PRIMARY) < %(B_MIPDV)s*mm) & (in_range (%(MassMin)s * GeV , M , %(MassMax)s * GeV)))" %self.config,
-                                            ReFitPVs = True)         
+                                            ReFitPVs = True)
         BppkpiLine = StrippingLine( self.name + '_kpiLine',
                                     prescale   = 1,
                                     #HLT = "(HLT_PASS_RE('Hlt1TrackAllL0Decision') & HLT_PASS_RE('Hlt2Topo[234]Body.*Decision'))",
@@ -178,9 +178,9 @@ class B2pphhConf(LineBuilder) :
                                     algos     = [ Bppkpi ],
                                     EnableFlavourTagging = True,
                                     MDSTFlag = False)
-        
+
         self.registerLine(BppkpiLine)
-        
+
     def makeBpppipi(self):
         Bpppipi = self.createCombinationSel (OutputList = "Bpppipi" + self.name,
                                              DecayDescriptor  = "B0 -> p+ p~- pi+ pi-",
@@ -190,7 +190,7 @@ class B2pphhConf(LineBuilder) :
                                              PreVertexCuts = "((AMAXDOCA('LoKi::TrgDistanceCalculator') < %(4h_AMAXDOCA)s) & (in_range( %(CombMassMin)s *GeV, AM , %(CombMassMax)s *GeV))  & (ACHI2DOCA(1,4) < %(d_achi2doca14)s )  & (ACHI2DOCA(2,4) < %(d_achi2doca24)s )  & (ACHI2DOCA(3, 4) < %(d_achi2doca34)s ))" %self.config,
                                              PostVertexCuts ="((BPVDIRA > %(B_DIRA)s) & (VFASPF(VCHI2) < %(B_CHI2)s) & (SUMTREE(PT,((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='pi+') | (ABSID=='pi-')),0.0) > %(4h_PTSUM)s*MeV) & (PT > %(B_PT)s* MeV) & (MIPDV(PRIMARY) < %(B_MIPDV)s*mm) & (in_range ( %(MassMin)s * GeV , M , %(MassMax)s * GeV)))" %self.config,
                                              ReFitPVs = True)
-        
+
         BpppipiLine = StrippingLine( self.name + '_pipiLine',
                                      prescale   = 1,
                                      #HLT = "(HLT_PASS_RE('Hlt1TrackAllL0Decision') & HLT_PASS_RE('Hlt2Topo[234]Body.*Decision'))",
@@ -199,9 +199,5 @@ class B2pphhConf(LineBuilder) :
                                      algos      = [ Bpppipi ],
                                      EnableFlavourTagging = True,
                                      MDSTFlag = False)
-        
-        self.registerLine(BpppipiLine) 
-       
-       
-       
-       
+
+        self.registerLine(BpppipiLine)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
index 57d96de37846c302ee7f6e158e79e7c0d5c81026..45fba56f052e8850409720431767685ca1265ad1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -10,17 +10,17 @@
 ###############################################################################
  # $Id: StrippingBc2hhh_BnoC.py,v 1.5 2015-07-31$
 '''
-Module for construction of Bc->hhh from:   
+Module for construction of Bc->hhh from:
      Exclusive lines to reconstruct the pipipi, Kpipi, KKpi, KKK, pppi and ppK decay modes.
-     
+
 Exported symbols (use python help!):
    - Bc2hhhBuilder
-   - makepipipi_excl  
-   - makeKpipi_excl  
-   - makeKKpi_excl  
-   - makeKKK_excl  
-   - makepppi_excl  
-   - makeppK_excl  
+   - makepipipi_excl
+   - makeKpipi_excl
+   - makeKKpi_excl
+   - makeKKK_excl
+   - makepppi_excl
+   - makeppK_excl
 '''
 
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
@@ -28,12 +28,12 @@ __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
 
 __all__ = ('Bc2hhhBuilder',
-           'makepipipi_excl', 
-           'makeKpipi_excl', 
-           'makeKKpi_excl', 
-           'makeKKK_excl', 
-           'makepppi_excl', 
-           'makeppK_excl', 
+           'makepipipi_excl',
+           'makeKpipi_excl',
+           'makeKKpi_excl',
+           'makeKKK_excl',
+           'makepppi_excl',
+           'makeppK_excl',
      )
 
 """
@@ -71,20 +71,20 @@ default_config = {
     'BUILDERTYPE' : 'Bc2hhhBuilder',
     'CONFIG'      : { 'MaxTrSIZE'             : 200,      ## GEC maximim recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG)
                       '_h_PT'                 : 300.,     ## tracks min PT
-                      '_h_P'                  : 2500.,    ## tracks min P  
+                      '_h_P'                  : 2500.,    ## tracks min P
                       '_h_IPCHI2'             : 1.,       ## min tracks IP wrt OWNPV
                       '_h_TRCHI2DOF'          : 4.0,      ## max tracks CHI2DOF
-                      '_h_TRGHP'              : .5,        ## Track Ghost Probability     
-                      '_3h_DOCA'              : .2,       ## max DOCA between h and 2h 
+                      '_h_TRGHP'              : .5,        ## Track Ghost Probability
+                      '_3h_DOCA'              : .2,       ## max DOCA between h and 2h
                       '_3h_PTmax'             : 1500,     ## min PT of the 3h highest PT track
-                      '_3h_DIRA'              : .9999,   ## min cos angle between 3h momentum and PV decay direction   
-                      '_3h_FDCHI2'            : 150.,     ## min 3h FDCHI2 wrt best 3h PV  
+                      '_3h_DIRA'              : .9999,   ## min cos angle between 3h momentum and PV decay direction
+                      '_3h_FDCHI2'            : 150.,     ## min 3h FDCHI2 wrt best 3h PV
                       '_3h_SVPV'              : 1.5,      ## Distance between sv and pv
-                      '_3h_CHI2'              : 40.0,     ## max 3h vertex CHI2 
+                      '_3h_CHI2'              : 40.0,     ## max 3h vertex CHI2
                       '_3h_IPCHI2'            : 10.,      ## max 3h IP CHI2 wrt best 3h PV
-                      '_3h_PT'                : 1000.,    ## min 3h PT   
-                      '_3h_PTsum'             : 4500.,    ## min of 3h tracks PT sum 
-                      '_3h_Psum'              : 22000.,   ## min of 3h tracks P sum 
+                      '_3h_PT'                : 1000.,    ## min 3h PT
+                      '_3h_PTsum'             : 4500.,    ## min of 3h tracks PT sum
+                      '_3h_Psum'              : 22000.,   ## min of 3h tracks P sum
                       '_3h_PVIPCHI2sum'       : 200.,     ## min of the 3h tracks IP wrt best 3h PV
                       '_3h_TRKCHIDOFmin'      : 3.0,       ## max track CHI2DOF for the track with smalest CHI2DOF
                       '_3h_Mmax'              : 6502.,     ## max 3h mass for exclusive lines
@@ -106,7 +106,7 @@ default_config = {
                       'pppi_exclLinePostscale'   : 1.0,
                       'ppK_exclLinePrescale'     : 1.0,
                       'ppK_exclLinePostscale'    : 1.0,
-                    }, 
+                    },
     'STREAMS'     : ['Bhadron']
 }
 
@@ -135,7 +135,7 @@ class Bc2hhhBuilder(LineBuilder) :
         _pppi_exclName = name + '_pppi_excl'
         _ppK_exclName = name + '_ppK_excl'
 
-        self.selpipipi = makepipipi_excl( 'pipipiexclFor' + _pipipi_exclName + 'Sel', 
+        self.selpipipi = makepipipi_excl( 'pipipiexclFor' + _pipipi_exclName + 'Sel',
                              _h_PT           = config['_h_PT'],
                              _h_P            = config['_h_P'],
                              _h_IPCHI2       = config['_h_IPCHI2'],
@@ -158,7 +158,7 @@ class Bc2hhhBuilder(LineBuilder) :
                              _bu3h_Mmin   = config['_bu3h_Mmin'],
                              _bu3h_Mmax   = config['_bu3h_Mmax'])
 
-        self.selKpipi = makeKpipi_excl( 'KpipiexclFor' + _Kpipi_exclName + 'Sel', 
+        self.selKpipi = makeKpipi_excl( 'KpipiexclFor' + _Kpipi_exclName + 'Sel',
                              _h_PT           = config['_h_PT'],
                              _h_P            = config['_h_P'],
                              _h_IPCHI2       = config['_h_IPCHI2'],
@@ -180,9 +180,9 @@ class Bc2hhhBuilder(LineBuilder) :
                              _3h_Mmax     = config['_3h_Mmax'],
                              _bu3h_Mmin   = config['_bu3h_Mmin'],
                              _bu3h_Mmax   = config['_bu3h_Mmax'],
-                             _probnnk     = config['_probnnk'])                                          
+                             _probnnk     = config['_probnnk'])
 
-        self.selKKpi = makeKKpi_excl( 'KKpiexclFor' + _KKpi_exclName + 'Sel', 
+        self.selKKpi = makeKKpi_excl( 'KKpiexclFor' + _KKpi_exclName + 'Sel',
                              _h_PT           = config['_h_PT'],
                              _h_P            = config['_h_P'],
                              _h_IPCHI2       = config['_h_IPCHI2'],
@@ -207,7 +207,7 @@ class Bc2hhhBuilder(LineBuilder) :
                              _probnnpi    = config['_probnnpi'],
                              _probnnk     = config['_probnnk'])
 
-        self.selKKK = makeKKK_excl( 'KKKexclFor' + _KKK_exclName + 'Sel', 
+        self.selKKK = makeKKK_excl( 'KKKexclFor' + _KKK_exclName + 'Sel',
                              _h_PT           = config['_h_PT'],
                              _h_P            = config['_h_P'],
                              _h_IPCHI2       = config['_h_IPCHI2'],
@@ -231,7 +231,7 @@ class Bc2hhhBuilder(LineBuilder) :
                              _bu3h_Mmax   = config['_bu3h_Mmax'],
                              _probnnk     = config['_probnnk'])
 
-        self.selpppi = makepppi_excl( 'pppiexclFor' + _pppi_exclName + 'Sel', 
+        self.selpppi = makepppi_excl( 'pppiexclFor' + _pppi_exclName + 'Sel',
                              _h_PT           = config['_h_PT'],
                              _h_P            = config['_h_P'],
                              _h_IPCHI2       = config['_h_IPCHI2'],
@@ -256,12 +256,12 @@ class Bc2hhhBuilder(LineBuilder) :
                              _probnnpi    = config['_probnnpi'],
                              _probnnp     = config['_probnnp'])
 
-        self.selppK = makeppK_excl( 'ppKexclFor' + _ppK_exclName + 'Sel', 
+        self.selppK = makeppK_excl( 'ppKexclFor' + _ppK_exclName + 'Sel',
                              _h_PT           = config['_h_PT'],
                              _h_P            = config['_h_P'],
                              _h_IPCHI2       = config['_h_IPCHI2'],
                              _h_TRCHI2DOF    = config['_h_TRCHI2DOF'],
-                             _h_TRGHP       = config['_h_TRGHP'],       
+                             _h_TRGHP       = config['_h_TRGHP'],
                              _3h_DOCA        = config['_3h_DOCA'],
                              _3h_PTmax       = config['_3h_PTmax'],
                              _3h_DIRA        = config['_3h_DIRA'],
@@ -281,7 +281,7 @@ class Bc2hhhBuilder(LineBuilder) :
                              _probnnk     = config['_probnnk'],
                              _probnnp     = config['_probnnp'])
 
-  
+
         self.algospipipi = []
         self.algospipipi.append(self.selpipipi)
 
@@ -298,8 +298,8 @@ class Bc2hhhBuilder(LineBuilder) :
         self.algospppi.append(self.selpppi)
 
         self.algosppK = []
-        self.algosppK.append(self.selppK) 
-  
+        self.algosppK.append(self.selppK)
+
 
         self.linepipipi_excl = StrippingLine( _pipipi_exclName + 'Line',
                                      prescale   = config['pipipi_exclLinePrescale'],
@@ -308,7 +308,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                      FILTER = filter,
                                      RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "ConeIso05pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "ConeIso05pi2",
@@ -316,7 +316,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "ConeIso10pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "ConeIso10pi2",
@@ -324,7 +324,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "ConeIso15pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "ConeIso15pi2",
@@ -332,7 +332,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                        { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "ConeIso20pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "ConeIso20pi2",
@@ -340,7 +340,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "NConeIso05pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "NConeIso05pi2",
@@ -348,7 +348,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "NConeIso10pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "NConeIso10pi2",
@@ -356,7 +356,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "NConeIso15pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "NConeIso15pi2",
@@ -364,7 +364,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^pi+ pi- pi+]CC" : "NConeIso20pi1",
                                                  "[B_c+ -> pi+ ^pi- pi+]CC" : "NConeIso20pi2",
@@ -372,7 +372,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 
 )
@@ -384,7 +384,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                      FILTER = filter,
                                      RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "ConeIso05K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "ConeIso05pi1",
@@ -392,7 +392,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "ConeIso10K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "ConeIso10pi1",
@@ -400,7 +400,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "ConeIso15K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "ConeIso15pi1",
@@ -408,7 +408,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                        { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "ConeIso20K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "ConeIso20pi1",
@@ -416,7 +416,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "NConeIso05K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "NConeIso05pi1",
@@ -424,7 +424,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "NConeIso10K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "NConeIso10pi1",
@@ -432,7 +432,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "NConeIso15K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "NConeIso15pi1",
@@ -440,7 +440,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ pi- pi+]CC" : "NConeIso20K",
                                                  "[B_c+ -> K+ ^pi- pi+]CC" : "NConeIso20pi1",
@@ -448,7 +448,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
  ]
 )
 
@@ -459,7 +459,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                      FILTER = filter,
                                      RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "ConeIso05K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "ConeIso05K2",
@@ -467,7 +467,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "ConeIso10K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "ConeIso10K2",
@@ -475,7 +475,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "ConeIso15K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "ConeIso15K2",
@@ -483,7 +483,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                        { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "ConeIso20K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "ConeIso20K2",
@@ -491,7 +491,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "NConeIso05K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "NConeIso05K2",
@@ -499,7 +499,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "NConeIso10K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "NConeIso10K2",
@@ -507,7 +507,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "NConeIso15K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "NConeIso15K2",
@@ -515,7 +515,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- pi+]CC" : "NConeIso20K1",
                                                  "[B_c+ -> K+ ^K- pi+]CC" : "NConeIso20K2",
@@ -523,7 +523,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
 
@@ -534,7 +534,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                      FILTER = filter,
                                      RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "ConeIso05K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "ConeIso05K2",
@@ -542,7 +542,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "ConeIso10K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "ConeIso10K2",
@@ -550,7 +550,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "ConeIso15K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "ConeIso15K2",
@@ -558,7 +558,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                        { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "ConeIso20K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "ConeIso20K2",
@@ -566,7 +566,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "NConeIso05K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "NConeIso05K2",
@@ -574,7 +574,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "NConeIso10K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "NConeIso10K2",
@@ -582,7 +582,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "NConeIso15K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "NConeIso15K2",
@@ -590,7 +590,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^K+ K- K+]CC" : "NConeIso20K1",
                                                  "[B_c+ -> K+ ^K- K+]CC" : "NConeIso20K2",
@@ -598,7 +598,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
 
@@ -609,7 +609,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                      FILTER = filter,
                                      RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "ConeIso05p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "ConeIso05p2",
@@ -617,7 +617,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "ConeIso10p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "ConeIso10p2",
@@ -625,7 +625,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "ConeIso15p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "ConeIso15p2",
@@ -633,7 +633,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                        { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "ConeIso20p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "ConeIso20p2",
@@ -641,7 +641,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "NConeIso05p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "NConeIso05p2",
@@ -649,7 +649,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "NConeIso10p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "NConeIso10p2",
@@ -657,7 +657,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "NConeIso15p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "NConeIso15p2",
@@ -665,7 +665,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- pi+]CC" : "NConeIso20p1",
                                                  "[B_c+ -> p+ ^p~- pi+]CC" : "NConeIso20p2",
@@ -673,10 +673,10 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
-        
+
         self.lineppK_excl = StrippingLine( _ppK_exclName + 'Line',
                                      prescale   = config['ppK_exclLinePrescale'],
                                      postscale  = config['ppK_exclLinePostscale'],
@@ -684,7 +684,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                      FILTER = filter,
                                      RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "ConeIso05p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "ConeIso05p2",
@@ -692,7 +692,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "ConeIso10p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "ConeIso10p2",
@@ -700,7 +700,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "ConeIso15p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "ConeIso15p2",
@@ -708,7 +708,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                        { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "ConeIso20p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "ConeIso20p2",
@@ -716,7 +716,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "NConeIso05p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "NConeIso05p2",
@@ -724,7 +724,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "NConeIso10p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "NConeIso10p2",
@@ -732,7 +732,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "NConeIso15p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "NConeIso15p2",
@@ -740,7 +740,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B_c+ -> ^p+ p~- K+]CC" : "NConeIso20p1",
                                                  "[B_c+ -> p+ ^p~- K+]CC" : "NConeIso20p2",
@@ -748,7 +748,7 @@ class Bc2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                        { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
 
@@ -764,7 +764,7 @@ def makepipipi_excl(name,
                     _h_P,
                     _h_IPCHI2,
                     _h_TRCHI2DOF,
-                    _h_TRGHP,      
+                    _h_TRGHP,
                     _3h_DOCA,
                     _3h_PTmax,
                     _3h_DIRA,
@@ -800,7 +800,7 @@ def makepipipi_excl(name,
                & (SUMTREE(P,(('pi+'==ABSID) | ('pi-'==ABSID)),0.0) > %(_3h_Psum)s*MeV) \
                & (SUMTREE(MIPCHI2DV(PRIMARY),(('pi+'==ABSID) | ('pi-'==ABSID)),0.0) > %(_3h_PVIPCHI2sum)s) \
                & (MINTREE((('pi+'==ABSID) | ('pi-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s)" % locals()
-   
+
     _pipipi=CombineParticles()
     _pipipi.DecayDescriptors  = ["[B_c+ -> pi+ pi- pi+]cc"]
     _pipipi.MotherCut         = _motherCut
@@ -816,7 +816,7 @@ def makeKpipi_excl(name,
                    _h_P,
                    _h_IPCHI2,
                    _h_TRCHI2DOF,
-                   _h_TRGHP,      
+                   _h_TRGHP,
                    _3h_DOCA,
                    _3h_PTmax,
                    _3h_DIRA,
@@ -859,7 +859,7 @@ def makeKpipi_excl(name,
                & (SUMTREE(P,((ABSID=='K+') | (ABSID=='K-') | ('pi+'==ABSID) | ('pi-'==ABSID)),0.0) > %(_3h_Psum)s*MeV) \
                & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='K+') | (ABSID=='K-') | ('pi+'==ABSID) | ('pi-'==ABSID)),0.0) > %(_3h_PVIPCHI2sum)s) \
                & (MINTREE((('K+'==ABSID) | ('K-'==ABSID) | ('pi+'==ABSID) | ('pi-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s)" % locals()
-   
+
     _Kpipi=CombineParticles()
     _Kpipi.DecayDescriptors  = ["[B_c+ -> K+ pi- pi+]cc"]
     _Kpipi.MotherCut         = _motherCut
@@ -875,7 +875,7 @@ def makeKKpi_excl(name,
                   _h_P,
                   _h_IPCHI2,
                   _h_TRCHI2DOF,
-                  _h_TRGHP,      
+                  _h_TRGHP,
                   _3h_DOCA,
                   _3h_PTmax,
                   _3h_DIRA,
@@ -920,7 +920,7 @@ def makeKKpi_excl(name,
                & (SUMTREE(P,((ABSID=='K+') | (ABSID=='K-') | ('pi+'==ABSID) | ('pi-'==ABSID)),0.0) > %(_3h_Psum)s*MeV) \
                & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='K+') | (ABSID=='K-') | ('pi+'==ABSID) | ('pi-'==ABSID)),0.0) > %(_3h_PVIPCHI2sum)s) \
                & (MINTREE((('K+'==ABSID) | ('K-'==ABSID) | ('pi+'==ABSID) | ('pi-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s)" % locals()
-   
+
     _KKpi=CombineParticles()
     _KKpi.DecayDescriptors  = ["[B_c+ -> K+ K- pi+]cc"]
     _KKpi.MotherCut         = _motherCut
@@ -936,7 +936,7 @@ def makeKKK_excl(name,
                  _h_P,
                  _h_IPCHI2,
                  _h_TRCHI2DOF,
-                 _h_TRGHP,      
+                 _h_TRGHP,
                  _3h_DOCA,
                  _3h_PTmax,
                  _3h_DIRA,
@@ -974,7 +974,7 @@ def makeKKK_excl(name,
                & (SUMTREE(P,((ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_Psum)s*MeV) \
                & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_PVIPCHI2sum)s) \
                & (MINTREE((('K+'==ABSID) | ('K-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s)" % locals()
-   
+
     _KKK=CombineParticles()
     _KKK.DecayDescriptors  = ["[B_c+ -> K+ K- K+]cc"]
     _KKK.MotherCut         = _motherCut
@@ -990,7 +990,7 @@ def makepppi_excl(name,
                   _h_P,
                   _h_IPCHI2,
                   _h_TRCHI2DOF,
-                  _h_TRGHP,            
+                  _h_TRGHP,
                   _3h_DOCA,
                   _3h_PTmax,
                   _3h_DIRA,
@@ -1035,7 +1035,7 @@ def makepppi_excl(name,
                & (SUMTREE(P,((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='pi+') | (ABSID=='pi-')),0.0) > %(_3h_Psum)s*MeV) \
                & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='pi+') | (ABSID=='pi-')),0.0) > %(_3h_PVIPCHI2sum)s) \
                & (MINTREE(((ABSID=='p+') |(ABSID=='p~-') |('pi+'==ABSID) | ('pi-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s)" % locals()
-   
+
     _pppi=CombineParticles()
     _pppi.DecayDescriptors  = ["[B_c+ -> p+ p~- pi+]cc"]
     _pppi.MotherCut         = _motherCut
@@ -1051,7 +1051,7 @@ def makeppK_excl(name,
                  _h_P,
                  _h_IPCHI2,
                  _h_TRCHI2DOF,
-                 _h_TRGHP,            
+                 _h_TRGHP,
                  _3h_DOCA,
                  _3h_PTmax,
                  _3h_DIRA,
@@ -1096,7 +1096,7 @@ def makeppK_excl(name,
                & (SUMTREE(P,((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_Psum)s*MeV) \
                & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_PVIPCHI2sum)s) \
                & (MINTREE(((ABSID=='p+') |(ABSID=='p~-') |('K+'==ABSID) | ('K-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s)" % locals()
-   
+
     _ppK=CombineParticles()
     _ppK.DecayDescriptors  = ["[B_c+ -> p+ p~- K+]cc"]
     _ppK.MotherCut         = _motherCut
@@ -1106,4 +1106,3 @@ def makeppK_excl(name,
     return Selection ( name,
                        Algorithm = _ppK,
                        RequiredSelections = [StdNoPIDsKaons, StdLooseProtons])
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py
index 3a1f86b5da4e6809dc962390d2520c326fd86361..25182c2e0970a86f968788a87ed0e6f3ad18043c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py
@@ -76,7 +76,7 @@ class BsPhiRhoConf(LineBuilder) :
         self.hlt1Filter = "( HLT_PASS_RE('Hlt1(Two)?TrackMVADecision') )"
         self.hlt2Filter = "( HLT_PASS_RE('Hlt2Topo[234]BodyDecision') | HLT_PASS_RE('Hlt2(Phi)?IncPhiDecision') )"
         _trkFilter = FilterDesktop(Code = "(TRGHOSTPROB < 0.45) & (PT>500.*MeV) & (TRCHI2DOF < 3.5) & (MIPCHI2DV(PRIMARY) > 4.5)")
-        
+
 	self.TrackListhh = Selection( 'TrackList' + self.name,
                                     Algorithm = _trkFilter,
                                     RequiredSelections = [StdNoPIDsPions])
@@ -145,7 +145,7 @@ def mkDiTrackList( name,
     """
     _diTrackPreVertexCuts = "(APT> %(MinPTCut)s *MeV) & (AP> %(MinPCut)s *GeV) & in_range( %(MinMassCut)s ,AM, %(MaxMassCut)s )" % locals()
     _diTrackPostVertexCuts = "(VFASPF(VCHI2/VDOF) < %(VtxChi2DOFCut)s )"% locals()
-    
+
     _combineDiTrack = CombineParticles( DecayDescriptor="rho(770)0 -> pi+ pi-",
 					CombinationCut = _diTrackPreVertexCuts,
                                          MotherCut = _diTrackPostVertexCuts )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 12f1d5a153e28b7cf506ba5afb68ce294c807773..ca49c89f95d7818c3829cb65687fb51ea02f8739 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -12,7 +12,7 @@
 """
 Module for construction of Bs->KSKS (including the Bd mass region) stripping Selections and StrippingLines.
 Provides functions to build, KS->LL (from StdLooseKsLL), KS->DD (from StdLooseKsDD), Bs->KSLL KSLL (BsLL), Bs->KSLL KSDD (BsLD) and Bs->KSDD KSDD (BsDD) selections.
-Provides class Bs2KSKSConf, which constructs the Selections and StrippingLines given a configuration dictionary. 
+Provides class Bs2KSKSConf, which constructs the Selections and StrippingLines given a configuration dictionary.
 Exported symbols (use python help!):
     - Bs2KSKSConf
 """
@@ -168,12 +168,12 @@ class Bs2KSKSConf(LineBuilder) :
 
         _vtx_cut  = "(VFASPF(VCHI2)<{})".format( config['B_' + ks_type + '_VtxChi2'] )
         _dira_cut = "(BPVDIRA>{})".format(       config['B_Dira'] )
-        
+
         _motherCuts = '&'.join([ _vtx_cut, _dira_cut])
-        
+
         if ks_type == 'LD':
           _motherCuts += " & INTREE((ABSID=='pi+') & (ISLONG)) & INTREE((ABSID=='pi+') & (ISDOWN))"
-        
+
         _B = CombineParticles()
         _B.DecayDescriptors = [ "B_s0 -> KS0 KS0" ]
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index c2c8680df9318c4a34e6a1c0a15ae64a4519c06d..7bea4fa1aeedefcb662883bfb6d2b1b94e4637a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -74,7 +74,7 @@ class StrippingBs2Kst_0Kst_0Conf(LineBuilder):
      """
      Builder of:
      - Bs-> Kst_0(1430)0 anti-Kst_0(1430)0 stripping line (Bs2Kst_0Kst_0)
-     
+
 
      Usage:
      >>> config = { .... }
@@ -89,9 +89,9 @@ class StrippingBs2Kst_0Kst_0Conf(LineBuilder):
      selKst_02Kpi             : nominal Kst_0->Kpi Selection object
      selBs2Kst_0Kst_0         : nominal Bs -> Kst_0(1430)(K+pi-) anti-Kst_0(1430)(K-pi+) Selection object
      Bs2Kst_0Kst_0_line         : StrippingLine made out of selBs2Kst_0Kst_0
-     
+
      lines                    : List of lines, [Bs2Kst_0Kst_0_line]
-    
+
      Exports as class data member:
      StrippingBs2Kst_0Kst_0Conf.__configuration_keys__ : List of required configuration parameters.
      """
@@ -129,22 +129,22 @@ class StrippingBs2Kst_0Kst_0Conf(LineBuilder):
                                             BFDistanceCHI2 = config['BFDistanceCHI2'],
                                             SumPT = config['SumPT'],
                                             BDIRA = config['BDIRA'])
-          
-        
+
+
           self.Bs2Kst_0Kst_0_line = StrippingLine(Kst_0Kst_0_name+"Line",
                                               prescale = 1,
                                               postscale = 1,
                                               algos = [ self.selBs2Kst_0Kst_0 ],
                                               EnableFlavourTagging = True,
                                               MDSTFlag = False)
-        
+
 
           self.registerLine(self.Bs2Kst_0Kst_0_line)
 
 
 
 
-        
+
 def makeKst_02Kpi(name,
                 KaonPT,
                 KaonIPCHI2,
@@ -186,7 +186,7 @@ def makeKst_02Kpi(name,
     _Kstar_02Kpi.DecayDescriptor = "[K*_0(1430)0 -> K+ pi-]cc"
     _Kstar_02Kpi.DaughtersCuts = {"K+" : "(PT > %(KaonPT)s *MeV) & (PIDK > %(KaonPIDK)s) & (MIPCHI2DV(PRIMARY)> %(KaonIPCHI2)s) & (TRGHOSTPROB < %(MaxGHOSTPROB)s)"% locals()
                                 ,"pi-" : "(PT > %(PionPT)s *MeV) & (PIDK < %(PionPIDK)s) & (MIPCHI2DV(PRIMARY)> %(PionIPCHI2)s) & (TRGHOSTPROB < %(MaxGHOSTPROB)s)"% locals()}
-                                
+
     _Kstar_02Kpi.CombinationCut = "(ADAMASS('K*_0(1430)0') < %(KstarMassWin)s *MeV) & (APT > %(KstarAPT)s *MeV)"% locals()
     _Kstar_02Kpi.MotherCut = "(VFASPF(VCHI2/VDOF)< %(KstarVCHI2)s) & (PT > %(KstarPT)s *MeV)"% locals()
 
@@ -219,11 +219,11 @@ def makeBs2Kst_0Kst_0(name,
        BDOCA          : Maximum Bs DOCA.
        BFDistanceCHI2 : Minimum Bs Flight Distance chi2.
        SumPT          : Sum|pT| of the daughters.
-       """ 
-       
+       """
+
        _motherCuts = " (VFASPF(VCHI2/VDOF) < %(BVCHI2)s) & (MIPCHI2DV(PRIMARY)< %(BIPCHI2)s) & (BPVVDCHI2 > %(BFDistanceCHI2)s) & (BPVDIRA > %(BDIRA)s)"% locals()
        _combinationCut = "(ADAMASS('B_s0') < %(BMassWin)s *MeV) & (AMAXDOCA('',False)< %(BDOCA)s *mm) "\
-                         "& ( (AMINCHILD(PT,ID=='K+') + AMINCHILD(PT,ID=='K-') + AMINCHILD(PT,ID=='pi-') + AMINCHILD(PT,ID=='pi+'))> %(SumPT)s *MeV)" % locals() 
+                         "& ( (AMINCHILD(PT,ID=='K+') + AMINCHILD(PT,ID=='K-') + AMINCHILD(PT,ID=='pi-') + AMINCHILD(PT,ID=='pi+'))> %(SumPT)s *MeV)" % locals()
 
        _Bs = CombineParticles()
        _Bs.DecayDescriptor = "B_s0 -> K*_0(1430)0 K*_0(1430)~0"
@@ -235,6 +235,3 @@ def makeBs2Kst_0Kst_0(name,
        return Selection ( name,
                           Algorithm = _Bs,
                           RequiredSelections = [Kst_0sel])
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py
index 5e3e6cbdfd2e41118d401cb5ff37ff85d2cb6226..87c179cefa132e3239ceeb83608a6d722db6dbc5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -33,22 +33,22 @@ default_config = {
 	"NAME"	      	: "Bs2PhiKst",
 	"WGs"	      	: ['BnoC'],
 	"BUILDERTYPE" 	: 'StrippingBs2PhiKstConf',
-	"CONFIG"	: {"KaonPT"                : 500.0, 
-                           "KaonIPCHI2"            : 9.,    
-                           "KaonPIDK"              : 0.,    
-                           "PionPT"                : 500.0, 
-                           "PionIPCHI2"            : 9.,    
-                           "PionPIDK"              : 10.,    
-                           "PhiVCHI2"              : 9.,    
-                           "PhiPT"                 : 900.0, 
-                           "PhiMassWin"            : 25.0,  
-                           "KstarVCHI2"            : 9.0,   
-                           "KstarPT"               : 900.0, 
-                           "KstarMassWin"          : 150.0, 
-                           "BMassWin"              : 500.0, 
-                           "BVCHI2"                : 15.0,  
-                           "BDOCA"                 : 0.3,   
-                           "BDIRA"                    : 0.99     
+	"CONFIG"	: {"KaonPT"                : 500.0,
+                           "KaonIPCHI2"            : 9.,
+                           "KaonPIDK"              : 0.,
+                           "PionPT"                : 500.0,
+                           "PionIPCHI2"            : 9.,
+                           "PionPIDK"              : 10.,
+                           "PhiVCHI2"              : 9.,
+                           "PhiPT"                 : 900.0,
+                           "PhiMassWin"            : 25.0,
+                           "KstarVCHI2"            : 9.0,
+                           "KstarPT"               : 900.0,
+                           "KstarMassWin"          : 150.0,
+                           "BMassWin"              : 500.0,
+                           "BVCHI2"                : 15.0,
+                           "BDOCA"                 : 0.3,
+                           "BDIRA"                    : 0.99
           					            },
 	"STREAMS"	: ['Bhadron']
 	}
@@ -86,11 +86,11 @@ class StrippingBs2PhiKstConf(LineBuilder):
      selBs2KstKst             : nominal Bs -> Kst(K+pi-) anti-Kst(K-pi+) Selection object
      Bs2KstKst_line           : StrippingLine made out of selBs2KstKst
      lines                    : List of lines, [Bs2KstKst_line]
-    
+
      Exports as class data member:
      StrippingBs2PhiKstConf.__configuration_keys__ : List of required configuration parameters.
      """
- 
+
      __configuration_keys__ = default_config['CONFIG'].keys()
 
      def __init__(self, name, config) :
@@ -117,7 +117,7 @@ class StrippingBs2PhiKstConf(LineBuilder):
                                     PhiMassWin = config['PhiMassWin'],
                                     PhiPT = config['PhiPT'],
                                     PhiVCHI2 = config['PhiVCHI2'])
-          
+
           self.selBs2PhiKst = makeBs2PhiKst(PhiKst_name,
                                             Phisel = self.selPhi2KK,
                                             Kstsel = self.selKst2Kpi,
@@ -125,7 +125,7 @@ class StrippingBs2PhiKstConf(LineBuilder):
                                             BVCHI2 = config['BVCHI2'],
                                             BDOCA = config['BDOCA'],
                                             BDIRA = config['BDIRA'])
-          
+
           self.Bs2PhiKst_line = StrippingLine(PhiKst_name+"Line",
                                               prescale = 1,
                                               postscale = 1,
@@ -235,10 +235,10 @@ def makeBs2PhiKst(name,
        BMassWin    : Bs invariant mass window around PDG mass value (MeV).
        BVCHI2      : Maximum Bs vertex chi2 per degree of freedom.
        BDOCA       : Maximum Bs DOCA.
-       """ 
-       
+       """
+
        _motherCuts = "(VFASPF(VCHI2/VDOF) < %(BVCHI2)s) & (BPVDIRA > %(BDIRA)s)"% locals()
-       _combinationCut = "(ADAMASS('B_s0') < %(BMassWin)s *MeV) & (AMAXDOCA('',False)< %(BDOCA)s *mm)" % locals() 
+       _combinationCut = "(ADAMASS('B_s0') < %(BMassWin)s *MeV) & (AMAXDOCA('',False)< %(BDOCA)s *mm)" % locals()
 
        _Bs = CombineParticles()
        _Bs.DecayDescriptor = "[B_s0 -> phi(1020) K*(892)~0]cc"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py
index 0604557dfaa1d044f8586bdefc05443fa8ea0167..6fd05106898e7a35b27645f22cfc0260775fa4d8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -147,7 +147,7 @@ class StrippingBs2PhiPhiConf(LineBuilder):
                 , postscale = 1
                 , selection = Bs2PhiPhi
                 , EnableFlavourTagging = True,
-                RelatedInfoTools = [ 
+                RelatedInfoTools = [
                     { "Type"         : "RelInfoConeVariables",
                     "ConeAngle"    : 0.8,
                     "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py
index fb4330051a27bc62599cb90cfeee10b1dd107eb5..716bab7d41ba619c042c4cb61eee3779d9b9c1d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py
@@ -68,9 +68,9 @@ default_config = {
                      'B_DD_FDChi2'             : 50.0,
                      'B_LL_FDChi2'             : 50.0,
                      'GEC_MaxTracks'           : 250,
-                     'ConeAngle10'             : 1.0, 
-                     'ConeAngle15'             : 1.5, 
-                     'ConeAngle17'             : 1.7, 
+                     'ConeAngle10'             : 1.0,
+                     'ConeAngle15'             : 1.5,
+                     'ConeAngle17'             : 1.7,
                      'HLT1Dec'                 : 'Hlt1(Two)?TrackMVADecision',
                      'HLT2Dec'                 : 'Hlt2Topo[234]BodyDecision',
                      'Prescale'                : 1.0,
@@ -120,20 +120,20 @@ class Bu2KsthhConf(LineBuilder) :
 
         Hlt1Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT1Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
+
         Hlt2Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT2Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
-        relInfo    = [ { "Type" : "RelInfoConeVariables" 
+
+        relInfo    = [ { "Type" : "RelInfoConeVariables"
                       , "ConeAngle" : config['ConeAngle10']
-                      , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'] 
+                      , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
                       , 'Location'  : 'P2ConeVar10_B'
                       , "DaughterLocations" : { "[B+ -> ^pi+ pi- (K*(892)+ -> KS0 pi+)]CC" : 'P2ConeVar10_1',
                                                 "[B+ -> pi+ ^pi- (K*(892)+ -> KS0 pi+)]CC" : 'P2ConeVar10_2',
                                                 "[B+ -> pi+ pi- (K*(892)+ -> ^KS0 pi+)]CC" : 'P2ConeVar10_3',
                                                 "[B+ -> pi+ pi- (K*(892)+ -> KS0 ^pi+)]CC" : 'P2ConeVar10_4'} },
                       { "Type" : "RelInfoConeVariables"
-                      , "ConeAngle" : config['ConeAngle15'] 
+                      , "ConeAngle" : config['ConeAngle15']
                       , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
                       , 'Location'  : 'P2ConeVar15_B'
                       , "DaughterLocations" : { "[B+ -> ^pi+ pi- (K*(892)+ -> KS0 pi+)]CC" : 'P2ConeVar15_1',
@@ -141,7 +141,7 @@ class Bu2KsthhConf(LineBuilder) :
                                                 "[B+ -> pi+ pi- (K*(892)+ -> ^KS0 pi+)]CC" : 'P2ConeVar15_3',
                                                 "[B+ -> pi+ pi- (K*(892)+ -> KS0 ^pi+)]CC" : 'P2ConeVar15_4'} },
                       { "Type" : "RelInfoConeVariables"
-                      , "ConeAngle" : config['ConeAngle17'] 
+                      , "ConeAngle" : config['ConeAngle17']
                       , "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
                       , 'Location'  : 'P2ConeVar17_B'
                       , "DaughterLocations" : { "[B+ -> ^pi+ pi- (K*(892)+ -> KS0 pi+)]CC" : 'P2ConeVar17_1',
@@ -169,9 +169,9 @@ class Bu2KsthhConf(LineBuilder) :
                                      selection = self.selBu2KstDDhh,
                                      HLT1 = Hlt1Filter,
                                      HLT2 = Hlt2Filter,
-                                     FILTER = GECCode, 
-                                     RelatedInfoTools = relInfo, 
-                                     EnableFlavourTagging = True, 
+                                     FILTER = GECCode,
+                                     RelatedInfoTools = relInfo,
+                                     EnableFlavourTagging = True,
                                      MDSTFlag = False
                                      )
         self.ll_line = StrippingLine(ll_name+"Line",
@@ -181,14 +181,14 @@ class Bu2KsthhConf(LineBuilder) :
                                      HLT1 = Hlt1Filter,
                                      HLT2 = Hlt2Filter,
                                      FILTER = GECCode,
-                                     RelatedInfoTools = relInfo, 
-                                     EnableFlavourTagging = True, 
+                                     RelatedInfoTools = relInfo,
+                                     EnableFlavourTagging = True,
                                      MDSTFlag = False
                                      )
 
         self.registerLine(self.dd_line)
         self.registerLine(self.ll_line)
-        
+
     def makeKS2DD( self, name, config ) :
         # define all the cuts
         _massCut = "(ADMASS('KS0')<%s*MeV)" % config['KS_DD_MassWindow']
@@ -255,19 +255,19 @@ class Bu2KsthhConf(LineBuilder) :
 
         _daughtersCuts = _trkChi2Cut
         _daughtersCuts += '&'+_trkGhostProbCut
-      
+
         _allCuts = _massCutLo
         _allCuts += '&'+_massCutHi
 
         # make the filter
         _filterKst2KSDDpi = CombineParticles()
         _filterKst2KSDDpi.DecayDescriptor = "[K*(892)+ -> KS0 pi+]cc"
-        _filterKst2KSDDpi.CombinationCut = _allCuts 
+        _filterKst2KSDDpi.CombinationCut = _allCuts
         _filterKst2KSDDpi.DaughtersCuts = { "pi+" : _daughtersCuts }
         _filterKst2KSDDpi.MotherCut = "ALL"
 
         # make and store the Selection object
-        self.selKst2KSDDpi = Selection( name, Algorithm = _filterKst2KSDDpi, RequiredSelections = [self.selKS2DD, self.pions] ) 
+        self.selKst2KSDDpi = Selection( name, Algorithm = _filterKst2KSDDpi, RequiredSelections = [self.selKS2DD, self.pions] )
 
     def makeKst2KSLLpi( self, name, config ) :
         # define all the cuts
@@ -279,19 +279,19 @@ class Bu2KsthhConf(LineBuilder) :
 
         _daughtersCuts = _trkChi2Cut
         _daughtersCuts += '&'+_trkGhostProbCut
-      
+
         _allCuts = _massCutLo
         _allCuts += '&'+_massCutHi
 
         # make the filter
         _filterKst2KSLLpi = CombineParticles()
         _filterKst2KSLLpi.DecayDescriptor = "[K*(892)+ -> KS0 pi+]cc"
-        _filterKst2KSLLpi.CombinationCut = _allCuts 
+        _filterKst2KSLLpi.CombinationCut = _allCuts
         _filterKst2KSLLpi.DaughtersCuts = { "pi+" : _daughtersCuts }
         _filterKst2KSLLpi.MotherCut = "ALL"
 
         # make and store the Selection object
-        self.selKst2KSLLpi = Selection( name, Algorithm = _filterKst2KSLLpi, RequiredSelections = [self.selKS2LL, self.pions] ) 
+        self.selKst2KSLLpi = Selection( name, Algorithm = _filterKst2KSLLpi, RequiredSelections = [self.selKS2LL, self.pions] )
 
 
     def makeBu2KstDDhh( self, name, config ) :
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py
index da5abd81e44dcfd63171b77e656ad684622413ec..7118cda0a42eb8bc02b7aa0e0f60f1f1bc9eeb85 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py
@@ -10,15 +10,15 @@
 ###############################################################################
  # $Id: StrippingBu2hhh.py,v 6.0 2017-05-19 Rio team $
 '''
-Module for construction of Bu->hhh from:   
-   Inclusive KKK line for light decay modes (pipipi, Kpipi, KKpi and KKK) 
-   Inclusive KpKpKp line for same-sign kaons of light decay modes (pipipi, Kpipi, KKpi and KKK) 
+Module for construction of Bu->hhh from:
+   Inclusive KKK line for light decay modes (pipipi, Kpipi, KKpi and KKK)
+   Inclusive KpKpKp line for same-sign kaons of light decay modes (pipipi, Kpipi, KKpi and KKK)
    Inclusive pph line for heavy modes (pppi, ppK)
 
 Exported symbols (use python help!):
    - Bu2hhhBuilder
-   - makeKKK_incl  
-   - makeKpKpKp_incl  
+   - makeKKK_incl
+   - makeKpKpKp_incl
    - makepph_incl
 '''
 
@@ -27,37 +27,37 @@ __date__ = '19/05/2017'
 __version__ = 'Stripping29'
 
 __all__ = ('Bu2hhhBuilder',
-           'makeKKK_incl', 
-           'makeKpKpKp_incl', 
-           'makepph_incl', 
+           'makeKKK_incl',
+           'makeKpKpKp_incl',
+           'makepph_incl',
      )
 
 
 config_params = {
     'MaxTrSIZE'             : 200 ,      ## GEC maximim recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG)
     '_h_PT'                 : 100. ,     ## tracks min PT
-    '_h_P'                  : 1500. ,    ## tracks min P  
+    '_h_P'                  : 1500. ,    ## tracks min P
     '_h_IPCHI2'             : 1. ,       ## min tracks IP wrt OWNPV
     '_h_TRCHI2DOF'          : 4.0 ,      ## max tracks CHI2DOF
-    '_h_TRGHP'             : .5,       ## Track GhostProbability     
-    '_3h_DOCA'              : .2 ,       ## max DOCA between h and 2h 
+    '_h_TRGHP'             : .5,       ## Track GhostProbability
+    '_3h_DOCA'              : .2 ,       ## max DOCA between h and 2h
     '_3h_PTmax'             : 1500 ,     ## min PT of the 3h highest PT track
-    '_3h_DIRA'              : .99998 ,   ## min cos angle between 3h momentum and PV decay direction   
-    '_3h_FDCHI2'            : 500. ,     ## min 3h FDCHI2 wrt best 3h PV  
+    '_3h_DIRA'              : .99998 ,   ## min cos angle between 3h momentum and PV decay direction
+    '_3h_FDCHI2'            : 500. ,     ## min 3h FDCHI2 wrt best 3h PV
     '_3h_PVDOCAmin'         : 3.0 ,      ## min value of the 3h doca wrt any PV
-    '_3h_CHI2'              : 12.0 ,     ## max 3h vertex CHI2 
+    '_3h_CHI2'              : 12.0 ,     ## max 3h vertex CHI2
     '_3h_IPCHI2'            : 10. ,      ## max 3h IP CHI2 wrt best 3h PV
-    '_3h_PT'                : 1000. ,    ## min 3h PT   
-    '_3h_PTsum'             : 4500. ,    ## min of 3h tracks PT sum 
-    '_3h_Psum'              : 20000. ,   ## min of 3h tracks P sum 
+    '_3h_PT'                : 1000. ,    ## min 3h PT
+    '_3h_PTsum'             : 4500. ,    ## min of 3h tracks PT sum
+    '_3h_Psum'              : 20000. ,   ## min of 3h tracks P sum
     '_3h_PVIPCHI2sum'       : 500. ,     ## min of the 3h tracks IP wrt best 3h PV
     '_3h_TRKCHIDOFmin'      : 3.0,       ## max track CHI2DOF for the track with smalest CHI2DOF
-    '_3h_CORRMmax'          : 7000. ,    ## max corrected mass for 3h candidate  
-    '_3h_CORRMmin'          : 4000. ,    ## min corrected mass for 3h candidate   
-    '_3hKKK_Mmax'           : 6300. ,    ## max 3h mass for inclusive KKK line       
+    '_3h_CORRMmax'          : 7000. ,    ## max corrected mass for 3h candidate
+    '_3h_CORRMmin'          : 4000. ,    ## min corrected mass for 3h candidate
+    '_3hKKK_Mmax'           : 6300. ,    ## max 3h mass for inclusive KKK line
     '_3hKKK_Mmin'           : 5050. ,    ## min 3h mass for inclusive KKK line
     '_3hpph_deltaMmax'      : 400,       ## max 3h mass difference for inclusive ppK line
-    '_3hpph_deltaMmin'      : 200,       ## min 3h mass difference for inclusive ppK line 
+    '_3hpph_deltaMmin'      : 200,       ## min 3h mass difference for inclusive ppK line
     'KKK_inclLinePrescale'  : 1.0,
     'KKK_inclLinePostscale' : 1.0,
     'KpKpKp_inclLinePrescale'  : 1.0,
@@ -100,28 +100,28 @@ default_config = {
     'BUILDERTYPE' : 'Bu2hhhBuilder',
     'CONFIG'      : { 'MaxTrSIZE'             : 200 ,      ## GEC maximim recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG)
                       '_h_PT'                 : 100. ,     ## tracks min PT
-                      '_h_P'                  : 1500. ,    ## tracks min P  
+                      '_h_P'                  : 1500. ,    ## tracks min P
                       '_h_IPCHI2'             : 1. ,       ## min tracks IP wrt OWNPV
                       '_h_TRCHI2DOF'          : 4.0 ,      ## max tracks CHI2DOF
-                      '_h_TRGHP'             : .5,       ## Track GhostProbability     
-                      '_3h_DOCA'              : .2 ,       ## max DOCA between h and 2h 
+                      '_h_TRGHP'             : .5,       ## Track GhostProbability
+                      '_3h_DOCA'              : .2 ,       ## max DOCA between h and 2h
                       '_3h_PTmax'             : 1500 ,     ## min PT of the 3h highest PT track
-                      '_3h_DIRA'              : .99998 ,   ## min cos angle between 3h momentum and PV decay direction   
-                      '_3h_FDCHI2'            : 500. ,     ## min 3h FDCHI2 wrt best 3h PV  
+                      '_3h_DIRA'              : .99998 ,   ## min cos angle between 3h momentum and PV decay direction
+                      '_3h_FDCHI2'            : 500. ,     ## min 3h FDCHI2 wrt best 3h PV
                       '_3h_PVDOCAmin'         : 3.0 ,      ## min value of the 3h doca wrt any PV
-                      '_3h_CHI2'              : 12.0 ,     ## max 3h vertex CHI2 
+                      '_3h_CHI2'              : 12.0 ,     ## max 3h vertex CHI2
                       '_3h_IPCHI2'            : 10. ,      ## max 3h IP CHI2 wrt best 3h PV
-                      '_3h_PT'                : 1000. ,    ## min 3h PT   
-                      '_3h_PTsum'             : 4500. ,    ## min of 3h tracks PT sum 
-                      '_3h_Psum'              : 20000. ,   ## min of 3h tracks P sum 
+                      '_3h_PT'                : 1000. ,    ## min 3h PT
+                      '_3h_PTsum'             : 4500. ,    ## min of 3h tracks PT sum
+                      '_3h_Psum'              : 20000. ,   ## min of 3h tracks P sum
                       '_3h_PVIPCHI2sum'       : 500. ,     ## min of the 3h tracks IP wrt best 3h PV
                       '_3h_TRKCHIDOFmin'      : 3.0,       ## max track CHI2DOF for the track with smalest CHI2DOF
-                      '_3h_CORRMmax'          : 7000. ,    ## max corrected mass for 3h candidate  
-                      '_3h_CORRMmin'          : 4000. ,    ## min corrected mass for 3h candidate   
-                      '_3hKKK_Mmax'           : 6300. ,    ## max 3h mass for inclusive KKK line       
+                      '_3h_CORRMmax'          : 7000. ,    ## max corrected mass for 3h candidate
+                      '_3h_CORRMmin'          : 4000. ,    ## min corrected mass for 3h candidate
+                      '_3hKKK_Mmax'           : 6300. ,    ## max 3h mass for inclusive KKK line
                       '_3hKKK_Mmin'           : 5050. ,    ## min 3h mass for inclusive KKK line
                       '_3hpph_deltaMmax'      : 400,       ## max 3h mass difference for inclusive ppK line
-                      '_3hpph_deltaMmin'      : 200,       ## min 3h mass difference for inclusive ppK line 
+                      '_3hpph_deltaMmin'      : 200,       ## min 3h mass difference for inclusive ppK line
                       'KKK_inclLinePrescale'  : 1.0,
                       'KKK_inclLinePostscale' : 1.0,
                       'KpKpKp_inclLinePrescale'  : 1.0,
@@ -153,9 +153,9 @@ class Bu2hhhBuilder(LineBuilder) :
         _KKK_inclName = name + '_KKK_incl'
         _KpKpKp_inclName = name + '_KKK_samesign'
         _pph_inclName = name + '_pph_incl'
-  
-        
-        self.selKKK = makeKKK_incl( 'KKKinclFor' + _KKK_inclName + 'Sel', 
+
+
+        self.selKKK = makeKKK_incl( 'KKKinclFor' + _KKK_inclName + 'Sel',
                                     _h_PT           = config['_h_PT'],
                                     _h_P            = config['_h_P'],
                                     _h_IPCHI2       = config['_h_IPCHI2'],
@@ -177,8 +177,8 @@ class Bu2hhhBuilder(LineBuilder) :
                                     _3h_CORRMmin    = config['_3h_CORRMmin'],
                                     _3hKKK_Mmin     = config['_3hKKK_Mmin'],
                                     _3hKKK_Mmax     = config['_3hKKK_Mmax'])
-        
-        self.selKpKpKp = makeKpKpKp_incl( 'KpKpKpinclFor' + _KpKpKp_inclName + 'Sel', 
+
+        self.selKpKpKp = makeKpKpKp_incl( 'KpKpKpinclFor' + _KpKpKp_inclName + 'Sel',
                                           _h_PT           = config['_h_PT'],
                                           _h_P            = config['_h_P'],
                                           _h_IPCHI2       = config['_h_IPCHI2'],
@@ -200,13 +200,13 @@ class Bu2hhhBuilder(LineBuilder) :
                                           _3h_CORRMmin    = config['_3h_CORRMmin'],
                                           _3hKKK_Mmin     = config['_3hKKK_Mmin'],
                                           _3hKKK_Mmax     = config['_3hKKK_Mmax'])
-        
-        self.selpph = makepph_incl( 'pphinclFor' + _pph_inclName + 'Sel', 
+
+        self.selpph = makepph_incl( 'pphinclFor' + _pph_inclName + 'Sel',
                                     _h_PT           = config['_h_PT'],
                                     _h_P            = config['_h_P'],
                                     _h_IPCHI2       = config['_h_IPCHI2'],
                                     _h_TRCHI2DOF    = config['_h_TRCHI2DOF'],
-                                    _h_TRGHP       = config['_h_TRGHP'],       
+                                    _h_TRGHP       = config['_h_TRGHP'],
                                     _3h_DOCA        = config['_3h_DOCA'],
                                     _3h_PTmax       = config['_3h_PTmax'],
                                     _3h_DIRA        = config['_3h_DIRA'],
@@ -223,18 +223,18 @@ class Bu2hhhBuilder(LineBuilder) :
                                     _3h_CORRMmin    = config['_3h_CORRMmin'],
                                     _3hpph_deltaMmax= config['_3hpph_deltaMmax'],
                                     _3hpph_deltaMmin= config['_3hpph_deltaMmin'])
-        
-  
+
+
         self.algosKKK = []
         self.algosKKK.append(self.selKKK)
-        
+
         self.algosKpKpKp = []
         self.algosKpKpKp.append(self.selKpKpKp)
-        
+
         self.algospph = []
-        self.algospph.append(self.selpph) 
-  
-        
+        self.algospph.append(self.selpph)
+
+
         self.lineKKK_incl = StrippingLine( _KKK_inclName + 'Line',
                                            prescale   = config['KKK_inclLinePrescale'],
                                            postscale  = config['KKK_inclLinePostscale'],
@@ -267,7 +267,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K-]CC" : "ConeIso20h1",
                                                  "[B+ -> K+ ^K+ K-]CC" : "ConeIso20h2",
@@ -275,7 +275,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K-]CC" : "NConeIso05h1",
                                                  "[B+ -> K+ ^K+ K-]CC" : "NConeIso05h2",
@@ -283,7 +283,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K-]CC" : "NConeIso10h1",
                                                  "[B+ -> K+ ^K+ K-]CC" : "NConeIso10h2",
@@ -291,7 +291,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K-]CC" : "NConeIso15h1",
                                                  "[B+ -> K+ ^K+ K-]CC" : "NConeIso15h2",
@@ -299,7 +299,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K-]CC" : "NConeIso20h1",
                                                  "[B+ -> K+ ^K+ K-]CC" : "NConeIso20h2",
@@ -307,10 +307,10 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
-        
+
         self.lineKpKpKp_incl = StrippingLine( _KpKpKp_inclName + 'Line',
                                               prescale   = config['KpKpKp_inclLinePrescale'],
                                               postscale  = config['KpKpKp_inclLinePostscale'],
@@ -319,7 +319,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                               FILTER = filter,
                                               RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "ConeIso05h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "ConeIso05h2",
@@ -327,7 +327,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "ConeIso10h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "ConeIso10h2",
@@ -335,7 +335,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "ConeIso15h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "ConeIso15h2",
@@ -343,7 +343,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "ConeIso20h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "ConeIso20h2",
@@ -351,7 +351,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "NConeIso05h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "NConeIso05h2",
@@ -359,7 +359,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "NConeIso10h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "NConeIso10h2",
@@ -367,7 +367,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "NConeIso15h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "NConeIso15h2",
@@ -375,7 +375,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^K+ K+ K+]CC" : "NConeIso20h1",
                                                  "[B+ -> K+ ^K+ K+]CC" : "NConeIso20h2",
@@ -383,10 +383,10 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"}                                                 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
-        
+
         self.linepph_incl = StrippingLine( _pph_inclName + 'Line',
                                            prescale   = config['pph_inclLinePrescale'],
                                            postscale  = config['pph_inclLinePostscale'],
@@ -395,7 +395,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                            FILTER = filter,
                                            RelatedInfoTools = [
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso05B', 
+                                              'Location'  : 'ConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "ConeIso05p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "ConeIso05p2",
@@ -403,7 +403,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso10B', 
+                                              'Location'  : 'ConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "ConeIso10p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "ConeIso10p2",
@@ -411,7 +411,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.5, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso15B', 
+                                              'Location'  : 'ConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "ConeIso15p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "ConeIso15p2",
@@ -419,7 +419,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                           { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 2.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPASYM', 'CONEPTASYM'],
-                                              'Location'  : 'ConeIso20B', 
+                                              'Location'  : 'ConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "ConeIso20p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "ConeIso20p2",
@@ -427,7 +427,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
 },
                                            { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 0.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso05B', 
+                                              'Location'  : 'NConeIso05B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "NConeIso05p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "NConeIso05p2",
@@ -435,7 +435,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso10B', 
+                                              'Location'  : 'NConeIso10B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "NConeIso10p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "NConeIso10p2",
@@ -443,7 +443,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 1.5, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso15B', 
+                                              'Location'  : 'NConeIso15B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "NConeIso15p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "NConeIso15p2",
@@ -451,7 +451,7 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { 'Type' : 'RelInfoConeVariablesForEW', 'ConeAngle' : 2.0, 'Variables' : ['EWCONEANGLE','EWCONENPX','EWCONENPY','EWCONENPZ','EWCONENMULT', 'EWCONENVPT', 'EWCONENSPT', 'EWCONENVP', 'EWCONENSP'],
-                                              'Location'  : 'NConeIso20B', 
+                                              'Location'  : 'NConeIso20B',
                                              "DaughterLocations" : {
                                                  "[B+ -> ^p+ p~- K+]CC" : "NConeIso20p1",
                                                  "[B+ -> p+ ^p~- K+]CC" : "NConeIso20p2",
@@ -459,21 +459,21 @@ class Bu2hhhBuilder(LineBuilder) :
                                              }
                                            },
                                           { "Type"           : "RelInfoVertexIsolation",
-                                            "Location"       : "VertexIsoInfo"} 
+                                            "Location"       : "VertexIsoInfo"}
                                      ]
 )
-        
+
         self.registerLine(self.lineKKK_incl)
         self.registerLine(self.lineKpKpKp_incl)
         self.registerLine(self.linepph_incl)
-        
-        
+
+
 def makeKKK_incl(name,
                  _h_PT,
                  _h_P,
                  _h_IPCHI2,
                  _h_TRCHI2DOF,
-                 _h_TRGHP,      
+                 _h_TRGHP,
                  _3h_DOCA,
                  _3h_PTmax,
                  _3h_DIRA,
@@ -490,7 +490,7 @@ def makeKKK_incl(name,
                  _3h_CORRMmin,
                  _3hKKK_Mmin,
                  _3hKKK_Mmax) :
-  
+
   _daughtersCuts = {"K+" : "(PT > %(_h_PT)s*MeV) \
                              & (P > %(_h_P)s*MeV) \
                              & (MIPCHI2DV(PRIMARY) > %(_h_IPCHI2)s) \
@@ -511,13 +511,13 @@ def makeKKK_incl(name,
                 & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_PVIPCHI2sum)s) \
                 & (MINTREE((('K+'==ABSID) | ('K-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s) \
                 & (BPVCORRM < %(_3h_CORRMmax)s * MeV)& (BPVCORRM > %(_3h_CORRMmin)s*MeV)" % locals()
-  
+
   _KKK=CombineParticles()
   _KKK.DecayDescriptors  = ["[B+ -> K+ K+ K-]cc"]
   _KKK.MotherCut         = _motherCut
   _KKK.CombinationCut    = _combinationCut
   _KKK.DaughtersCuts     = _daughtersCuts
-  
+
   return Selection ( name,
                      Algorithm = _KKK,
                      RequiredSelections = [StdNoPIDsKaons])
@@ -528,7 +528,7 @@ def makeKpKpKp_incl(name,
                     _h_P,
                     _h_IPCHI2,
                     _h_TRCHI2DOF,
-                    _h_TRGHP,      
+                    _h_TRGHP,
                     _3h_DOCA,
                     _3h_PTmax,
                     _3h_DIRA,
@@ -545,7 +545,7 @@ def makeKpKpKp_incl(name,
                     _3h_CORRMmin,
                     _3hKKK_Mmin,
                     _3hKKK_Mmax) :
-  
+
   _daughtersCuts = {"K+" : "(PT > %(_h_PT)s*MeV) \
                              & (P > %(_h_P)s*MeV) \
                              & (MIPCHI2DV(PRIMARY) > %(_h_IPCHI2)s) \
@@ -566,13 +566,13 @@ def makeKpKpKp_incl(name,
                 & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_PVIPCHI2sum)s) \
                 & (MINTREE((('K+'==ABSID) | ('K-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s) \
                 & (BPVCORRM < %(_3h_CORRMmax)s * MeV)& (BPVCORRM > %(_3h_CORRMmin)s*MeV)" % locals()
-  
+
   _KpKpKp=CombineParticles()
   _KpKpKp.DecayDescriptors  = ["[B+ -> K+ K+ K+]cc"]
   _KpKpKp.MotherCut         = _motherCut
   _KpKpKp.CombinationCut    = _combinationCut
   _KpKpKp.DaughtersCuts     = _daughtersCuts
-  
+
   return Selection ( name,
                      Algorithm = _KpKpKp,
                      RequiredSelections = [StdNoPIDsKaons])
@@ -583,7 +583,7 @@ def makepph_incl(name,
                  _h_P,
                  _h_IPCHI2,
                  _h_TRCHI2DOF,
-                 _h_TRGHP,            
+                 _h_TRGHP,
                  _3h_DOCA,
                  _3h_PTmax,
                  _3h_DIRA,
@@ -600,7 +600,7 @@ def makepph_incl(name,
                  _3h_CORRMmin,
                  _3hpph_deltaMmax,
                  _3hpph_deltaMmin) :
-  
+
   _daughtersCuts = {"p+" : "(PT > %(_h_PT)s*MeV) \
                              & (P > %(_h_P)s*MeV) \
                              & (MIPCHI2DV(PRIMARY) > %(_h_IPCHI2)s) \
@@ -626,14 +626,13 @@ def makepph_incl(name,
                 & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='p+') |(ABSID=='p~-') |(ABSID=='K+') | (ABSID=='K-')),0.0) > %(_3h_PVIPCHI2sum)s) \
                 & (MINTREE(((ABSID=='p+') |(ABSID=='p~-') |('K+'==ABSID) | ('K-'==ABSID)),TRCHI2DOF) < %(_3h_TRKCHIDOFmin)s) \
                 & (BPVCORRM < %(_3h_CORRMmax)s * MeV)& (BPVCORRM > %(_3h_CORRMmin)s*MeV)" % locals()
-  
+
   _pph=CombineParticles()
   _pph.DecayDescriptors  = ["[B+ -> p+ p~- K+]cc"]
   _pph.MotherCut         = _motherCut
   _pph.CombinationCut    = _combinationCut
   _pph.DaughtersCuts     = _daughtersCuts
-  
+
   return Selection ( name,
                      Algorithm = _pph,
                      RequiredSelections = [StdNoPIDsKaons,StdLooseProtons])
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 28c9ae6932657765b28733e89f36c10579ba1976..e5969a92ee91ced39b6bb6443371ea0b668c414a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -41,7 +41,7 @@ default_config = {
                                     "StrippingBu2rho0rhoPlusUpResolvedLine", ] },
     "CONFIG"      : { "isMC"           : False,  # True = no Hlt filter
                       "refitPVs"       : True,
-                      
+
                       "vetoTrISMUON"   : True,   # ~ISMUON causes errors?
                       "trMinIPChi2"    : 4,
                       "trUpMinIPChi2"  : 8,
@@ -54,7 +54,7 @@ default_config = {
                                           "rhoMothMassMax"        : 1200,   # MeV
                                           "rhoMothMassMin"        : 200,    # MeV
                                           "rho0MinVChi2Dof"       : 14,
-                                          
+
                                           "pi0ResMinCL"           :-1000,
                                           "pi0ResMinP"            : 3500,   # MeV
                                           "pi0ResMinPT"           : 400,    # MeV
@@ -63,7 +63,7 @@ default_config = {
                                           "rho0ResMinFDChi2"      : 27,
                                           "rhoPResMinP"           : 7000,   # MeV
                                           "rhoPResMinPT"          : 1000,   # MeV
-                                          
+
                                           "BuResCombMassWindow"   : 650,    # MeV
                                           "BuResMaxTrIPChi2Min"   : 40,
                                           "BuResMaxTrPTMin"       : 1900,   # MeV
@@ -74,14 +74,14 @@ default_config = {
                                           "BuResMaxIPChi2"        : 30,
                                           "BuResMinDira"          : 0.9998,
                                           "BuResMinPT"            : 1000,   # MeV
-                                          
+
                                           "pi0MgdMinPT"           : 1900,   # MeV
                                           "piPRhoPMgdMinPT"       : 960,    # MeV
                                           "rho0MgdDauMinPT"       : 100,    # MeV
                                           "rho0MgdMinIPChi2"      : 33,
                                           "rho0MgdMinFDChi2"      : 25,
                                           "rho0MgdMaxTrIPChi2Min" : 20,
-                                          
+
                                           "BuMgdCombMassMin"      : 3900,   # MeV
                                           "BuMgdCombMassMax"      : 7150,   # MeV
                                           "BuMgdMaxTrIPChi2Min"   : 20,
@@ -98,7 +98,7 @@ default_config = {
                                           "rhoMothMassMax"        : 1200,   # MeV
                                           "rhoMothMassMin"        : 200,    # MeV
                                           "rho0MinVChi2Dof"       : 14,
-                                          
+
                                           "pi0ResMinCL"           :-1000,
                                           "pi0ResMinP"            : 1000,   # MeV
                                           "pi0ResMinPT"           : 400,    # MeV
@@ -107,7 +107,7 @@ default_config = {
                                           "rho0ResMinFDChi2"      : 55,
                                           "rhoPResMinP"           : 9000,   # MeV
                                           "rhoPResMinPT"          : 1400,   # MeV
-                                          
+
                                           "BuResCombMassWindow"   : 650,    # MeV
                                           "BuResMaxTrIPChi2Min"   : 0,
                                           "BuResMaxTrPTMin"       : 1600,   # MeV
@@ -118,14 +118,14 @@ default_config = {
                                           "BuResMaxIPChi2"        : 20,
                                           "BuResMinDira"          : 0.9998,
                                           "BuResMinPT"            : 1500,   # MeV
-                                          
+
                                           "pi0MgdMinPT"           : 0,      # MeV
                                           "piPRhoPMgdMinPT"       : 0,      # MeV
                                           "rho0MgdDauMinPT"       : 0,      # MeV
                                           "rho0MgdMinIPChi2"      : 55,
                                           "rho0MgdMinFDChi2"      : 55,
                                           "rho0MgdMaxTrIPChi2Min" : 55,
-                                          
+
                                           "BuMgdCombMassMin"      : 3900,   # MeV
                                           "BuMgdCombMassMax"      : 7150,   # MeV
                                           "BuMgdMaxTrIPChi2Min"   : 55,
@@ -137,7 +137,7 @@ default_config = {
                                           "BuMgdMinDira"          : 0.999,
                                           "BuMgdMinPT"            : 5000,   # MeV
                                           },
-                      
+
                       "PrescaleBu2rho0rhoPlusResolved"   : 1.0,
                       "PrescaleBu2rho0rhoPlusMerged"     : 1.0,
                       "PrescaleBu2rho0rhoPlusUpResolved" : 1.0,
@@ -150,7 +150,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-### :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::    
+### :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
     def __init__(self, name, config) :
         self.name = name
         LineBuilder.__init__(self, name, config)
@@ -184,7 +184,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
         longTracksFilter = FilterDesktop( Code = longTracksCuts )
         longTracks = Selection( "longTracksFor" + self.name,
                                 Algorithm = longTracksFilter,
-                                RequiredSelections = [ StdAllNoPIDsPions ] )        
+                                RequiredSelections = [ StdAllNoPIDsPions ] )
         upAndLongTracksFilter = FilterDesktop( Code = upAndLongTracksCuts )
         upAndLongTracks = Selection( "upAndLongTracksFor" + self.name,
                                      Algorithm = upAndLongTracksFilter,
@@ -202,7 +202,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             [ StdLooseMergedPi0 ],
             merged = True,
             refit = config["refitPVs"] )
-        
+
         self.Bu2rho0rhoPlusMergedLine = StrippingLine(
             modeName + "MergedLine",
             prescale = config["PrescaleBu2rho0rhoPlusMerged"],
@@ -218,8 +218,8 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             # RelatedInfoTools = relInfoToolList( selBuMgdLong, mgdDaughters ),
             # RequiredRawEvents = [ 'Calo' ],
             selection = selBuMgdLong )
-        
-        self.registerLine( self.Bu2rho0rhoPlusMergedLine )            
+
+        self.registerLine( self.Bu2rho0rhoPlusMergedLine )
         ### :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
         selBuResLong, resDaughters = makeBu2rho0rhoPlus(
             modeName + "Resolved",
@@ -228,7 +228,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             [ StdLooseResolvedPi0 ],
             merged = False,
             refit = config["refitPVs"] )
-        
+
         self.Bu2rho0rhoPlusResolvedLine = StrippingLine(
             modeName + "ResolvedLine",
             prescale = config["PrescaleBu2rho0rhoPlusResolved"],
@@ -244,7 +244,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             # RelatedInfoTools = relInfoToolList( selBuResLong, resDaughters ),
             # RequiredRawEvents = [ 'Calo' ],
             selection = selBuResLong )
-        
+
         self.registerLine( self.Bu2rho0rhoPlusResolvedLine )
         ### upstream ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
         selBuMgdUp, mgdUpDaughters = makeBu2rho0rhoPlus(
@@ -255,7 +255,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             merged = True,
             upstream = True,
             refit = config["refitPVs"] )
-        
+
         self.Bu2rho0rhoPlusUpMergedLine = StrippingLine(
             modeName + "UpMergedLine",
             prescale = config["PrescaleBu2rho0rhoPlusUpMerged"],
@@ -271,8 +271,8 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             # RelatedInfoTools = relInfoToolList( selBuMgdUp, mgdUpDaughters ),
             # RequiredRawEvents = [ 'Calo' ],
             selection = selBuMgdUp )
-        
-        self.registerLine( self.Bu2rho0rhoPlusUpMergedLine )            
+
+        self.registerLine( self.Bu2rho0rhoPlusUpMergedLine )
         ### :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
         selBuResUp, resUpDaughters = makeBu2rho0rhoPlus(
             modeName + "UpResolved",
@@ -282,7 +282,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             merged = False,
             upstream = True,
             refit = config["refitPVs"] )
-        
+
         self.Bu2rho0rhoPlusUpResolvedLine = StrippingLine(
             modeName + "UpResolvedLine",
             prescale = config["PrescaleBu2rho0rhoPlusUpResolved"],
@@ -298,7 +298,7 @@ class StrippingBu2rho0rhoPlusConf(LineBuilder) :
             # RelatedInfoTools = relInfoToolList( selBuResUp, resUpDaughters ),
             # RequiredRawEvents = [ 'Calo' ],
             selection = selBuResUp )
-        
+
         self.registerLine( self.Bu2rho0rhoPlusUpResolvedLine )
 ### helper functions ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 def makeRho0( name ,
@@ -310,7 +310,7 @@ def makeRho0( name ,
                " & (AM < %(rhoCombMassMax)s)" % locals()["config"]
     ### -------------------------------------------------------------------------
     DaughtersCuts = {}
-    
+
     motherCuts = "(MIPCHI2DV(PRIMARY) > %(rho0ResMinIPChi2)s)"\
                  " & (BPVVDCHI2 > %(rho0ResMinFDChi2)s)"\
                  " & (M > %(rhoMothMassMin)s) & (M < %(rhoMothMassMax)s)"\
@@ -351,11 +351,11 @@ def makeRhoP( name,
                       % locals()["config"],
                       "pi0" : "(CL > %(pi0ResMinCL)s) & (P > %(pi0ResMinP)s)"\
                       " & (PT > %(pi0ResMinPT)s)" % locals()["config"] }
-    
+
     motherCuts = "(M > %(rhoMothMassMin)s) & (M < %(rhoMothMassMax)s)"\
                  " & (P > %(rhoPResMinP)s) & (PT > %(rhoPResMinPT)s)"\
                  % locals()["config"]
-    ### -------------------------------------------------------------------------    
+    ### -------------------------------------------------------------------------
     if merged:
         DaughtersCuts = { "pi+" : "(PT > %(piPRhoPMgdMinPT)s)" % locals()["config"],
                           "pi0" : "(PT > %(pi0MgdMinPT)s)" % locals()["config"] }
@@ -379,47 +379,47 @@ def makeBu2rho0rhoPlus( name,
                         upstream = False,
                         refit = True ) :
     __configuration_keys__ = (
-        "rhoCombMassMax",     
-        "rhoCombMassMin",     
-        "rhoMothMassMax",     
-        "rhoMothMassMin",     
-        "rho0MinVChi2Dof",    
-        
+        "rhoCombMassMax",
+        "rhoCombMassMin",
+        "rhoMothMassMax",
+        "rhoMothMassMin",
+        "rho0MinVChi2Dof",
+
         "pi0ResMinCL",
         "pi0ResMinP",
         "pi0ResMinPT",
         "piPRhoPResMinIPChi2",
-        "rho0ResMinIPChi2", 
+        "rho0ResMinIPChi2",
         "rho0ResMinFDChi2",
         "rhoPResMinP",
         "rhoPResMinPT",
-                              
+
         "BuResCombMassWindow",
         "BuResMaxTrIPChi2Min",
         "BuResMaxTrPTMin",
-        "BuResSumTrPTMin",    
-        "BuResMinVChi2Dof",   
+        "BuResSumTrPTMin",
+        "BuResMinVChi2Dof",
         "BuResMothMassWindow",
         "BuResMinFDChi2",
         "BuResMaxIPChi2",
         "BuResMinDira",
         "BuResMinPT",
-                              
+
         "pi0MgdMinPT",
         "piPRhoPMgdMinPT",
-        "rho0MgdDauMinPT",    
-        "rho0MgdMinIPChi2", 
+        "rho0MgdDauMinPT",
+        "rho0MgdMinIPChi2",
         "rho0MgdMinFDChi2",
         "rho0MgdMaxTrIPChi2Min",
 
-        "BuMgdCombMassMin",   
-        "BuMgdCombMassMax",   
+        "BuMgdCombMassMin",
+        "BuMgdCombMassMax",
         "BuMgdMaxTrIPChi2Min",
         "BuMgdMinFDChi2",
         "BuMgdMaxIPChi2",
-        "BuMgdMinVChi2Dof",   
-        "BuMgdMothMassMin",   
-        "BuMgdMothMassMax",   
+        "BuMgdMinVChi2Dof",
+        "BuMgdMothMassMin",
+        "BuMgdMothMassMax",
         "BuMgdMinDira",
         "BuMgdMinPT",
         )
@@ -432,7 +432,7 @@ def makeBu2rho0rhoPlus( name,
     ### -------------------------------------------------------------------------
     combCuts = "(ADAMASS('B0') < %(BuResCombMassWindow)s)"\
                " & (APT > %(BuResMinPT)s)" % locals()["config"]
-    
+
     motherCuts = "(SUMTREE('pi+'==ABSID,PT) > %(BuResSumTrPTMin)s)"\
                  " & (ADMASS('B+') < %(BuResMothMassWindow)s)"\
                  " & (MAXTREE('pi+'==ABSID,MIPCHI2DV(PRIMARY))"\
@@ -530,5 +530,3 @@ def relInfoVtxDict( DauDict = {} ):
                                     ],
              'DaughterLocations': ModifiedDauDict,
              'Location'         : 'maps/vtxIso_B' }
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py
index a824adf3baa1a680e1c1850ee5befd77a29b8cf2..1176d3b9c06575699911eab0bcdc088bbe2dda6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for construction of Bu->5h from:   
+Module for construction of Bu->5h from:
    Exclusive 5pi line
    Exclusive K4pi line
    Exclusive pp3pi line
@@ -17,7 +17,7 @@ Module for construction of Bu->5h from:
 
 Exported symbols (use python help!):
    - Buto5hBuilder
-   - make5pi_excl  
+   - make5pi_excl
    - makeK4pi_excl
    - makepp3pi_excl
    - makeppKpipi_excl
@@ -28,24 +28,24 @@ __date__ = '22/Aug/2014'
 __version__ = '$Revision: 1.0 $'
 
 __all__ = ('Buto5hBuilder',
-           'make5pi_excl', 
-           'makeK4pi_excl', 
-           'makepp3pi_excl', 
-           'makeppKpipi_excl', 
+           'make5pi_excl',
+           'makeK4pi_excl',
+           'makepp3pi_excl',
+           'makeppKpipi_excl',
            'default_config'
 	   )
 
-# Selecting Cuts 
+# Selecting Cuts
 
 config_params = {
-    'MaxTrSIZE'             : 200 ,    
+    'MaxTrSIZE'             : 200 ,
     '_h_PT'                 : 250. ,
-    '_h_IPCHI2'             : 6. ,     
-    '_h_TRCHI2DOF'          : 1.7 ,    
-    '_h_TRGHP'              : 0.2 , 
-    '_5h_DOCA'              : .14 ,    
-    '_5h_DIRA'              : .99999 , 
-    '_5h_FDCHI2'            : 500. ,   
+    '_h_IPCHI2'             : 6. ,
+    '_h_TRCHI2DOF'          : 1.7 ,
+    '_h_TRGHP'              : 0.2 ,
+    '_5h_DOCA'              : .14 ,
+    '_5h_DIRA'              : .99999 ,
+    '_5h_FDCHI2'            : 500. ,
     '_5h_CHI2'              : 12. ,
     '_5h_PT'                : 1000. ,
     '_5h_PVIPCHI2sum'       : 400. ,
@@ -116,97 +116,97 @@ class Buto5hBuilder(LineBuilder) :
       _pp3pi_exclName = name + '_pp3pi_excl'
       _ppKpipi_exclName = name + '_ppKpipi_excl'
 
-      self.sel5pi = make5pi_excl( '5piexclFor' + _5pi_exclName + 'Sel', 
+      self.sel5pi = make5pi_excl( '5piexclFor' + _5pi_exclName + 'Sel',
 			   _h_PT           = config['_h_PT'],
 			   _h_IPCHI2       = config['_h_IPCHI2'],
-			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'], 
+			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'],
                            _h_TRGHP        = config['_h_TRGHP'],
-			   _5h_DOCA	 = config['_5h_DOCA'],        
-			   _5h_DIRA	 = config['_5h_DIRA'],        
-			   _5h_FDCHI2	 = config['_5h_FDCHI2'],      
-			   _5h_CHI2        = config['_5h_CHI2'], 
+			   _5h_DOCA	 = config['_5h_DOCA'],
+			   _5h_DIRA	 = config['_5h_DIRA'],
+			   _5h_FDCHI2	 = config['_5h_FDCHI2'],
+			   _5h_CHI2        = config['_5h_CHI2'],
                            _5h_PT        = config['_5h_PT'],
-			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'], 
-			   _5h_Mmax     = config['_5h_Mmax'],         
+			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'],
+			   _5h_Mmax     = config['_5h_Mmax'],
                            _probnnpi    = config['_probnnpi'],
-			   _5h_Mmin     = config['_5h_Mmin'])     
+			   _5h_Mmin     = config['_5h_Mmin'])
 
-      self.selK4pi = makeK4pi_excl( 'K4piexclFor' + _K4pi_exclName + 'Sel', 
+      self.selK4pi = makeK4pi_excl( 'K4piexclFor' + _K4pi_exclName + 'Sel',
 			   _h_PT           = config['_h_PT'],
 			   _h_IPCHI2       = config['_h_IPCHI2'],
-			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'], 
+			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'],
                            _h_TRGHP        = config['_h_TRGHP'],
-			   _5h_DOCA	 = config['_5h_DOCA'],        
-			   _5h_DIRA	 = config['_5h_DIRA'],        
-			   _5h_FDCHI2	 = config['_5h_FDCHI2'],      
-			   _5h_CHI2        = config['_5h_CHI2'], 
+			   _5h_DOCA	 = config['_5h_DOCA'],
+			   _5h_DIRA	 = config['_5h_DIRA'],
+			   _5h_FDCHI2	 = config['_5h_FDCHI2'],
+			   _5h_CHI2        = config['_5h_CHI2'],
                            _5h_PT        = config['_5h_PT'],
-			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'], 
+			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'],
 			   _5h_Mmax    = config['_5h_Mmax'],
                            _probnnpi    = config['_probnnpi'],
-                           _probnnk    = config['_probnnk'],                                    
-			   _5h_Mmin    = config['_5h_Mmin'] )    
+                           _probnnk    = config['_probnnk'],
+			   _5h_Mmin    = config['_5h_Mmin'] )
 
-      self.selpp3pi = makepp3pi_excl( 'pp3piexclFor' + _pp3pi_exclName + 'Sel', 
+      self.selpp3pi = makepp3pi_excl( 'pp3piexclFor' + _pp3pi_exclName + 'Sel',
 			   _h_PT           = config['_h_PT'],
 			   _h_IPCHI2       = config['_h_IPCHI2'],
-			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'], 
+			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'],
                            _h_TRGHP        = config['_h_TRGHP'],
-			   _5h_DOCA	 = config['_5h_DOCA'],        
-			   _5h_DIRA	 = config['_5h_DIRA'],        
-			   _5h_FDCHI2	 = config['_5h_FDCHI2'],      
-			   _5h_CHI2        = config['_5h_CHI2'], 
+			   _5h_DOCA	 = config['_5h_DOCA'],
+			   _5h_DIRA	 = config['_5h_DIRA'],
+			   _5h_FDCHI2	 = config['_5h_FDCHI2'],
+			   _5h_CHI2        = config['_5h_CHI2'],
                            _5h_PT        = config['_5h_PT'],
-			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'], 
+			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'],
 			   _5h_Mmax    = config['_5h_Mmax'],
                            _probnnpi    = config['_probnnpi'],
-                           _probnnp    = config['_probnnp'],                                      
-			   _5h_Mmin    = config['_5h_Mmin'] )    
+                           _probnnp    = config['_probnnp'],
+			   _5h_Mmin    = config['_5h_Mmin'] )
 
-      self.selppKpipi = makeppKpipi_excl( 'ppKpipiexclFor' + _ppKpipi_exclName + 'Sel', 
+      self.selppKpipi = makeppKpipi_excl( 'ppKpipiexclFor' + _ppKpipi_exclName + 'Sel',
 			   _h_PT           = config['_h_PT'],
 			   _h_IPCHI2       = config['_h_IPCHI2'],
-			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'], 
+			   _h_TRCHI2DOF    = config['_h_TRCHI2DOF'],
                            _h_TRGHP        = config['_h_TRGHP'],
-			   _5h_DOCA	 = config['_5h_DOCA'],        
-			   _5h_DIRA	 = config['_5h_DIRA'],        
-			   _5h_FDCHI2	 = config['_5h_FDCHI2'],      
-			   _5h_CHI2        = config['_5h_CHI2'], 
+			   _5h_DOCA	 = config['_5h_DOCA'],
+			   _5h_DIRA	 = config['_5h_DIRA'],
+			   _5h_FDCHI2	 = config['_5h_FDCHI2'],
+			   _5h_CHI2        = config['_5h_CHI2'],
                            _5h_PT        = config['_5h_PT'],
-			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'], 
+			   _5h_PVIPCHI2sum = config['_5h_PVIPCHI2sum'],
 			   _5h_Mmax    = config['_5h_Mmax'],
                            _probnnpi    = config['_probnnpi'],
                            _probnnk    = config['_probnnk'],
-                           _probnnp    = config['_probnnp'],                                        
-			   _5h_Mmin    = config['_5h_Mmin'] )    
+                           _probnnp    = config['_probnnp'],
+			   _5h_Mmin    = config['_5h_Mmin'] )
 
       self.gECFilter = globalEventCutFilter(name + 'GlobalEVventCutFilter', MaxTrSIZE = config['MaxTrSIZE'])
-      
+
       self.algos5pi = []
       if self.gECFilter != None  : self.algos5pi.append(self.gECFilter)
 
       self.algos5pi.append(self.sel5pi)
-      
+
       self.algosK4pi = []
       if self.gECFilter != None : self.algosK4pi.append(self.gECFilter)
 
-      self.algosK4pi.append(self.selK4pi)	
+      self.algosK4pi.append(self.selK4pi)
 
       self.algospp3pi = []
       if self.gECFilter != None : self.algospp3pi.append(self.gECFilter)
 
-      self.algospp3pi.append(self.selpp3pi)	
+      self.algospp3pi.append(self.selpp3pi)
 
       self.algosppKpipi = []
       if self.gECFilter != None : self.algosppKpipi.append(self.gECFilter)
 
-      self.algosppKpipi.append(self.selppKpipi)	
+      self.algosppKpipi.append(self.selppKpipi)
 
       self.line5pi_excl = StrippingLine( _5pi_exclName + 'Line',
                                       prescale   = config['5pi_exclLinePrescale'],
                                       postscale  = config['5pi_exclLinePostscale'],
                                       algos      = self.algos5pi)
-   
+
       self.lineK4pi_excl = StrippingLine( _K4pi_exclName + 'Line',
                                       prescale   = config['K4pi_exclLinePrescale'],
                                       postscale  = config['K4pi_exclLinePostscale'],
@@ -302,7 +302,7 @@ def makeK4pi_excl(name,
                  & (PT > %(_5h_PT)s*MeV) \
 		 & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='pi+') | (ABSID=='pi-') | (ABSID=='K+') | (ABSID=='K-')),0.0) > %(_5h_PVIPCHI2sum)s) " \
                  % locals()
-    
+
     _K4pi=CombineParticles()
     _K4pi.DecayDescriptors  = ["[B+ -> K+ pi+ pi+ pi- pi-]cc"]
     _K4pi.MotherCut         = _motherCut
@@ -348,7 +348,7 @@ def makepp3pi_excl(name,
                  & (PT > %(_5h_PT)s*MeV) \
 		 & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='pi+') | (ABSID=='pi-') | (ABSID=='p+') | (ABSID=='p~-')),0.0) > %(_5h_PVIPCHI2sum)s) " \
                  % locals()
-    
+
     _pp3pi=CombineParticles()
     _pp3pi.DecayDescriptors  = ["[B+ -> p+ p~- pi+ pi+ pi-]cc"]
     _pp3pi.MotherCut         = _motherCut
@@ -400,7 +400,7 @@ def makeppKpipi_excl(name,
                  & (PT > %(_5h_PT)s*MeV) \
 		 & (SUMTREE(MIPCHI2DV(PRIMARY),((ABSID=='K+') | (ABSID=='K-') | (ABSID=='pi+') | (ABSID=='pi-') | (ABSID=='p+') | (ABSID=='p~-')),0.0) > %(_5h_PVIPCHI2sum)s) " \
                  % locals()
-    
+
     _ppKpipi=CombineParticles()
     _ppKpipi.DecayDescriptors  = ["[B+ -> p+ p~- K+ pi+ pi-]cc"]
     _ppKpipi.MotherCut         = _motherCut
@@ -411,12 +411,12 @@ def makeppKpipi_excl(name,
                        Algorithm = _ppKpipi,
                        RequiredSelections = [StdNoPIDsPions, StdLooseProtons, StdNoPIDsKaons])
 
-def globalEventCutFilter(name, 
-	                 MaxTrSIZE = None 
+def globalEventCutFilter(name,
+	                 MaxTrSIZE = None
 	                 ) :
-  
+
   if MaxTrSIZE == None : return None
-  
+
   _code = ""
   from Configurables import LoKi__VoidFilter as VoidFilter
   from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
@@ -427,5 +427,5 @@ def globalEventCutFilter(name,
 
   globalFilter= VoidFilter(name)
   globalFilter.Code = _code
-  
+
   return globalFilter
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py
index c417e9b2b5cce64aacb0dafec47439a998ee1c91..251edab565d4707333274e3d3e02a66c255d03d2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py
@@ -174,4 +174,3 @@ def applyBDT( name,
 
 
 ########################################################################
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py
index 46b1a83a302504cffe9c96b1322a0bed4c259524..a745f0beddd04f57a989de734fa78effc0e2da78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -58,15 +58,15 @@ default_config = {
 
 class Hb2Charged2BodyLines( LineBuilder ) :
     """Class defining the Hb -> hh stripping lines"""
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__( self,name,config ) :        
-        
+
+    def __init__( self,name,config ) :
+
         LineBuilder.__init__(self, name, config)
-        
+
         B2Charged2BodyName   = name + "B2Charged2Body"
-        
+
         # make the various stripping selections
         self.B2Charged2Body = makeB2Charged2Body( B2Charged2BodyName,
                                                   config['TrChi2'],
@@ -84,35 +84,35 @@ class Hb2Charged2BodyLines( LineBuilder ) :
                                                   config['MassLow'],
                                                   config['MassHigh']
                                                 )
-        
+
         self.lineB2Charged2Body = StrippingLine( B2Charged2BodyName+"Line",
                                                  prescale  = config['PrescaleB2Charged2Body'],
                                                  selection = self.B2Charged2Body,
                                                  EnableFlavourTagging = False,
                                                  #RequiredRawEvents = ["Trigger","Muon","Calo","Rich","Velo","Tracker"])
-                                                 RequiredRawEvents = ["Velo"])  
+                                                 RequiredRawEvents = ["Velo"])
 
         self.registerLine(self.lineB2Charged2Body)
 
-def makeB2Charged2Body( name, 
+def makeB2Charged2Body( name,
                         trChi2,trGhostProb,minPT,minIPChi2,
                         maxPT,maxIPChi2,combMassLow,combMassHigh,doca,
-                        bPT,bIPChi2,bTAU,massLow,massHigh ) : 
-    
+                        bPT,bIPChi2,bTAU,massLow,massHigh ) :
+
     _daughters_cuts = "(TRGHOSTPROB < %(trGhostProb)s) & (TRCHI2DOF < %(trChi2)s) & (PT > %(minPT)s * MeV) & ( MIPCHI2DV(PRIMARY) > %(minIPChi2)s  )" %locals()
-    
+
     _combination_cuts = "(AMAXCHILD(MAXTREE('pi+'==ABSID,PT)) > %(maxPT)s ) & ( AMAXCHILD(MAXTREE('pi+'==ABSID,MIPCHI2DV(PRIMARY))) > %(maxIPChi2)s ) & (AMAXDOCA('') < %(doca)s ) & (AM > %(combMassLow)s * MeV) & (AM < %(combMassHigh)s * MeV)" %locals()
-    
+
     _mother_cuts = "(PT > %(bPT)s * MeV) & (M > %(massLow)s * MeV) & (M < %(massHigh)s * MeV) & ( BPVIPCHI2() < %(bIPChi2)s ) & (BPVLTIME() > %(bTAU)s )" %locals()
-    
+
     CombineHb2Charged2Body = CombineParticles( DecayDescriptor = 'B0 -> pi+ pi-',
                                                DaughtersCuts = { "pi+" : _daughters_cuts },
                                                CombinationCut = _combination_cuts,
                                                MotherCut = _mother_cuts )
-    
+
     return Selection( name,
                       Algorithm = CombineHb2Charged2Body,
-                      RequiredSelections = [ StdNoPIDsPions ] )    
+                      RequiredSelections = [ StdNoPIDsPions ] )
 
 
-########################################################################  
+########################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py
index 7279fc2ce0b55075a0c8a7d0fb4b7d2d7371c695..7daef010aaf062e965e1ea2e2c8dfb45b60dc087 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py
@@ -122,10 +122,10 @@ class Hb2V0V0hConf(LineBuilder) :
 
         Hlt1Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT1Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
+
         Hlt2Filter = {'Code' : "HLT_PASS_RE('%s')" % config['HLT2Dec'],
                      'Preambulo' : ["from LoKiCore.functions import *"]}
-                          
+
         # the input charged particles
         self.pions = Pions
 
@@ -149,7 +149,7 @@ class Hb2V0V0hConf(LineBuilder) :
             _selV0V0h[v0v0_type]  = {}
             _mylines_V0V0h[v0v0_type] = {}
             for v0v0_comb in _v0v0_combs :
-                if ((v0v0_type != 'KSKS') | (v0v0_type != 'LzLz')) & (v0v0_comb != 'DL') :    
+                if ((v0v0_type != 'KSKS') | (v0v0_type != 'LzLz')) & (v0v0_comb != 'DL') :
                     _selV0V0h[v0v0_type][v0v0_comb] = self.makeHb2V0V0h( name+v0v0_type+v0v0_comb+'h', v0v0_type, v0v0_comb, config )
 
                     _linename = name+'_'+v0v0_type+'h'+v0v0_comb+'_Line'
@@ -161,7 +161,7 @@ class Hb2V0V0hConf(LineBuilder) :
                                            FILTER = GECCode,
                                            HLT1 = Hlt1Filter,
                                            HLT2 = Hlt2Filter,
-                                           RelatedInfoTools = config['RelatedInfoTools'], 
+                                           RelatedInfoTools = config['RelatedInfoTools'],
                                            EnableFlavourTagging = False,
                                            MDSTFlag = False
                                            )
@@ -188,7 +188,7 @@ class Hb2V0V0hConf(LineBuilder) :
                                            postscale = config['Postscale'],
                                            selection = _selV0V0V0[v0v0v0_type][v0v0v0_comb],
                                            FILTER = GECCode,
-                                           RelatedInfoTools = config['RelatedInfoTools'], 
+                                           RelatedInfoTools = config['RelatedInfoTools'],
                                            EnableFlavourTagging = True,
                                            MDSTFlag = False
                                            )
@@ -266,7 +266,7 @@ class Hb2V0V0hConf(LineBuilder) :
 
         _motherCuts = _diraCut +'&'+_vtxChi2Cut +'&'+_fdChi2Cut+'&'+_ipChi2Cut
 
-        if v0v0_comb == 'LL' : 
+        if v0v0_comb == 'LL' :
             _motherCuts += "& (CHILDCUT(CHILDCUT(ISLONG, 2), 1)) & (CHILDCUT(CHILDCUT(ISLONG, 2), 2))"
         elif v0v0_comb == 'LD' :
             _motherCuts += "& (CHILDCUT(CHILDCUT(ISLONG, 2), 1)) & (CHILDCUT(CHILDCUT(ISDOWN, 2), 2))"
@@ -279,13 +279,13 @@ class Hb2V0V0hConf(LineBuilder) :
         _B.DaughtersCuts = { "pi+" : _daughtersCuts }
         _B.CombinationCut = _combCuts
         _B.MotherCut = _motherCuts
-        _B.ReFitPVs       = True 
+        _B.ReFitPVs       = True
 
         _selname = name + '_' + v0v0_type + '_' + v0v0_comb + '_Sel'
 
         if v0v0_type == 'KSKS' :
             _B.DecayDescriptors = [ "[B+ -> KS0 KS0 pi+]cc" ]
-            if v0v0_comb == 'LL' : 
+            if v0v0_comb == 'LL' :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['KS']['LL'], self.pions ])
             elif v0v0_comb == 'LD' :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['KS']['LL'], self.selV0['KS']['DD'], self.pions ])
@@ -294,7 +294,7 @@ class Hb2V0V0hConf(LineBuilder) :
 
         elif v0v0_type == 'KSLz' :
             _B.DecayDescriptors = [ "[Xi_b- -> KS0 Lambda0 pi-]cc" ]
-            if v0v0_comb == 'LL' : 
+            if v0v0_comb == 'LL' :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['KS']['LL'], self.selV0['Lz']['LL'], self.pions ])
             elif v0v0_comb == 'LD' :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['KS']['LL'], self.selV0['Lz']['DD'], self.pions ])
@@ -305,7 +305,7 @@ class Hb2V0V0hConf(LineBuilder) :
 
         else :
             _B.DecayDescriptors = [ "[B+ -> Lambda0 Lambda0 pi+]cc" ]
-            if v0v0_comb == 'LL' : 
+            if v0v0_comb == 'LL' :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['Lz']['LL'], self.pions ])
             elif v0v0_comb == 'LD' :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['Lz']['LL'], self.selV0['Lz']['DD'], self.pions ])
@@ -324,7 +324,7 @@ class Hb2V0V0hConf(LineBuilder) :
         if (v0v0v0_comb != 'KSKSLz') | (v0v0v0_comb != 'LzLzLz') :
             _massCutLow       = "(AM>(5279-%s)*MeV)"                                                    % config['B_Mlow']
             _massCutHigh      = "(AM<(5279+%s)*MeV)"                                                    % config['B_Mhigh']
-        else : 
+        else :
             _massCutLow       = "(AM>(5619-%s)*MeV)"                                                    % config['Hb_Mlow']
             _massCutHigh      = "(AM<(5619+%s)*MeV)"                                                    % config['Hb_Mhigh']
 
@@ -338,7 +338,7 @@ class Hb2V0V0hConf(LineBuilder) :
 
         _motherCuts = _diraCut +'&'+_fdChi2Cut+'&'+_ipChi2Cut
 
-        if v0v0v0_comb == 'LLL' : 
+        if v0v0v0_comb == 'LLL' :
             _motherCuts += "& (CHILDCUT(CHILDCUT(ISLONG, 2), 1)) & (CHILDCUT(CHILDCUT(ISLONG, 2), 2)) & (CHILDCUT(CHILDCUT(ISLONG, 2), 3))"
         elif v0v0v0_comb == 'LLD' :
             _motherCuts += "& (CHILDCUT(CHILDCUT(ISLONG, 2), 1)) & (CHILDCUT(CHILDCUT(ISLONG, 2), 2)) & (CHILDCUT(CHILDCUT(ISDOWN, 2), 3))"
@@ -354,7 +354,7 @@ class Hb2V0V0hConf(LineBuilder) :
         _B = CombineParticles()
         _B.CombinationCut = _combCuts
         _B.MotherCut = _motherCuts
-        _B.ReFitPVs       = True 
+        _B.ReFitPVs       = True
 
         _selname = name + '_' + v0v0v0_type + '_' + v0v0v0_comb + '_Sel'
 
@@ -383,7 +383,7 @@ class Hb2V0V0hConf(LineBuilder) :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['KS']['DD'], self.selV0['Lz']['LL'] ])
             else:
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['KS']['DD'], self.selV0['Lz']['DD'] ])
-            
+
         elif "LzLzKS" in name:
             _B.DecayDescriptors = [ "B0 -> KS0 Lambda0 Lambda0" ]
             if v0v0v0_comb == 'LLL':
@@ -398,7 +398,7 @@ class Hb2V0V0hConf(LineBuilder) :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['Lz']['DD'], self.selV0['KS']['LL'] ])
             else:
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['Lz']['DD'], self.selV0['KS']['DD'] ])
-            
+
         else:
             _B.DecayDescriptors = [ "Lambda_b0 -> Lambda0 Lambda0 Lambda0" ]
             if v0v0v0_comb == 'LLL':
@@ -409,5 +409,3 @@ class Hb2V0V0hConf(LineBuilder) :
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['Lz']['LL'], self.selV0['Lz']['DD'] ])
             else:
                 return Selection (_selname, Algorithm = _B, RequiredSelections = [ self.selV0['Lz']['DD'] ])
-            
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py
index 918d539f1377251ba033f8cbe3e961210a227533..80b667be3759b158fe1c494abdc535c16d4141ca 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py
@@ -88,24 +88,24 @@ default_config = {
                 'HLT2Dec'                  : 'Hlt2Topo[234]BodyDecision',
                 'Prescale'                 : 1.0,
                 'Postscale'                : 1.0,
-                'RelatedInfoTools' : [    { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 1.7, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                'RelatedInfoTools' : [    { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 1.7,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar17'
-                                            }, 
-                                          { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 1.5, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                            },
+                                          { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 1.5,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar15'
-                                            }, 
-                                          { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 1.0, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                            },
+                                          { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 1.0,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar10'
                                             },
-                                          { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 0.8, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                          { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 0.8,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar08'
                                             },
                                           { "Type" : "RelInfoVertexIsolation",
@@ -135,13 +135,13 @@ class Lb2V0hhConf(LineBuilder) :
 
     selLb2V0DDhh           : Lb -> Lambda0(DD) h+ h- Selection object
     selLb2V0LLhh           : Lb -> Lambda0(LL) h+ h- Selection object
-    selLb2V0LDhh           : Lb -> Lambda0(LD) h+ h- Selection object            
+    selLb2V0LDhh           : Lb -> Lambda0(LD) h+ h- Selection object
     selLb2V0DDh            : Lb -> Lambda0(DD) h- Selection object
-    selLb2V0LLh            : Lb -> Lambda0(LL) h- Selection object 
-    selLb2V0LDh            : Lb -> Lambda0(LD) h- Selection object        
+    selLb2V0LLh            : Lb -> Lambda0(LL) h- Selection object
+    selLb2V0LDh            : Lb -> Lambda0(LD) h- Selection object
 
     Lb_dd_line             : StrippingLine made out of selLb2V0DDhh
-    Lb_ll_line             : StrippingLine made out of selLb2V0LLhh 
+    Lb_ll_line             : StrippingLine made out of selLb2V0LLhh
     Lb_ld_line             : StrippingLine made out of selLb2V0LDhh
 
     lines                  : List of lines, [Lb_dd_line, Lb_ll_line, Lb_ld_line]
@@ -197,9 +197,9 @@ class Lb2V0hhConf(LineBuilder) :
                                  selection = sel,
                                  prescale = config['Prescale'],
                                  postscale = config['Postscale'],
-                                 RelatedInfoTools = config['RelatedInfoTools'], 
+                                 RelatedInfoTools = config['RelatedInfoTools'],
                                  FILTER = GECCode,
-                                 **extra) 
+                                 **extra)
 
             self.registerLine(line)
 
@@ -221,7 +221,7 @@ class Lb2V0hhConf(LineBuilder) :
 
         # get the Lambda0's to filter
         _stdLambdaDD = DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")
-        
+
         # make the filter
         _filterLambdaDD = FilterDesktop( Code = _allCuts )
 
@@ -230,7 +230,7 @@ class Lb2V0hhConf(LineBuilder) :
 
         return self.selLambda2DD
 
-    def makeLambda2LL( self, name, config ) : 
+    def makeLambda2LL( self, name, config ) :
         # define all the cuts
         _massCut    = "(ADMASS('Lambda0')<%s*MeV)"           % config['Lambda_LL_MassWindow']
         _vtxCut     = "(VFASPF(VCHI2)<%s)"                   % config['Lambda_LL_VtxChi2']
@@ -251,7 +251,7 @@ class Lb2V0hhConf(LineBuilder) :
 
         # make the filter
         _filterLambdaLL = FilterDesktop( Code = _allCuts )
-        
+
         # make and store the Selection object
         self.selLambda2LL = Selection( name, Algorithm = _filterLambdaLL, RequiredSelections = [_stdLambdaLL] )
 
@@ -275,7 +275,7 @@ class Lb2V0hhConf(LineBuilder) :
 
         # get the Lambda0's to filter
         _stdLambdaLD = DataOnDemand(Location = "Phys/StdLooseLambdaLD/Particles")
-        
+
         # make the filter
         _filterLambdaLD = FilterDesktop( Code = _allCuts )
 
@@ -328,7 +328,7 @@ class Lb2V0hhConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         self.selLb2V0DDh = Selection (name, Algorithm = _Lb, RequiredSelections = [self.selLambda2DD, self.pions ])
 
         return self.selLb2V0DDh
@@ -390,7 +390,7 @@ class Lb2V0hhConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         _LbConf = _Lb.configurable(name + '_combined')
 
         if 'SS' in name: # Same sign
@@ -442,7 +442,7 @@ class Lb2V0hhConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         self.selLb2V0LLh = Selection (name, Algorithm = _Lb, RequiredSelections = [self.selLambda2LL, self.pions  ])
 
         return self.selLb2V0LLh
@@ -468,7 +468,7 @@ class Lb2V0hhConf(LineBuilder) :
         _combCuts += '&'+_massCutLow
         _combCuts += '&'+_massCutHigh
         _combCuts += '&'+_maxDocaChi2Cut
-        
+
         _ptCut      = "(PT>%s*MeV)"                    % config['Lb_PTmin']
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)"             % config['Lb_VtxChi2']
         _diraCut    = "(BPVDIRA>%s)"                   % config['Lb_LL_Dira']
@@ -503,7 +503,7 @@ class Lb2V0hhConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         _LbConf = _Lb.configurable(name + '_combined')
 
         if 'SS' in name: # Same sign
@@ -619,7 +619,7 @@ class Lb2V0hhConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         _LbConf = _Lb.configurable(name + '_combined')
 
         if 'SS' in name: # Same sign
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py
index 3b0426837b9b6efaa6d131a53c9dfce379a2be85..636cd63f32d57285067f5d49a9744f1a84d4db6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py
@@ -36,50 +36,50 @@ default_config = {
     'NAME' : 'Lb2V0p',
     'WGs'  : ['BnoC'],
     'BUILDERTYPE' : 'Lb2V0ppConf',
-    'CONFIG' : {'Trk_Chi2'                 : 3.0,    
-                'Trk_GhostProb'            : 0.5,     
-                'Lambda_DD_MassWindow'     : 20.0,    
-                'Lambda_DD_VtxChi2'        : 9.0,     
-                'Lambda_DD_FDChi2'         : 50.0,    
-                'Lambda_DD_FD'             : 300.0,   
-                'Lambda_DD_Pmin'           : 5000.0,  
-                'Lambda_LL_MassWindow'     : 20.0,    
-                'Lambda_LL_VtxChi2'        : 9.0,     
-                'Lambda_LL_FDChi2'         : 0.0,     
-                'Lambda_LD_MassWindow'     : 25.0,    
-                'Lambda_LD_VtxChi2'        : 16.0,    
-                'Lambda_LD_FDChi2'         : 50.0,    
-                'Lambda_LD_FD'             : 300.0,   
-                'Lambda_LD_Pmin'           : 5000.0,  
-                'Lb_Mlow'                  : 419.0,   
-                'Lb_Mhigh'                 : 581.0,   
-                'Lb_2bodyMlow'             : 800.0,   
-                'Lb_2bodyMhigh'            : 800.0,   
-                'Lb_APTmin'                : 1000.0,  
-                'Lb_PTmin'                 : 1050,    
-                'LbDaug_MedPT_PT'          : 450.0,   
-                'LbDaug_MaxPT_IP'          : 0.05,   
-                'LbDaug_DD_maxDocaChi2'    : 16.0,    
-                'LbDaug_LL_maxDocaChi2'    : 5.0,     
-                'LbDaug_LD_maxDocaChi2'    : 5.0,     
-                'LbDaug_DD_PTsum'          : 2000.0,  
-                'LbDaug_LL_PTsum'          : 3000.0, 
-                'LbDaug_LD_PTsum'          : 4200.0,  
-                'Lbh_DD_PTMin'             : 0.0,    
-                'Lbh_LL_PTMin'             : 0.0,    
-                'Lbh_LD_PTMin'             : 500.0,   
-                'Lb_VtxChi2'               : 16.0,    
-                'Lb_DD_Dira'               : 0.9990,  
-                'Lb_LL_Dira'               : 0.9990,  
-                'Lb_LD_Dira'               : 0.9990, 
-                'Lb_DD_IPCHI2wrtPV'        : 25.0,   
-                'Lb_LL_IPCHI2wrtPV'        : 25.0,   
-                'Lb_LD_IPCHI2wrtPV'        : 15.0,    
-                'Lb_FDwrtPV'               : 0.8,    
-                'Lb_DD_FDChi2'             : 0.5,    
-                'Lb_LL_FDChi2'             : 0.5,    
-                'Lb_LD_FDChi2'             : 30.0,  
-                'GEC_MaxTracks'            : 250,    
+    'CONFIG' : {'Trk_Chi2'                 : 3.0,
+                'Trk_GhostProb'            : 0.5,
+                'Lambda_DD_MassWindow'     : 20.0,
+                'Lambda_DD_VtxChi2'        : 9.0,
+                'Lambda_DD_FDChi2'         : 50.0,
+                'Lambda_DD_FD'             : 300.0,
+                'Lambda_DD_Pmin'           : 5000.0,
+                'Lambda_LL_MassWindow'     : 20.0,
+                'Lambda_LL_VtxChi2'        : 9.0,
+                'Lambda_LL_FDChi2'         : 0.0,
+                'Lambda_LD_MassWindow'     : 25.0,
+                'Lambda_LD_VtxChi2'        : 16.0,
+                'Lambda_LD_FDChi2'         : 50.0,
+                'Lambda_LD_FD'             : 300.0,
+                'Lambda_LD_Pmin'           : 5000.0,
+                'Lb_Mlow'                  : 419.0,
+                'Lb_Mhigh'                 : 581.0,
+                'Lb_2bodyMlow'             : 800.0,
+                'Lb_2bodyMhigh'            : 800.0,
+                'Lb_APTmin'                : 1000.0,
+                'Lb_PTmin'                 : 1050,
+                'LbDaug_MedPT_PT'          : 450.0,
+                'LbDaug_MaxPT_IP'          : 0.05,
+                'LbDaug_DD_maxDocaChi2'    : 16.0,
+                'LbDaug_LL_maxDocaChi2'    : 5.0,
+                'LbDaug_LD_maxDocaChi2'    : 5.0,
+                'LbDaug_DD_PTsum'          : 2000.0,
+                'LbDaug_LL_PTsum'          : 3000.0,
+                'LbDaug_LD_PTsum'          : 4200.0,
+                'Lbh_DD_PTMin'             : 0.0,
+                'Lbh_LL_PTMin'             : 0.0,
+                'Lbh_LD_PTMin'             : 500.0,
+                'Lb_VtxChi2'               : 16.0,
+                'Lb_DD_Dira'               : 0.9990,
+                'Lb_LL_Dira'               : 0.9990,
+                'Lb_LD_Dira'               : 0.9990,
+                'Lb_DD_IPCHI2wrtPV'        : 25.0,
+                'Lb_LL_IPCHI2wrtPV'        : 25.0,
+                'Lb_LD_IPCHI2wrtPV'        : 15.0,
+                'Lb_FDwrtPV'               : 0.8,
+                'Lb_DD_FDChi2'             : 0.5,
+                'Lb_LL_FDChi2'             : 0.5,
+                'Lb_LD_FDChi2'             : 30.0,
+                'GEC_MaxTracks'            : 250,
                 # 2012 Triggers
                 #'HLT1Dec'                  : 'Hlt1TrackAllL0Decision',
                 #'HLT2Dec'                  : 'Hlt2Topo[234]Body.*Decision',
@@ -88,24 +88,24 @@ default_config = {
                 #'HLT2Dec'                  : 'Hlt2Topo[234]BodyDecision',
                 'Prescale'                 : 1.0,
                 'Postscale'                : 1.0,
-                'RelatedInfoTools' : [    { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 1.7, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                'RelatedInfoTools' : [    { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 1.7,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar17'
-                                            }, 
-                                          { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 1.5, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                            },
+                                          { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 1.5,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar15'
-                                            }, 
-                                          { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 1.0, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                            },
+                                          { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 1.0,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar10'
                                             },
-                                          { "Type" : "RelInfoConeVariables", 
-                                            "ConeAngle" : 0.8, 
-                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                          { "Type" : "RelInfoConeVariables",
+                                            "ConeAngle" : 0.8,
+                                            "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                             "Location"  : 'ConeVar08'
                                             },
                                           { "Type" : "RelInfoVertexIsolation",
@@ -135,13 +135,13 @@ class Lb2V0ppConf(LineBuilder) :
 
     selLb2V0DDpp           : Lb -> Lambda0(DD) h+ h- Selection object
     selLb2V0LLpp           : Lb -> Lambda0(LL) h+ h- Selection object
-    selLb2V0LDpp           : Lb -> Lambda0(LD) h+ h- Selection object            
+    selLb2V0LDpp           : Lb -> Lambda0(LD) h+ h- Selection object
     selLb2V0DDp            : Lb -> Lambda0(DD) h- Selection object
-    selLb2V0LLp            : Lb -> Lambda0(LL) h- Selection object 
-    selLb2V0LDp            : Lb -> Lambda0(LD) h- Selection object        
+    selLb2V0LLp            : Lb -> Lambda0(LL) h- Selection object
+    selLb2V0LDp            : Lb -> Lambda0(LD) h- Selection object
 
     Lb_dd_line             : StrippingLine made out of selLb2V0DDpp
-    Lb_ll_line             : StrippingLine made out of selLb2V0LLpp 
+    Lb_ll_line             : StrippingLine made out of selLb2V0LLpp
     Lb_ld_line             : StrippingLine made out of selLb2V0LDpp
 
     lines                  : List of lines, [Lb_dd_line, Lb_ll_line, Lb_ld_line]
@@ -185,7 +185,7 @@ class Lb2V0ppConf(LineBuilder) :
                           ]
 
         # make lines
-        
+
         for selName, sel in namesSelections:
 
             extra = {}
@@ -198,9 +198,9 @@ class Lb2V0ppConf(LineBuilder) :
                                  selection = sel,
                                  prescale = config['Prescale'],
                                  postscale = config['Postscale'],
-                                 RelatedInfoTools = config['RelatedInfoTools'], 
+                                 RelatedInfoTools = config['RelatedInfoTools'],
                                  FILTER = GECCode,
-                                 **extra) 
+                                 **extra)
 
             self.registerLine(line)
 
@@ -215,14 +215,14 @@ class Lb2V0ppConf(LineBuilder) :
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
-        _allCuts += '&'+_vtxCut 
+        _allCuts += '&'+_vtxCut
         _allCuts += '&'+_fdChi2Cut
         #_allCuts += '&'+_trkGhostProbCut1
         #_allCuts += '&'+_trkGhostProbCut2
 
         # get the Lambda0's to filter
         _stdLambdaDD = DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")
-        
+
         # make the filter
         _filterLambdaDD = FilterDesktop( Code = _allCuts )
 
@@ -231,7 +231,7 @@ class Lb2V0ppConf(LineBuilder) :
 
         return self.selLambda2DD
 
-    def makeLambda2LL( self, name, config ) : 
+    def makeLambda2LL( self, name, config ) :
         # define all the cuts
         _massCut    = "(ADMASS('Lambda0')<%s*MeV)"           % config['Lambda_LL_MassWindow']
         _vtxCut     = "(VFASPF(VCHI2)<%s)"                   % config['Lambda_LL_VtxChi2']
@@ -252,7 +252,7 @@ class Lb2V0ppConf(LineBuilder) :
 
         # make the filter
         _filterLambdaLL = FilterDesktop( Code = _allCuts )
-        
+
         # make and store the Selection object
         self.selLambda2LL = Selection( name, Algorithm = _filterLambdaLL, RequiredSelections = [_stdLambdaLL] )
 
@@ -276,7 +276,7 @@ class Lb2V0ppConf(LineBuilder) :
 
         # get the Lambda0's to filter
         _stdLambdaLD = DataOnDemand(Location = "Phys/StdLooseLambdaLD/Particles")
-        
+
         # make the filter
         _filterLambdaLD = FilterDesktop( Code = _allCuts )
 
@@ -329,7 +329,7 @@ class Lb2V0ppConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         self.selLb2V0DDp = Selection (name, Algorithm = _Lb, RequiredSelections = [self.selLambda2DD, self.protons ])
 
         return self.selLb2V0DDp
@@ -351,12 +351,12 @@ class Lb2V0ppConf(LineBuilder) :
         _daugPtSumCut   = "((APT1+APT2+APT3)>%s*MeV)"        % config['LbDaug_DD_PTsum']
 
         _combCuts = _aptCut
-        _combCuts += '&'+_daugPtSumCut    
-        _combCuts += '&'+_daugMedPtCut    
-        _combCuts += '&'+_massCutLow     
-        _combCuts += '&'+_massCutHigh     
-        #_combCuts += '&'+_daugMaxPtIPCut  # does not work properly 
-        _combCuts += '&'+_maxDocaChi2Cut  
+        _combCuts += '&'+_daugPtSumCut
+        _combCuts += '&'+_daugMedPtCut
+        _combCuts += '&'+_massCutLow
+        _combCuts += '&'+_massCutHigh
+        #_combCuts += '&'+_daugMaxPtIPCut  # does not work properly
+        _combCuts += '&'+_maxDocaChi2Cut
 
         _ptCut      = "(PT>%s*MeV)"                    % config['Lb_PTmin']
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)"             % config['Lb_VtxChi2']
@@ -366,11 +366,11 @@ class Lb2V0ppConf(LineBuilder) :
         _fdChi2Cut  = "(BPVVDCHI2>%s)"                 % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
-        _motherCuts += '&'+_vtxChi2Cut 
-        _motherCuts += '&'+_diraCut  
-        _motherCuts += '&'+_ipChi2Cut 
+        _motherCuts += '&'+_vtxChi2Cut
+        _motherCuts += '&'+_diraCut
+        _motherCuts += '&'+_ipChi2Cut
         _motherCuts += '&'+_fdCut #lookhere
-        _motherCuts += '&'+_fdChi2Cut 
+        _motherCuts += '&'+_fdChi2Cut
 
         _Lb = CombineParticles()
 
@@ -392,7 +392,7 @@ class Lb2V0ppConf(LineBuilder) :
         _Lb.CombinationCut =  _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         _LbConf = _Lb.configurable(name + '_combined')
 
         if 'SS' in name: # Same sign
@@ -444,7 +444,7 @@ class Lb2V0ppConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         self.selLb2V0LLp = Selection (name, Algorithm = _Lb, RequiredSelections = [self.selLambda2LL, self.protons  ])
 
         return self.selLb2V0LLp
@@ -470,7 +470,7 @@ class Lb2V0ppConf(LineBuilder) :
         _combCuts += '&'+_massCutLow
         _combCuts += '&'+_massCutHigh
         _combCuts += '&'+_maxDocaChi2Cut
-        
+
         _ptCut      = "(PT>%s*MeV)"                    % config['Lb_PTmin']
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)"             % config['Lb_VtxChi2']
         _diraCut    = "(BPVDIRA>%s)"                   % config['Lb_LL_Dira']
@@ -505,7 +505,7 @@ class Lb2V0ppConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         _LbConf = _Lb.configurable(name + '_combined')
 
         if 'SS' in name: # Same sign
@@ -621,7 +621,7 @@ class Lb2V0ppConf(LineBuilder) :
         _Lb.CombinationCut = _combCuts
         _Lb.MotherCut = _motherCuts
         _Lb.ReFitPVs = True
-        
+
         _LbConf = _Lb.configurable(name + '_combined')
 
         if 'SS' in name: # Same sign
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py
index 221731fb4474462bae1fc836573bd7e614a7750c..9a2cb716afaf206d869c8501dd327ffeadaa645c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py
@@ -177,6 +177,6 @@ class Xb23phConf(LineBuilder) :
                                                                           '[Lambda_b0 -> p+ p~- p+ ^pi-]CC' : self.getConeVarLocation(Angle,4,Name)} } )
         self.RelatedInfoTools.append({ "Type"           : "RelInfoVertexIsolation",
                                        "Location"       : "VertexIsoInfo" })
-                
+
     def getConeVarLocation(self,angle,num,name):
         return "ConeVar{angle}_{num}_{name}".format(angle=str(angle).replace('.',''),num=str(num),name=name)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py
index 93239ecb9d565d3861c191bf4839f0a0692c4e1f..b3f203850f4237d2553cccb1bc7ed151036daf62 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py
@@ -118,22 +118,22 @@ class Xb2phhhConf(LineBuilder) :
                                          postscale        = config['Postscale'],
                                          selection        = self.selXb2phhh,
 					 RelatedInfoTools = self.RelatedInfoTools )
-        
+
         self.registerLine(self.lineXb2phhh)
-        
+
     def makeXb2phhh(self, name, config) :
         # Define all the cuts
         _mass12CutPreVtx          = '(AM < (%s - 280)*MeV)'                                   % config['Xb_MaxM_4body']
         _sumpt12CutPreVtx         = '( (APT1 + APT2) > %s*MeV)'                               % config['Xb_MinSumPTppi']
         _doca12chi2CutPreVtx      = '(ACHI2DOCA(1,2) < %s)'                                   % config['Xb_MaxDOCAChi2']
         _combCuts12               = _mass12CutPreVtx+' & '+_sumpt12CutPreVtx+' & '+_doca12chi2CutPreVtx
-        
+
         _mass123CutPreVtx         = '(AM < (%s - 140)*MeV)'                                   % config['Xb_MaxM_4body']
         _sumpt123CutPreVtx        = '( (APT1 + APT2 + APT3) > %s*MeV)'                        % config['Xb_MinSumPTppipi']
         _doca123chi2CutPreVtx13   = '(ACHI2DOCA(1,3) < %s)'                                   % config['Xb_MaxDOCAChi2']
         _doca123chi2CutPreVtx23   = '(ACHI2DOCA(2,3) < %s)'                                   % config['Xb_MaxDOCAChi2']
         _combCuts123              = _mass123CutPreVtx+' & '+_sumpt123CutPreVtx+' & '+_doca123chi2CutPreVtx13+' & '+_doca123chi2CutPreVtx23
-        
+
         _wmass3pKCutPreVtx        = "(AWM('p+','p~-','p+','K-') > %s*MeV)"                    % config['Xb_MinM_4body']
         _massCutPreVtx            = '(AM             < %s*MeV)'                               % config['Xb_MaxM_4body']
         _sumptCutPreVtx           = '( (APT1 + APT2 + APT3 + APT4) > %s*MeV)'                 % config['Xb_MinSumPT_4body']
@@ -144,13 +144,13 @@ class Xb2phhhConf(LineBuilder) :
         _massCutsPreVtx           = _massCutPreVtx+' & '+_wmass3pKCutPreVtx
         _combCuts                 = _massCutsPreVtx+' & '+_sumptCutPreVtx+' & '+_ptCutPreVtx+' & '+\
                                     _docachi2CutPreVtx14+' & '+_docachi2CutPreVtx24+' & '+_docachi2CutPreVtx34
-        
+
         _vtxChi2CutPostVtx        = '(VFASPF(VCHI2)  < %s)'                                   % config['Xb_MaxVtxChi2']
         _fdChi2CutPostVtx         = '(BPVVDCHI2      > %s)'                                   % config['Xb_MinFDChi2']
         _diraCutPostVtx           = '(BPVDIRA        > %s)'                                   % config['Xb_MinDira']
         _ipChi2CutPostVtx         = '(BPVIPCHI2()    < %s)'                                   % config['Xb_MaxIPChi2']
         _motherCuts               = _vtxChi2CutPostVtx+' & '+_fdChi2CutPostVtx+' & '+_diraCutPostVtx+' & '+_ipChi2CutPostVtx
-        
+
         _Xb                       = DaVinci__N4BodyDecays()
         _Xb.Combination12Cut      = _combCuts12
         _Xb.Combination123Cut     = _combCuts123
@@ -158,7 +158,7 @@ class Xb2phhhConf(LineBuilder) :
         _Xb.MotherCut             = _motherCuts
         _Xb.DecayDescriptor       = "[Lambda_b0 -> p+ pi- pi+ pi-]cc"
         _Xb.ReFitPVs              = True
-        
+
         self.selXb2phhh           = Selection(name, Algorithm = _Xb, RequiredSelections = [self.myProtons, self.myPions])
 
     def defineRelatedInfoTools(self, config):
@@ -177,6 +177,6 @@ class Xb2phhhConf(LineBuilder) :
                                                                           '[Lambda_b0 -> p+ pi- pi+ ^pi-]CC' : self.getConeVarLocation(Angle,4,Name)} } )
         self.RelatedInfoTools.append({ "Type"           : "RelInfoVertexIsolation",
                                        "Location"       : "VertexIsoInfo" })
-                
+
     def getConeVarLocation(self,angle,num,name):
         return "ConeVar{angle}_{num}_{name}".format(angle=str(angle).replace('.',''),num=str(num),name=name)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py
index 936887afc9048cce527578661a5834b4fae806af..ad1558bf696a96fec7e0d2bc4fbda845310bc6d5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py
@@ -168,5 +168,3 @@ class Xb2phhConf(LineBuilder) :
         _Xb.ReFitPVs              = True
 
         self.selXb2phh            = Selection(name, Algorithm = _Xb, RequiredSelections = [self.myProtons, self.myPions])
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index a44190d8fe865c0319c3457c92da0525a49e6387..f11f8944e39da64d38f6980c029cf808661b6019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -38,11 +38,11 @@ default_config = {
         'BUILDERTYPE' : 'CharmFromBSemiForHadronAsyAllLinesConf',
         'CONFIG'      : {
             "prescale_LbRS" : 1.0
-            ,"prescale_LbWS" : 0.2 
+            ,"prescale_LbWS" : 0.2
             ,"prescale_D0to3piRS" : 1.0
             ,"prescale_D0to3piWS" : 0.2
             ,"prescale_D0toK2piRS" : 1.0
-            ,"prescale_D0toK2piWS" : 0.2 
+            ,"prescale_D0toK2piWS" : 0.2
             #### common to all modes
             ,"GEC_nLongTrk" : 250. # adimensional
             ,"GHOSTPROB_MAX" : 0.35 #adimensional
@@ -80,7 +80,7 @@ default_config = {
             ,"PiPi_DOCACHI2_MAX" : 15. # adimensional
             ,"PiPi_CHI2NDF" : 3. # adimensional
             ,"PiPi_SUMPT_MIN" : 600.  # MeV
-            ,"MuPiPi_DOCACHI2_MAX" : 15. 
+            ,"MuPiPi_DOCACHI2_MAX" : 15.
             ,"MuPiPi_CHI2NDF": 3.
             ,"MuPiPi_FDCHI2_MIN" : 20. # adimensional
             ,"Lc2Kpi_REQUIRE_TOS" : True # bool
@@ -109,28 +109,28 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     __confdict__={}
-    
+
     def __init__(self, _name, config) :
 
         LineBuilder.__init__(self, _name, config)
         self.__confdict__=config
-        
+
         ### define the global event cuts
         ### max number of long tracks
         GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" %config ,
                  "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         ### define the muon cuts
         self.MuonCuts = "(PT > %(Mu_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDmu > 0)" %config
-        self.PionCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK < %(Pi_PIDKMax)s)" %config 
-        self.KaonCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK > %(K_PIDKMin)s)" %config 
+        self.PionCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK < %(Pi_PIDKMax)s)" %config
+        self.KaonCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK > %(K_PIDKMin)s)" %config
         self.SlowpionCuts = "(PT > %(Slowpi_PTMin)s*MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDe < %(Slowpi_PIDeMax)s)"\
                           "& (PIDK < %(Slowpi_PIDKMax)s)" %config
-        
+
         self.Muons = Selection( "Mufor" + _name,
                                 Algorithm = FilterDesktop(name = "MuFilterFor"+_name, Code = self.MuonCuts ),
                                 RequiredSelections = [StdLooseMuons])
-        
+
         self.Pions = Selection( "Pifor" + _name,
                                 Algorithm = FilterDesktop(name = "PiFilterFor"+_name, Code = self.PionCuts),
                                 RequiredSelections = [StdLoosePions])
@@ -143,7 +143,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                     Algorithm = FilterDesktop(name = "SlowpiFilterFor"+_name, Code = self.SlowpionCuts),
                                     RequiredSelections = [StdLoosePions])
         #### D0 -> K3pi lines
-        
+
         self.D0to3pi_RS = D0To3HMaker("D0To3piRSFor"+_name
                                       ,config["D0to3H_3pi_MASS_MIN"],config["D0to3H_3pi_MASS_MAX"]
                                       ,config
@@ -155,7 +155,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                       ,config
                                       ,[self.Pions]
                                       ,['[D0 -> pi+ pi- pi+]cc','[D0 -> pi+ pi+ pi+]cc'])
-        
+
         self.D0toK2pi_RS = D0To3HMaker("D0ToK2piRSFor"+_name
                                        ,config["D0to3H_K2pi_MASS_MIN"],config["D0to3H_K2pi_MASS_MAX"]
                                        ,config,[self.Kaons,self.Pions]
@@ -195,7 +195,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                     ,config
                                                     ,[self.MuPi_WS,self.D0to3pi_WS]
                                                     ,['[B0 -> D~0 K*(892)+]cc'])
-        
+
         self.BtoDstarMuD0toK2pi_RS = BtoDstarMuMaker("BtoDstarMuD0toK2pi_RSFor"+_name
                                                      ,config["D0to3H_K2pi_DeltaMass_MAX"]
                                                      ,config
@@ -207,7 +207,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                      ,config
                                                      ,[self.MuPi_WS,self.D0toK2pi_WS]
                                                      ,['[B0 -> D~0 K*(892)+]cc'])
-        
+
         self.B2DstarMuD0to3piRSLine = StrippingLine(_name+'_B2DstarMuD0to3piRS',
                                                     prescale = config["prescale_D0to3piRS"],
                                                     FILTER=GECs,
@@ -217,7 +217,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                     prescale = config["prescale_D0to3piWS"],
                                                     FILTER=GECs,
                                                     selection = self.BtoDstarMuD0to3pi_WS)
-        
+
         self.B2DstarMuD0toK2piRSLine = StrippingLine(_name+'_B2DstarMuD0toK2piRS',
                                                     prescale = config["prescale_D0toK2piRS"],
                                                     FILTER=GECs,
@@ -227,14 +227,14 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                     prescale = config["prescale_D0toK2piWS"],
                                                     FILTER=GECs,
                                                     selection = self.BtoDstarMuD0toK2pi_WS)
-        
-        
+
+
         ###################### Lambda_c lines ##########################
-        
+
         self.LcToKpi_RS = LcToKpiMaker("LcToKpiRSFor"+_name,config,[self.Kaons,self.Pions],['[Lambda_c+ -> K- pi+]cc'])
         self.LcToKpi_WS = LcToKpiMaker("LcToKpiWSFor"+_name,config,[self.Kaons,self.Pions],
                                         ['[Lambda_c+ -> K- pi+]cc','[Lambda_c+ -> K+ pi-]cc','[Lambda_c+ -> K+ pi+]cc','[Lambda_c+ -> K- pi-]cc'])
-        
+
         self.PiPi_RS = PiPiMaker("PiPiRSFor"+_name,config,[self.Slowpions],['rho(770)0 -> pi+ pi-'])
         self.PiPi_WS = PiPiMaker("PiPiWSFor"+_name,config,[self.Slowpions],['rho(770)0 -> pi+ pi-','rho(770)0 -> pi+ pi+','rho(770)0 -> pi- pi-'])
 
@@ -249,21 +249,21 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                       prescale = config["prescale_LbRS"],
                                       FILTER=GECs,
                                       selection = self.Lb_RS)
-        
+
         self.LbWSLine = StrippingLine(_name+'_LbToLcStarMuLcToKpiWS',
                                       prescale = config["prescale_LbWS"],
                                       FILTER=GECs,
                                        selection = self.Lb_WS)
 
-        ######## register lines 
-        
-        self.registerLine(self.B2DstarMuD0to3piRSLine)        
-        self.registerLine(self.B2DstarMuD0to3piWSLine)        
-        self.registerLine(self.B2DstarMuD0toK2piRSLine)        
-        self.registerLine(self.B2DstarMuD0toK2piWSLine)        
-        self.registerLine(self.LbRSLine)        
-        self.registerLine(self.LbWSLine)        
-        
+        ######## register lines
+
+        self.registerLine(self.B2DstarMuD0to3piRSLine)
+        self.registerLine(self.B2DstarMuD0to3piWSLine)
+        self.registerLine(self.B2DstarMuD0toK2piRSLine)
+        self.registerLine(self.B2DstarMuD0toK2piWSLine)
+        self.registerLine(self.LbRSLine)
+        self.registerLine(self.LbWSLine)
+
 def MuPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
     _CombinationCut = "(ACHILD(PT,1)+ACHILD(PT,2) > %(MuPi_SUMPT_MIN)s *MeV)"\
                       "& (ADOCACHI2CUT(%(MuPi_DOCACHI2_MAX)s, ''))" %config
@@ -291,7 +291,7 @@ def BtoDstarMuMaker(_combName,DeltaMass_MAX,config,_RequiredSelections,_decayDes
                  'MD0PI = sqrt((EPI+ED0)**2 - (PXPI+PXD0)**2 - (PYPI+PYD0)**2 - (PZPI+PZD0)**2)',
                  'DELTA_MASS = MD0PI - ACHILD(M,1)']
     _CombinationCut = "(DELTA_MASS < %s *MeV)" %DeltaMass_MAX
-    _CombinationCut += "& (ADOCACHI2CUT(%(D0to3H_B_DOCACHI2_MAX)s, ''))" %config 
+    _CombinationCut += "& (ADOCACHI2CUT(%(D0to3H_B_DOCACHI2_MAX)s, ''))" %config
     _MotherCut = "(M > %(D0to3H_B_MASS_MIN)s *MeV) & (M < %(D0to3H_B_MASS_MAX)s *MeV)"\
                  "& (MINTREE((ABSID=='D0'),VFASPF(VZ)) - MINTREE((ABSID=='K*(892)+'),VFASPF(VZ)) > %(D0to3H_DZ)s *mm )"\
                  "& (VFASPF(VCHI2/VDOF) < %(D0to3H_B_VCHI2NDF_MAX)s)"\
@@ -321,7 +321,7 @@ def D0To3HMaker(_combName,MASS_MIN,MASS_MAX,config,_RequiredSelections,_decayDes
                       "& (ACHILD(PT,1) + ACHILD(PT,2) + ACHILD(PT,3) > %(D0to3H_SUMPT_MIN)s)" %config
     ### different mass cut depending on whether we miss a pion or a kaon
     _MotherCut = "(M > %s *MeV) & (M < %s *MeV)" %(MASS_MIN,MASS_MAX)
-    _MotherCut = _MotherCut + "& (VFASPF(VCHI2/VDOF)< %(D0to3H_VCHI2NDF_MAX)s)" %config 
+    _MotherCut = _MotherCut + "& (VFASPF(VCHI2/VDOF)< %(D0to3H_VCHI2NDF_MAX)s)" %config
     _comb = CombineParticles( name = "Comb"+_combName,
                               DecayDescriptors = _decayDescriptors,
                               CombinationCut = _CombinationCut,
@@ -335,11 +335,11 @@ def D0To3HMaker(_combName,MASS_MIN,MASS_MAX,config,_RequiredSelections,_decayDes
 
 def PiPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
     comb = CombineParticles(name="Comb"+_combName,
-                            DecayDescriptors = _decayDescriptors, 
+                            DecayDescriptors = _decayDescriptors,
                             CombinationCut = "(AM < %(PiPi_MASS_MAX)s*MeV)"\
                             "& (ACUTDOCACHI2(%(PiPi_DOCACHI2_MAX)s,''))"\
-                            "& (ACHILD(PT,1) + ACHILD(PT,2) > %(PiPi_SUMPT_MIN)s *MeV)" % config, 
-                            MotherCut = "(VFASPF(VCHI2/VDOF)< %(PiPi_CHI2NDF)s)" % config)        
+                            "& (ACHILD(PT,1) + ACHILD(PT,2) > %(PiPi_SUMPT_MIN)s *MeV)" % config,
+                            MotherCut = "(VFASPF(VCHI2/VDOF)< %(PiPi_CHI2NDF)s)" % config)
     sel = Selection("Sel"+_combName,
                     Algorithm = comb,
                     RequiredSelections = _RequiredSelections)
@@ -347,7 +347,7 @@ def PiPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
 
 def MuPiPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
     comb = CombineParticles(name="Comb"+_combName,
-                            DecayDescriptors = _decayDescriptors, 
+                            DecayDescriptors = _decayDescriptors,
                             CombinationCut = "(ACUTDOCACHI2(%(MuPiPi_DOCACHI2_MAX)s,''))" % config,
                             MotherCut = "(VFASPF(VCHI2/VDOF)< %(MuPiPi_CHI2NDF)s)"\
                             "& (BPVVDCHI2 > %(MuPiPi_FDCHI2_MIN)s)" %config)
@@ -412,7 +412,7 @@ def LbMaker(_combName,config,_RequiredSelections,_decayDescriptors):
         return sel_Hlt2TOS
     else:
         return sel
-        
+
 def TOSFilter( name, _input, _trigger ) :
     from Configurables import TisTosParticleTagger
     _tisTosFilter = TisTosParticleTagger( name + "Tagger" )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 2413c0816b540b1359fa2a7edcc1c03a0befd479..20fd4127589c66e2dff1202884b8f708b401c444 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -55,13 +55,13 @@ default_config = {
         },
     "STREAMS":["Bhadron"]
 }
-        
+
 class CharmFromBSemiForProtonPIDAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, _name, config) :
 
         LineBuilder.__init__(self, _name, config)
@@ -69,11 +69,11 @@ class CharmFromBSemiForProtonPIDAllLinesConf(LineBuilder) :
 
         #### define the cuts for the Lambda_b0 daughter tracks
         self.MuonCuts = "(TRGHOSTPROB < %(MAXGHOSTPROB)s) & (PIDmu > 0) & (PT > %(Mu_PT)s *MeV)" % self.__confdict__
-        self.PionCuts = "(TRGHOSTPROB < %(MAXGHOSTPROB)s) & (PIDK < %(Pi_PIDKMax)s) & (PT > %(H_PT)s *MeV)" % self.__confdict__ 
-        self.KaonCuts = "(TRGHOSTPROB < %(MAXGHOSTPROB)s) & (PIDK > %(K_PIDKMin)s) & (PT > %(H_PT)s *MeV)" % self.__confdict__ 
+        self.PionCuts = "(TRGHOSTPROB < %(MAXGHOSTPROB)s) & (PIDK < %(Pi_PIDKMax)s) & (PT > %(H_PT)s *MeV)" % self.__confdict__
+        self.KaonCuts = "(TRGHOSTPROB < %(MAXGHOSTPROB)s) & (PIDK > %(K_PIDKMin)s) & (PT > %(H_PT)s *MeV)" % self.__confdict__
         self.ProtonCuts = "(TRGHOSTPROB < %(MAXGHOSTPROB)s) & (PT > %(H_PT)s *MeV)" % self.__confdict__
 
-        #### Define the combination cuts 
+        #### Define the combination cuts
         self.LambdaC_CombinationCut = "(ADAMASS('Lambda_c+') < %(LambdaC_MASSWIN)s *MeV)"\
                               "& (ACHILD(PT,1)+ACHILD(PT,2)+ACHILD(PT,3) > %(LambdaC_PTSUM)s *MeV)"\
                               "& (ADOCACHI2CUT(%(LambdaC_DOCACHI2_MAX)s, ''))" % self.__confdict__
@@ -81,36 +81,36 @@ class CharmFromBSemiForProtonPIDAllLinesConf(LineBuilder) :
         self.LambdaC_MotherCut = "(ADMASS('Lambda_c+') < %(LambdaC_MASSWIN)s *MeV)"\
                                  "& (VFASPF(VCHI2/VDOF) < %(LambdaC_VCHI2NDF)s) " \
                                  "& (BPVVDCHI2 > %(LambdaC_FDCHI2)s)"\
-                                 "& (BPVDIRA> %(LambdaC_DIRA)s)" % self.__confdict__ 
+                                 "& (BPVDIRA> %(LambdaC_DIRA)s)" % self.__confdict__
 
         self.LambdaB_CombinationCut = "(AM > %(LambdaB_MASS_MIN)s *MeV)"\
                                       "& (AM < %(LambdaB_MASS_MAX)s *MeV)"\
-                                      "& (ADOCACHI2CUT(%(LambdaB_DOCACHI2_MAX)s, ''))" % self.__confdict__ 
+                                      "& (ADOCACHI2CUT(%(LambdaB_DOCACHI2_MAX)s, ''))" % self.__confdict__
 
         self.LambdaB_MotherCut = "( MINTREE((ABSID=='Lambda_c+'),VFASPF(VZ)) - VFASPF(VZ) > %(LambdaC_DZ)s *mm )"\
                                  "& (BPVDIRA> %(LambdaB_DIRA)s)"\
-                                 "& (VFASPF(VCHI2/VDOF) < %(LambdaB_VCHI2NDF)s)" % self.__confdict__ 
+                                 "& (VFASPF(VCHI2/VDOF) < %(LambdaB_VCHI2NDF)s)" % self.__confdict__
+
+        #### make the Lambda_c -> p K pi
 
-        #### make the Lambda_c -> p K pi 
-        
         self.comb_Lc2PKPi = CombineParticles(DecayDescriptors = ['[Lambda_c+ -> p+ K- pi+]cc'],
                                              DaughtersCuts = { "pi+" : self.PionCuts,
                                                                "K-"  : self.KaonCuts,
                                                                "p+"  : self.ProtonCuts},
                                              CombinationCut = self.LambdaC_CombinationCut,
                                              MotherCut = self.LambdaC_MotherCut)
-        
+
         self.sel_Lc2PKPi = Selection(name="SelLc2PKPiFor"+_name,
                                      Algorithm = self.comb_Lc2PKPi,
                                      RequiredSelections = [StdLoosePions,StdLooseKaons,StdNoPIDsProtons])
 
         #### combine the Lambda_c -> p K pi with a muon
-        
+
         self.comb_Lb2LcMuNu = CombineParticles(DecayDescriptor = '[Lambda_b0 -> Lambda_c+ mu-]cc',
                                                DaughtersCuts = {"mu-" : self.MuonCuts},
                                                CombinationCut = self.LambdaB_CombinationCut,
                                                MotherCut = self.LambdaB_MotherCut)
-                                               
+
         self.sel_Lb2LcMuNu = Selection(name="sel_Lb2LcMuNu"+_name,
                                        Algorithm = self.comb_Lb2LcMuNu,
                                        RequiredSelections = [self.sel_Lc2PKPi,StdLooseMuons])
@@ -126,4 +126,4 @@ class CharmFromBSemiForProtonPIDAllLinesConf(LineBuilder) :
                                            selection = self.sel_Lb2LcMuNu)
         self.registerLine(self.StrippingLine)
 
-## the end
\ No newline at end of file
+## the end
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py
index 6dcdf9b4e492a51f66dc4a0f4dd651e47f506146..72210fa723b1536ce49f317e4774a4abf2bf7bcb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py
@@ -13,10 +13,10 @@ __date__ = '16/07/2014'
 __version__ = '$Revision: 1.6 $'
 
 '''
-Stripping selection for D0 -> K pi pi0 
+Stripping selection for D0 -> K pi pi0
 '''
 ####################################################################
-# Stripping selection for D0 -> K pi pi0 
+# Stripping selection for D0 -> K pi pi0
 #  2 lines : one for merged, one for resolved pi0
 ####################################################################
 
@@ -108,7 +108,7 @@ def makeD02KPiPi0R( name,
                   inputSel
                   ) :
 
-    _TrackCuts    = "(PT>%(TrackMinPT_R)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']    
+    _TrackCuts    = "(PT>%(TrackMinPT_R)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']
     _pi0Cuts      = "(PT>%(Pi0MinPT_R)s *MeV) & (CHILD(CL,1)>%(ResPi0MinGamCL)s) & (CHILD(CL,2)>%(ResPi0MinGamCL)s)" %locals()['config']
     _daughterCuts = { 'K-' : _TrackCuts, 'pi+' : _TrackCuts, 'pi0' : _pi0Cuts }
     _combCuts     = "(AM>%(D0MinM)s *MeV) & (AM<%(D0MaxM)s *MeV)" % locals()['config']
@@ -131,7 +131,7 @@ def makeD02KPiPi0M( name,
                   inputSel
                   ) :
 
-    _TrackCuts    = "(PT>%(TrackMinPT_M)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']    
+    _TrackCuts    = "(PT>%(TrackMinPT_M)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']
     _pi0Cuts      = "(PT>%(Pi0MinPT_M)s *MeV)" %locals()['config']
     _daughterCuts = { 'K-' : _TrackCuts, 'pi+' : _TrackCuts, 'pi0' : _pi0Cuts }
     _combCuts     = "(AM>%(D0MinM)s *MeV) & (AM<%(D0MaxM)s *MeV)" % locals()['config']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index 6f949e0aab9dcb2c94f48791ad9a9be174d0dea5..6621d4b8f972b829d3e7f3d376c21eb99d8261ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -13,7 +13,7 @@ __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
 
 '''
-D* -> D0 pis, D0 -> K- pi+ pi0, pi0 -> e e gamma, photon and one electron unreconstructed 
+D* -> D0 pis, D0 -> K- pi+ pi0, pi0 -> e e gamma, photon and one electron unreconstructed
 '''
 # =============================================================================
 ##
@@ -21,7 +21,7 @@ D* -> D0 pis, D0 -> K- pi+ pi0, pi0 -> e e gamma, photon and one electron unreco
 #
 
 """
-Stripping lines for  
+Stripping lines for
 
 Last modification $Date: 18/05/2017 $
                by $Author: gciezare$
@@ -55,7 +55,7 @@ default_config = {
             ,"Slowpion_PIDe" : 5 #adimensional
             ,"TOSFilter" : { 'Hlt2CharmHad.*HHX.*Decision%TOS' : 0}  #adimensional
             },
-        'STREAMS'     : ['CharmCompleteEvent']	  
+        'STREAMS'     : ['CharmCompleteEvent']
         }
     }
 from Gaudi.Configuration import *
@@ -67,27 +67,27 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     """
     Definition of D* tagged D0 -> H- mu+(e+) nu stripping
     """
-    
+
     __configuration_keys__ = default_config['D2KPiPi0_PartReco']['CONFIG'].keys()
-    
+
     def __init__(self,name,config):
         LineBuilder.__init__(self, name, config)
         self._config=config
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         #self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         self._electronSel=None
         self._electronFilter()
-        
+
         self._slowpionSel =None
         self._pionSel=None
         self._kaonSel=None
         self._kaonFilter()
         self._pionFilter()
         self._slowpionFilter()
-        
+
         self.registerLine(self._D2KENuLine())
         #self.registerLine(self._D2KENuSSLine())
 
@@ -118,7 +118,7 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def _electronFilter( self ):
         if self._electronSel is not None:
             return self._electronSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseElectrons
@@ -126,9 +126,9 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
         _electronSel=Selection("Electron_for"+self._name,
                          Algorithm=_el,
                          RequiredSelections = [StdLooseElectrons])
-        
+
         self._electronSel=_electronSel
-        
+
         return _electronSel
 
     ######--######
@@ -136,11 +136,11 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def _pionFilter( self ):
         if self._pionSel is not None:
             return self._pionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _ka = FilterDesktop( Code = self._NominalPiSelection() % self._config )
         _kaSel=Selection("Pi_for"+self._name,
                          Algorithm=_ka,
@@ -152,11 +152,11 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def _kaonFilter( self ):
         if self._kaonSel is not None:
             return self._kaonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._NominalKSelection() % self._config )
         _kaSel=Selection("K_for"+self._name,
                          Algorithm=_ka,
@@ -168,11 +168,11 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def _slowpionFilter( self ):
         if self._slowpionSel is not None:
             return self._slowpionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
-        
+
         _ka = FilterDesktop( Code = self._NominalSlowPiSelection() % self._config )
         _kaSel=Selection("pis_for"+self._name,
                          Algorithm=_ka,
@@ -191,7 +191,7 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StrippingConf.StrippingLine import StrippingLine
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = _D0Decays,
             CombinationCut = "(AM>%(KLepMassLow)s*MeV) & (AM<%(KLepMassHigh)s*MeV)" % self._config,
@@ -204,7 +204,7 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-            
+
         _D0Sel=Selection("SelD0_for"+_name,
                          Algorithm=_KMu,
                          RequiredSelections = [lfilter, kfiler, pifilter])
@@ -223,19 +223,19 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
         DstSelTOS = TOSFilter( "SelDstHMu_Hlt2TOS"+_name
                 ,DstSel
                 ,_tosFilter)
-    
+
         Line = StrippingLine(_name+'Line',
                 prescale = 1.,
                 RequiredRawEvents = ["Calo","Tracker","Velo"],
-                selection = DstSelTOS) 
+                selection = DstSelTOS)
         return Line
-                                                    
+
 def TOSFilter( name, _input, _specs ) :
     from Configurables import TisTosParticleTagger
-    from PhysSelPython.Wrappers import Selection 
+    from PhysSelPython.Wrappers import Selection
     _tisTosFilter = TisTosParticleTagger( name + "Tagger" )
-    _tisTosFilter.TisTosSpecs = _specs 
+    _tisTosFilter.TisTosSpecs = _specs
     return Selection( name
                       , Algorithm = _tisTosFilter
                       , RequiredSelections = [ _input ]
-                      )        
+                      )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py
index fdde8699d9a65a9265d98d1c98457be854acfadd..8ce0ab9defa1b4001172802bdea5cd484d0a0542 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py
@@ -34,7 +34,7 @@ default_config = {
     'WGs'         : ['Calib'],
     'BUILDERTYPE' : 'D0forBXXLinesConf',
     'CONFIG'      :{
-      "PreScale"      : 0.005   # adimensiional        
+      "PreScale"      : 0.005   # adimensiional
       ,"PreScaleRS"   : 1.0    # adimensiional
       ,"PreScaleWS"   : 0.2    # adimensiional
       ,"MINIPCHI2"     : 9.0   # adimensiional
@@ -43,16 +43,16 @@ default_config = {
       ,"PionPIDK"      : 10.0   # adimensiional
       ,"PT"            : 300.0  # MeV
       ,"D0DIRA"        : 0.9999    # adimensiional
-      ,"D0DIRAK3Pi"    : 0.9999    # adimensiional        
+      ,"D0DIRAK3Pi"    : 0.9999    # adimensiional
       ,"FDCHI2"        : 100.0   # adimensiional
       ,"D0AMassWin"    : 100.0   # MeV
       ,"D0MassWin"     : 80.0  # MeV
       ,"D0IP"          : 0.2    #mm
-      ,"D0K3PiIP"      : 0.2    #mm        
+      ,"D0K3PiIP"      : 0.2    #mm
       ,"D0VCHI2DOF"    : 6.0   # adimensiional
       ,"DDocaChi2Max" : 20   #adimensiional
     },
-    'STREAMS'     : ['Semileptonic']   
+    'STREAMS'     : ['Semileptonic']
   }
 }
 
@@ -91,15 +91,15 @@ class D0forBXXLinesConf(LineBuilder):
         self.seldstws = makeDst2D0Pi("DstWSwD0K2Pi" + name,
                                      DecayDescriptor = '[D*(2010)- -> D0 pi-]cc',
                                      DaughterLists = [ self.seld02k2pi, StdAllLoosePions ])
-                                     
+
         self.seldstrs_tos = TOSFilter( "DstRSwD0K2Pi_TOS" + name,
                                      self.seldstrs,
                                      "Hlt2Global")
 
         self.seldstws_tos = TOSFilter( "DstWSwD0K2Pi_TOS" + name,
                                      self.seldstws,
-                                     "Hlt2Global")        
-        
+                                     "Hlt2Global")
+
         self.D02KPiLine = StrippingLine('D02KPi' + name + 'Line'
                                         , prescale = config['PreScale']
                                         , selection = self.seld02kpi
@@ -113,17 +113,17 @@ class D0forBXXLinesConf(LineBuilder):
                                        , prescale = config['PreScaleRS']
                                        , selection = self.seldstrs_tos
                                        )
-        
+
         self.DstWSLine = StrippingLine('DstWSwD02K2Pi' + name + 'Line'
                                        , prescale = config['PreScaleWS']
                                        , selection = self.seldstws_tos
-                                       )        
-        
+                                       )
+
         self.registerLine(self.D02KPiLine)
         self.registerLine(self.D02K3PiLine)
         self.registerLine(self.DstRSLine)
         self.registerLine(self.DstWSLine)
-        
+
     def _D02KPi( self ):
         _decayDescriptor = '[D0 -> pi+ K-]cc'
         _combinationCut = "(ADAMASS('D0') < %(D0AMassWin)s *MeV) & (APT > 1500*MeV) & (ADOCACHI2CUT( %(DDocaChi2Max)s, ''))" % self.__confdict__
@@ -151,7 +151,7 @@ class D0forBXXLinesConf(LineBuilder):
                                 )
 
     def _D02K3Pi( self ):
-        _decayDescriptor = '[D0 -> K- pi+ pi- pi+]cc' 
+        _decayDescriptor = '[D0 -> K- pi+ pi- pi+]cc'
         _combinationCut = "(ADAMASS('D0') < %(D0AMassWin)s *MeV) & (APT > 1500.*MeV) &  (ADOCACHI2CUT( %(DDocaChi2Max)s, ''))" % self.__confdict__
         _daughtersCuts = { "pi+" : "  (PT > 250 *MeV) & (P>2.0*GeV)"\
                            "& (TRCHI2DOF < %(TRCHI2)s)" % self.__confdict__,
@@ -176,12 +176,12 @@ def makeDst2D0Pi(name,
                             DaughtersCuts = _daughtersCuts,
                             CombinationCut = _combinationCut,
                             MotherCut = _motherCut,
-                            )        
+                            )
     return Selection(name,
                      Algorithm = _dst,
                      RequiredSelections = DaughterLists)
 
-    
+
 def TOSFilter( name = None, sel = None, trigger = None ):
     """
     Function to return a selection object, filtering for TOS candidates from input selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02KShhForTrackingEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02KShhForTrackingEff.py
index 0364cef43d9d5223249236b1f7784d4a53635d36..646f52f24fffca42808c711e7c62f2d390a0a3bd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02KShhForTrackingEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02KShhForTrackingEff.py
@@ -101,13 +101,13 @@ class DstarD02KShh_ForTrackingEffBuilder(LineBuilder):
         self.selDauPP = [self.selDauPion]
         self.selDauKK = [self.selDauKaon]
         self.selDauKP = [self.selDauKaon,self.selDauPion]
-        
+
         # Now make the various decays of the D0
         strDecaysPiPi         = ["D0 -> pi+ pi-"]
         strDecaysKPlusPiMinus = ["D0 -> K+ pi-"]
         strDecaysKMinusPiPlus = ["D0 -> K- pi+"]
         strDecaysKK           = ["D0 -> K+ K-"]
-        
+
         self.selD0PiPi         = makeD0('D02PiPi'        + name, strDecaysPiPi,         self.selDauPP, config['Pair_SumAPT_MIN'], config['Pair_AMINDOCA_MAX'], config['Pair_BPVVD_MIN'], config['Pair_BPVCORRM_MAX'], config['FDCHI2_D0_MIN'], config['DIRA_D0_MIN'],config['M_MIN'], config['M_MAX'], config['VCHI2_D0_MAX'])
         self.selD0KK           = makeD0('D02KK'          + name, strDecaysKK  ,         self.selDauKK, config['Pair_SumAPT_MIN'], config['Pair_AMINDOCA_MAX'], config['Pair_BPVVD_MIN'], config['Pair_BPVCORRM_MAX'], config['FDCHI2_D0_MIN'], config['DIRA_D0_MIN'],config['PhiM_MIN'], config['PhiM_MAX'], config['VCHI2_D0_MAX'])
         self.selD0KMinusPiPlus         = makeD0('D02KMinusPiPlus'        + name, strDecaysKMinusPiPlus,self.selDauKP, config['Pair_SumAPT_MIN'], config['Pair_AMINDOCA_MAX'], config['Pair_BPVVD_MIN'], config['Pair_BPVCORRM_MAX'], config['FDCHI2_D0_MIN'], config['DIRA_D0_MIN'],config['M_MIN'], config['M_MAX'], config['VCHI2_D0_MAX'])
@@ -135,7 +135,7 @@ class DstarD02KShh_ForTrackingEffBuilder(LineBuilder):
                                    , selection = self.selDstarKMinusPiPlus
                                    , hltTisTosSpec = config['Hlt2TisTosSpec'])
 
-        
+
         # Make the stripping lines
         self.linePiPi          = StrippingLine(name+'PiPiLine',
                                                FILTER    = _globalEventCuts,
@@ -171,7 +171,7 @@ class DstarD02KShh_ForTrackingEffBuilder(LineBuilder):
         self.registerLine(self.lineKPlusPiMinus)
         self.registerLine(self.lineKMinusPiPlus)
 
-        
+
 def filterPions(name, inputName, TrkChi2_MAX_Child_MAX, Trk_PT_MIN, Trk_P_MIN,Trk_GHOST_MAX,PION_PIDK_MAX,IPCHI2_MAX_Child_MIN):
     """
     Apply cuts to daughters of D0
@@ -182,7 +182,7 @@ def filterPions(name, inputName, TrkChi2_MAX_Child_MAX, Trk_PT_MIN, Trk_P_MIN,Tr
     _strCutPID    = "(PIDK  < %(PION_PIDK_MAX)s)"                 % locals()
     _strCutGHOST  = "(TRGHP  < %(Trk_GHOST_MAX)s)"                % locals()
     _strCutIPChi2 = "(MIPCHI2DV(PRIMARY)> %(IPCHI2_MAX_Child_MIN)s)" % locals()
-    
+
     _strCuts = '((~ISMUON)&' + _strCutChi2 + '&' + _strCutPT + '&' + _strCutP \
                    + '&' + _strCutPID \
                    + '&' + _strCutGHOST + '&' + _strCutIPChi2 + ')'
@@ -191,7 +191,7 @@ def filterPions(name, inputName, TrkChi2_MAX_Child_MAX, Trk_PT_MIN, Trk_P_MIN,Tr
     return Selection(name,
                      Algorithm          = _trackFilter,
                      RequiredSelections = [inputTracks])
-                     
+
 def filterKaons(name, inputName, TrkChi2_MAX_Child_MAX, Trk_PT_MIN, Trk_P_MIN,Trk_GHOST_MAX,KAON_PIDK_MIN, IPCHI2_MAX_Child_MIN):
     """
     Apply cuts to daughters of D0
@@ -202,7 +202,7 @@ def filterKaons(name, inputName, TrkChi2_MAX_Child_MAX, Trk_PT_MIN, Trk_P_MIN,Tr
     _strCutPID    = "(PIDK  > %(KAON_PIDK_MIN)s)"                 % locals()
     _strCutGHOST  = "(TRGHP  < %(Trk_GHOST_MAX)s)"                % locals()
     _strCutIPChi2 = "(MIPCHI2DV(PRIMARY)> %(IPCHI2_MAX_Child_MIN)s)" % locals()
-    
+
     _strCuts = '((~ISMUON)&' + _strCutChi2 + '&' + _strCutPT + '&' + _strCutP \
                    + '&' + _strCutPID \
                    + '&' + _strCutGHOST + '&' + _strCutIPChi2 + ')'
@@ -210,7 +210,7 @@ def filterKaons(name, inputName, TrkChi2_MAX_Child_MAX, Trk_PT_MIN, Trk_P_MIN,Tr
     inputTracks = DataOnDemand(Location = inputName)
     return Selection(name,
                      Algorithm          = _trackFilter,
-                     RequiredSelections = [inputTracks])                     
+                     RequiredSelections = [inputTracks])
 
 def makeD0(name, inputDecayDescriptors, inputDaughters, Pair_SumAPT_MIN, Pair_AMINDOCA_MAX, Pair_BPVVD_MIN, Pair_BPVCORRM_MAX, FDCHI2_D0_MIN, DIRA_D0_MIN,M_MIN, M_MAX, VCHI2_D0_MAX):
     """
@@ -218,13 +218,13 @@ def makeD0(name, inputDecayDescriptors, inputDaughters, Pair_SumAPT_MIN, Pair_AM
     The same routine works for all final states.
     """
 
-    _combCutsMass = "(AM<1200*MeV)" 
+    _combCutsMass = "(AM<1200*MeV)"
     _combCutsPT   = "((APT1+APT2)> %(Pair_SumAPT_MIN)s)"                                % locals()
     _combCutsDOCA = "(AMINDOCA('LoKi::TrgDistanceCalculator') < %(Pair_AMINDOCA_MAX)s)" % locals()
 
     _combCuts = '(' + _combCutsMass + '&' + _combCutsPT + '&' \
                     + _combCutsDOCA + ')'
-    
+
     _motherCutsFD       = '(BPVVD> %(Pair_BPVVD_MIN)s)'            % locals()
     _motherCutsCorrMass = '(BPVCORRM < %(Pair_BPVCORRM_MAX)s)'     % locals()
     _motherCutsFDChi2   = '(BPVVDCHI2> %(FDCHI2_D0_MIN)s)'         % locals()
@@ -232,7 +232,7 @@ def makeD0(name, inputDecayDescriptors, inputDaughters, Pair_SumAPT_MIN, Pair_AM
     _motherCutsMass_MIN     = '(M > %(M_MIN)s)'                        % locals()
     _motherCutsMass_MAX     = '(M < %(M_MAX)s)'                        % locals()
     _motherCutsVtx      = '(VFASPF(VCHI2PDOF) < %(VCHI2_D0_MAX)s)' % locals()
-    
+
     _motherCuts = '(' + _motherCutsFD           + '&' + \
                         _motherCutsCorrMass     + '&' + \
                         _motherCutsFDChi2       + '&' + \
@@ -240,7 +240,7 @@ def makeD0(name, inputDecayDescriptors, inputDaughters, Pair_SumAPT_MIN, Pair_AM
                         _motherCutsMass_MIN     + '&' + \
                         _motherCutsMass_MAX     + '&' + \
                         _motherCutsVtx          + ')'
-    
+
     _D0 = CombineParticles(DecayDescriptors = inputDecayDescriptors,
                             CombinationCut   = _combCuts,
                             MotherCut        = _motherCuts)
@@ -253,23 +253,23 @@ def makeDstar(name, inputD0, IPCHI2_PiSlow_MAX, PairMaxDoca_Dstar, PT_Dstar_MIN,
     Given a list of D0, try to make D*+ -> D0 pi+
     """
     _softPi = DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles')
-    
-    
+
+
     _cutsSoftPi = '( MIPCHI2DV(PRIMARY) < %(IPCHI2_PiSlow_MAX)s)' % locals()
-    
+
     _cutsDstarCombDoca = "((AMAXDOCA('LoKi::TrgDistanceCalculator') < %(PairMaxDoca_Dstar)s))" % locals()
-    
+
     _cutsDstarComb = '(' + _cutsDstarCombDoca + ')'
 
-    
+
     _cutsDstarMothPT       = '(PT > %(PT_Dstar_MIN)s)' % locals()
     _cutsDstarMothMassLow  = "(M-MAXTREE('D0'==ABSID,M)>%(DeltaM_MIN)s)" % locals()
     _cutsDstarMothMassHigh = "(M-MAXTREE('D0'==ABSID,M)<%(DeltaM_MAX)s)" % locals()
-    
+
     _cutsDstarMoth = '(' + _cutsDstarMothPT + '&' + \
                      _cutsDstarMothMassLow  + '&' + \
                      _cutsDstarMothMassHigh + ')'
-    
+
     _Dstar = CombineParticles(DecayDescriptors = ["D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-"],
                               DaughtersCuts    = {"pi+" : _cutsSoftPi},
                               CombinationCut   = _cutsDstarComb,
@@ -277,7 +277,7 @@ def makeDstar(name, inputD0, IPCHI2_PiSlow_MAX, PairMaxDoca_Dstar, PT_Dstar_MIN,
     return Selection(name,
                      Algorithm = _Dstar,
                      RequiredSelections = inputD0 + [_softPi])
-                     
+
 def makeTisTos( name, selection, hltTisTosSpec = { } ) :
     outSel = selection
     if len(hltTisTosSpec) > 0:
@@ -289,5 +289,3 @@ def makeTisTos( name, selection, hltTisTosSpec = { } ) :
                             , RequiredSelections = [ selection ] )
 
     return outSel
-    
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index d9a924d5b64bbc4467a20ab023d8a3ee1c231fa9..74265bbc73a1b2da29f30211e73899f5c48f161c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -9,10 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 """
-Stripping options for D*+ - > D0 (h h gamma x) pi+ 
+Stripping options for D*+ - > D0 (h h gamma x) pi+
 
 Missing is photon from pi0->gamma gamma
-For soft photon calibration within SoftPhotonApplications (SPA) 
+For soft photon calibration within SoftPhotonApplications (SPA)
 
 Authors: Jolanta Brodzicka, Marcello Rotondo
 
@@ -52,29 +52,29 @@ default_config = {
                       # HH
                       'TrChi2'                  : 4,
                       'TrGhostProb'             : 0.5,
-                      'MinTrkPT'                : 500 * MeV, 
+                      'MinTrkPT'                : 500 * MeV,
                       'MinTrkIPChi2'            : 10,
                       'HighPIDK'                : -1, #pions
                       'LowPIDK'                 :  5, #kaons
                       'CombMassLow_HH'          : 500 * MeV,
                       'CombMassHigh_HH'         : 1820 * MeV,
-                      'MinCombPT'               : 2.0 * GeV, 
+                      'MinCombPT'               : 2.0 * GeV,
                       'MaxADOCACHI2'            : 10.0,
                       'MinVDCHI2_HHComb'        : 1000.0,
                       'MassLow_HH'              : 600 * MeV,
                       'MassHigh_HH'             : 1810 * MeV,
-                      'MaxVCHI2NDOF_HH'         : 10.0, 
-                      'MinVDCHI2_HH'            : 1000.0, 
+                      'MaxVCHI2NDOF_HH'         : 10.0,
+                      'MinVDCHI2_HH'            : 1000.0,
                       # D0 -> HH Gamma
                       'CombMassLow'             : 1280 * MeV,#1380 -> 1280 in 2019 campaign
                       'CombMassHigh'            : 2270 * MeV,#2120 -> 2270 in 2019 campaign
                       'MassLow'                 : 1300 * MeV,#1400 -> 1300 in 2019 campaign
                       'MassHigh'                : 2250 * MeV,#2100 -> 2250 in 2019 campaign
-                      'MinPT'                   : 2.5 * GeV, 
+                      'MinPT'                   : 2.5 * GeV,
                       'MaxVCHI2NDOF'            : 10.0,
                       'MinBPVDIRA'              : 0.995,
-                      'MinBPVTAU'               : 0.1 * picosecond, 
-                      'MaxIPChi2'               : 15, 
+                      'MinBPVTAU'               : 0.1 * picosecond,
+                      'MaxIPChi2'               : 15,
                       # D* -> D0 pi+
                       'PiSoft_PT_MIN'           : 250 * MeV,
                       'Daug_TRCHI2DOF_MAX'      : 3,
@@ -83,8 +83,8 @@ default_config = {
                       'Dstar_MDiff_MAX'         : 165 * MeV, #160 -> 165 in 2019 campaign
                       # HLT filters, only process events firing triggers matching the RegEx
                       'Hlt1Filter': None,
-                      'Hlt2Filter': None, #"HLT_PASS_RE('Hlt2CharmHadInclDst2PiD02HHXBDTDecision')", 
-                      'Hlt1Tos': {'Hlt1.*Track.*Decision%TOS' : 0}, 
+                      'Hlt2Filter': None, #"HLT_PASS_RE('Hlt2CharmHadInclDst2PiD02HHXBDTDecision')",
+                      'Hlt1Tos': {'Hlt1.*Track.*Decision%TOS' : 0},
                       'Hlt2Tos': {'Hlt2CharmHadInclDst2PiD02HHXBDTDecision%TOS' : 0, 'Hlt2PhiIncPhiDecision%TOS' : 0}
                     },
     'STREAMS'     : ['CharmCompleteEvent']
@@ -159,7 +159,7 @@ class DstarD2hhGammaCalibLines( LineBuilder ) :
                 self.Dst2D0pi[decay+phName] = self.makeDstar2D0Pi(DstarD2XGammaName+phName,
                                                                   config,
                                                                   ['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'],
-                                                                  inputSel = [self.D2XGamma[decay+phName], StdAllNoPIDsPions], 
+                                                                  inputSel = [self.D2XGamma[decay+phName], StdAllNoPIDsPions],
                                                                   Hlt1TOS = config['Hlt1Tos'],
                                                                   Hlt2TOS = config['Hlt2Tos'] )
 
@@ -284,8 +284,8 @@ class DstarD2hhGammaCalibLines( LineBuilder ) :
                        config,
                        DecayDescriptors,
                        inputSel,
-                       Hlt1TOS,   
-                       Hlt2TOS) : 
+                       Hlt1TOS,
+                       Hlt2TOS) :
         """
           Create and return a D* -> D0 pi Selection object.
           Arguments:
@@ -302,7 +302,7 @@ class DstarD2hhGammaCalibLines( LineBuilder ) :
             return Selection( name
                               , Algorithm = _tisTosFilter
                               , RequiredSelections = [ _input ]
-                              )        
+                              )
 
         daugCuts = "(PT > %(PiSoft_PT_MIN)s)" \
                    "&(TRCHI2DOF < %(Daug_TRCHI2DOF_MAX)s)" % locals()['config']
@@ -336,7 +336,7 @@ class DstarD2hhGammaCalibLines( LineBuilder ) :
                                             , _selDstarHlt1TOS
                                             , Hlt2TOS
                                             )
-       
+
         return _selDstarHlt2TOS
 
 ########################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py
index e8684f99f977f5e3ce3f71d6a041cad5540c4c21..1cd0f96b41fb5561efc05b9027280f566b238ecb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py
@@ -41,7 +41,7 @@ config_default =  {
         'Both_P'                  : 3000.   ,  # MeV
         'Both_TRCHI2DOF'          :    5.   ,
         'Both_MIPCHI2'            :    9.   ,
-        
+
         'Tag_PT'                  : 1500.   ,  # MeV
         'Tag_P'                   : 6000.   ,  # MeV
         'Tag_PIDe'                :    5.   ,
@@ -50,15 +50,15 @@ config_default =  {
         'Probe_PT'                :  500.   ,  # MeV
         'Probe_P'                 : 3000.   ,  # MeV
         'Probe_MIPCHI2'           :    9.   ,
-        
-        'eeCombMinMass'           : 2100.   ,  # MeV         
-        'eeCombMaxMass'           : 4300.   ,  # MeV   
-        'eeVCHI2PDOF'             :    9.   ,  
-        'eeMinMass'               : 2200.   ,  # MeV 
+
+        'eeCombMinMass'           : 2100.   ,  # MeV
+        'eeCombMaxMass'           : 4300.   ,  # MeV
+        'eeVCHI2PDOF'             :    9.   ,
+        'eeMinMass'               : 2200.   ,  # MeV
         'eeMaxMass'               : 4200.   ,  # MeV
 
-        'JpsiLineCut'             : "(PT>2.*GeV) & (BPVDLS>50) ",      
-        
+        'JpsiLineCut'             : "(PT>2.*GeV) & (BPVDLS>50) ",
+
         'Bu2JpsieeKLine_Prescale'  :  1,
         'Bu2JpsieeKLine_HltFilter' : None,
         'Bu2JpsieeKLine_KaonCut'   : "(TRCHI2DOF<4) & (PT>1.0*GeV) & (PIDK >0) & (BPVIPCHI2()>9)",
@@ -85,17 +85,17 @@ from StrippingUtils.Utils import LineBuilder
 
 
 class ElectronIDConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        
+
         self.name = name
         self.config = config
-        
-        self.JpsiList= makeEE( 'eeFor'+self.name,                             
+
+        self.JpsiList= makeEE( 'eeFor'+self.name,
                                     #
                                     Both_PT = config['Both_PT'],
                                     Both_P = config['Both_P'],
@@ -117,10 +117,10 @@ class ElectronIDConf(LineBuilder):
                                     eeMinMass = config['eeMinMass'],
                                     eeMaxMass = config['eeMaxMass']
                                     )
-        
+
         self.makeJpsi2eeLine()
-        self.makeBu2JpsieeKLine() 
-        
+        self.makeBu2JpsieeKLine()
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -128,7 +128,7 @@ class ElectronIDConf(LineBuilder):
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createCombinationSel( self, OutputList,
                               DecayDescriptor,
                               DaughterLists,
@@ -144,29 +144,29 @@ class ElectronIDConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-    
-        
-    
+
+
+
     def makeJpsi2eeLine( self ):
-        
+
         Jpsi2eeForElectronID = self.createSubSel(  OutputList = self.JpsiList.name() + "ForJpsi2eeLine",
                                                    InputList  = self.JpsiList,
                                                    Cuts = self.config['JpsiLineCut'] )
-        
-        
+
+
         Jpsi2eeForElectronIDLine = StrippingLine( self.name + "JpsiLine",
-                                                  HLT       = self.config['JpsiLineHltFilter'], 
+                                                  HLT       = self.config['JpsiLineHltFilter'],
                                                   algos = [ Jpsi2eeForElectronID ],
                                                   prescale = self.config['JpsiLinePrescale']
                                                   )
-        
+
         self.registerLine( Jpsi2eeForElectronIDLine )
-        
-            
+
+
     def makeBu2JpsieeKLine( self ):
-        
+
         from StandardParticles import StdTightKaons
-        
+
         Bu2JpsieeK = self.createCombinationSel(
             OutputList = "Bu2JpsieeKFor" + self.name,
             DecayDescriptor = "[B+ -> J/psi(1S) K+]cc",
@@ -175,15 +175,15 @@ class ElectronIDConf(LineBuilder):
                                  "K+"        :  self.config['Bu2JpsieeKLine_KaonCut']},
                 PreVertexCuts = self.config['Bu2JpsieeKLine_BuComCut'],
                 PostVertexCuts = self.config['Bu2JpsieeKLine_BuMomCut'] )
-        
+
         Bu2JpsieeKLine = StrippingLine( self.name + "Bu2JpsiKLine",
-                                        HLT       = self.config['Bu2JpsieeKLine_HltFilter'], 
+                                        HLT       = self.config['Bu2JpsieeKLine_HltFilter'],
                                         algos = [ Bu2JpsieeK ] ,
                                         prescale = self.config["Bu2JpsieeKLine_Prescale"]
                                         )
         self.registerLine( Bu2JpsieeKLine )
-        
-            
+
+
 def makeEE( name,
             #
             Both_PT,
@@ -206,41 +206,40 @@ def makeEE( name,
             eeMinMass,
             eeMaxMass
             ):
-    
+
     from StandardParticles import StdNoPIDsElectrons as NoPIDsElectronsForElectronID
-    
+
     InAccCuts = "(0.5<PPINFO(LHCb.ProtoParticle.InAccEcal,-1))"
-    
+
     BothCuts = "(PT> %(Both_PT)s *MeV)"\
                " & (TRCHI2DOF < %(Both_TRCHI2DOF)s)"\
                " & (MINTREE('e+'==ABSID,BPVIPCHI2())> %(Both_MIPCHI2)s )" % locals()
-    
+
     EEComCut = "(in_range(%(eeCombMinMass)s *MeV, AM, %(eeCombMaxMass)s *MeV))" % locals()
-    
+
     EEMomCut = "(VFASPF(VCHI2)< %(eeVCHI2PDOF)s)"\
                " & (in_range(%(eeMinMass)s *MeV, MM, %(eeMaxMass)s *MeV))" % locals()
-    
+
     Tag1Cuts = "(CHILDCUT((PT>%(Tag_PT)s*MeV),1)) & (CHILDCUT((PIDe>%(Tag_PIDe)s),1)) & (CHILDCUT((P>%(Tag_P)s*MeV),1))"\
                " & (CHILDCUT((BPVIPCHI2()> %(Tag_MIPCHI2)s),1))" % locals()
     Tag2Cuts = "(CHILDCUT((PT>%(Tag_PT)s*MeV),2)) & (CHILDCUT((PIDe>%(Tag_PIDe)s),2)) & (CHILDCUT((P>%(Tag_P)s*MeV),2))"\
                " & (CHILDCUT((BPVIPCHI2()> %(Tag_MIPCHI2)s),2))" % locals()
-        
+
     Probe1Cuts = "(CHILDCUT((PT>%(Probe_PT)s*MeV),1)) & (CHILDCUT((P>%(Probe_P)s*MeV),1))"\
                  " & (CHILDCUT((BPVIPCHI2()> %(Probe_MIPCHI2)s),1))" % locals()
     Probe2Cuts = "(CHILDCUT((PT>%(Probe_PT)s*MeV),2)) & (CHILDCUT((P>%(Probe_P)s*MeV),2))"\
                  " & (CHILDCUT((BPVIPCHI2()> %(Probe_MIPCHI2)s),2))" % locals()
-    
+
     Tag1Probe2Cuts = Tag1Cuts + " & " + Probe2Cuts
-    Tag2Probe1Cuts = Tag2Cuts + " & " + Probe1Cuts 
-    
+    Tag2Probe1Cuts = Tag2Cuts + " & " + Probe1Cuts
+
     _EE = CombineParticles( DecayDescriptor = "J/psi(1S) -> e+ e-",
                             DaughtersCuts = {"e+" : InAccCuts + "&" + BothCuts },
                             CombinationCut = EEComCut,
                             MotherCut = EEMomCut + " & ( ( " + Tag1Probe2Cuts + " ) | (" + Tag2Probe1Cuts + " ) ) "
                             )
-    
+
     return Selection( name,
                       Algorithm = _EE,
                       RequiredSelections = [ NoPIDsElectronsForElectronID ]
-                      )    
-
+                      )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py
index 253be2b58c6c37091c04441ce16b35fbf6ef7667..f0f34eb5c7993c1a72b8065272933878fea5fe77 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py
@@ -39,13 +39,13 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from SelPy.utils import ( UniquelyNamedObject,
                           ClonableObject,
                           SelectionBase )
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, 
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, 
+from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
+                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
                            PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                          TrackStateInitAlg, TrackStateInitTool) 
+                          TrackStateInitAlg, TrackStateInitTool)
 from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
                                            ConfiguredForwardStraightLineEventFitter)
- 
+
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs' : ['Calib'],
                   'BUILDERTYPE':'StrippingElectronRecoEffLines',
@@ -127,7 +127,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                               "MMAX": 1000*MeV,
                               "VCHI2": 20,
                               "KST_IPCHI2": 4
-                              
+
                               },
     'DetachedEEK'          : {'AMTAP'      :   6000*MeV,
                               'VCHI2TAP'   :   22,
@@ -161,7 +161,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                               },
     'DetachedMuMuK'        : {'AMTAP'      :   6000*MeV,
                               'VCHI2TAP'   :   20,
-                              'MLOW'       :   5000.*MeV,                              
+                              'MLOW'       :   5000.*MeV,
                               'MHIGH'      :   5700.*MeV,
                               'bmass_ip_constraint': -2.75,
                               'probePcutMin' : 750*MeV,
@@ -172,7 +172,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                               },
     'DetachedMuMuKstar'        : {'AMTAP'      :   6000*MeV,
                               'VCHI2TAP'   :   20,
-                              'MLOW'       :   5000.*MeV,                              
+                              'MLOW'       :   5000.*MeV,
                               'MHIGH'      :   5700.*MeV,
                               'bmass_ip_constraint': -2.5,
                               'probePcutMin' : 750*MeV,
@@ -183,7 +183,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                               },
     'DetachedMuMuPhi'        : {'AMTAP'      :   6000*MeV,
                               'VCHI2TAP'   :   20,
-                              'MLOW'       :   5000.*MeV,                              
+                              'MLOW'       :   5000.*MeV,
                               'MHIGH'      :   5700.*MeV,
                               'bmass_ip_constraint': -1.0,
                               'probePcutMin' : 750*MeV,
@@ -221,7 +221,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                               "bCandFlightDist"          : 4.0*mm,
                               'TisTosSpec' :   {"Hlt1TrackMVA.*Decision%TOS":0}
                               },
-    
+
     'DetachedEKstar'           : {'AM'         :   5500*MeV,
                               'VCHI2'      :   10,
                               'VDCHI2'     :   36,
@@ -241,13 +241,13 @@ default_config = {'NAME': 'ElectronRecoEff',
     # The next decisions are "DECs"
     'L0Req'                : {'DetachedEK'   : "L0_CHANNEL_RE('Electron')", # this is TOS!
                               'DetachedMuK'  : "L0_CHANNEL_RE('Muon|Hadron')", # this is TOS!
-                              
+
                               "DetachedMuKstar": "L0_CHANNEL_RE('Muon|Hadron')", # this is DEC!
                               "DetachedMuPhi": "L0_CHANNEL_RE('Muon|Hadron')", # this is DEC!
-                              
+
                               "DetachedEKstar" :"L0_CHANNEL_RE('Electron')", # this is DEC!
                               "DetachedEPhi" :"L0_CHANNEL_RE('Muon|Electron|Hadron')" }, # this is DEC!
-    
+
     'Hlt1Req'              : {'DetachedEKstar'  : "Hlt1TrackMVA.*Decision",
                               'DetachedEPhi'  : "Hlt1TrackMVA.*Decision",
                               'DetachedEK'   : "Hlt1TrackMVA.*Decision",
@@ -255,7 +255,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                               'DetachedMuKstar': "Hlt1Track*MVA.*Decision",
                               'DetachedMuK'  : "Hlt1Track*MVA.*Decision"
                               },
-    
+
     'Hlt2Req'               : {'DetachedEK' : "Hlt2Topo(E)?2BodyDecision",
                                'DetachedEKstar' : "Hlt2Topo(E)?2BodyDecision",
                                'DetachedEPhi' : "Hlt2Topo(E)?2BodyDecision",
@@ -263,7 +263,7 @@ default_config = {'NAME': 'ElectronRecoEff',
                                'DetachedMuKstar' : "Hlt2Topo(Mu)?2BodyDecision",
                                'DetachedMuPhi' : "Hlt2Topo(Mu)?2BodyDecision",
                                }
-                  
+
     },
               'STREAMS' : ['BhadronCompleteEvent']
               }
@@ -281,14 +281,14 @@ class StrippingElectronRecoEffLines(LineBuilder):
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self,name,config):        
+
+    def __init__(self,name,config):
         LineBuilder.__init__(self, name, config)
-        
+
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
-        
+
         self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(TrackGEC)s )" % config,
                       "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -297,38 +297,38 @@ class StrippingElectronRecoEffLines(LineBuilder):
         self._LooseDetachedMuons=None
         self._DetachedKaons=None
         self._DetachedMuons = None
-        
+
         # Composite tags
         self._DetachedKstars=False
         self._DetachedPhis=None
-        
-        ###### the velo tracking (from D2K3pi line from mika)        
+
+        ###### the velo tracking (from D2K3pi line from mika)
         self.VeloProtoOutputLocation = 'Rec/ProtoP/VeloProtosFor%s'%self.name
         self.VeloTrackOutputLocation="Rec/Track/MyVeloFor%s"%self.name
-        self.FittedVeloTrackOutputLocation = "Rec/Track/PreparedVeloFor%s"%self.name        
+        self.FittedVeloTrackOutputLocation = "Rec/Track/PreparedVeloFor%s"%self.name
         self.VeloTracks = self.MakeVeloTracks([])
-        
+
         self.Hlt2ProbeElectrons = self.MakeVeloParticles("VeloElectrons","electrons",self.VeloTracks)
         self.Hlt2ProbeMuons = self.MakeVeloParticles("VeloMuons","muons",self.VeloTracks)
-        
+
         ###rest of it.
         self.DetachedEKPair("DetachedEKPair")
         self.DetachedEKstarPair("DetachedEKstarPair")
         self.DetachedEPhiPair("DetachedEPhiPair")
-        
+
         self.DetachedMuKPair("DetachedMuKPair")
         self.DetachedMuKstarPair("DetachedMuKstarPair")
         self.DetachedMuPhiPair("DetachedMuPhiPair")
-        
+
         #actual registration of the lines
         self.registerLine( self.DetachedEEKPair("DetachedEEKPair") )
         self.registerLine( self.DetachedEEKstarPair("DetachedEEKstarPair") )
         self.registerLine( self.DetachedEEPhiPair("DetachedEEPhiPair") );
-        
+
         self.registerLine(self.DetachedMuMuKPair("DetachedMuMuKPair"))
         self.registerLine(self.DetachedMuMuKstarPair("DetachedMuMuKstarPair"))
         self.registerLine(self.DetachedMuMuPhiPair("DetachedMuMuPhiPair"))
-        
+
         self.combine_particles_mumuk = None;
         self.combine_particles_eek = None;
 
@@ -356,7 +356,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                            )
             self._LooseDetachedElectrons  = _DetachedElectrons
         return self._LooseDetachedElectrons
-    
+
     def _DetachedKaonFilter(self):
         if not self._DetachedKaons:
             code = ("(MIPCHI2DV(PRIMARY)>%(IPChi2Kaon)s) & (PT> %(PtKaon)s) & \
@@ -369,28 +369,28 @@ class StrippingElectronRecoEffLines(LineBuilder):
 
     def _DetachedKstarFilter(self):
         if not self._DetachedKstars:
-            dc = {'K-' : "(MIPCHI2DV(PRIMARY)>%(K_IPCHI2)s) & (PROBNNk>%(K_PROBNNk)s) & (PT>%(K_PT)s)" % (self._config['DetachedKstar']), 
+            dc = {'K-' : "(MIPCHI2DV(PRIMARY)>%(K_IPCHI2)s) & (PROBNNk>%(K_PROBNNk)s) & (PT>%(K_PT)s)" % (self._config['DetachedKstar']),
                   'pi+' : "(MIPCHI2DV(PRIMARY)>%(Pi_IPCHI2)s) & (PROBNNpi>%(Pi_PROBNNpi)s) & (PT>%(Pi_PT)s)" % (self._config['DetachedKstar'])}
             cc = ("in_range(%(AMMIN)s, AM, %(AMMAX)s) & (APT>%(APTMIN)s)") % self._config['DetachedKstar']
-            mc = ("in_range(%(MMIN)s, M, %(MMAX)s) & (VFASPF(VCHI2) < %(VCHI2)s) & (MIPCHI2DV(PRIMARY)>%(KST_IPCHI2)s)") % self._config['DetachedKstar']        
+            mc = ("in_range(%(MMIN)s, M, %(MMAX)s) & (VFASPF(VCHI2) < %(VCHI2)s) & (MIPCHI2DV(PRIMARY)>%(KST_IPCHI2)s)") % self._config['DetachedKstar']
             _DetachedKstarCreator = CombineParticles(
                 DecayDescriptors = ['[K*(892)0 -> K- pi+]cc'],
                 DaughtersCuts = dc,
                 CombinationCut = cc,
                 MotherCut = mc,
                 )
-            
+
             _DetachedKstars = Selection("DetachedKstars_For_"+self.name,
                                        Algorithm = _DetachedKstarCreator,
                                        RequiredSelections = [Hlt2Kaons, Hlt2Pions])
             self._DetachedKstars = _DetachedKstars
-            
+
         return self._DetachedKstars
-    
+
     def _DetachedPhiFilter(self):
         if not self._DetachedPhis:
             from PhysSelPython.Wrappers import Selection
-            
+
             dc = {'K-' : ("(MIPCHI2DV(PRIMARY)>%(K_IPCHI2)s) & "\
                          "(PIDK>%(K_PIDK)s) & (PT>%(K_PT)s)") % (self._config['DetachedPhi'])
                   }
@@ -408,15 +408,15 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                        Algorithm = _DetachedPhiCreator,
                                        RequiredSelections = [Hlt2Kaons])
             self._DetachedPhis = _DetachedPhis
-        
+
         return self._DetachedPhis
-    
+
     def DetachedEKPair(self,_name):
         dc = {'K+' : "ALL", 'e+' : "ALL"}
         cc = ("(AM < %(AM)s)")%self._config['DetachedEK']
         mc = ("(VFASPF(VCHI2) < %(VCHI2)s) &  (BPVVDCHI2 > %(VDCHI2)s) " \
               " & (VFASPF(VMINVDDV(PRIMARY)) > %(bCandFlightDist)s )") % self._config['DetachedEK']
-        
+
         _DetachedEKPair = CombineParticles(
             DecayDescriptors = ['[J/psi(1S) -> e+ K-]cc',
                                 '[J/psi(1S) -> e+ K+]cc'],
@@ -424,26 +424,26 @@ class StrippingElectronRecoEffLines(LineBuilder):
             CombinationCut = cc,
             MotherCut = mc,
             )
-        
+
         _DetachedEKPairSel = Selection("SelKE_for_"+_name,
                                             Algorithm = _DetachedEKPair,
                                             RequiredSelections = [self._DetachedKaonFilter(),
                                                                   self._DetachedElectronFilter()
                                                                   ]
                                             )
-        L0Filtered_DetachedEKPairSel = L0TOSSelection(_DetachedEKPairSel, 
+        L0Filtered_DetachedEKPairSel = L0TOSSelection(_DetachedEKPairSel,
                                             self._config["L0TOS"]['DetachedEK'],
                                             name='EK_L0Decision_for_'+_name)
-        
-        EK_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedEKPairSel, 
+
+        EK_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedEKPairSel,
                                             self._config["Hlt1Req"]['DetachedEK'],
                                             name='EK_HLT1Selection_for_'+_name)
         EK_HLT2Selection = Hlt2TOSSelection(EK_HLT1Selection,
                                             self._config["Hlt2Req"]['DetachedEK'],
                                             name='EK_HLT2Selection_for_'+_name)
-        
+
         self._DetachedEKPairSel = EK_HLT2Selection;
-        
+
     def DetachedEKstarPair(self,_name):
         dc = {'e+' : "ALL"}
         cc = ("(AM < %(AM)s)") % self._config['DetachedEKstar']
@@ -456,11 +456,11 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                 "[J/psi(1S) -> e- K*(892)0]cc"],
             DaughtersCuts = dc,
             CombinationCut = cc,
-            MotherCut = mc,            
+            MotherCut = mc,
             )
         EKstar_L0sel = L0Selection('EKstar_L0Selection_for_'+_name,
                                    '%(DetachedEKstar)s' % self._config['L0Req'])
-        
+
         L0Filtered_DetachedEKstarPairSel = Selection("SelEKstar_for_"+_name,
                                              Algorithm = _DetachedEKstarPair,
                                              RequiredSelections = [self._DetachedKstarFilter(),
@@ -468,17 +468,17 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                    EKstar_L0sel
                                                                    ]
                                              )
-        
-        EKstar_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedEKstarPairSel, 
+
+        EKstar_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedEKstarPairSel,
                                             self._config["Hlt1Req"]['DetachedEKstar'],
                                             name='EKstar_HLT1Selection_for_'+_name)
         EKstar_HLT2Selection = Hlt2TOSSelection(EKstar_HLT1Selection,
                                             self._config["Hlt2Req"]['DetachedEKstar'],
                                             name='EKstar_HLT2Selection_for_'+_name)
-        
+
         self._DetachedEKstarPairSel = EKstar_HLT2Selection
-    
-    
+
+
     def DetachedEPhiPair(self,_name):
         dc = {'e+' : "ALL"}
         cc = ("(AM < %(AM)s)") % self._config['DetachedEPhi']
@@ -494,7 +494,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
             )
         EPhi_L0sel = L0Selection('EPhi_L0Selection_for_'+_name,
                                  '%(DetachedEPhi)s' % self._config['L0Req'])
-        
+
         L0Filtered_DetachedEPhiPairSel = Selection("SelEPhi_for_"+_name,
                                              Algorithm = _DetachedEPhiPair,
                                              RequiredSelections = [self._DetachedPhiFilter(),
@@ -502,16 +502,16 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                    EPhi_L0sel
                                                                    ]
                                              )
-        
-        EPhi_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedEPhiPairSel, 
+
+        EPhi_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedEPhiPairSel,
                                             self._config["Hlt1Req"]['DetachedEPhi'],
                                             name='EPhi_HLT1Selection_for_'+_name)
         EPhi_HLT2Selection = Hlt2TOSSelection(EPhi_HLT1Selection,
                                             self._config["Hlt2Req"]['DetachedEPhi'],
                                             name='EPhi_HLT2Selection_for_'+_name)
-        
+
         self._DetachedEPhiPairSel = EPhi_HLT2Selection
-        
+
     def getCPForEEK(self, config_key="DetachedEEK"):
         dc = {"e+" : "ALL", "J/psi(1S)" : "ALL"}
         cc = "(AM < %(AMTAP)s)" % self._config[config_key]
@@ -520,7 +520,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
              "in_range(%(MLOW)s, BMassFromConstraint, %(MHIGH)s) & " \
              "in_range(%(probePcutMin)s,Probe_Momentum_From_Mass_constraint,%(probePcutMax)s)" % self._config[config_key]
         # "& (MAXOVERLAP( (ABSID == 'e+') | (ABSID=='K-') ) < %(overlapCut)s)"
-        
+
         preambulo = [  # With thanks to L. Dufour!
             'from numpy import inner',  # if you want you can also calculate all inner products yourself.
             'TagKaonMomentumVector    = [CHILD(CHILD(PX,2), 1), CHILD(CHILD(PY,2),1), CHILD(CHILD(PZ,2),1)]',
@@ -553,7 +553,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
             "B_MASS_CONSTRAINT_IP_VECTOR = [(B_ENDVERTEX_POSITION[i] + LambdaFactor * normalised_mass_constraint_b_momentum_vector[i]) - B_PV_POSITION[i] for i in range (0,3)]",
             "B_MASS_CONSTRAINT_IP = math.sqrt(B_MASS_CONSTRAINT_IP_VECTOR[0]**2+B_MASS_CONSTRAINT_IP_VECTOR[1]**2+B_MASS_CONSTRAINT_IP_VECTOR[2]**2)",
             ]
-        
+
         return CombineParticles(
             DecayDescriptors=["B+ -> J/psi(1S) e+", "B- -> J/psi(1S) e-"],
             DaughtersCuts=dc,
@@ -561,11 +561,11 @@ class StrippingElectronRecoEffLines(LineBuilder):
             MotherCut=mc,
             Preambulo=preambulo
             )
-        
+
 
     def DetachedEEKPair(self,_name):
         configuration = self._config[ "DetachedEEK" ]
-        
+
         _DetachedEEKPair= self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
                                          Algorithm = _DetachedEEKPair,
@@ -573,7 +573,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                self.Hlt2ProbeElectrons
                                                                ]
                                          )
-        
+
         line = StrippingLine(_name+"Line",
                              prescale = 1.0,
                              FILTER = self.GECs,
@@ -585,7 +585,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
 
     def DetachedEEKstarPair(self,_name):
         configuration = self._config[ "DetachedEEKstar" ]
-        
+
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
                                          Algorithm = _DetachedEEKstarPair,
@@ -593,7 +593,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                self.Hlt2ProbeElectrons
                                                                ]
                                          )
-        
+
         line = StrippingLine(_name+"Line",
                              prescale = 1.0,
                              FILTER = self.GECs,
@@ -605,7 +605,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
 
     def DetachedEEPhiPair(self,_name):
         configuration = self._config[ "DetachedEEPhi" ]
-        
+
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
                                          Algorithm = _DetachedEEPhiPair,
@@ -613,7 +613,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                self.Hlt2ProbeElectrons
                                                                ]
                                          )
-        
+
         line = StrippingLine(_name+"Line",
                              prescale = 1.0,
                              FILTER = self.GECs,
@@ -626,30 +626,30 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def _DetachedMuonFilter(self):
         if not self._DetachedMuons:
             from PhysSelPython.Wrappers import Selection
-            
+
             code = ("(MIPDV(PRIMARY)>%(IPMu)s) & (MIPCHI2DV(PRIMARY)>%(IPChi2Mu)s) & (PT> %(PtMu)s) & \
             (TRCHI2DOF<%(TrChi2Mu)s)  & in_range(%(EtaMinMu)s, ETA, %(EtaMaxMu)s) & (PROBNNmu > %(ProbNNmu)s)")%self._config['SharedChild']
-            
+
             _DetachedMuons= Selection("DetachedMuons_For_"+self.name,
                                       Algorithm = FilterDesktop(Code = code),
                                       RequiredSelections = [Hlt2Muons])
             self._DetachedMuons = _DetachedMuons
-        
+
         return self._DetachedMuons
-    
+
     def _LooseDetachedMuonFilter(self):
         if not self._LooseDetachedMuons:
             code = ("(MIPDV(PRIMARY)>%(IPMu)s) & (MIPCHI2DV(PRIMARY)>%(IPChi2Mu)s) & (PT> %(PtMu)s) & \
             (TRCHI2DOF<%(TrChi2Mu)s)  & in_range(%(EtaMinMu)s, ETA, %(EtaMaxMu)s) " \
             "& (PROBNNmu > %(ProbNNmu)s)")%self._config['LooseSharedChild']
-            
+
             _DetachedMuons = Selection("LooseDetachedMuons_For_"+self.name,
                                       Algorithm = FilterDesktop(Code = code),
                                       RequiredSelections = [Hlt2Muons])
             self._LooseDetachedMuons = _DetachedMuons
-        
+
         return self._LooseDetachedMuons
-    
+
     def DetachedMuKPair(self,_name):
         dc = {'K+' : "ALL", 'mu+' : "ALL"}
         cc = ("(AM < %(AM)s)")%self._config['DetachedMuK']
@@ -663,28 +663,28 @@ class StrippingElectronRecoEffLines(LineBuilder):
             CombinationCut = cc,
             MotherCut = mc,
             )
-        
+
         NoTrigger_DetachedMuKPairSel = Selection("SelMuK_for_"+_name,
                                              Algorithm = _DetachedMuKPair,
                                              RequiredSelections = [self._DetachedKaonFilter(),
                                                                    self._DetachedMuonFilter()
                                                                    ]
                                              )
-        
-        MuK_L0TOSSelection = L0TOSSelection(NoTrigger_DetachedMuKPairSel, 
+
+        MuK_L0TOSSelection = L0TOSSelection(NoTrigger_DetachedMuKPairSel,
                                             self._config["L0TOS"]['DetachedMuK'],
                                             name='MuK_L0TOSSelection_for_'+_name)
-        
-        MuK_HLT1Selection = Hlt1TOSSelection(MuK_L0TOSSelection, 
+
+        MuK_HLT1Selection = Hlt1TOSSelection(MuK_L0TOSSelection,
                                             self._config["Hlt1Req"]['DetachedMuK'],
                                             name='MuK_HLT1Selection_for_'+_name)
-        
+
         MuK_HLT2Selection = Hlt2TOSSelection(MuK_HLT1Selection,
                                             self._config["Hlt2Req"]['DetachedMuK'],
                                             name='MuK_HLT2Selection_for_'+_name)
-        
+
         self._DetachedMuKPairSel = MuK_HLT2Selection
-       
+
     def DetachedMuKstarPair(self,_name):
         dc = {'mu+' : "ALL"}
         cc = ("(AM < %(AM)s)") % self._config['DetachedMuKstar']
@@ -697,10 +697,10 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                 "[J/psi(1S) -> mu- K*(892)0]cc"],
             DaughtersCuts = dc,
             CombinationCut = cc,
-            MotherCut = mc,            
+            MotherCut = mc,
             )
         MuKstar_L0sel = L0Selection('MuKstar_L0Selection','%(DetachedMuKstar)s' % self._config['L0Req'])
-        
+
         L0Filtered_DetachedMuKstarPairSel = Selection("SelMuKstar_for_"+_name,
                                              Algorithm = _DetachedMuKstarPair,
                                              RequiredSelections = [self._DetachedKstarFilter(),
@@ -708,17 +708,17 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                    MuKstar_L0sel
                                                                    ]
                                              )
-        
-        MuKstar_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedMuKstarPairSel, 
+
+        MuKstar_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedMuKstarPairSel,
                                             self._config["Hlt1Req"]['DetachedMuKstar'],
                                             name='MuKstar_HLT1Selection')
-        
+
         MuKstar_HLT2Selection = Hlt2TOSSelection(MuKstar_HLT1Selection,
                                             self._config["Hlt2Req"]['DetachedMuKstar'],
                                             name='MuKstar_HLT2Selection')
-        
+
         self._DetachedMuKstarPairSel = MuKstar_HLT2Selection
-    
+
     def DetachedMuPhiPair(self,_name):
         dc = {'mu+' : "ALL"}
         cc = ("(AM < %(AM)s)") % self._config['DetachedMuK']
@@ -732,7 +732,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
             CombinationCut = cc,
             MotherCut = mc,
             )
-        
+
         L0sel = L0Selection('MuPhi_L0Selection','%(DetachedMuPhi)s' % self._config['L0Req'])
         L0Filtered_DetachedMuPhiPairSel = Selection("SelMuPhi_for_"+_name,
                                              Algorithm = _DetachedMuPhiPair,
@@ -741,20 +741,20 @@ class StrippingElectronRecoEffLines(LineBuilder):
                                                                    L0sel
                                                                    ]
                                              )
-        
-        MuPhi_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedMuPhiPairSel, 
+
+        MuPhi_HLT1Selection = Hlt1TOSSelection(L0Filtered_DetachedMuPhiPairSel,
                                             self._config["Hlt1Req"]['DetachedMuPhi'],
                                             name='MuPhi_HLT1Selection_for_'+_name)
         MuPhi_HLT2Selection = Hlt2TOSSelection(MuPhi_HLT1Selection,
                                             self._config["Hlt2Req"]['DetachedMuPhi'],
                                             name='MuPhi_HLT2Selection_for_'+_name)
-        
+
         self._DetachedMuPhiPairSel = MuPhi_HLT2Selection
-    
+
     def getCPForMuMuK(self, config_key="DetachedMuMuK"):
         dc = {"mu+" : "ALL", "J/psi(1S)" : "ALL"}
         cc = "(AM < %(AMTAP)s)"%self._config[config_key]
-        mc = "(VFASPF(VCHI2) < %(VCHI2TAP)s) & (log(B_MASS_CONSTRAINT_IP) < %(bmass_ip_constraint)s) & in_range(%(MLOW)s, BMassFromConstraint, %(MHIGH)s) & in_range(%(probePcutMin)s,Probe_Momentum_From_Mass_constraint,%(probePcutMax)s)"%self._config[config_key]        
+        mc = "(VFASPF(VCHI2) < %(VCHI2TAP)s) & (log(B_MASS_CONSTRAINT_IP) < %(bmass_ip_constraint)s) & in_range(%(MLOW)s, BMassFromConstraint, %(MHIGH)s) & in_range(%(probePcutMin)s,Probe_Momentum_From_Mass_constraint,%(probePcutMax)s)"%self._config[config_key]
         preambulo =  [ # With thanks to L. Dufour!
             'from numpy import inner', #if you want you can also calculate all inner products yourself.
             'TagKaonMomentumVector    = [CHILD(CHILD(PX,2), 1), CHILD(CHILD(PY,2),1), CHILD(CHILD(PZ,2),1)]',
@@ -796,20 +796,20 @@ class StrippingElectronRecoEffLines(LineBuilder):
             MotherCut = mc,
             Preambulo = preambulo
             )
-    
+
     def DetachedMuMuKPair(self,_name):
         combine_particles_mumuk = self.getCPForMuMuK("DetachedMuMuK");
-        
+
         _DetatchedMuMuK_Sel = Selection("SelMuMuK_for_"+_name,
                                         Algorithm = combine_particles_mumuk,
                                         RequiredSelections = [self._DetachedMuKPairSel,
                                                               self.Hlt2ProbeMuons])
-        
+
         PVMassFilteredSel = Selection("MassFilterSel"+_name,
                                       Algorithm = FilterDesktop(Code = "(in_range(%(POINTINGMASSMIN)s, POINTINGMASS ( LoKi.Child.Selector(0), LoKi.Child.Selector(1), LoKi.Child.Selector(2) ), %(POINTINGMASSMAX)s))" %self._config["DetachedMuMuK"]) ,
                                       RequiredSelections = [_DetatchedMuMuK_Sel]
                                       )
-                                     
+
         line = StrippingLine(_name+"Line",
                              prescale = 1.0,
                              FILTER = self.GECs,
@@ -817,20 +817,20 @@ class StrippingElectronRecoEffLines(LineBuilder):
                              selection = PVMassFilteredSel)
 
         return line
-    
+
     def DetachedMuMuKstarPair(self,_name):
         combine_particles_mumukstar = self.getCPForMuMuK("DetachedMuMuKstar");
-        
+
         _DetatchedMuMuKstar_Sel = Selection("SelMuMuKstar_for_"+_name,
                                         Algorithm = combine_particles_mumukstar,
                                         RequiredSelections = [self._DetachedMuKstarPairSel,
                                                               self.Hlt2ProbeMuons])
-        
+
         PVMassFilteredSel = Selection("MassFilterSel"+_name,
                                       Algorithm = FilterDesktop(Code = "(in_range(%(POINTINGMASSMIN)s, POINTINGMASS ( LoKi.Child.Selector(0), LoKi.Child.Selector(1), LoKi.Child.Selector(2) ), %(POINTINGMASSMAX)s))" %self._config["DetachedMuMuKstar"]) ,
                                       RequiredSelections = [_DetatchedMuMuKstar_Sel]
                                       )
-         
+
         line = StrippingLine(_name+"Line",
                              prescale = 1.0,
                              FILTER = self.GECs,
@@ -839,20 +839,20 @@ class StrippingElectronRecoEffLines(LineBuilder):
 
 
         return line
-    
+
     def DetachedMuMuPhiPair(self,_name):
         combine_particles_mumuphi = self.getCPForMuMuK("DetachedMuMuPhi");
-        
+
         _DetatchedMuMuPhi_Sel = Selection("SelMuMuPhi_for_"+_name,
                                         Algorithm = combine_particles_mumuphi,
                                         RequiredSelections = [self._DetachedMuPhiPairSel,
                                                               self.Hlt2ProbeMuons])
-        
+
         PVMassFilteredSel = Selection("MassFilterSel"+_name,
                                       Algorithm = FilterDesktop(Code = "(in_range(%(POINTINGMASSMIN)s, POINTINGMASS ( LoKi.Child.Selector(0), LoKi.Child.Selector(1), LoKi.Child.Selector(2) ), %(POINTINGMASSMAX)s))" %self._config["DetachedMuMuPhi"]) ,
                                       RequiredSelections = [_DetatchedMuMuPhi_Sel]
                                       )
-         
+
         line = StrippingLine(_name+"Line",
                              prescale = 1.0,
                              FILTER = self.GECs,
@@ -863,7 +863,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     ##### velo tracking ####
-    def MakeVeloTracks(self,prefilter):        
+    def MakeVeloTracks(self,prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
             from DAQSys.DecoderClass import decodersForBank
@@ -875,7 +875,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
             decs=decs+[vdec]
             VeloDecoding = GaudiSequencer("RecoDecodingSeq")
             VeloDecoding.Members += [d.setup() for d in decs ]
-        
+
         MyFastVeloTracking = FastVeloTracking("For%sFastVelo"%self.name,
                                               OutputTracksName=self.VeloTrackOutputLocation)
         MyFastVeloTracking.OnlyForward = True
@@ -887,7 +887,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         copyVelo = TrackContainerCopy( "For%sCopyVelo"%self.name )
         copyVelo.inputLocations = [self.VeloTrackOutputLocation]
         copyVelo.outputLocation = self.FittedVeloTrackOutputLocation
-        
+
         ### fitting
         if self._config["VeloFitter"] == "SimplifiedGeometry":
             MyVeloFit = ConfiguredEventFitter(Name="For%sVeloRefitterAlg"%self.name,
@@ -897,26 +897,26 @@ class StrippingElectronRecoEffLines(LineBuilder):
             MyVeloFit = ConfiguredEventFitter(Name="For%sVeloRefitterAlg"%self.name,
                                               TracksInContainer=self.FittedVeloTrackOutputLocation,
                                               SimplifiedGeometry=False)
-            
+
         #### making the proto particles
         MakeVeloProtos = ChargedProtoParticleMaker('For%sVeloProtoMaker'%self.name)
         MakeVeloProtos.Inputs=[self.FittedVeloTrackOutputLocation]
         MakeVeloProtos.Output = self.VeloProtoOutputLocation
         MakeVeloProtos.addTool( DelegatingTrackSelector, name="TrackSelector" )
         MakeVeloProtos.TrackSelector.TrackTypes = [ "Velo" ]
-    
+
         #### the full sequence
         makeparts = GaudiSequencer('For%sMakeVeloTracksGS'%self.name)
-        
+
         if self._config["DoVeloDecoding"]:
-            makeparts.Members += [ VeloDecoding ] 
-        
-        makeparts.Members += [ MyFastVeloTracking ] 
-        makeparts.Members += [ preve ] 
-        makeparts.Members += [ copyVelo ] 
-        makeparts.Members += [ MyVeloFit ] 
-        makeparts.Members += [ MakeVeloProtos ] 
-    
+            makeparts.Members += [ VeloDecoding ]
+
+        makeparts.Members += [ MyFastVeloTracking ]
+        makeparts.Members += [ preve ]
+        makeparts.Members += [ copyVelo ]
+        makeparts.Members += [ MyVeloFit ]
+        makeparts.Members += [ MakeVeloProtos ]
+
         #### some python magic to make this appear like a "Selection"
         return GSWrapper(name="For%sWrappedVeloTrackingFor"%self.name,
                          sequencer=makeparts,
@@ -924,8 +924,8 @@ class StrippingElectronRecoEffLines(LineBuilder):
                          requiredSelections =  prefilter)
 
     def MakeVeloParticles(self,name,
-                          particle, 
-                          protoParticlesMaker):        
+                          particle,
+                          protoParticlesMaker):
         particleMaker =  NoPIDsParticleMaker("For%sParticleMaker%s"%(self.name,name) , Particle = particle, AddBremPhotonTo = [])
         particleMaker.Input = self.VeloProtoOutputLocation
 
@@ -934,17 +934,17 @@ class StrippingElectronRecoEffLines(LineBuilder):
                 "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
                 } )
 
-        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name,name), 
-                                     Algorithm = particleMaker, 
+        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name,name),
+                                     Algorithm = particleMaker,
                                      RequiredSelections = [protoParticlesMaker], InputDataSetter=None)
-        
+
         ### filter on the IP of the velo tracks
-        return Selection("For%sSelVeloParts%s"%(self.name,name), 
+        return Selection("For%sSelVeloParts%s"%(self.name,name),
                      Algorithm = FilterDesktop(Code="(MIPDV(PRIMARY) > %(VeloMINIP)s) & " \
                                                     "(TRCHI2DOF<%(VeloTrackChi2)s) & " \
                                                     "in_range(%(EtaMinVelo)s, ETA, %(EtaMaxVelo)s)" %self._config),
                      RequiredSelections = [AllVeloParticles])
-                             
+
 #####Tos filter from B2DMuNuXUtils
 """ Is this still used?? """
 def TOSFilter( name = None, sel = None, trigger = None ):
@@ -959,15 +959,15 @@ def TOSFilter( name = None, sel = None, trigger = None ):
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
         SelectionBase.__init__(self,
                                algorithm = sequencer,
                                outputLocation = output,
-                               requiredSelections = requiredSelections )        
-            
+                               requiredSelections = requiredSelections )
+
 
 
 ###the end
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py
index 72aeb810178945403dbdfd9daad04c69c891dd7e..eb9479f99edeaa551499a74aad10e4d9e40f93a8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py
@@ -66,11 +66,11 @@ default_config = {
 
 
 class JPsiForSLAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
@@ -96,7 +96,7 @@ class JPsiForSLAllLinesConf(LineBuilder) :
                                  )
 
         #### J/psi->mumu selection
-        self.JPsi_to_mumu = CombineParticles(DecayDescriptor = "J/psi(1S) -> mu+ mu-",                                         
+        self.JPsi_to_mumu = CombineParticles(DecayDescriptor = "J/psi(1S) -> mu+ mu-",
                                              CombinationCut = "(ADAMASS('J/psi(1S)')<%(PsiMasswinPreFit)s) & (ADOCACHI2CUT(%(PsiDocaChi2Max)s,''))" %config,
                                              MotherCut = "(INTREE( (ABSID=='mu+') & ISMUON ) )"\
                                              "& (VFASPF(VCHI2/VDOF)< %(PsiVChi2NdofMax)s)"\
@@ -107,15 +107,15 @@ class JPsiForSLAllLinesConf(LineBuilder) :
         self.Sel_JPsi_to_mumu = Selection ("JPsi_to_mumu_for_"+name,
                                            Algorithm = self.JPsi_to_mumu,
                                            RequiredSelections = [self.muons])
-        
-        
+
+
         #### B -> J/psi + >=1 track selection
-        self.B_to_JPsi_track = CombineParticles(DecayDescriptor = "[B+ -> J/psi(1S) K+]cc",                                         
+        self.B_to_JPsi_track = CombineParticles(DecayDescriptor = "[B+ -> J/psi(1S) K+]cc",
                                                 CombinationCut = "(AM > %(BCombMassMin)s) & (AM < %(BCombMassMax)s) & (ADOCACHI2CUT(%(BDocaChi2Max)s,''))" %config,
                                                 MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVChi2NdofMax)s)"\
                                                 " & (SUMTREE( PT,  ISBASIC )>%(BPTMin)s) & (BPVVDCHI2 > %(BFDChi2Min)s) & (BPVDIRA>%(BDIRAMin)s)" %config
                                                 )
-        
+
         self.Sel_B_to_JPsi_track = Selection( "B_to_JPsi_track_For" + name,
                                               Algorithm = self.B_to_JPsi_track,
                                               RequiredSelections = [self.Sel_JPsi_to_mumu,self.tracks]
@@ -124,7 +124,7 @@ class JPsiForSLAllLinesConf(LineBuilder) :
         #### GECs
         GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(nLongTrackMax)s )" %config,
                  "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         #### register the line
         self.registerLine(StrippingLine("SemiIncJpsi2mumu" + name + "Line",
                                         prescale = config["PrescaleSemiIncJpsi2mumu"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 9b33a9cb2d411f24017a6293f565cc80c070be98..246c7fecb417cbb35fa8676f47155021116745da 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -54,7 +54,7 @@ default_config = {
     'TripionFlightDistanceChi2'  : 100,
     'TripionMinVertexZ'          : 0,
     'TripionMaxVertexZ'          : 2200,
-    
+
     ### Prescales
     'DipionSSNarrowDownstreamPrescale'  : 1.0,
     'DipionSSNarrowLongPrescale'        : 0.2,
@@ -78,24 +78,24 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class K23PiForDownstreamTrackEffConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        
+
         self.name = name
         self.config = config
 
-        
-        
+
+
         self._downPionSel = None
         self._downPionFilter()
-        
+
         self._longPionSel = None
         self._longPionFilter()
-        
+
         self._dipionSelSSNarrowDownstream = None
         self._dipionSelSSNarrowLong = None
         self._dipionSelSSWide = None
@@ -105,26 +105,26 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         self._dipionSelOSNarrowLong = None
         self._dipionSelOSWide = None
         #self._dipionFilterOS()
-                
+
         #self._tripionSelDipionSS = None
         #self._tripionFilterDipionSS()
-        
+
         #self._tripionSelDipionOS = None
         #self._tripionFilterDipionOS()
 
-       
+
 
         # some calculation for the major contribution to the corrected mass error
         self.mCorrCalc =  [ "from LoKiPhys.decorators import *",
                             # This is a simplified version of the corrected mass error calculation (only taking the uncertainty on the SV into account)
                             "invSqMassPt   =  1/sqrt( M*M +  BPVPTFLIGHT*BPVPTFLIGHT )",
                             "dMcorrdPt     =  0.5 * invSqMassPt * 2 * BPVPTFLIGHT + 1",
-                            "A             =  PX*(VFASPF(VX) - BPV(VX))+ PY*(VFASPF(VY) - BPV(VY)) + PZ*(VFASPF(VZ) - BPV(VZ))", 
+                            "A             =  PX*(VFASPF(VX) - BPV(VX))+ PY*(VFASPF(VY) - BPV(VY)) + PZ*(VFASPF(VZ) - BPV(VZ))",
                             "B             =  (VFASPF(VX) - BPV(VX))*(VFASPF(VX) - BPV(VX)) + (VFASPF(VY) - BPV(VY))*(VFASPF(VY) - BPV(VY)) + (VFASPF(VZ) - BPV(VZ))*(VFASPF(VZ) - BPV(VZ))",
                             "dAdx_sv       =  PX",
                             "dAdy_sv       =  PY",
                             "dAdz_sv       =  PZ",
-                            "dBdx_sv       =  2*(VFASPF(VX) - BPV(VX))", 
+                            "dBdx_sv       =  2*(VFASPF(VX) - BPV(VX))",
                             "dBdy_sv       =  2*(VFASPF(VY) - BPV(VY))",
                             "dBdz_sv       =  2*(VFASPF(VZ) - BPV(VZ))",
                             "dMcdx_sv      =  dMcorrdPt * 1/BPVPTFLIGHT * -0.5 * (2*A*B*dAdx_sv - A*A*dBdx_sv)/(B*B)",
@@ -140,7 +140,7 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
                             # corrected mass with a missing pion (instead of a neutrino)
                             "MCORRPi       = (BPVCORRM - BPVPTFLIGHT) + sqrt(BPVPTFLIGHT*BPVPTFLIGHT + 139.57*139.57)"
                             ]
-        
+
         self.registerLine( self._KPiPi_DipionSSNarrow_Downstream_line() )
         self.registerLine( self._KPiPi_DipionSSNarrow_Long_line() )
         self.registerLine( self._KPiPi_DipionSSWide_line() )
@@ -149,7 +149,7 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         self.registerLine( self._KPiPi_DipionOSWide_line() )
         self.registerLine( self._KPiPiPi_DipionSS_line() )
         self.registerLine( self._KPiPiPi_DipionOS_line() )
-        
+
 
     ### The lines
     def _KPiPi_DipionSSNarrow_Downstream_line( self ):
@@ -172,7 +172,7 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
                              prescale =  self.config["DipionSSWidePrescale"],
                              RequiredRawEvents = ["Trigger","Calo","Velo","Tracker"],
                              algos = [ self._dipionFilterSSWide()])
-    
+
     def _KPiPi_DipionOSNarrow_Downstream_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'_K2PiPiDipionOSNarrow_Downstream_Line',
@@ -207,13 +207,13 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
                              prescale =  self.config["TripionOSPrescale"],
                              RequiredRawEvents = ["Trigger","Calo","Velo","Tracker"],
                              algos = [ self._tripionFilterDipionOS()])
-        
+
 
 
     ### The particle (and composite) selection criteria
     #def _pionSelection( self ):
     #    return
-    
+
     def _tagPionSelection( self ):
         return "(P > %(PionMinP)s ) & (PT > %(PionMinPT)s ) & (PROBNNghost < %(PionProbNNghost)s ) & (PROBNNpi > %(PionProbNNpi)s ) & (MIPCHI2DV(PRIMARY) > %(PionIPCHI2)s ) & (PROBNNp < %(PionProbNNp)s )"
 
@@ -222,13 +222,13 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
                " & (BPVVDCHI2 > %(DipionFlightDistanceChi2)s ) & (VFASPF(VZ) > %(DipionMinVertexZ)s ) & (VFASPF(VZ) < %(DipionMaxVertexZ)s )" \
                " & (PT > %(DipionMinPT)s ) & (P > %(DipionMinP)s ) & (BPVDIRA > %(DipionDira)s ) & ( MCORRPi < %(DipionMaxMCorrNarrow)s )" \
                " & (PSEUDOERR < %(DipionMCorrPseudoErrNarrow)s )"
-    
+
     def _dipionSelectionWide( self ):
         return "(M > %(DipionMinMassWide)s )  & (M < %(DipionMaxMassWide)s ) & (VFASPF(VCHI2/VDOF) < %(DipionVertexChi2PerDoF)s )"\
                " & (BPVVDCHI2 > %(DipionFlightDistanceChi2)s ) & (VFASPF(VZ) > %(DipionMinVertexZ)s ) & (VFASPF(VZ) < %(DipionMaxVertexZ)s )" \
                " & (PT > %(DipionMinPT)s ) & (P > %(DipionMinP)s ) & (BPVDIRA > %(DipionDira)s ) & ( MCORRPi < %(DipionMaxMCorrWide)s )" \
                " & (PSEUDOERR < %(DipionMCorrPseudoErrWide)s )"
-    
+
     def _tripionSelection( self ):
         return "(M > %(TripionMinMass)s )  & (M < %(TripionMaxMass)s ) & (VFASPF(VCHI2/VDOF) < %(TripionVertexChi2PerDoF)s )"\
                " & (BPVVDCHI2 > %(TripionFlightDistanceChi2)s ) & (VFASPF(VZ) > %(TripionMinVertexZ)s ) & (VFASPF(VZ) < %(TripionMaxVertexZ)s )"
@@ -238,26 +238,26 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
     def _downPionFilter( self ):
         if self._downPionSel is not None:
             return self._downPionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsDownPions
-        
+
         _pi = FilterDesktop( Code = 'ALL' )
         _piSel=Selection("DownPi_for"+self._name,
                          Algorithm=_pi,
                          RequiredSelections = [StdNoPIDsDownPions])
         self._downPionSel=_piSel
         return _piSel
-    
+
     def _longPionFilter( self ):
         if self._longPionSel is not None:
             return self._longPionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions
-        
+
         _pi = FilterDesktop( Code = "(MIPCHI2DV(PRIMARY) > 49.0)" )
         _piSel=Selection("LongPi_for"+self._name,
                          Algorithm=_pi,
@@ -270,7 +270,7 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
     def _dipionFilterSSNarrowDownstream( self ):
         if self._dipionSelSSNarrowDownstream is not None:
            return self._dipionSelSSNarrowDownstream
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
@@ -282,20 +282,20 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
             )
 
         _k2pipi.Preambulo = self.mCorrCalc
-        
+
 
         _dipionSel=Selection("Kplus2PiPiSSNarrowDownstream_for"+self._name,
                              Algorithm= _k2pipi,
                              RequiredSelections = [self._downPionFilter()])
-      
+
         self._dipionSelSSNarrowDownstream = _dipionSel
-      
+
         return _dipionSel
 
     def _dipionFilterSSNarrowLong( self ):
         if self._dipionSelSSNarrowLong is not None:
            return self._dipionSelSSNarrowLong
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
@@ -307,21 +307,21 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
             )
 
         _k2pipi.Preambulo = self.mCorrCalc
-        
+
 
         _dipionSel=Selection("Kplus2PiPiSSNarrowLong_for"+self._name,
                              Algorithm= _k2pipi,
                              RequiredSelections = [self._longPionFilter()])
-      
+
         self._dipionSelSSNarrowLong = _dipionSel
-      
+
         return _dipionSel
 
 
     def _dipionFilterSSWide( self ):
         if self._dipionSelSSWide is not None:
            return self._dipionSelSSWide
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
@@ -337,23 +337,23 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         _dipionSel=Selection("Kplus2PiPiSSWide_for"+self._name,
                              Algorithm= _k2pipi,
                              RequiredSelections = [self._downPionFilter(), self._longPionFilter()])
-      
+
         self._dipionSelSSWide = _dipionSel
-      
+
         return _dipionSel
-    
+
 
     #### Dipion ####
     def _dipionFilterOSNarrowDownstream( self ):
         if self._dipionSelOSNarrowDownstream is not None:
            return self._dipionSelOSNarrowDownstream
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
-        
+
         _k2pipi = CombineParticles(
             DecayDescriptors = [ "phi(1020) -> pi+ pi-" ] ,
             DaughtersCuts    = { "pi+" : self._tagPionSelection()  %self._config,
@@ -363,25 +363,25 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
             )
 
         _k2pipi.Preambulo = self.mCorrCalc
-        
+
         _dipionSel=Selection("Kplus2PiPiOSNarrowDownstream_for"+self._name,
                              Algorithm= _k2pipi,
                              RequiredSelections = [self._downPionFilter()])
-      
+
         self._dipionSelOSNarrowDownstream = _dipionSel
-      
+
         return _dipionSel
 
     def _dipionFilterOSNarrowLong( self ):
         if self._dipionSelOSNarrowLong is not None:
            return self._dipionSelOSNarrowLong
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
-        
+
         _k2pipi = CombineParticles(
             DecayDescriptors = [ "phi(1020) -> pi+ pi-" ] ,
             DaughtersCuts    = { "pi+" : self._tagPionSelection()  %self._config,
@@ -391,25 +391,25 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
             )
 
         _k2pipi.Preambulo = self.mCorrCalc
-        
+
         _dipionSel=Selection("Kplus2PiPiOSNarrowLong_for"+self._name,
                              Algorithm= _k2pipi,
                              RequiredSelections = [self._longPionFilter()])
-      
+
         self._dipionSelOSNarrowLong = _dipionSel
-      
+
         return _dipionSel
 
     def _dipionFilterOSWide( self ):
         if self._dipionSelOSWide is not None:
            return self._dipionSelOSWide
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
-        
+
         _k2pipi = CombineParticles(
             DecayDescriptors = [ "phi(1020) -> pi+ pi-" ] ,
             DaughtersCuts    = { "pi+" : self._tagPionSelection()  %self._config,
@@ -419,20 +419,20 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
             )
 
         _k2pipi.Preambulo = self.mCorrCalc
-        
+
         _dipionSel=Selection("Kplus2PiPiOSWide_for"+self._name,
                              Algorithm= _k2pipi,
                              RequiredSelections = [self._downPionFilter(), self._longPionFilter()])
-      
+
         self._dipionSelOSWide = _dipionSel
-      
+
         return _dipionSel
 
     #### Tripion ####
     def _tripionFilterDipionSS( self ):
         #if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
@@ -446,16 +446,16 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         _tripionSel=Selection("Kplus2PiPiPi_DipionSS_for"+self._name,
                               Algorithm= _k2pipipi,
                               RequiredSelections = [self._downPionFilter(), self._longPionFilter(), self._dipionSelSSWide])
-      
+
         #self._tripionSelDipionSS = _tripionSel
-        
+
         return _tripionSel
 
     #### Tripion ####
     def _tripionFilterDipionOS( self ):
         #if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
@@ -469,11 +469,7 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         _tripionSel=Selection("Kplus2PiPiPi_DipionOS_for"+self._name,
                               Algorithm= _k2pipipi,
                               RequiredSelections = [self._downPionFilter(), self._longPionFilter(), self._dipionSelOSWide])
-      
-        #self._tripionSelDipionOS = _tripionSel
-        
-        return _tripionSel
-    
-
 
+        #self._tripionSelDipionOS = _tripionSel
 
+        return _tripionSel
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py
index 4038773ec74e16190ea24b66224346c90b584365..d00acea02ad2a7832560d8d5bdaa44c9e7372595 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py
@@ -38,7 +38,7 @@ default_config = {
                      'VertexCHI2'         : 5,
                      'FDCHI2'             : 225,
                      'DIRA'               : 0.9995
-                      
+
                      },
     'STREAMS'     :  ['Leptonic']
 }
@@ -58,18 +58,18 @@ class LowPTMuConf( LineBuilder ):
 
     def __init__( self, name, config ) :
         LineBuilder.__init__( self, name, config )
-        
+
         self.config=config
 
 
-        self.selStdAllNoPIDMuons = StdAllNoPIDsMuons 
+        self.selStdAllNoPIDMuons = StdAllNoPIDsMuons
         #Detached
         self.sel_DetachedLowPT  = makeLowPTSelection( name + "_JpsiFromBLowPTCombine", self.selStdAllNoPIDMuons,self )
-        self.line_DetachedLowPT = StrippingLine( name + '_JpsiFromBLowPT', 
-                                                 prescale = config[ 'Prescale' ], 
-                                                 selection = self.sel_DetachedLowPT, 
+        self.line_DetachedLowPT = StrippingLine( name + '_JpsiFromBLowPT',
+                                                 prescale = config[ 'Prescale' ],
+                                                 selection = self.sel_DetachedLowPT,
                                                  RequiredRawEvents = ["Muon"]
-                                                 ) 
+                                                 )
         self.registerLine( self.line_DetachedLowPT )
 
 
@@ -79,12 +79,12 @@ Selection Makers
 '''
 def makeLowPTSelection( name, muons,self):
 
-    mucocut = '(MIPCHI2DV(PRIMARY)>%(ProbeIPCHI2)s)' 
+    mucocut = '(MIPCHI2DV(PRIMARY)>%(ProbeIPCHI2)s)'
     combination = CombineParticles( DecayDescriptor = 'J/psi(1S) -> mu+ mu-',
                                     DaughtersCuts = { 'mu+' : mucocut % self.config, 'mu-' : mucocut % self.config},
                                     CombinationCut = "(ADAMASS('J/psi(1S)')<%(MassWindow)s*MeV)" % self.config,
                                     MotherCut = "(VFASPF(VCHI2/VDOF)<%(VertexCHI2)s) & (BPVVDCHI2 > %(FDCHI2)s) & (BPVDIRA > %(DIRA)s) & ( ( (CHILDCUT(ISMUON,1)) & (CHILDCUT((PT>%(TagPT)s),1)) & (CHILDCUT((MIPCHI2DV(PRIMARY)>%(TagIPCHI2)s),1)) ) | ((CHILDCUT(ISMUON,2)) & (CHILDCUT((PT>%(TagPT)s),2)) & (CHILDCUT((MIPCHI2DV(PRIMARY)>%(TagIPCHI2)s),2)) ) ) " % self.config
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [muons] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py
index 191dfde9f59b3f9bb5e03ed545e1b9166f324c50..ee790dfd7875fef70ec2297965cb3961a8a57879 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py
@@ -29,9 +29,9 @@ __version__ = '$Revision: 1.5 $'
 __all__     = ( 'MuIDCalibConf',
                 'makePromptSelection',
                 'makeDetachedSelection',
-                'makeDetachedNoMIPSelection', 
-                'makeDetachedNoMIPNoPCutSelection', 
-                'makeDetachedNoMIPHiPSelection', 
+                'makeDetachedNoMIPSelection',
+                'makeDetachedNoMIPNoPCutSelection',
+                'makeDetachedNoMIPHiPSelection',
                 'makeDetachedNoMIPKSelection',
                 'makeLambdacSelection',
                 'makeTISTOS',
@@ -54,8 +54,8 @@ default_config = {
                      'KISMUONFromLambdacPrescale' : 0.,
                      'PiISMUONFromLambdacPrescale': 0.,
                      'PISMUONFromLambdacPrescale' : 0.},
-    'STREAMS'     :  { 'Leptonic' : ['StrippingMuIDCalib_JpsiFromBNoPIDNoMip', 
-                                'StrippingMuIDCalib_JpsiKFromBNoPIDNoMip', 
+    'STREAMS'     :  { 'Leptonic' : ['StrippingMuIDCalib_JpsiFromBNoPIDNoMip',
+                                'StrippingMuIDCalib_JpsiKFromBNoPIDNoMip',
                                 'StrippingMuIDCalib_FromLambdacDecay'] }
     }
 
@@ -77,120 +77,120 @@ class MuIDCalibConf( LineBuilder ):
         LineBuilder.__init__( self, name, config )
 
 
-        self.selStdAllNoPIDMuons = StdAllNoPIDsMuons 
-        self.selStdNoPIDMuons    = StdNoPIDsMuons 
+        self.selStdAllNoPIDMuons = StdAllNoPIDsMuons
+        self.selStdNoPIDMuons    = StdNoPIDsMuons
         #self.selStdNoPIDMuons_L0   = makeTISTOS( name + "muons_L0"  , self.selStdNoPIDMuons   ,   "L0.*Physics.*Decision%TIS"   )
         #self.selStdNoPIDMuons_Hlt1 = makeTISTOS( name + "muons_Hlt1", self.selStdNoPIDMuons_L0,   "Hlt1.*Physics.*Decision%TIS" )
         #self.selStdNoPIDMuons_Hlt2 = makeTISTOS( name + "muons_Hlt2", self.selStdNoPIDMuons_Hlt1, "Hlt2.*Physics.*Decision%TIS" )
 
-        self.selStdNoPIDKaons    = StdNoPIDsKaons 
+        self.selStdNoPIDKaons    = StdNoPIDsKaons
         self.selStdNoPIDPions    = StdNoPIDsPions
         self.selStdNoPIDProtons  = StdNoPIDsProtons
 
         #Prompt line
         self.sel_Prompt  = makePromptSelection( name + "_Combine", self.selStdAllNoPIDMuons )
-        self.line_Prompt = StrippingLine( name + '_JpsiNoPID', 
-                                          prescale = config[ 'PromptPrescale' ], 
-                                          selection = self.sel_Prompt, 
+        self.line_Prompt = StrippingLine( name + '_JpsiNoPID',
+                                          prescale = config[ 'PromptPrescale' ],
+                                          selection = self.sel_Prompt,
                                           RequiredRawEvents = ["Muon"],
-                                          RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_Prompt.algorithm().DecayDescriptor)  ] 
-                                          ) 
+                                          RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_Prompt.algorithm().DecayDescriptor)  ]
+                                          )
 
         #Detached
         self.sel_Detached  = makeDetachedSelection( name + "_FromBCombine", self.selStdNoPIDMuons)
-        self.line_Detached = StrippingLine( name + '_JpsiFromBNoPID', 
-                                            prescale = config[ 'DetachedPrescale' ], 
-                                            selection = self.sel_Detached, 
+        self.line_Detached = StrippingLine( name + '_JpsiFromBNoPID',
+                                            prescale = config[ 'DetachedPrescale' ],
+                                            selection = self.sel_Detached,
                                             RequiredRawEvents = ["Muon"],
                                             RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_Detached.algorithm().DecayDescriptor)  ]
-                                            ) 
+                                            )
 
         self.sel_DetachedNoMIP  = makeDetachedNoMIPSelection( name + "_FromBNoMipCombine", self.selStdNoPIDMuons )
-        self.line_DetachedNoMIP = StrippingLine( name + '_JpsiFromBNoPIDNoMip', 
-                                                 prescale = config[ 'DetachedNoMIPPrescale' ], 
-                                                 selection = self.sel_DetachedNoMIP, 
+        self.line_DetachedNoMIP = StrippingLine( name + '_JpsiFromBNoPIDNoMip',
+                                                 prescale = config[ 'DetachedNoMIPPrescale' ],
+                                                 selection = self.sel_DetachedNoMIP,
                                                  RequiredRawEvents = ["Muon"],
                                                  RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_DetachedNoMIP.algorithm().DecayDescriptor)  ]
-                                                 ) 
-                 
+                                                 )
+
         self.sel_DetachedNoMIPHiP  = makeDetachedNoMIPHiPSelection( name + "_FromBNoMipHiPCombine", self.selStdNoPIDMuons )
-        self.line_DetachedNoMIPHiP = StrippingLine( name + '_JpsiFromBNoPIDNoMipHiP', 
-                                                    prescale = config[ 'DetachedNoMIPHiPPrescale' ], 
-                                                    selection = self.sel_DetachedNoMIPHiP, 
+        self.line_DetachedNoMIPHiP = StrippingLine( name + '_JpsiFromBNoPIDNoMipHiP',
+                                                    prescale = config[ 'DetachedNoMIPHiPPrescale' ],
+                                                    selection = self.sel_DetachedNoMIPHiP,
                                                     RequiredRawEvents = ["Muon"],
                                                     RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_DetachedNoMIPHiP.algorithm().DecayDescriptor)  ]
-                                                    ) 
+                                                    )
 
         self.sel_DetachedNoMIPNoPCut  = makeDetachedNoMIPNoPCutSelection( name + "_FromBNoMipCombineNoPCut", self.selStdNoPIDMuons )
         self.sel_DetachedNoMIPK  = makeDetachedNoMIPKSelection( name + "_FromBNoMipWithKCombine", self.sel_DetachedNoMIPNoPCut, self.selStdNoPIDKaons )
-        self.line_DetachedNoMIPK = StrippingLine( name + '_JpsiKFromBNoPIDNoMip', 
-                                                  prescale = config[ 'DetachedNoMIPKPrescale' ], 
-                                                  selection = self.sel_DetachedNoMIPK, 
+        self.line_DetachedNoMIPK = StrippingLine( name + '_JpsiKFromBNoPIDNoMip',
+                                                  prescale = config[ 'DetachedNoMIPKPrescale' ],
+                                                  selection = self.sel_DetachedNoMIPK,
                                                   MDSTFlag = False,
                                                   RequiredRawEvents = ["Muon"],
                                                   RelatedInfoTools = [  addRelInfoMuonIsolation('[B+ ->  ( J/psi(1S) -> mu+ mu-) K+ ]CC')  ]
-                                                  ) 
+                                                  )
 
         #lambda_c
         self.sel_Lambdac = makeLambdacSelection( name + '_FromLambdac', "", self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_Lambdac = StrippingLine( name + '_FromLambdacDecay', 
-                                           prescale = config[ 'FromLambdacPrescale' ], 
-                                           selection = self.sel_Lambdac, 
+        self.line_Lambdac = StrippingLine( name + '_FromLambdacDecay',
+                                           prescale = config[ 'FromLambdacPrescale' ],
+                                           selection = self.sel_Lambdac,
                                            MDSTFlag = False,
                                            RequiredRawEvents = ["Muon"],
                                            RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_Lambdac.algorithm().DecayDescriptor)  ]
-                                           ) 
+                                           )
 
         self.sel_PiLambdac = makeLambdacSelection( name + '_PiFromLambdac', "pion", self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_PiLambdac = StrippingLine( name + '_PiFromLambdacDecay', 
-                                             prescale = config[ 'PiFromLambdacPrescale' ], 
-                                             selection = self.sel_PiLambdac, 
+        self.line_PiLambdac = StrippingLine( name + '_PiFromLambdacDecay',
+                                             prescale = config[ 'PiFromLambdacPrescale' ],
+                                             selection = self.sel_PiLambdac,
                                              RequiredRawEvents = ["Muon"],
                                              RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_PiLambdac.algorithm().DecayDescriptor)  ]
-                                             ) 
+                                             )
 
         self.sel_KLambdac = makeLambdacSelection( name + '_KFromLambdac', "kaon", self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_KLambdac = StrippingLine( name + '_KFromLambdacDecay', 
-                                            prescale = config[ 'KFromLambdacPrescale' ], 
-                                            selection = self.sel_KLambdac, 
+        self.line_KLambdac = StrippingLine( name + '_KFromLambdacDecay',
+                                            prescale = config[ 'KFromLambdacPrescale' ],
+                                            selection = self.sel_KLambdac,
                                             RequiredRawEvents = ["Muon"],
                                             RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_KLambdac.algorithm().DecayDescriptor)  ]
-                                            ) 
+                                            )
 
         self.sel_PLambdac = makeLambdacSelection( name + '_PFromLambdac', "proton", self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_PLambdac = StrippingLine( name + '_PFromLambdacDecay', 
-                                            prescale = config[ 'PFromLambdacPrescale' ], 
-                                            selection = self.sel_PLambdac, 
+        self.line_PLambdac = StrippingLine( name + '_PFromLambdacDecay',
+                                            prescale = config[ 'PFromLambdacPrescale' ],
+                                            selection = self.sel_PLambdac,
                                             RequiredRawEvents = ["Muon"],
                                             RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_PLambdac.algorithm().DecayDescriptor)  ]
-                                            ) 
+                                            )
 
-        self.sel_PiISMUONLambdac = makeLambdacSelection( name + '_PiISMUONFromLambdac', "pionISMUON", 
+        self.sel_PiISMUONLambdac = makeLambdacSelection( name + '_PiISMUONFromLambdac', "pionISMUON",
                                                          self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_PiISMUONLambdac = StrippingLine( name + '_PiISMUONFromLambdacDecay', 
-                                                   prescale = config[ 'PiISMUONFromLambdacPrescale' ], 
-                                                   selection = self.sel_PiISMUONLambdac, 
+        self.line_PiISMUONLambdac = StrippingLine( name + '_PiISMUONFromLambdacDecay',
+                                                   prescale = config[ 'PiISMUONFromLambdacPrescale' ],
+                                                   selection = self.sel_PiISMUONLambdac,
                                                    RequiredRawEvents = ["Muon"],
                                                    RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_PiISMUONLambdac.algorithm().DecayDescriptor)  ]
-                                                   ) 
+                                                   )
 
-        self.sel_KISMUONLambdac = makeLambdacSelection( name + '_KISMUONFromLambdac', "kaonISMUON", 
+        self.sel_KISMUONLambdac = makeLambdacSelection( name + '_KISMUONFromLambdac', "kaonISMUON",
                                                         self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_KISMUONLambdac = StrippingLine( name + '_KISMUONFromLambdacDecay', 
-                                                  prescale = config[ 'KISMUONFromLambdacPrescale' ], 
-                                                  selection = self.sel_KISMUONLambdac, 
+        self.line_KISMUONLambdac = StrippingLine( name + '_KISMUONFromLambdacDecay',
+                                                  prescale = config[ 'KISMUONFromLambdacPrescale' ],
+                                                  selection = self.sel_KISMUONLambdac,
                                                   RequiredRawEvents = ["Muon"],
                                                   RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_KISMUONLambdac.algorithm().DecayDescriptor)  ]
-                                                  ) 
+                                                  )
 
         self.sel_PISMUONLambdac = makeLambdacSelection( name + '_PISMUONFromLambdac', "protonISMUON"
                                                         , self.selStdNoPIDPions, self.selStdNoPIDKaons, self.selStdNoPIDProtons)
-        self.line_PISMUONLambdac = StrippingLine( name + '_PISMUONFromLambdacDecay', 
-                                                  prescale = config[ 'PISMUONFromLambdacPrescale' ], 
-                                                  selection = self.sel_PISMUONLambdac, 
+        self.line_PISMUONLambdac = StrippingLine( name + '_PISMUONFromLambdacDecay',
+                                                  prescale = config[ 'PISMUONFromLambdacPrescale' ],
+                                                  selection = self.sel_PISMUONLambdac,
                                                   RequiredRawEvents = ["Muon"],
                                                   RelatedInfoTools = [addRelInfoMuonIsolation(self.sel_PISMUONLambdac.algorithm().DecayDescriptor)  ]
-                                                  ) 
+                                                  )
 
         #self.registerLine( self.line_Prompt )
         #self.registerLine( self.line_Detached )
@@ -229,7 +229,7 @@ def makePromptSelection( name, muons ):
                                     CombinationCut = "(ADAMASS('J/psi(1S)')<200*MeV)",
                                     MotherCut = "(VFASPF(VCHI2/VDOF)<5) & ( " + child1cuts + " | " + child2cuts + " ) "
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [muons] )
 
@@ -245,15 +245,15 @@ def makeDetachedSelection( name, muons ):
     tag2cuts = " (CHILDCUT(ISMUON,2)) & (CHILDCUT((P>6*GeV),2)) & (CHILDCUT((PT>1.5*GeV),2)) & (CHILDCUT((MIPDV(PRIMARY)>0.12),2)) "
     probe2cuts = " ( (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloEcalE,-10000)<1000*MeV),2)) & (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloHcalE,-10000)<4000*MeV),2)) & (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloEcalE,-10000)>-10*MeV),2)) & (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloHcalE,-10000)>1000*MeV),2)) ) "
     probe1cuts = " ( (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloEcalE,-10000)<1000*MeV),1)) & (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloHcalE,-10000)<4000*MeV),1)) & (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloEcalE,-10000)>-10*MeV),1)) & (CHILDCUT((PPINFO(LHCb.ProtoParticle.CaloHcalE,-10000)>1000*MeV),1)) )  "
-    child1cuts = tag1cuts + " & " + probe2cuts 
-    child2cuts = tag2cuts + " & " + probe1cuts 
+    child1cuts = tag1cuts + " & " + probe2cuts
+    child2cuts = tag2cuts + " & " + probe1cuts
 
     combination = CombineParticles( DecayDescriptor = 'J/psi(1S) -> mu+ mu-',
                                     DaughtersCuts = { 'mu+' : mucocut , 'mu-' : mucocut },
                                     CombinationCut = "(ADAMASS('J/psi(1S)')<200*MeV)",
                                     MotherCut = "(VFASPF(VCHI2/VDOF)<5) & (BPVVDCHI2 > 225) & ( ( " + child1cuts + " ) | (" + child2cuts + " ) ) "
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [muons] )
 
@@ -273,7 +273,7 @@ def makeDetachedNoMIPSelection( name, muons ):
                                     CombinationCut = "(ADAMASS('J/psi(1S)')<200*MeV)",
                                     MotherCut = "(VFASPF(VCHI2/VDOF)<5) & (BPVVDCHI2 > 225) & ( ( " + tag1cuts + " ) | (" + tag2cuts + " ) ) "
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [muons] )
 
@@ -292,7 +292,7 @@ def makeDetachedNoMIPNoPCutSelection( name, muons ):
                                     CombinationCut = "(ADAMASS('J/psi(1S)')<200*MeV)",
                                     MotherCut = "(VFASPF(VCHI2/VDOF)<5) & (BPVVDCHI2 > 225) & ( ( " + tag1cuts + " ) | (" + tag2cuts + " ) ) "
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [muons] )
 
@@ -309,15 +309,15 @@ def makeDetachedNoMIPHiPSelection( name, muons ):
     probe1cuts = "(CHILDCUT(P>40*GeV,1))"
     probe2cuts = "(CHILDCUT(P>40*GeV,2))"
 
-    child1cuts = tag1cuts + " & " + probe2cuts 
-    child2cuts = tag2cuts + " & " + probe1cuts 
+    child1cuts = tag1cuts + " & " + probe2cuts
+    child2cuts = tag2cuts + " & " + probe1cuts
 
     combination = CombineParticles( DecayDescriptor = 'J/psi(1S) -> mu+ mu-',
                                     DaughtersCuts = { 'mu+' : mucocut , 'mu-' : mucocut },
                                     CombinationCut = "(ADAMASS('J/psi(1S)')<200*MeV)",
                                     MotherCut = "(VFASPF(VCHI2/VDOF)<5) & (BPVVDCHI2 > 225) & ( ( " + child1cuts + " ) | (" + child2cuts + " ) ) "
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [muons] )
 
@@ -329,7 +329,7 @@ def makeDetachedNoMIPKSelection( name, jpsis, kaons ):
                                     CombinationCut = "ADAMASS('B+') < 500.*MeV",
                                     MotherCut = "(BPVIPCHI2()<25)"
                                     )
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = combination,
                       RequiredSelections = [ jpsis, kaons ] )
 
@@ -364,7 +364,7 @@ def makeLambdacSelection( name, line, pions, kaons, protons ) :
     combcuts = "( ADAMASS('Lambda_c+')<150*MeV ) & ( APT>1.*GeV ) & ( ADOCACHI2CUT(50, '') )"
     momcuts  = "( M > 2.240*GeV ) & ( M<2.330*GeV ) & ( VFASPF(VCHI2/VDOF)<8 ) & ( BPVDIRA>0.99999 ) & ( MIPCHI2DV(PRIMARY)<4. )"
     momcuts += " & in_range( 0.85*GeV, M13, 0.95*GeV ) & ( (WM( 'K-' , 'pi+' , 'pi+' )>1.89*GeV) |  (WM( 'K-' , 'pi+' , 'pi+' )<1.80*GeV) )" #D+->Kpipi removal
-    LambdaC = CombineParticles ( 
+    LambdaC = CombineParticles (
         DecayDescriptor = "[Lambda_c+ -> K- p+ pi+]cc",
         DaughtersCuts = {
             "K-"  : kcuts,
@@ -375,7 +375,7 @@ def makeLambdacSelection( name, line, pions, kaons, protons ) :
         MotherCut = momcuts
         )
 
-    return Selection( name, 
+    return Selection( name,
                       Algorithm = LambdaC,
                       RequiredSelections = [ pions, kaons, protons ] )
 
@@ -395,11 +395,11 @@ def makeTISTOS( name, sel, trigger ) :
 
 
 
-def addRelInfoMuonIsolation( decdes ):    
+def addRelInfoMuonIsolation( decdes ):
     import re
     _DauLoc={}
     _daughters = re.match(r'(.*)->([ |\[]*)([^\]]+)(.*)', decdes)
-    if _daughters:    
+    if _daughters:
         _particles = _daughters.group(3).split()
         _ip=1
         _gp=1
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index bf79321dd6b9acc22d77bb719f4f73d4bce26c92..5b76bb8fccfce18a485eca1f16aec1286fa26e33 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -51,7 +51,7 @@ default_config =  {
     'WGs'        : ['Calib'],
     'BUILDERTYPE': 'NoPIDDstarWithD02RSKPiConf',
     'CONFIG'     :{
-    
+
       'DaugPt'           : 250 * MeV      ## GeV
     , 'DaugP'            : 2.0 * GeV      ## GeV
     , 'DaugIPChi2'       : 16             ## unitless
@@ -111,7 +111,7 @@ class NoPIDDstarWithD02RSKPiConf(LineBuilder) :
                                              selection = self.selDstar2D0Pi,
                                              RequiredRawEvents = ["Muon"],
                                              RelatedInfoTools = [  addRelInfoMuonIsolation('[D*(2010)+ ->  ( D0 -> K- pi+ ) pi+]CC')  ]
-                                             )  
+                                             )
 
         self.registerLine(self.Dstar2D0Pi_line)
 
@@ -123,7 +123,7 @@ def D0 ( name,
     """
     Selection for D0
     """
-    
+
     _D0 = CombineParticles()
     _D0.DecayDescriptor = "[D0 -> K- pi+]cc"
     dauCutStr = "(PT > %(DaugPt)s) & (P > %(DaugP)s) & (TRCHI2DOF < %(DaugTrkChi2)s) & (MIPCHI2DV(PRIMARY) > %(DaugIPChi2)s)" %locals()['config']
@@ -145,8 +145,8 @@ def D0 ( name,
    # & ( ADWM( 'D0' , WM( 'pi-' , 'pi+') ) > %(PiPi_WrongMass)s)
    # """
     _D0.MotherCut = mothercut %locals()['config']
-    
-    if Monitor != None :    
+
+    if Monitor != None :
         _D0.Preambulo    = [
             ## define historam type (shortcut)
             "Histo  = Gaudi.Histo1DDef"  ,
@@ -162,13 +162,13 @@ def D0 ( name,
         >> process ( y )
         >> EMPTY
             """
-            
+
     D0 = Selection("SelD02RSKPiFor"+name,
                    Algorithm = _D0,
                    RequiredSelections = [StdAllNoPIDsKaons,
                                          StdAllNoPIDsPions])
     return D0
-    
+
 def Dstar ( name,
             D0Sel,
             config,
@@ -176,7 +176,7 @@ def Dstar ( name,
     """
     Selection for D*
     """
-    
+
     _DSt = CombineParticles()
     _DSt.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc"
     slowPiCuts = "(PT>%(SlowPiPt)s) & (TRCHI2DOF < %(SlowPiTrkChi2)s)" %locals()['config']
@@ -185,7 +185,7 @@ def Dstar ( name,
     combcut = """
     (APT>%(DstarPt)s)
     & (ADAMASS('D*(2010)+')<75)
-    & (AM - AM1 < 165 * MeV) 
+    & (AM - AM1 < 165 * MeV)
     """
     _DSt.CombinationCut = combcut %locals()['config']
     mothercut = """
@@ -194,8 +194,8 @@ def Dstar ( name,
     & (M-MAXTREE('D0'==ABSID,M)>%(DeltaM_Min)s)
     """
     _DSt.MotherCut =  mothercut %locals()['config']
-    
-    if Monitor != None :    
+
+    if Monitor != None :
         _DSt.Preambulo    = [
             ## define historam type (shortcut)
             "Histo  = Gaudi.Histo1DDef"  ,
@@ -213,21 +213,21 @@ def Dstar ( name,
         >> process ( y )
         >> EMPTY
         """
-        
+
     DSt = Selection("SelDSt2D0PiFor"+name,
                     Algorithm = _DSt,
                     RequiredSelections = [StdAllNoPIDsPions,
                                           D0Sel])
-    
+
     return DSt
 
 
 
-def addRelInfoMuonIsolation( decdes ):    
+def addRelInfoMuonIsolation( decdes ):
     import re
     _DauLoc={}
     _daughters = re.match(r'(.*)->([ |\[]*)([^\]]+)(.*)', decdes)
-    if _daughters:    
+    if _daughters:
         _particles = _daughters.group(3).split()
         _ip=1
         _gp=1
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py
index 4967ee432553aed3376af7c31fadd0cc971ebd2f..9dc3354dc3984e1b15624f86ffe91bc70e79d589 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py
@@ -52,8 +52,8 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "J/psi(1S) -> mu+ mu-"
         , 'TagAndProbeIndices' : [ 1, 2 ]
@@ -75,8 +75,8 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : True
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[B+ -> mu+ mu- K+]cc"
         , 'TagAndProbeIndices' : [ 1, 2 ]
@@ -102,11 +102,11 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[Lambda0 -> p+ pi-]cc"
-        , 'InputTES'    : [ 'Phys/StdAllNoPIDsPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdAllNoPIDsPions/Particles',
                                    'Phys/StdAllNoPIDsProtons/Particles' ]
         , 'DaughtersCuts'       : {
             'p+'               : "( 2.0 * GeV < P ) &  ( TRCHI2DOF < 5 ) & ( MIPCHI2DV(PRIMARY) > 35 )",
@@ -115,10 +115,10 @@ default_config = {
         , 'CombinationCut'     :
             "(AM < 1.5 * GeV) & (ACHI2DOCA(1,2) < 20)"
         , 'MotherCut'          : (
-            "   ( ADMASS ( 'Lambda0') < 25 ) " + 
-            " & ( in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) )" + 
+            "   ( ADMASS ( 'Lambda0') < 25 ) " +
+            " & ( in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) )" +
             " & ( VFASPF ( VZ ) < 2200 ) "  +
-            " & ( in_range ( 0 , BPVLTFITCHI2() , 49 ) )" + 
+            " & ( in_range ( 0 , BPVLTFITCHI2() , 49 ) )" +
             " & ( BPVLTIME() * c_light > 5  ) " +
             " & ( ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20 )"
           )
@@ -154,37 +154,37 @@ default_config = {
       'L02ppiDD' : {
         'CloneLine' : "L02ppi"
         , 'Prescale'  : .14
-        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles',
                                    'Phys/StdNoPIDsDownProtons/Particles' ]
       },
 
       'L02ppiDDHighPT' : {
         'CloneLine' : "L02ppiHighPT"
         , 'Prescale'  : 1.0
-        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles',
                                    'Phys/StdNoPIDsDownProtons/Particles' ]
       },
 
       'L02ppiDDVeryHighPT' : {
         'CloneLine' : "L02ppiVeryHighPT"
         , 'Prescale'  : 1.0
-        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles',
                                    'Phys/StdNoPIDsDownProtons/Particles' ]
       },
 
-      'Jpsi2ee'       : { 
+      'Jpsi2ee'       : {
         'Prescale'      : 1.0
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Calo']
         , 'MDST.DST'    : True
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "J/psi(1S) -> e+ e-"
         , 'TagAndProbeIndices' : [ 1, 2 ]
         , 'InputTES'           : [ 'Phys/StdNoPIDsElectrons/Particles' ]
         , 'DaughtersCuts'       : {
-            'e+' : "( P > 3*GeV ) & ( PT > 500*MeV ) & (BPVIPCHI2()> 9.0)  " 
+            'e+' : "( P > 3*GeV ) & ( PT > 500*MeV ) & (BPVIPCHI2()> 9.0)  "
           }
         , 'TagAndProbeCut'     :
             "(ACHILD(PIDe, #tag) > 5.0) & (ACHILD(PT, #tag) > 1500*MeV) & (ACHILD(P, #tag) > 6*GeV) "
@@ -199,8 +199,8 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Calo']
         , 'MDST.DST'    : True
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[B+ -> e+ e- K+]cc"
         , 'TagAndProbeIndices' : [ 1, 2 ]
@@ -224,8 +224,8 @@ default_config = {
         , 'CheckPV'      : True
         , 'RawEvent'    : ['Calo']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[B+ -> J/psi(1S) K+]cc"
         , 'DecayDescriptorJpsi': "J/psi(1S) -> mu+ mu-"
@@ -252,8 +252,8 @@ default_config = {
         , 'CheckPV'      : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[B+ -> J/psi(1S) K+]cc"
         , 'DecayDescriptorJpsi': "J/psi(1S) -> e+ e-"
@@ -283,8 +283,8 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'       : "KS0 -> pi+ pi-"
         , 'InputTES'              : ['Phys/StdNoPIDsPions/Particles']
@@ -294,50 +294,50 @@ default_config = {
         , 'CombinationCut'        : " ( ADAMASS('KS0') < 100 ) & (ACHI2DOCA(1,2) < 20 )"
         , 'MotherCut'             : (
             "( ADMASS ( 'KS0') < 50 ) & "+
-            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " + 
-            " ( VFASPF ( VZ ) < 2200 ) & " + 
+            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " +
+            " ( VFASPF ( VZ ) < 2200 ) & " +
             " (BPVVDCHI2 > 25) & " +
-            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 9 ) & " + 
+            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 9 ) & " +
             " ( ADWM( 'Lambda0' , WM( 'pi+' , 'p~-') ) > 9 )"
           )
       },
-    
+
       'Ks02pipiDD' : {
         'CloneLine'    : 'Ks02pipi'
         , 'Prescale'   : 0.024
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'InputTES'   : ['Phys/StdNoPIDsDownPions/Particles']
         , 'MotherCut'             : (
             "( ADMASS ( 'KS0') < 50 ) & "+
-            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " + 
-            " ( VFASPF ( VZ ) < 2200 ) & " + 
+            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " +
+            " ( VFASPF ( VZ ) < 2200 ) & " +
             " (BPVVDCHI2 > 25) & " +
-            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 18 ) & " + 
+            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 18 ) & " +
             " ( ADWM( 'Lambda0' , WM( 'pi+' , 'p~-') ) > 18 )"
         )
       },
-    
+
       'Lc2pKpi' : {
         'Prescale':   1.0
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'HLT1'        : "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'HLT2'        : "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
-        , 'InputTES' : [  'Phys/StdNoPIDsKaons/Particles' , 
-                          'Phys/StdNoPIDsPions/Particles' , 
-                          'Phys/StdNoPIDsProtons/Particles' 
+        , 'InputTES' : [  'Phys/StdNoPIDsKaons/Particles' ,
+                          'Phys/StdNoPIDsPions/Particles' ,
+                          'Phys/StdNoPIDsProtons/Particles'
                        ]
         , 'DecayDescriptor' : "[Lambda_c+ -> K- p+ pi+]cc"
         , 'DaughtersCuts' : {
-          'K+'    : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) ' 
-          , 'p+'  : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) ' 
+          'K+'    : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) '
+          , 'p+'  : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) '
           , 'pi+' : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) '
           }
         , 'Combination12Cut' : "( ACHI2DOCA(1,2) < 25 )"
@@ -361,19 +361,19 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import DaVinci__N3BodyDecays 
+from Configurables import DaVinci__N3BodyDecays
 
 class PIDCalibLineBuilder(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
 ##==============================================================================
 ## PIDCalibLineBuilder constructor
 ##==============================================================================
-    def __init__(self, name, config ): 
-      
+    def __init__(self, name, config ):
+
       LineBuilder.__init__(self, name, config)
-      self.name = name 
+      self.name = name
       self.config = config
 
       self.registerLine ( self.buildPIDLine ( 'Jpsi2MuMu'    , bodies = 2) )
@@ -395,9 +395,9 @@ class PIDCalibLineBuilder(LineBuilder):
 
 
 ##==============================================================================
-## PIDCalibLineBuilder::_builderTagProbeCut 
-##    takes as input a cutPattern defining tag and probe requirements using 
-##    #tag and #probe key words which are replaced by tge indices of the 
+## PIDCalibLineBuilder::_builderTagProbeCut
+##    takes as input a cutPattern defining tag and probe requirements using
+##    #tag and #probe key words which are replaced by tge indices of the
 ##    tag and probe particles as defined in the configuration dictionary.
 ##    Tag and probe tracks are then swapped and the resulting cuts AND-ed.
 ##==============================================================================
@@ -412,8 +412,8 @@ class PIDCalibLineBuilder(LineBuilder):
 
 
 ##==============================================================================
-## PIDCalibLineBuilder::_resolveCloning 
-##    check if the config declares a "CloneLine" keyword, if yes it clones the 
+## PIDCalibLineBuilder::_resolveCloning
+##    check if the config declares a "CloneLine" keyword, if yes it clones the
 ##    pointed line, if the latter declares a "CloneLine" keyword imports from
 ##    that the missing keywords and so on.
 ##    Returns a _copy_ of the updated dictionary
@@ -425,7 +425,7 @@ class PIDCalibLineBuilder(LineBuilder):
       while 'CloneLine' in _config:
 ###        print "Cloning " + configRowId + " from " + _config['CloneLine']
         _newConfig = {}
-        _newConfig.update ( self.config[_config['CloneLine']] ) 
+        _newConfig.update ( self.config[_config['CloneLine']] )
         del _config['CloneLine']
         _newConfig.update ( _config )
         _config = _newConfig
@@ -434,7 +434,7 @@ class PIDCalibLineBuilder(LineBuilder):
 
 ##==============================================================================
 ## PIDCalibLineBuilder::buildPIDLine
-##   Parses the configuration dictionary to build the lines as defined in the 
+##   Parses the configuration dictionary to build the lines as defined in the
 ##   configuration dictionaries
 ##==============================================================================
     def buildPIDLine(self, configRowId, bodies):
@@ -442,7 +442,7 @@ class PIDCalibLineBuilder(LineBuilder):
 
       ## Resolves possible clone statements
       _config = self._resolveCloning(configRowId)
-      
+
       ## Selects the algorithm according to the number of bodies
       _algorithm = None
       if (bodies == 2)   :
@@ -465,7 +465,7 @@ class PIDCalibLineBuilder(LineBuilder):
       _algorithm.DaughtersCuts   = _config['DaughtersCuts']
       _algorithm.MotherCut       = _config['MotherCut']
       _algorithm.DecayDescriptor = _config['DecayDescriptor']
-      
+
       _requiredSelections = [DataOnDemand(x) for x in _config['InputTES']]
       _selection = Selection(self.name + configRowId + 'Selection'
                               , Algorithm = _algorithm
@@ -478,16 +478,16 @@ class PIDCalibLineBuilder(LineBuilder):
                               , EnableFlavourTagging = False
                               , RequiredRawEvents    = _config['RawEvent']
                               , MDSTFlag             = _config['MDST.DST']
-                              , HLT1                 = _config['HLT1'] 
-                              , HLT2                 = _config['HLT2'] 
+                              , HLT1                 = _config['HLT1']
+                              , HLT2                 = _config['HLT2']
                               , algos    = [ _selection ]
                            )
-      
+
       return _line
 
 ##==============================================================================
 ## PIDCalibLineBuilder::buildPIDLineWithJpsi
-##   Parses the configuration dictionary to build the lines as defined in the 
+##   Parses the configuration dictionary to build the lines as defined in the
 ##   configuration dictionaries, this function allows two subsequent fits,
 ##   and uses the output of the former as input of the latter
 ##==============================================================================
@@ -512,7 +512,7 @@ class PIDCalibLineBuilder(LineBuilder):
       _algorithmJpsi.DaughtersCuts   = _config['DaughtersCuts']
       _algorithmJpsi.MotherCut       = _config['JpsiMotherCut']
       _algorithmJpsi.DecayDescriptor = _config['DecayDescriptorJpsi']
-      
+
       _requiredSelections = [DataOnDemand(x) for x in _config['InputTESJpsi']]
       _selectionJpsi = Selection(self.name + configRowId + 'SelectionJpsi'
                                   , Algorithm = _algorithmJpsi
@@ -525,7 +525,7 @@ class PIDCalibLineBuilder(LineBuilder):
       _algorithm.DaughtersCuts   = _config['DaughtersCuts']
       _algorithm.MotherCut       = _config['MotherCut']
       _algorithm.DecayDescriptor = _config['DecayDescriptor']
-      
+
       _requiredSelections = [_selectionJpsi] + [DataOnDemand(x) for x in _config['InputTES']]
       _selection = Selection(self.name + configRowId + 'Selection'
                               , Algorithm = _algorithm
@@ -538,9 +538,9 @@ class PIDCalibLineBuilder(LineBuilder):
                               , EnableFlavourTagging = False
                               , RequiredRawEvents    = _config['RawEvent']
                               , MDSTFlag             = _config['MDST.DST']
-                              , HLT1                 = _config['HLT1'] 
-                              , HLT2                 = _config['HLT2'] 
+                              , HLT1                 = _config['HLT1']
+                              , HLT2                 = _config['HLT2']
                               , algos    = [ _selection ]
                            )
-      
+
       return _line
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingProtonAsym.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingProtonAsym.py
index de15560bc9a14de8065a501f6cbcedb2cfa8f00f..88223780d666e1ba23f69fdf3cb9932816c9d8b6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingProtonAsym.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingProtonAsym.py
@@ -133,7 +133,7 @@ default_config = {
         # Maximum Lambda_b impact parameter chi2
         "LbBPVIPCHI2": 15.0, #20
         # Minimum Lambda_b flight distance fit quality per DOF
-        "LbFDCHI2": 36.0, #50    
+        "LbFDCHI2": 36.0, #50
 
         # Partial B0/B+ mass window, taken from TGenPhaseSpace studies
         "BPartialMassMin": 3500*MeV,
@@ -174,7 +174,7 @@ default_config = {
         "ScMaxWin": 2753*MeV,
         "LcstMinWin": 2292*MeV,
         "LcstMaxWin": 2892*MeV
-             
+
     },
     "STREAMS": {
         "CharmCompleteEvent": [
@@ -216,7 +216,7 @@ class ProtonAsymBuilder(LineBuilder):
     sc_pip_decay_full = "[Sigma_c++ -> Sigma_c++ p+]cc"
     sc_pim_decay_full = "[Sigma_c0 -> Sigma_c0 p+]cc"
     lcst_decay_full = "[Lambda_c(2595)+ -> Lambda_c(2595)+ p+]cc"
- 
+
 
     # Allowed configuration keys
     __configuration_keys__ = default_config["CONFIG"].keys()
@@ -423,7 +423,7 @@ class ProtonAsymBuilder(LineBuilder):
             "sqrt(((CHILD(CHILD(E,1),1)+CHILD(E,2))**2)-((CHILD(CHILD(PX,1),1)+CHILD(PX,2))**2)-((CHILD(CHILD(PY,1),1)+CHILD(PY,2))**2)-((CHILD(CHILD(PZ,1),1)+CHILD(PZ,2))**2))>{0[LcMinWin]}",
             "sqrt(((CHILD(CHILD(E,1),1)+CHILD(E,2))**2)-((CHILD(CHILD(PX,1),1)+CHILD(PX,2))**2)-((CHILD(CHILD(PY,1),1)+CHILD(PY,2))**2)-((CHILD(CHILD(PZ,1),1)+CHILD(PZ,2))**2))<{0[LcMaxWin]}"
             ], self.config)
-        bd_full= self.make_full_mother(        
+        bd_full= self.make_full_mother(
             "BdSelectionFullFor{0}".format(self.name),
             self.bd_decay_full,
             [bd, StdAllNoPIDsProtons],
@@ -436,7 +436,7 @@ class ProtonAsymBuilder(LineBuilder):
             [bu, StdAllNoPIDsProtons],
             b_combination_cuts_full,
             b_mother_cuts_full
-            )            
+            )
         lb_combination_cuts_full = cut_string([
             "AM - 20 > {0[LbMinWin]}",
             "AM + 20 < {0[LbMaxWin]}",
@@ -508,7 +508,7 @@ class ProtonAsymBuilder(LineBuilder):
             lcst_combination_cuts_full,
             lcst_mother_cuts_full
             )
-                        
+
 
 
 
@@ -558,7 +558,7 @@ class ProtonAsymBuilder(LineBuilder):
         self.registerLine(lb_full_3pi_line)
         self.registerLine(sc_full_pip_line)
         self.registerLine(sc_full_pim_line)
-        self.registerLine(lcst_full_line)     
+        self.registerLine(lcst_full_line)
 
 
     def make_line(self, name, selection):
@@ -594,7 +594,7 @@ class ProtonAsymBuilder(LineBuilder):
 
         mother = CombineParticles(
             name="CombineFull{0}".format(name),
-            DecayDescriptors=[decay],                       
+            DecayDescriptors=[decay],
             CombinationCut=combination_cuts,
             MotherCut=mother_cuts
             )
@@ -732,4 +732,3 @@ def cut_string(cuts, config):
     config -- Dictionary of cut values with keys as placeholders in `cuts`
     """
     return "({0})".format(") & (".join(cuts).format(config))
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingSigmacForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingSigmacForPID.py
index 9a858fdc78e6a355f77fce0e77c09ee6f7d56be4..ccef1b3743649ba420d95282b0782a0702e0dd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingSigmacForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingSigmacForPID.py
@@ -30,9 +30,9 @@ from PhysSelPython.Wrappers import   Selection, MergedSelection
 from StandardParticles      import ( StdNoPIDsPions     ,
                                      StdLoosePions      ,
                                      StdLooseKaons      ,
-                                     StdNoPIDsProtons    ,  
+                                     StdNoPIDsProtons    ,
                                      ## for soft pion from Sigma_c
-                                     StdAllNoPIDsPions  
+                                     StdAllNoPIDsPions
                                     )
 
 
@@ -53,7 +53,7 @@ _default_configuration_ = {
     'TrackCuts'       : """
     ( TRCHI2DOF < 4     ) &
     ( PT > 250 * MeV    ) &
-    ( TRGHOSTPROB < 0.5 ) & 
+    ( TRGHOSTPROB < 0.5 ) &
     in_range  ( 2 , ETA , 5 )
     """ ,
     'BasicCuts'       : ' & ( 9 < MIPCHI2DV() ) ' ,
@@ -77,7 +77,7 @@ _default_configuration_ = {
     ## monitoring ?
     'Monitor'     : False ,
     ## prescale
-    'SigmaCPrescale'         : 1.0 ,  
+    'SigmaCPrescale'         : 1.0 ,
     ## ========================================================================
     }
 
@@ -91,7 +91,7 @@ default_config = {
 
 
 # =============================================================================
-# use a bit faster fitter 
+# use a bit faster fitter
 FITTER = 'LoKi::VertexFitter:PUBLIC'
 ## ============================================================================
 class SigmacForPIDConf(LineBuilder) :
@@ -186,10 +186,10 @@ class SigmacForPIDConf(LineBuilder) :
         sel = [
             StrippingLine (
             self.name() + "Line" ,
-            prescale = self['SigmaCPrescale'] , 
+            prescale = self['SigmaCPrescale'] ,
             checkPV  = self['CheckPV'       ] ,
             algos    =     [ self.SigC ()   ]
-            )          
+            )
             ]
         #
         return self._add_selection ( 'PIDLines' , sel )
@@ -208,7 +208,7 @@ class SigmacForPIDConf(LineBuilder) :
     def pionCuts     ( self ) : return self.basicCuts() + self [ 'PionCuts'     ]
     def protonCuts   ( self ) : return self.basicCuts()
     def slowPionCuts ( self ) : return                    self [ 'SlowPionCuts' ]
-  
+
     ## get the selection of kaons
     def kaons ( self ) :
         """
@@ -291,7 +291,7 @@ class SigmacForPIDConf(LineBuilder) :
     ## get the common preambulo:
     def preambulo ( self ) : return self['Preambulo']
 
-  
+
     # =============================================================================
     # Lambda_C -> ( pKpi )  selection
     # =============================================================================
@@ -323,11 +323,11 @@ class SigmacForPIDConf(LineBuilder) :
             ( PT      > %s                   ) &
             ( ADMASS('Lambda_c+') < 40 * MeV ) &
             ( ctau_9 > 100 * micrometer      )
-            """ %  self [ 'pT(Lc+)' ] , 
+            """ %  self [ 'pT(Lc+)' ] ,
             ##
             MotherMonitor  = """
             process ( monitor ( M , hpKpi , 'mass p K pi ' ) ) >> ~EMPTY
-            """ , 
+            """ ,
             #
             ## make the selection faster
             #
@@ -345,7 +345,7 @@ class SigmacForPIDConf(LineBuilder) :
 
         return self._add_selection( 'LambdaCForPID_Selection' ,  sel )
 
-       
+
     # =============================================================================
     # Sigma_C -> Lambda_C pi selection
     # =============================================================================
@@ -365,7 +365,7 @@ class SigmacForPIDConf(LineBuilder) :
             ] ,
             ##
             DaughtersCuts = {
-            #'Lambda_c+' : ' INTREE ( good_proton ) ' , 
+            #'Lambda_c+' : ' INTREE ( good_proton ) ' ,
             'pi+'       :  self.slowPionCuts()
             } ,
             ##
@@ -400,9 +400,8 @@ class SigmacForPIDConf(LineBuilder) :
             )
 
         return self._add_selection( 'SigmaCForPID_Selection' ,  sel )
- 
-  
+
+
 # =============================================================================
 # The END
 # =============================================================================
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToK3Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToK3Pi.py
index efafff3d43fc45d3b39228fce902ddae150a7129..5a46b07e556334cba9a74e05bfe873bb1aaff41c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToK3Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToK3Pi.py
@@ -22,13 +22,13 @@ from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from SelPy.utils import ( UniquelyNamedObject,
                           ClonableObject,
                           SelectionBase )
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, 
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, 
+from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
+                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
                            PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                          TrackStateInitAlg, TrackStateInitTool) 
+                          TrackStateInitAlg, TrackStateInitTool)
 from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
                                            ConfiguredForwardStraightLineEventFitter)
-    
+
 
 __all__ = ('TrackEffD0ToK3PiAllLinesConf',
            'TOSFilter',
@@ -59,44 +59,44 @@ default_config = {
             }
     }
 class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__=config
         self.name = name
-        
+
 
         ##### long track kaons and pions
         self.PionCuts = "(PIDK < %(Pion_MAX_PIDK)s) & (TRGHOSTPROB < 0.35)" %config
         self.KaonCuts = "(PIDK > %(Kaon_MIN_PIDK)s) & (TRGHOSTPROB < 0.35)" %config
-        
+
         SelLongPions = Selection("SelLongPionsFor"+name,
                                  Algorithm = FilterDesktop(name="LongPionFilterFor"+name,
                                                            Code=self.PionCuts),
                                  RequiredSelections = [StdLoosePions])
-        
+
         SelLongKaons = Selection("SelLongKaonsFor"+name,
                                  Algorithm = FilterDesktop(name="LongKaonFilterFor"+name,
                                                            Code=self.KaonCuts),
                                  RequiredSelections = [StdLooseKaons])
-        
+
         ###### the velo tracking
         self.VeloProtoOutputLocation = 'Rec/ProtoP/VeloProtosFor%s'%self.name
         self.VeloTrackOutputLocation="Rec/Track/MyVeloFor%s"%self.name
         self.FittedVeloTrackOutputLocation = "Rec/Track/PreparedVeloFor%s"%self.name
-        
-        self.VeloTracks = self.MakeVeloTracks([]) 
+
+        self.VeloTracks = self.MakeVeloTracks([])
         self.VeloPions = self.MakeVeloParticles("VeloPions","pion",self.VeloTracks)
         self.VeloKaons = self.MakeVeloParticles("VeloKaons","kaon",self.VeloTracks)
         self.VeloProtons = self.MakeVeloParticles("VeloProtons","proton",self.VeloTracks)
-        
+
         ##################### MAKE THE LINES #############
-        
+
         self.MissingPion4BodyLine = self.MakeLine("%sMissingPion4Body"%self.name,
                                                   ['[K*(892)+ -> K- pi+ pi+]cc','[K*(892)+ -> K- pi+ pi-]cc','[K*(892)+ -> K- pi- pi-]cc'],## RS-A, RS-B , SS
                                                   [SelLongKaons,SelLongPions],
@@ -112,7 +112,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                                                   ["[D*(2010)+ -> D0 pi+]cc","[D*(2010)+ -> D~0 pi+]cc"], ## add also wrong sign
                                                   ['[K*_0(1430)0 -> K*(892)+ pi-]cc','[K*_0(1430)0 -> K*(892)+ pi+]cc'], ## allow also wrong sign StdAllNoPIDs "pions"
                                                   self.VeloKaons)
-        
+
         self.MissingProtonLine = self.MakeLine("%sMissingProton"%self.name,
                                                ['[K*(892)+ -> K- pi+]cc','[K*(892)+ -> K- pi-]cc'], ## RS, SS
                                                [SelLongKaons, SelLongPions],
@@ -123,18 +123,18 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
 
         if config["VeloLineForTiming"] == True:
             self.registerLine(StrippingLine("VeloLine"+name,selection=self.VeloPions))
-            
+
         ### these are the partially reconstructed signals
         self.registerLine(self.MissingKaon4BodyLine[0])
         self.registerLine(self.MissingPion4BodyLine[0])
         self.registerLine(self.MissingProtonLine[0])
-        
+
         ### and these contain the candidate matching long tracks
         self.registerLine(self.MissingPion4BodyLine[1])
         self.registerLine(self.MissingKaon4BodyLine[1])
         self.registerLine(self.MissingProtonLine[1])
 
-    
+
     #### function to make the stripping line
     def MakeLine(self,
                  name,
@@ -144,11 +144,11 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                  DstDecayDescriptors,
                  MatchDecayDescriptor,
                  Probes):
-        
+
         #########################################################
         ## DEFINE ALL OF THE CUTS
         #########################################################
-        
+
         MatchingLongTrackCuts = "(ISLONG) & (TRGHOSTPROB < 0.35)"
         D0CombinationCut = "(AMAXDOCA('') < %(D0_MAX_DOCA)s )" %self.__confdict__
         SlowpionCuts = "(MIPCHI2DV(PRIMARY) < 9) & (PIDe < 5) & (PT > 300*MeV)"
@@ -178,23 +178,23 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             DstMotherCut = "(in_range ( 2.4 * GeV , mfit , %(Sc_MAX_M)s )) & (DTF_CHI2NDOF(True,'Lambda_c+') < %(Sc_MAX_DTFCHI2)s)" %self.__confdict__
         else:
             print name + ' = Bad line name'
-        
+
         #########################################################
-        ## STEP 1: 
+        ## STEP 1:
         ## make the partially reconstructed D0/Lamda_c candidate
         #########################################################
-            
+
         CombKst = CombineParticles(name="For%sCombKst"%name,
                                    DecayDescriptors = KstDecayDescriptors,
                                    CombinationCut = KstCombinationCut,
                                    MotherCut = KstMotherCut)
-        
+
         SelKst = Selection('For%sSelKst'%name,
                            Algorithm = CombKst,
                            RequiredSelections = KstRequirements)
-    
+
         #########################################################
-        ## STEP 2 (OPTIONAL): 
+        ## STEP 2 (OPTIONAL):
         ## Does this make an "inclusive D*" candidate?
         #########################################################
         if self.__confdict__["RequireDstFirst"]:
@@ -207,22 +207,22 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             SelDstarPrelim = Selection("For%sSelDstarPrelimfor"%name,
                                        Algorithm = CombDstarPrelim,
                                        RequiredSelections = [SelKst,StdAllLoosePions])
-        
+
             SelDstarPrelimTOS = TOSFilter( "For%sSelDstarPrelimTOS"%name
                                            ,SelDstarPrelim
                                            ,self.__confdict__["TTSpecs"])
 
         #########################################################
-        ## STEP 3: 
+        ## STEP 3:
         ## Add the probe velo track to the D0
         #########################################################
-    
+
         CombD0 = CombineParticles(name="For%sCombD0"%name,
                                   Preambulo = D0Preambulo,
                                   DecayDescriptors = D0DecayDescriptor,
                                   CombinationCut = D0CombinationCut,
                                   MotherCut = D0MotherCut)
-    
+
         if self.__confdict__["RequireDstFirst"]:
             SelD0 = Selection('For%sSelD0'%name,
                               Algorithm = CombD0,
@@ -231,31 +231,31 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             SelD0 = Selection('For%sSelD0'%name,
                               Algorithm = CombD0,
                               RequiredSelections = [SelKst,Probes])
-            
+
         #########################################################
-        ## STEP 4: 
+        ## STEP 4:
         ## Build a D* candidate
         #########################################################
-            
-        
+
+
 
         CombDstar = CombineParticles(name = "For%sCombDstar"%name,
                                      DecayDescriptors = DstDecayDescriptors,
                                      DaughtersCuts = {"pi+": SlowpionCuts},
                                      CombinationCut = DstPrelimComboCuts,
                                      MotherCut = DstMotherCut)
-        
+
         SelDstar = Selection("For%sSelDstarf"%name,
                              Algorithm = CombDstar,
                              RequiredSelections = [SelD0,StdAllLoosePions])
-        
+
         SelDstarTOS = TOSFilter( "For%sSelDstarTOS"%name
                                  ,SelDstar
                                  ,self.__confdict__["TTSpecs"])
-        
-        
+
+
         #########################################################
-        ## STEP 5: 
+        ## STEP 5:
         ## Find any interesting matching long tracks
         #########################################################
 
@@ -264,23 +264,23 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                                            DecayDescriptors = MatchDecayDescriptor,
                                            CombinationCut = "(AMAXDOCA('') < 0.10 * mm )",
                                            MotherCut = 'ALL')
-        
+
         SelD0MatchLong = Selection('For%sSelD0MatchLong'%name,
                                    Algorithm = CombD0MatchLong,
                                    RequiredSelections = [SelDstarTOS,SelKst,StdAllNoPIDsPions])
 
         #########################################################
-        ## STEP 6: 
+        ## STEP 6:
         ## Make the stripping lines
         #########################################################
-        
-        LineDstar = StrippingLine(name, 
+
+        LineDstar = StrippingLine(name,
                                   FILTER = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 180 )",
                                              "Preambulo": ["from LoKiTracks.decorators import *"]},
                                   HLT2 = self.__confdict__["HLT2"],
-                                  selection = SelDstarTOS) 
-        
-        LineMatchLong = StrippingLine(name+'MatchLong', 
+                                  selection = SelDstarTOS)
+
+        LineMatchLong = StrippingLine(name+'MatchLong',
                                       FILTER = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 180 )",
                                                  "Preambulo": ["from LoKiTracks.decorators import *"]},
                                       HLT2 = self.__confdict__["HLT2"],
@@ -289,7 +289,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
 
 
     def MakeVeloTracks(self,prefilter):
-        
+
         if self.__confdict__["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
             from DAQSys.DecoderClass import decodersForBank
@@ -301,7 +301,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             decs=decs+[vdec]
             VeloDecoding = GaudiSequencer("RecoDecodingSeq")
             VeloDecoding.Members += [d.setup() for d in decs ]
-        
+
         MyFastVeloTracking = FastVeloTracking("For%sFastVelo"%self.name,OutputTracksName=self.VeloTrackOutputLocation)
         MyFastVeloTracking.OnlyForward = True
         MyFastVeloTracking.ResetUsedFlags = True
@@ -311,7 +311,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
         copyVelo = TrackContainerCopy( "For%sCopyVelo"%self.name )
         copyVelo.inputLocations = [self.VeloTrackOutputLocation]
         copyVelo.outputLocation = self.FittedVeloTrackOutputLocation
-        
+
         ### fitting
         if self.__confdict__["VeloFitter"] == "ForwardStraightLine":
             MyVeloFit = ConfiguredForwardStraightLineEventFitter(Name="For%sVeloRefitterAlg"%self.name,
@@ -323,24 +323,24 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
         else:
             MyVeloFit = ConfiguredEventFitter(Name="For%sVeloRefitterAlg"%self.name,
                                               TracksInContainer=self.FittedVeloTrackOutputLocation)
-            
+
         #### making the proto particles
         MakeVeloProtos = ChargedProtoParticleMaker('For%sVeloProtoMaker'%self.name)
         MakeVeloProtos.Inputs=[self.FittedVeloTrackOutputLocation]
         MakeVeloProtos.Output = self.VeloProtoOutputLocation
         MakeVeloProtos.addTool( DelegatingTrackSelector, name="TrackSelector" )
         MakeVeloProtos.TrackSelector.TrackTypes = [ "Velo" ]
-    
+
         #### the full sequence
         makeparts = GaudiSequencer('For%sMakeVeloTracksGS'%self.name)
         if self.__confdict__["DoVeloDecoding"]:
-            makeparts.Members += [ VeloDecoding ] 
-        makeparts.Members += [ MyFastVeloTracking ] 
-        makeparts.Members += [ preve ] 
-        makeparts.Members += [ copyVelo ] 
-        makeparts.Members += [ MyVeloFit ] 
-        makeparts.Members += [ MakeVeloProtos ] 
-    
+            makeparts.Members += [ VeloDecoding ]
+        makeparts.Members += [ MyFastVeloTracking ]
+        makeparts.Members += [ preve ]
+        makeparts.Members += [ copyVelo ]
+        makeparts.Members += [ MyVeloFit ]
+        makeparts.Members += [ MakeVeloProtos ]
+
         #### some python magic to maek this appear like a "Selection"
         return GSWrapper(name="For%sWrappedVeloTrackingFor"%self.name,
                          sequencer=makeparts,
@@ -348,32 +348,32 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                          requiredSelections =  prefilter)
 
     def MakeVeloParticles(self,name,
-                          particle, 
+                          particle,
                           protoParticlesMaker):
-        
+
         particleMaker =  NoPIDsParticleMaker("For%sParticleMaker%s"%(self.name,name) , Particle = particle)
         particleMaker.Input = self.VeloProtoOutputLocation
-        
+
         DataOnDemandSvc().AlgMap.update( {
                 "/Event/Phys/" + particleMaker.name() + '/Particles' : particleMaker.getFullName(),
                 "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
                 } )
-        
-        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name,name), 
-                                     Algorithm = particleMaker, 
+
+        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name,name),
+                                     Algorithm = particleMaker,
                                      RequiredSelections = [protoParticlesMaker], InputDataSetter=None)
-        
+
         ### filter on the IP of the velo tracks
-        return Selection("For%sSelVeloParts%s"%(self.name,name), 
-                         Algorithm = FilterDesktop(name+"For%sFilterVeloTrackIP%s"%(self.name,name), 
+        return Selection("For%sSelVeloParts%s"%(self.name,name),
+                         Algorithm = FilterDesktop(name+"For%sFilterVeloTrackIP%s"%(self.name,name),
                                                    Code="(MIPDV(PRIMARY) > %(VeloMINIP)s)" %self.__confdict__),
                          RequiredSelections = [AllVeloParticles])
-    
+
 ###### OTHER FUNCTIONS ###############
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
index a4e5a8204f5d5d1b21356296303511c9ceb0a4a5..37df147bbfb58a0da64e4605abf9e1eb5def1967 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -14,7 +14,7 @@ __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection 
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions,StdAllNoPIDsPions
@@ -48,28 +48,28 @@ default_config = {
     }
 
 class TrackEffD0ToKPiAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__=config
-        
-        
+
+
         self.TagCommonCuts = "(PT > %(Tag_MIN_PT)s*MeV)" %self.__confdict__
 
         self.PionCuts = self.TagCommonCuts + "&(PIDK < %(Pion_MAX_PIDK)s)" %self.__confdict__
-        
+
         self.KaonCuts = self.TagCommonCuts + "&(PIDK > %(Kaon_MIN_PIDK)s)" %self.__confdict__
-        
+
         self.SelLongPions = Selection("SelLongPionsFor"+name,
                                       Algorithm = FilterDesktop(name="LongPionFilterFor"+name,
                                                                 Code=self.PionCuts),
                                       RequiredSelections = [StdLoosePions])
-        
+
         self.SelLongKaons = Selection("SelLongKaonsFor"+name,
                                       Algorithm = FilterDesktop(name="LongKaonFilterFor"+name,
                                                                 Code=self.KaonCuts),
@@ -77,43 +77,43 @@ class TrackEffD0ToKPiAllLinesConf(LineBuilder) :
 
         self.VeloTrackInputLocaton = 'Rec/Track/FittedHLT1VeloTracks'
         self.VeloProtoOutputLocation = 'Rec/ProtoP/VeloProtosFor%s'%self.name()
-        
-        self.VeloTracks = self.MakeVeloProtos([]) 
+
+        self.VeloTracks = self.MakeVeloProtos([])
         self.VeloPions = self.MakeVeloParticles("VeloPions","pion",self.VeloTracks)
         self.VeloKaons = self.MakeVeloParticles("VeloKaons","kaon",self.VeloTracks)
-        
-        
+
+
         self.MissingPion2BodyLine = self.MakeLine(name+"_PionProbe",
-                                                  ['[D0 -> K- pi+]cc','[D~0 -> K+ pi+]cc'], 
+                                                  ['[D0 -> K- pi+]cc','[D~0 -> K+ pi+]cc'],
                                                   ["[D*(2010)+ -> D0 pi+]cc"],
                                                   [self.SelLongKaons,self.VeloPions])
 
         self.MissingKaon2BodyLine = self.MakeLine(name+"_KaonProbe",
-                                                  ['[D0 -> K+ pi+]cc','[D~0 -> K+ pi-]cc'], 
+                                                  ['[D0 -> K+ pi+]cc','[D~0 -> K+ pi-]cc'],
                                                   ["[D*(2010)+ -> D0 pi+]cc"],
                                                   [self.SelLongPions,self.VeloKaons])
-                
+
         self.registerLine(self.MissingPion2BodyLine)
-        self.registerLine(self.MissingKaon2BodyLine)        
+        self.registerLine(self.MissingKaon2BodyLine)
 
     def MakeLine(self,name,
                  D0DecayDescriptor,
                  DstDecayDescriptors,
                  D0Requirements):
-        
-        
+
+
         D0CombinationCut = "(AM > 0.1*GeV) & (AM < 3.0*GeV)"
         D0CombinationCut += " & (AMAXDOCA('') < 0.05 * mm)"
-        D0CombinationCut += " & (ACHILD(MIPDV(PRIMARY),1)+ACHILD(MIPDV(PRIMARY),2) > 0.2*mm)" 
+        D0CombinationCut += " & (ACHILD(MIPDV(PRIMARY),1)+ACHILD(MIPDV(PRIMARY),2) > 0.2*mm)"
         D0MotherCut  = "(VFASPF(VZ) > 2*mm) & (VFASPF(VCHI2/VDOF) < 4.0)"
-        SlowpionCuts = "(MIPCHI2DV(PRIMARY) < 9)" 
-        DstMotherCut = "(PT > 1*MeV)" 
+        SlowpionCuts = "(MIPCHI2DV(PRIMARY) < 9)"
+        DstMotherCut = "(PT > 1*MeV)"
 
         CombD0 = CombineParticles(name="CombD0for"+name,
                                   DecayDescriptors = D0DecayDescriptor,
                                   CombinationCut = D0CombinationCut,
                                   MotherCut = D0MotherCut)
-        
+
         SelD0 = Selection('SelD0for'+name,
                           Algorithm = CombD0,
                           RequiredSelections = D0Requirements)
@@ -123,18 +123,18 @@ class TrackEffD0ToKPiAllLinesConf(LineBuilder) :
                                      DaughtersCuts = {"pi+": SlowpionCuts},
                                      CombinationCut = "AALL",
                                      MotherCut = DstMotherCut)
-    
+
         SelDstar = Selection("SelDstarfor"+name,
                              Algorithm = CombDstar,
                              RequiredSelections = [SelD0,StdAllLoosePions])
-        
+
         SelDstarTOS = TOSFilter("TOSDstarfor"+name,
                                 SelDstar,
                                 self.__confdict__["TTSpecs"])
-        
-        MassFilter =FilterDesktop(name="MassFilter"+name, 
+
+        MassFilter =FilterDesktop(name="MassFilter"+name,
                                   Code="(DTF_CHI2NDOF(True,'D0') < %(Dst_DTFCHI2_MAX)s) & (DTF_FUN( M ,True,'D0') < %(Dst_M_MAX)s)" %self.__confdict__)
-     
+
         MassFilterSel = Selection("MassFilterSel"+name,
                                   Algorithm = MassFilter,
                                   RequiredSelections = [SelDstarTOS])
@@ -146,27 +146,27 @@ class TrackEffD0ToKPiAllLinesConf(LineBuilder) :
                 ]
             MassFilter.Monitor      = True  ,
             MassFilter.HistoProduce = True  ,
-            MassFilter.PostMonitor  = """ process ( mass ) >> EMPTY """                                                                                                        
-        LineDstar = StrippingLine(name, 
+            MassFilter.PostMonitor  = """ process ( mass ) >> EMPTY """
+        LineDstar = StrippingLine(name,
                                   HLT1 = self.__confdict__["HLT1"],
                                   HLT2 = self.__confdict__["HLT2"],
                                   selection = MassFilterSel)
-        
+
         return LineDstar
-        
+
     def MakeVeloProtos(self,prefilter):
-                    
+
         #### making the proto particles
         MakeVeloProtos = ChargedProtoParticleMaker('For%sVeloProtoMaker'%self.name())
-        MakeVeloProtos.Inputs = [self.VeloTrackInputLocaton] 
+        MakeVeloProtos.Inputs = [self.VeloTrackInputLocaton]
         MakeVeloProtos.Output = self.VeloProtoOutputLocation
         MakeVeloProtos.addTool( DelegatingTrackSelector, name="TrackSelector" )
         MakeVeloProtos.TrackSelector.TrackTypes = [ "Velo" ]
-    
+
         #### the full sequence
         makeparts = GaudiSequencer('For%sMakeVeloProtosGS'%self.name())
-        makeparts.Members += [ MakeVeloProtos ] 
-    
+        makeparts.Members += [ MakeVeloProtos ]
+
         #### some python magic to maek this appear like a "Selection"
         return GSWrapper(name="For%sWrappedVeloTrackingFor"%self.name(),
                          sequencer=makeparts,
@@ -174,24 +174,24 @@ class TrackEffD0ToKPiAllLinesConf(LineBuilder) :
                          requiredSelections =  prefilter)
 
     def MakeVeloParticles(self,name,
-                          particle, 
+                          particle,
                           protoParticlesMaker):
-        
+
         particleMaker =  NoPIDsParticleMaker("For%sParticleMaker%s"%(self.name(),name) , Particle = particle)
         particleMaker.Input = self.VeloProtoOutputLocation
-        
+
         DataOnDemandSvc().AlgMap.update( {
                 "/Event/Phys/" + particleMaker.name() + '/Particles' : particleMaker.getFullName(),
                 "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
                 } )
-        
-        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name(),name), 
-                                     Algorithm = particleMaker, 
+
+        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name(),name),
+                                     Algorithm = particleMaker,
                                      RequiredSelections = [protoParticlesMaker], InputDataSetter=None)
-        
+
         ### filter on the IP of the velo tracks
-        return Selection("For%sSelVeloParts%s"%(self.name(),name), 
-                         Algorithm = FilterDesktop(name+"For%sFilterVeloTrackIP%s"%(self.name(),name), 
+        return Selection("For%sSelVeloParts%s"%(self.name(),name),
+                         Algorithm = FilterDesktop(name+"For%sFilterVeloTrackIP%s"%(self.name(),name),
                                                    Code="(MIPCHI2DV(PRIMARY) > %(VeloMINIPCHI2)s)" %self.__confdict__),
                          RequiredSelections = [AllVeloParticles])
 
@@ -208,7 +208,7 @@ def TOSFilter( name = None, sel = None, trigger = None ):
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
@@ -216,5 +216,3 @@ class GSWrapper(UniquelyNamedObject,
                                algorithm = sequencer,
                                outputLocation = output,
                                requiredSelections = requiredSelections )
-        
-        
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py
index 26cc3e114d1aa9082c43387283c0d87156b940ba..b283d6e880e839ca33ac3d1f2255d7e5d38a90ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -264,7 +264,7 @@ class StrippingTrackEffMuonTTConf(LineBuilder) :
         self.SelMuonTTPPartsZ = 	  selMuonTTPParts(name+'Z',           muonTTTrackMaker = self.SelMakeMuonTTZ )
 
         self.SelMuonTTPartsJpsi = 	 selMuonTTParts(name+'Jpsi',        protoParticlesMaker = self.SelMuonTTPPartsJpsi )
-	self.SelMuonTTPartsJpsiLowMult = selMuonTTParts(name+'JpsiLowMult', protoParticlesMaker = self.SelMuonTTPPartsJpsiLowMult ) ## CHECKME 
+	self.SelMuonTTPartsJpsiLowMult = selMuonTTParts(name+'JpsiLowMult', protoParticlesMaker = self.SelMuonTTPPartsJpsiLowMult ) ## CHECKME
         self.SelMuonTTPartsZ = 		 selMuonTTParts(name+'Z',           protoParticlesMaker = self.SelMuonTTPPartsZ )
 
         self.SelFilterLongPartsMuJpsi = 	selFilterLongParts(name = name+'Jpsi',       filterName = 'MuJpsi',    tagCut = tagCut,       selection = [StdLooseMuons],    muon = True )
@@ -559,7 +559,7 @@ class StrippingTrackEffMuonTTConf(LineBuilder) :
 # The long track preparation, including hard coded cuts
 # ########################################################################################
 
-def selFilterLongParts(name, filterName, tagCut, selection, muon = True ): 
+def selFilterLongParts(name, filterName, tagCut, selection, muon = True ):
     """
     Get Muons from StdLooseMuons for detached Jpsi
     """
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py
index bd0266cd2f9c5e3a9ba5dcdb0e513aee7e1a35ee..ad8c565a9c005e62255cade8a9d9efe410e8cba4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -18,7 +18,7 @@
 #
 # @authors P. Seyfert, A. Jaeger
 # @date 2011-Mar-17
-# 
+#
 # @author M. Kolpin
 # @date 2015-Mar-23
 #
@@ -47,7 +47,7 @@ default_config = {
               ,   "TrChi2":          5.0 # adimensional
               ,   "LongP":           7. # GeV
               ,   "LongPT":          0.5 # GeV
-              ,   "LongChi2":        3.0 
+              ,   "LongChi2":        3.0
               ,   "LongMinIP":       0.2 # mm
               ,   "VertChi2":        2.0
               ,   "MuDLL"   :        -1.
@@ -105,7 +105,7 @@ default_config = {
                ,   "TrMaxEta":        4.5
                ,   "LongMinEta":        2.0
                ,   "LongMaxEta":        4.5
-               ,   "VertChi2":        10000. 
+               ,   "VertChi2":        10000.
                ,   "MuDLL"   :        1.
                ,   "MassPreComb":     100000. # MeV
                ,   "MassPostComb":    40000. # MeV
@@ -121,7 +121,7 @@ default_config = {
                ,   "longcut"      :   "((PT > %(LongPT)s*GeV) & (ETA > %(LongMinEta)s) & (ETA < %(LongMaxEta)s) )"
                ,   "resonancecut" :   "(PT > %(CombPT)s*GeV)"
                ,   "linename"     :   "ZLine"
-               }                        
+               }
          },
     'STREAMS'     : { 'Dimuon' : ['StrippingTrackEffVeloMuonLine1',
                                        'StrippingTrackEffVeloMuonLine2',
@@ -135,11 +135,11 @@ default_config = {
 
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from Configurables import CombineParticles	
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
 from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
 from Configurables import FastVeloTracking
-  
+
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo,TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
 from Configurables import TrackCloneFinder
@@ -170,11 +170,11 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         _lines = []
-        _lines += self.buildTrackEffVeloMuonLine( "Jpsi" ) #two lines per call one for positive probes and one for negative probes 
+        _lines += self.buildTrackEffVeloMuonLine( "Jpsi" ) #two lines per call one for positive probes and one for negative probes
         _lines += self.buildTrackEffVeloMuonLine( "Upsilon" )
         _lines += self.buildTrackEffVeloMuonLine( "Z" )
         for _line in _lines:
@@ -185,7 +185,7 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
         _config = self.config[confLine]
         _lines = []
         TrackingPreFilter = self.VeloMuonBuilder(self.name+"_"+confLine,
-                                                 [ ]) 
+                                                 [ ])
         VeloMuProtoPFilter = self.selMuonPParts(self.name+"_"+confLine,
                                                 TrackingPreFilter)
         VeloMuPFilter = self.makeMyMuons(self.name+"_"+confLine,
@@ -193,7 +193,7 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         longMuons = self.longtrackFilter( self.name+"_"+confLine+"_Longs",
                                                muCut = _config["longcut"] % _config)
-        
+
 
         LongMuHlt1 = self.selHlt1('TisTosFilter1'+confLine+'for'+self.name,
                                                 preFilter = longMuons,
@@ -204,24 +204,24 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
                                                 HLT1Filter = LongMuHlt1,
                                                 HLT2TisTosSpecs = _config['HLT2TisTosSpecs'],
                                                 HLT2PassOnAll = _config['HLT2PassOnAll'])
-        
+
 
         _lines.append(self.buildPerCharge( confLine,
                                            velomuons = VeloMuPFilter,
                                            longmuons = LongMuHlt2,
-                                           charge = 1) ) 
-        
+                                           charge = 1) )
+
         _lines.append(self.buildPerCharge( confLine,
                                   velomuons = VeloMuPFilter,
                                   longmuons = LongMuHlt2,
-                                  charge = -1) )        
+                                  charge = -1) )
 
         return _lines
-        
+
     def buildPerCharge(self, confLine, velomuons, longmuons, charge):
 
         _config = self.config[confLine]
-        
+
         _pchargeCut = None
         _tchargeCut = None
         _tagCharge = None
@@ -229,18 +229,18 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
         _chargename = None
         _linename = _config["linename"]
         if (charge > 0):
-            pchargeCut = "& (Q > 0)"    
-            tchargeCut = "& (Q < 0)"    
+            pchargeCut = "& (Q > 0)"
+            tchargeCut = "& (Q < 0)"
             _tagCharge = "Minus"
             _probeCharge = "Plus"
             _chargename = "1"
         else:
-            pchargeCut = "& (Q < 0)"    
-            tchargeCut = "& (Q > 0)"    
+            pchargeCut = "& (Q < 0)"
+            tchargeCut = "& (Q > 0)"
             _probeCharge = "Minus"
             _tagCharge = "Plus"
             _chargename = "2"
-            
+
         _probeCut = _config["vemucut"] % _config
         _probeCut += pchargeCut
 
@@ -275,27 +275,27 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
                                , MDSTFlag = True)
 
         return _line
-        
+
     ########################
-    # Probe Muon 
+    # Probe Muon
     ########################
 
     def VeloMuonBuilder(self, localname, prefilter):
-        
+
         VeloMuonBuilder1 = VeloMuonBuilder("VeloMuonBuilder"+localname)
         VeloMuonBuilder1.OutputLevel = 6
         VeloMuonBuilder1.MuonLocation = "Rec/Track/"+localname+"MuonStandalone"
         VeloMuonBuilder1.VeloLocation = "Rec/Track/"+localname+"UnFittedVelo"
         VeloMuonBuilder1.lhcbids = 4
         VeloMuonBuilder1.OutputLocation = "Rec/VeloMuon/"+localname+"Tracks"
-        
+
         preve = TrackPrepareVelo(localname+"preve")
         preve.inputLocation = "Rec/"+localname+"_Track/Velo"
         preve.outputLocation = "Rec/Track/"+localname+"UnFittedVelo"
         preve.bestLocation = ""
         alg = GaudiSequencer("VeloMuonTrackingFor"+localname,
                              Members = [ FastVeloTracking(localname+"FastVelo",OutputTracksName="Rec/"+localname+"_Track/Velo"),
-                                         preve, 
+                                         preve,
                                          StandaloneMuonRec(localname+"MuonStandalone",OutputMuonTracksName="Rec/Track/"+localname+"MuonStandalone"),
                                          VeloMuonBuilder1]
                              )
@@ -306,7 +306,7 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
                          output='Rec/VeloMuon/'+localname+'Tracks',
                          requiredSelections =  prefilter)
 
-    
+
 
     def selMuonPParts(self, localname, preSequence):
         """
@@ -331,8 +331,8 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
                          sequencer=veloprotoseq,
                          output='Rec/ProtoP/ProtoPMaker/'+localname+'ProtoParticles',
                          requiredSelections = [preSequence])
-    
-    
+
+
     def makeMyMuons(self, localname, protoParticlesMaker):
         """
         Make Particles out of the muon ProtoParticles
@@ -343,9 +343,9 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         DataOnDemandSvc().AlgMap.update( {
             "/Event/Phys/" + particleMaker.name() + '/Particles' : particleMaker.getFullName(),
-            "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName() 
+            "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
             } )
-        
+
 
         return Selection(localname+"SelVeloMuonParts",
                          Algorithm = particleMaker,
@@ -354,7 +354,7 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
 
     ########################
-    # Tag Muon 
+    # Tag Muon
     ########################
 
     def longtrackFilter(self, localname, muCut):
@@ -406,11 +406,11 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
 
     ########################
-    # make the resonance 
+    # make the resonance
     ########################
 
 
-    def makeResonanceVeloMuTrackEff(self, localname, confLine, tagmuon, probemuon):                                    
+    def makeResonanceVeloMuTrackEff(self, localname, confLine, tagmuon, probemuon):
         """
         Create and return a Resonance -> mu mu Selection object, with one track a long track
         and the other a MuonVelo track.
@@ -420,26 +420,26 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
         DecayDescriptor      : decayDescriptor of the decay
         plusCharge           : algorithm for selection positvely charged tracks
         minusCharge          : algorithm for selection negatively charged tracks
-        """    
+        """
         _config = self.config[confLine]
-        
+
         MuonVeloResonance = CombineParticles('_'+localname)
         MuonVeloResonance.DecayDescriptor = _config["DecayDescriptor"]
-        MuonVeloResonance.OutputLevel = 4 
+        MuonVeloResonance.OutputLevel = 4
 
         MuonVeloResonance.CombinationCut = "ADAMASS('%(ResonanceName)s')<%(MassPreComb)s*MeV" % _config
         _resonancecut = "(ADMASS('%(ResonanceName)s')<%(MassPostComb)s*MeV) &" % _config
         _resonancecut+= _config["resonancecut"] % _config
         MuonVeloResonance.MotherCut = _resonancecut
-                    
+
         return Selection(localname, Algorithm = MuonVeloResonance, RequiredSelections = [tagmuon, probemuon] )
-    
+
 
 
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingV0ForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingV0ForPID.py
index fbae8c14b986e5f4111523d2064a15207d39e9ef..b9ff0e931e1be612a6ff0a40a0adb6ff4d904d48 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingV0ForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingV0ForPID.py
@@ -21,7 +21,7 @@
 # the periphery of phase-space, the selections are binned in terms of the
 # V0's rapidity and pT. Each bin is then assigned its own
 # pre-scale.
-# 
+#
 #
 # Acknowledgements:
 #
@@ -46,7 +46,7 @@ Usage:
  >>> from StrippingSelections.StrippingV0ForPID import default_config as config_v0
  >>> lb_v0  = builder_v0( name='noPIDV0', config=config_v0)
  >>> stream.appendLines( lb_v0.lines()  )
- 
+
 Results from running over:
 $STRIPPINGSELECTIONSROOT/tests/data/Reco13c_Run124134.py
 
@@ -59,7 +59,7 @@ StrippingReport                                                INFO Event 100000
 |!StrippingLam0DDLinenoPIDV0                        |  0.2920|       292|  1.051|   4.443|
 |!StrippingLam0LLIsMUONLine1noPIDV0                 |  0.1640|       164|  1.043|   0.117|
 |!StrippingLam0LLIsMUONLine2noPIDV0                 |  0.0080|         8|  1.000|   0.116|
-|!StrippingLam0DDIsMUONLinenoPIDV0                  |  0.1270|       127|  1.031|  39.297|                
+|!StrippingLam0DDIsMUONLinenoPIDV0                  |  0.1270|       127|  1.031|  39.297|
 """
 # =============================================================================
 __author__  = 'Andrew Powell a.powell1@physics.ox.ac.uk'
@@ -82,7 +82,7 @@ from GaudiKernel.SystemOfUnits import mm, cm , MeV, GeV
 # =============================================================================
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand        
+from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsDownPions, StdAllNoPIDsProtons, StdNoPIDsDownProtons
@@ -93,12 +93,12 @@ from StandardParticles import StdAllNoPIDsPions, StdNoPIDsDownPions, StdAllNoPID
 # =============================================================================
 ## Define the default configuration
 _default_configuration_ = {
-    'TrackChi2'            :  5       ,          ## Track Chi2/ndof quality 
+    'TrackChi2'            :  5       ,          ## Track Chi2/ndof quality
     'VertexChi2'           :  16      ,          ## Cut on Vertex chi2-quality
-    'DeltaMassK0S'         :  50 * MeV,          ## Mass-window (half)-width for K0S 
-    'DeltaMassLambda'      :  25 * MeV,          ## Mass-window (half)-width for Lambda 
+    'DeltaMassK0S'         :  50 * MeV,          ## Mass-window (half)-width for K0S
+    'DeltaMassLambda'      :  25 * MeV,          ## Mass-window (half)-width for Lambda
     'MaxZ'                 : 220 * cm ,          ## Maximal allowed vertex Z-position
-    'DaughtersIPChi2'      :  25      ,          ## minimal IP-chi2 for daughter particles  
+    'DaughtersIPChi2'      :  25      ,          ## minimal IP-chi2 for daughter particles
     'LTimeFitChi2'         :  49      ,          ## Chi2 from LifeTime Fitter
     ##
     'WrongMassK0S'         :   9 * MeV,          ## Mass-window (half)-width for ppi hypthesis
@@ -107,14 +107,14 @@ _default_configuration_ = {
     'WrongMassLambda'      :  20 * MeV,          ## Mass-window (half)-width for pipi hypthesis
     'WrongMassLambda_DD'   :  40 * MeV,          ## Mass-window (half)-width for pipi hypthesis (DD-case)
     ##
-    'CTauK0S'              :   1 * mm ,          ## Cut on c*tau for K0S 
+    'CTauK0S'              :   1 * mm ,          ## Cut on c*tau for K0S
     'CTauK0S_DD'           :  10 * mm ,          ## Cut on c*tau for K0S (DD-case)
     ##
     'CTauLambda0'          :   5 * mm ,          ## Cut on c*tau for Lambda0
     'CTauLambda0_DD'       :  20 * mm ,          ## Cut on c*tau for Lambda0 (DD-case)
     ##
-    'Proton_IsMUONCut'     :  "(INTREE( (ABSID=='p+') & ISMUON ) )" , 
-    ## 
+    'Proton_IsMUONCut'     :  "(INTREE( (ABSID=='p+') & ISMUON ) )" ,
+    ##
     # Technicalities:
     ##
     'Monitor'              :  False    ,          ## Activate the monitoring ?
@@ -124,19 +124,19 @@ _default_configuration_ = {
     'Preambulo'       : [
     ## import c_light
     "from GaudiKernel.PhysicalConstants import c_light" ,
-    ## define DD-category of K0S 
+    ## define DD-category of K0S
     "DD =    CHILDCUT ( ISDOWN , 1 ) & CHILDCUT ( ISDOWN , 2 ) " ,
-    ## define LL-category of K0S 
+    ## define LL-category of K0S
     "LL =    CHILDCUT ( ISLONG , 1 ) & CHILDCUT ( ISLONG , 2 ) "
     ] ,
     'KS0LL_Prescale'           : 0.020 ,
-    'KS0DD_Prescale'           : 0.024 , 
-    'LamLL_Prescale_LoP'       : 0.140 , 
+    'KS0DD_Prescale'           : 0.024 ,
+    'LamLL_Prescale_LoP'       : 0.140 ,
     'LamLL_Prescale_HiP'       : 1.000 ,
-    'LamDD_Prescale'           : 0.100 , 
+    'LamDD_Prescale'           : 0.100 ,
     'LamLLIsMUON_Prescale_LoP' : 1.000 ,
     'LamLLIsMUON_Prescale_HiP' : 1.000 ,
-    'LamDDIsMUON_Prescale'     : 1.000   
+    'LamDDIsMUON_Prescale'     : 1.000
 
     }
 
@@ -145,35 +145,35 @@ _default_configuration_ = {
 default_config ={
     'NAME'        :   'VznoPID'       ,
     'WGs'         : [ 'Calib'] ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'StrippingV0ForPIDConf'            ,
     'STREAMS'     :  [ 'Charm']
-              }    
+              }
 
 
 
 # =============================================================================
-class StrippingV0ForPIDConf(LineBuilder) :    
+class StrippingV0ForPIDConf(LineBuilder) :
     """
     Helper class to configure 'V0ForPID'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    ## get the default configuration 
+    ## get the default configuration
     #@staticmethod
     def defaultConfiguration( key = None ) :
-        
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__(self, name, config) :
         """
         Constructor
-        """        
-                
+        """
+
         self._name            = name
 
         self._trackChi2       = config[ 'TrackChi2' ]
@@ -183,21 +183,21 @@ class StrippingV0ForPIDConf(LineBuilder) :
         self._maxZ            = config[ 'MaxZ' ]
         self._daughtersIPChi2 = config[ 'DaughtersIPChi2' ]
         self._lTimeFitChi2    = config[ 'LTimeFitChi2' ]
-        
+
         self._wrongMassK0S       = config[ 'WrongMassK0S' ]
         self._wrongMassK0S_DD    = config[ 'WrongMassK0S_DD' ]
         self._wrongMassLambda    = config[ 'WrongMassLambda' ]
-        self._wrongMassLambda_DD = config[ 'WrongMassLambda_DD' ] 
-        
+        self._wrongMassLambda_DD = config[ 'WrongMassLambda_DD' ]
+
         self._cTauK0S        = config[ 'CTauK0S' ]
         self._cTauK0S_DD     = config[ 'CTauK0S_DD' ]
         self._cTauLambda0    = config[ 'CTauLambda0' ]
         self._cTauLambda0_DD = config[ 'CTauLambda0_DD' ]
 
         self._protonIsmuon   = config[ 'Proton_IsMUONCut' ]
-        
+
         self._KS0LLPrescale            = config[ 'KS0LL_Prescale' ]
-        self._KS0DDPrescale            = config[ 'KS0DD_Prescale' ] 
+        self._KS0DDPrescale            = config[ 'KS0DD_Prescale' ]
         self._LamLLPrescale_HiP        = config[ 'LamLL_Prescale_HiP' ]
         self._LamLLPrescale_LoP        = config[ 'LamLL_Prescale_LoP' ]
         self._LamDDPrescale            = config[ 'LamDD_Prescale' ]
@@ -208,10 +208,10 @@ class StrippingV0ForPIDConf(LineBuilder) :
         self._monitor      = config[ 'Monitor' ]
         self._hlt          = config[ 'HLT' ]
         self._Preambulo    = config[ 'Preambulo' ]
-        
-       
+
+
         LineBuilder.__init__( self , name , config )
-        
+
         for line in self._lines_inner() :
             self.registerLine(line)
 
@@ -225,97 +225,97 @@ class StrippingV0ForPIDConf(LineBuilder) :
             prescale   = self._KS0LLPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.K0S_LL_Bin1() ],
-            RequiredRawEvents = ["Muon"],    
-            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]  
+            RequiredRawEvents = ["Muon"],
+            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "K0SDDLine" + self._name ,
             prescale   = self._KS0DDPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.K0S_DD_Bin1() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ] 
+            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "Lam0LLLine1" + self._name ,
             prescale   = self._LamLLPrescale_LoP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin1() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]     
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
                 ) ,
-            ## 
+            ##
             StrippingLine (
             "Lam0LLLine2" + self._name ,
             prescale   = self._LamLLPrescale_HiP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin2() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "Lam0DDLine" + self._name ,
             prescale   = self._LamDDPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_DD_Bin1() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             ),
-            ## 
+            ##
             StrippingLine (
             "Lam0LLIsMUONLine1" + self._name ,
             prescale   = self._LamLLIsMUONPrescale_LoP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin1_IsMUON() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             )
             ,
-            ## 
+            ##
             StrippingLine (
             "Lam0LLIsMUONLine2" + self._name ,
             prescale   = self._LamLLIsMUONPrescale_HiP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin2_IsMUON() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             )
             ,
-            ## 
+            ##
             StrippingLine (
             "Lam0DDIsMUONLine" + self._name ,
             prescale   = self._LamDDIsMUONPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_DD_Bin1_IsMUON() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             )
             ]
 
         return self._Lines
-    
+
     def K0S ( self ) :
         """
-        Selection for K0S 
+        Selection for K0S
         """
         if hasattr ( self , 'K0S_LL' ) :
             return self.K0S_LL
@@ -327,7 +327,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
             DaughtersCuts   = {
             '' : self._k0s_daughtersCuts ()
             } ,
-            CombinationCut  = "AM < 1.0 * GeV " , 
+            CombinationCut  = "AM < 1.0 * GeV " ,
             MotherCut       = self._k0s_motherCut()
             )
 
@@ -347,20 +347,20 @@ class StrippingV0ForPIDConf(LineBuilder) :
             >> process ( p2LL )
             >> EMPTY
             """
-        
+
         self.K0S_LL = Selection("SelK0S2PiPi_LL_" + self._name,
                                 Algorithm = _K0S,
-                                RequiredSelections = [ StdAllNoPIDsPions ]) 
-            
+                                RequiredSelections = [ StdAllNoPIDsPions ])
+
         return self.K0S_LL
 
     def K0SDD ( self ) :
         """
-        Selection for K0S DD 
+        Selection for K0S DD
         """
         if hasattr ( self , 'K0S_DD' ) :
             return self.K0S_DD
-        
+
         _K0SDD = CombineParticles(
             #self.name + "StripK0S_DD" ,
             DecayDescriptor = "KS0 -> pi+ pi-" ,
@@ -388,16 +388,16 @@ class StrippingV0ForPIDConf(LineBuilder) :
             >> process ( p2DD )
             >> EMPTY
             """
-        
+
         self.K0S_DD = Selection("SelK0S2PiPi_DD_" + self._name,
                                 Algorithm = _K0SDD,
-                                RequiredSelections = [ StdNoPIDsDownPions ]) 
+                                RequiredSelections = [ StdNoPIDsDownPions ])
 
         return self.K0S_DD
 
     def Lam0 ( self ) :
         """
-        Selection for Lam0 
+        Selection for Lam0
         """
         if hasattr ( self , 'Lam0_LL' ) :
             return self.Lam0_LL
@@ -429,17 +429,17 @@ class StrippingV0ForPIDConf(LineBuilder) :
             >> process ( p2LL )
             >> EMPTY
             """
-        
+
 
         self.Lam0_LL = Selection("SelLam02PPi_LL" + self._name,
                                  Algorithm = _Lam0,
-                                 RequiredSelections = [ StdAllNoPIDsPions, StdAllNoPIDsProtons ]) 
+                                 RequiredSelections = [ StdAllNoPIDsPions, StdAllNoPIDsProtons ])
 
         return self.Lam0_LL
 
     def Lam0DD ( self ) :
         """
-        Selection for Lam0 DD 
+        Selection for Lam0 DD
         """
         if hasattr ( self , 'Lam0_DD' ) :
             return self.Lam0_DD
@@ -452,7 +452,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
             '' : self._lam0_daughtersCuts (),
             } ,
             CombinationCut  = "AM < 1.5 * GeV " ,
-            MotherCut       = self._lam0_motherCut()        
+            MotherCut       = self._lam0_motherCut()
             )
 
         if  self._monitor == True :
@@ -473,8 +473,8 @@ class StrippingV0ForPIDConf(LineBuilder) :
             """
         self.Lam0_DD = Selection("SelLam02PiPi_DD" + self._name ,
                                  Algorithm = _Lam0DD,
-                                 RequiredSelections = [ StdNoPIDsDownPions , StdNoPIDsDownProtons]) 
-        
+                                 RequiredSelections = [ StdNoPIDsDownPions , StdNoPIDsDownProtons])
+
         return self.Lam0_DD
 
     def K0S_LL_Bin1 ( self ) :
@@ -563,7 +563,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
             #self.name + 'Lam0_LL_Bin1_Filter' ,
             Code         = self._lam0_bin1Cut_LL()
             )
-        
+
         if self._monitor == True :
             _Lam0_LL_Bin1_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -632,7 +632,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         """
         if hasattr(self, 'Lam0_LL_Bin1_IsMUON_V0ForPID') :
             return self.Lam0_LL_Bin1_IsMUON_V0ForPID
-        
+
         Lam0 = self.Lam0()
         _Lam0_LL_Bin1_IsMUON_Filter = FilterDesktop (
             #self.name + 'Lam0_LL_Bin1_Filter' ,
@@ -669,13 +669,13 @@ class StrippingV0ForPIDConf(LineBuilder) :
         """
         if hasattr(self, 'Lam0_LL_Bin2_IsMUON_V0ForPID') :
             return self.Lam0_LL_Bin2_IsMUON_V0ForPID
-        
+
         Lam0 = self.Lam0()
         _Lam0_LL_Bin2_IsMUON_Filter = FilterDesktop (
             #self.name + 'Lam0_LL_Bin2_Filter' ,
             Code         = self._lam0_bin2Cut_LL_IsMUON()
             )
-        
+
         if self._monitor == True :
             _Lam0_LL_Bin2_IsMUON_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -706,7 +706,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         """
         if hasattr(self, 'Lam0_DD_Bin1_V0ForPID') :
             return self.Lam0_DD_Bin1_V0ForPID
-        
+
         Lam0DD = self.Lam0DD()
         _Lam0_DD_Bin1_Filter = FilterDesktop (
             ##
@@ -714,7 +714,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
             ##
             Code         = self._lam0_bin1Cut_DD()
             )
-        
+
         if self._monitor == True :
             _Lam0_DD_Bin1_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -745,7 +745,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         """
         if hasattr(self, 'Lam0_DD_Bin1_IsMUON_V0ForPID') :
             return self.Lam0_DD_Bin1_IsMUON_V0ForPID
-        
+
         Lam0DD = self.Lam0DD()
         _Lam0_DD_Bin1_IsMUON_Filter = FilterDesktop (
             ##
@@ -753,7 +753,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
             ##
             Code         = self._lam0_bin1Cut_LL_IsMUON()
             )
-        
+
         if self._monitor == True :
             _Lam0_DD_Bin1_IsMUON_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -780,8 +780,8 @@ class StrippingV0ForPIDConf(LineBuilder) :
 
     def trackChi2       ( self ) : return self._trackChi2
     def daughtersIPChi2 ( self ) : return self._daughtersIPChi2
-    
-    ## define daughter cuts for K0S 
+
+    ## define daughter cuts for K0S
     def _k0s_daughtersCuts ( self ) :
         """
         Define 'DaughtersCuts' for K0S
@@ -793,16 +793,16 @@ class StrippingV0ForPIDConf(LineBuilder) :
         & ( MIPCHI2DV(PRIMARY) > %g )
         """
         cuts = cuts %( self._trackChi2, self._daughtersIPChi2 )
-        return cuts.replace ( '\n' , ' ' ) 
-    
+        return cuts.replace ( '\n' , ' ' )
+
     ## define daughter cuts for Lambda0
     def _lam0_daughtersCuts ( self ) :
         """
         Define 'DaughtersCuts' for Lambda0
         """
-        return self._k0s_daughtersCuts () 
+        return self._k0s_daughtersCuts ()
 
-    ## define "MotherCut" for K0s 
+    ## define "MotherCut" for K0s
     def _k0s_motherCut      ( self ) :
         """
         Define 'MotherCut' for K0S
@@ -827,9 +827,9 @@ class StrippingV0ForPIDConf(LineBuilder) :
                     self._wrongMassK0S_DD,
                     self._wrongMassK0S
                     )
-        
-        return cut.replace ( '\n' , ' ' )  
-    
+
+        return cut.replace ( '\n' , ' ' )
+
     ## define "MotherCut" for Lambda0
     def _lam0_motherCut      ( self ) :
         """
@@ -841,7 +841,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         & ( VFASPF ( VZ       ) < %g            )
         & in_range ( 0 , BPVLTFITCHI2()   ,  %g )
         & ( BPVLTIME()*c_light > switch ( DD , %g , %g ) )
-        & ( ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > switch( DD, %g  , %g ) ) 
+        & ( ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > switch( DD, %g  , %g ) )
         """
         cut = cut %(self._deltaMassLambda,
                     self._vertexChi2,
@@ -852,9 +852,9 @@ class StrippingV0ForPIDConf(LineBuilder) :
                     self._wrongMassLambda_DD,
                     self._wrongMassLambda
                     )
-        
-        return cut.replace ( '\n' , ' ' ) 
-        
+
+        return cut.replace ( '\n' , ' ' )
+
 
     ## define "Bin1 Cut" for K0S LL
     def _k0s_bin1Cut_LL ( self ) :
@@ -865,7 +865,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ## define "Bin1 Cut" for Lambda0 LL
     def _lam0_bin1Cut_LL ( self ) :
@@ -876,7 +876,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ## define "Bin2 Cut" for Lambda0 LL
     def _lam0_bin2Cut_LL ( self ) :
@@ -887,10 +887,10 @@ class StrippingV0ForPIDConf(LineBuilder) :
         (INTREE( (ABSID=='p+') & ( P > 40 * GeV ) ) )
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
-    ## define "Bin1 IsMUON Cut" for Lambda0 LL 
+    ## define "Bin1 IsMUON Cut" for Lambda0 LL
     def _lam0_bin1Cut_LL_IsMUON ( self ) :
         """
         Define 'Bin1 Cut' for Lambda0 LL
@@ -899,9 +899,9 @@ class StrippingV0ForPIDConf(LineBuilder) :
         (INTREE( (ABSID=='p+') & ISMUON ) )
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
-    ## define "Bin1 IsMUON Cut" for Lambda0 LL 
+    ## define "Bin1 IsMUON Cut" for Lambda0 LL
     def _lam0_bin2Cut_LL_IsMUON ( self ) :
         """
         Define 'Bin2 Cut' for Lambda0 LL
@@ -910,7 +910,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         (INTREE( (ABSID=='p+') & ( ISMUON & (P > 40 * GeV) ) ) )
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
     ## define "Bin1 Cut" for K0S DD
@@ -922,9 +922,9 @@ class StrippingV0ForPIDConf(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
+
 
- 
 
     ## define "Bin1 Cut" for Lambda0 DD
     def _lam0_bin1Cut_DD ( self ) :
@@ -935,7 +935,7 @@ class StrippingV0ForPIDConf(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
 if '__main__' == __name__ :
@@ -946,24 +946,24 @@ if '__main__' == __name__ :
     print __version__
 
     conf = StrippingV0ForPIDConf()
-    
+
     print conf
 
     props = [ 'DaughtersCuts'   ,
               'CombinationCut'  ,
               'MotherCut'       ,
               'DecayDescriptor' ,
-              'DecayDescriptors'] 
-                           
-    for l in conf.K0S     () : print __enroll__ ( l , lst = props ) 
+              'DecayDescriptors']
+
+    for l in conf.K0S     () : print __enroll__ ( l , lst = props )
     for l in conf.Lambda0 () : print __enroll__ ( l , lst = props )
-    
 
-def addRelInfoMuonIsolation( decdes ):    
+
+def addRelInfoMuonIsolation( decdes ):
     import re
     _DauLoc={}
     _daughters = re.match(r'(.*)->([ |\[]*)([^\]]+)(.*)', decdes)
-    if _daughters:    
+    if _daughters:
         _particles = _daughters.group(3).split()
         _ip=1
         _gp=1
@@ -986,6 +986,5 @@ def addRelInfoMuonIsolation( decdes ):
 
 
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 64f3e233945c643b88482dafd0a3a06612460780..cd4203878c19f907e4af0f47d699983ef17617bc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -172,7 +172,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,MINIPCHI2 = config['piSigmaMINIPCHI2']
       ,trackChi2DOF = config['TrackChi2DOF']
       )
-    
+
     selThreePart = makeThreePart(
       name = name
       ,pMINP = config['protonMINP']
@@ -197,7 +197,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,threepartMinIPChi2 = config['threepartMinIPChi2']
       ,noPIDs = config['NoPIDs']
       )
-      
+
     selThreePartWS_SC = makeThreePartWS_SC(
       name = name
       ,pMINP = config['protonMINP']
@@ -222,7 +222,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,threepartMinIPChi2 = config['threepartMinIPChi2']
       ,noPIDs = config['NoPIDs']
       )
-    
+
     selThreePartSc0 = makeThreePartSc0(
       name = name
       ,pMINP = config['protonMINP']
@@ -247,7 +247,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,threepartMinIPChi2 = config['threepartMinIPChi2']
       ,noPIDs = config['NoPIDs']
       )
-    
+
     selFourPart = makeFourPart(
       name = name
       ,selectionthree = selThreePart
@@ -265,7 +265,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,UseTOS = config['UseTOS']
       ,Hlt2TOS = config['Hlt2TOS']
       )
-    
+
     selFourPartWS = makeFourPartWS(
       name = name
       ,selectionthree = selThreePart
@@ -283,7 +283,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,UseTOS = config['UseTOS']
       ,Hlt2TOS = config['Hlt2TOS']
       )
-    
+
     selFourPartWS_SC = makeFourPartWS_SC(
       name = name
       ,selectionthree = selThreePartWS_SC
@@ -301,7 +301,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,UseTOS = config['UseTOS']
       ,Hlt2TOS = config['Hlt2TOS']
       )
-    
+
     selmyLc = makeLc2pKpi(
       name = name
       ,LcMassWind = config['LcMassWind']
@@ -315,7 +315,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,LcMINDauPT = config['LcMINDauPT']
       ,LcMINDauIPCHI2 = config['LcMINDauIPCHI2']
     )
-    
+
     selSigmacmm2Lcpi = makeSigmacmm2Lcpi(
       name = name
       ,selectionpi = selpifromSigmacmm
@@ -330,7 +330,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,SigmaLcDeltaMhigh = config['SigmaLcDeltaMhigh']
       ,SigmaPT = config['SigmaPT']
       )
-    
+
     selSigmac02Lcpi = makeSigmac02Lcpi(
       name = name
       ,selectionpi = selpifromSigmacmm
@@ -345,7 +345,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,SigmaLcDeltaMhigh = config['SigmaLcDeltaMhigh']
       ,SigmaPT = config['SigmaPT']
       )
-    
+
     selB2ppipiSigmacmm = makeB2ppipiSigmacmm(
       name = name
       ,selectionthree = selThreePart
@@ -356,7 +356,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,BFDChi2 = config['BFDChi2']
       ,BDIRA = config['BDIRA']
       )
-    
+
     selB2ppipiSigmac0 = makeB2ppipiSigmac0(
       name = name
       ,selectionthree = selThreePartSc0
@@ -367,8 +367,8 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,BFDChi2 = config['BFDChi2']
       ,BDIRA = config['BDIRA']
       )
-    
-    
+
+
     selB2ppipiSigmacmm_FourPart = makeB2ppipiSigmacmm_FourPart(
       name = name
       ,selectionfour = selFourPart
@@ -381,7 +381,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,LcVtxChi2DOF = config['LcVtxChi2DOF']
       ,LcFDChi2 = config['LcFDChi2']
       )
-      
+
     selB2ppipiSigmacmm_FourPart_WS = makeB2ppipiSigmacmm_FourPart_WS(
       name = name
       ,selectionfour = selFourPartWS
@@ -407,11 +407,11 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
               ,LcVtxChi2DOF = config['LcVtxChi2DOF']
               ,LcFDChi2 = config['LcFDChi2']
               )
-    
+
     _GECfilter = None
-    
-    
-    
+
+
+
     if config['ApplyGECs']:
       _filter = ""
 
@@ -428,11 +428,11 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
                                      'from LoKiCore.functions    import *']
                       }
 
-    
+
     coneinfo=[]
     for conekey, coneitem in (config['ConeAngles']).iteritems():
-            coneinfo.append({ 
-                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'], 
+            coneinfo.append({
+                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'],
                                         'Location' : 'P2CVDst'+conekey
                                       })
 
@@ -448,8 +448,8 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
                       'Type'              : 'RelInfoBstautauCDFIso',
                       'Location'          : 'RelInfoBstautauCDFIso'
                   })
-    
-    
+
+
     self.line_fourpart = StrippingLine(
       name+"_PartReco_Line"
       ,prescale=config['Prescalefourpart']
@@ -459,8 +459,8 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,FILTER=_GECfilter
       ,RelatedInfoTools=coneinfo)
     self.registerLine(self.line_fourpart)
-    
-    
+
+
     self.line_fourpartWS = StrippingLine(
       name+"_PartRecoWS_Line"
       ,prescale=config['Prescalefourpart']
@@ -470,7 +470,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,FILTER=_GECfilter
       ,RelatedInfoTools=coneinfo)
     self.registerLine(self.line_fourpartWS)
-    
+
     self.line_fourpartWS_SC = StrippingLine(
       name+"_PartRecoWS_SC_Line"
       ,prescale=config['Prescalefourpart']
@@ -480,7 +480,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,FILTER=_GECfilter
       ,RelatedInfoTools=coneinfo)
     self.registerLine(self.line_fourpartWS_SC)
-    
+
     self.line_B2ppipiSigmacmm= StrippingLine(
       name+"_Closed_Line"
       ,prescale=config['PrescaleCompleteNorm']
@@ -490,8 +490,8 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,FILTER=_GECfilter
       ,RelatedInfoTools=coneinfo)
     self.registerLine(self.line_B2ppipiSigmacmm)
-    
-    
+
+
     self.line_B2ppipiSigmac0= StrippingLine(
       name+"_Neutral_Closed_Line"
       ,prescale=config['PrescaleCompleteNorm']
@@ -501,7 +501,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,FILTER=_GECfilter
       ,RelatedInfoTools=coneinfo)
     self.registerLine(self.line_B2ppipiSigmac0)
-    
+
     self.line_B2ppipiSigmacmm_FourPart= StrippingLine(
       name+"_Closed_Line_FourPart"
       ,prescale=config['PrescaleComplete']
@@ -511,7 +511,7 @@ class StrippingB2ppipiSigmacmm_Lcpi_Conf(LineBuilder):
       ,FILTER=_GECfilter
       ,RelatedInfoTools=coneinfo)
     self.registerLine(self.line_B2ppipiSigmacmm_FourPart)
-    
+
     self.line_B2ppipiSigmacmm_FourPart_WS= StrippingLine(
       name+"_Closed_Line_FourPart_WS"
       ,prescale=config['PrescaleComplete']
@@ -546,11 +546,11 @@ def makepifromSigmacmm(
               " &(PT<%(MAXPT)s)&(P<%(MAXP)s)" \
               " & (MIPCHI2DV(PRIMARY)>%(MINIPCHI2)s)" \
               %locals()
-  
+
   from StandardParticles import StdAllNoPIDsPions
-  
+
   _filter = FilterDesktop(Code = _cuts)
-  
+
   _selection = Selection('pifromSigmamm_'+name
                           ,Algorithm=_filter
                           ,RequiredSelections=[StdAllNoPIDsPions])
@@ -595,17 +595,17 @@ def makeThreePart(
   if applyPionPIDK:
     _tmpc = "((PIDK-PIDpi)<%(pionPIDK)s)" %locals()
     _pionCuts = _pionCuts + " & "+_tmpc
-     
+
   _protonCuts = "(PT>%(pMINPT)s)&(P>%(pMINP)s) & (TRCHI2DOF<%(trackChi2DOF)s) " \
               " & (MIPCHI2DV(PRIMARY)>%(pMINIPCHI2)s) & ((PIDp-PIDpi)>%(pMINPIDp)s) & ((PIDp-PIDK)>%(pMINPIDp_K)s)" \
               %locals()
-              
+
   if applyGhostProbCut:
     _ghostCut = "( TRGHOSTPROB < %(ghostProbCut)s )" %locals()
     _pionCuts = _pionCuts + " & "+_ghostCut
-     
+
   from StandardParticles import StdLoosePions, StdLooseProtons, StdNoPIDsPions, StdNoPIDsProtons
-  
+
   _combpart = DaVinci__N3BodyDecays(DecayDescriptor = "[D+ -> p+ pi+ pi+]cc"
                                ,Combination12Cut = _prefitCuts12
                                ,CombinationCut = _prefitCuts
@@ -661,17 +661,17 @@ def makeThreePartWS_SC(
   if applyPionPIDK:
     _tmpc = "((PIDK-PIDpi)<%(pionPIDK)s)" %locals()
     _pionCuts = _pionCuts + " & "+_tmpc
-     
+
   _protonCuts = "(PT>%(pMINPT)s)&(P>%(pMINP)s) & (TRCHI2DOF<%(trackChi2DOF)s) " \
               " & (MIPCHI2DV(PRIMARY)>%(pMINIPCHI2)s) & ((PIDp-PIDpi)>%(pMINPIDp)s) & ((PIDp-PIDK)>%(pMINPIDp_K)s)" \
               %locals()
-              
+
   if applyGhostProbCut:
     _ghostCut = "( TRGHOSTPROB < %(ghostProbCut)s )" %locals()
     _pionCuts = _pionCuts + " & "+_ghostCut
-     
+
   from StandardParticles import StdLoosePions, StdLooseProtons, StdNoPIDsPions, StdNoPIDsProtons
-  
+
   _combpart = DaVinci__N3BodyDecays(DecayDescriptor = "[D+ -> p~- pi+ pi+]cc"
                                ,Combination12Cut = _prefitCuts12
                                ,CombinationCut = _prefitCuts
@@ -728,17 +728,17 @@ def makeThreePartSc0(
   if applyPionPIDK:
     _tmpc = "((PIDK-PIDpi)<%(pionPIDK)s)" %locals()
     _pionCuts = _pionCuts + " & "+_tmpc
-     
+
   _protonCuts = "(PT>%(pMINPT)s)&(P>%(pMINP)s) & (TRCHI2DOF<%(trackChi2DOF)s) " \
               " & (MIPCHI2DV(PRIMARY)>%(pMINIPCHI2)s) & ((PIDp-PIDpi)>%(pMINPIDp)s) & ((PIDp-PIDK)>%(pMINPIDp_K)s)" \
               %locals()
-              
+
   if applyGhostProbCut:
     _ghostCut = "( TRGHOSTPROB < %(ghostProbCut)s )" %locals()
     _pionCuts = _pionCuts + " & "+_ghostCut
-     
+
   from StandardParticles import StdLoosePions, StdLooseProtons, StdNoPIDsPions, StdNoPIDsProtons
-  
+
   _combpart = DaVinci__N3BodyDecays(DecayDescriptor = "[D+ -> p+ pi+ pi-]cc"
                                ,Combination12Cut = _prefitCuts12
                                ,CombinationCut = _prefitCuts
@@ -806,7 +806,7 @@ def makeSigmacmm2Lcpi(
   ,SigmaPT
   ):
   _prefitCuts = "(AMAXDOCA('')<%(SigmaMAXDOCA)s) & (APT>%(SigmaPT)s)" %locals()
-  
+
   _LcCuts = "(ADMASS('Lambda_c~-')<%(LcMassWind)s) & (VFASPF(VCHI2/VDOF)<%(LcVtxChi2DOF)s) & (BPVVDCHI2>%(LcFDChi2)s) " %locals()
 
   _motherCuts = "(VFASPF(VCHI2/VDOF)<%(SigmaVtxChi2DOF)s) & " \
@@ -841,7 +841,7 @@ def makeSigmac02Lcpi(
   ,SigmaPT
   ):
   _prefitCuts = "(AMAXDOCA('')<%(SigmaMAXDOCA)s) & (APT>%(SigmaPT)s)" %locals()
-  
+
   _LcCuts = "(ADMASS('Lambda_c~-')<%(LcMassWind)s) & (VFASPF(VCHI2/VDOF)<%(LcVtxChi2DOF)s) & (BPVVDCHI2>%(LcFDChi2)s) " %locals()
 
   _motherCuts = "(VFASPF(VCHI2/VDOF)<%(SigmaVtxChi2DOF)s) & " \
@@ -887,7 +887,7 @@ def makeFourPart(
   if(ApplyDeltaMCut):
     _deltamcut="((M-M2)>%(DelmLower)s) & ((M-M2)<%(DelmUpper)s)"%locals()
     _motherCuts=motherCuts+" & "+_deltamcut
-    
+
   _combpart = CombineParticles (
     DecayDescriptor="[B+ -> pi- D+]cc"
     ,CombinationCut = _prefitCuts
@@ -936,7 +936,7 @@ def makeFourPartWS(
   if(ApplyDeltaMCut):
     _deltamcut="((M-M2)>%(DelmLower)s) & ((M-M2)<%(DelmUpper)s)"%locals()
     _motherCuts=motherCuts+" & "+_deltamcut
-    
+
   _combpart = CombineParticles (
     DecayDescriptor="[B+ -> pi+ D+]cc"
     ,CombinationCut = _prefitCuts
@@ -985,7 +985,7 @@ def makeFourPartWS_SC(
   if(ApplyDeltaMCut):
     _deltamcut="((M-M2)>%(DelmLower)s) & ((M-M2)<%(DelmUpper)s)"%locals()
     _motherCuts=motherCuts+" & "+_deltamcut
-    
+
   _combpart = CombineParticles (
     DecayDescriptor="[B+ -> pi+ D+]cc"
     ,CombinationCut = _prefitCuts
@@ -1066,7 +1066,7 @@ def makeB2ppipiSigmac0(
     ,RequiredSelections=[selectionthree, selectionSigma]
     )
   return _selection
-  
+
 def makeB2ppipiSigmacmm_FourPart(
   name
   ,selectionfour
@@ -1177,4 +1177,4 @@ def makeTISTOS( name, _input, _hlttos ) :
   return Selection( name
            , Algorithm = _tisTosFilter
            , RequiredSelections = [ _input ]
-            )        
+            )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py
index f63b98517719a49d8616588b210dfc61f39ffd72..1ae6ae68ec2df22df9cfc04553feb60e1ac1cdb5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py
@@ -67,7 +67,7 @@ default_config={
                    , 'PostVertexChi2_MIN'     :  5.0
                    , 'LambdaPr_PT_MIN'        : 500. * MeV
                    , 'LambdaPi_PT_MIN'        : 100. * MeV
-      } ## end of 'CONFIG' 
+      } ## end of 'CONFIG'
 }  ## end of default_config
 #-------------------------------------------------------------------------------------------------------------
 class StrippingChargedHyperonsConf(LineBuilder) :
@@ -78,24 +78,24 @@ class StrippingChargedHyperonsConf(LineBuilder) :
            LineBuilder.__init__(self, name, config)
            self.name = name
            self.config = config
-	
 
-       
+
+
            self.LongPionsList = MergedSelection("LongPionsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")]) # take all long tracks
- 
-           
+
+
            self.DownstreamPionsList = MergedSelection("DownstreamPionsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")]) # take all long tracks
- 
+
            self.LongKaonsList = MergedSelection("LongKaonsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdAllLooseKaons/Particles")]) # take all long tracks
- 
-           
+
+
            self.DownstreamKaonsList = MergedSelection("DownstreamKaonsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseDownKaons/Particles")]) # take all long tracks
- 
-           
+
+
 
            self.GoodLongPionsList = self.createSubSel( OutputList = "GoodLongPionsFor" + self.name,
                                                InputList = self.LongPionsList,
@@ -124,9 +124,9 @@ class StrippingChargedHyperonsConf(LineBuilder) :
                                                " & (PIDK > %(KaonPIDK)s )" % self.config )
 
 
-           
-           
-           
+
+
+
            self.LambdaListLooseDD = MergedSelection("StdLooseDDLambdaFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")])
 
@@ -146,7 +146,7 @@ class StrippingChargedHyperonsConf(LineBuilder) :
                                                 "& (VFASPF(VZ) < %(LambdaLLMaxVZ)s ) " \
                                                 "& (BPVLTIME() > %(LambdaLLMinDecayTime)s )" % self.config \
                                                 )
-           
+
            self.LambdaListDD =  self.createSubSel(OutputList = "LambdaDDFor" + self.name,
                                                 InputList = self.LambdaListLooseDD ,
                                                 Cuts = "(MAXTREE('p+'==ABSID, PT) > %(LambdaPr_PT_MIN)s ) "\
@@ -161,16 +161,16 @@ class StrippingChargedHyperonsConf(LineBuilder) :
            self.LambdaList = MergedSelection("LambdaFor" + self.name,
                                              RequiredSelections = [self.LambdaListLL, self.LambdaListDD]
                                              )
-           
+
            self.XiminusList = self.makeXiminus()
            self.OmegaminusList = self.makeOmegaminus()
-           
+
        def createSubSel( self, OutputList, InputList, Cuts ) :
            '''create a selection using a FilterDesktop'''
            filter = FilterDesktop(Code = Cuts)
            return Selection( OutputList,
                              Algorithm = filter,
-                             RequiredSelections = [ InputList ] ) 
+                             RequiredSelections = [ InputList ] )
        def createCombinationSel( self, OutputList,
                                  DecayDescriptor,
                                  DaughterLists,
@@ -186,13 +186,13 @@ class StrippingChargedHyperonsConf(LineBuilder) :
            return Selection ( OutputList,
                               Algorithm = combiner,
                               RequiredSelections = DaughterLists)
-       
+
 
 
 #------------------------------------------------------------------------------------------
 
        def makeXiminus( self ):
-            
+
               ''' Make a Xi minus candidate from long tracks '''
               Ximinus2LambdaPiLLL = self.createCombinationSel(OutputList = "Ximinus2LambdaPiLLL"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -205,8 +205,8 @@ class StrippingChargedHyperonsConf(LineBuilder) :
                                                                              "(BPVVDZ>0) & "\
                                                                              "(CHILD(VFASPF(VZ),1)-VFASPF(VZ) > %(LambdaDeltaZ_MIN)s)"% self.config
                                                            )
-              
-            
+
+
               ''' Make a Xi minus candidate  from a LambdaDD and along pion'''
               Ximinus2LambdaPiDDL = self.createCombinationSel(OutputList = "Ximinus2LambdaPiDDL"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -218,8 +218,8 @@ class StrippingChargedHyperonsConf(LineBuilder) :
                                                                              "(BPVLTIME() > %(Hyperon_BPVLTIME_MIN)s) & "\
                                                                              "(BPVVDZ>0) & "\
                                                                              "(CHILD(VFASPF(VZ),1)-VFASPF(VZ) > %(LambdaDeltaZ_MIN)s )"% self.config
-                                                           ) 
-            
+                                                           )
+
               ''' Make a Xi minus candidate  from downstream tracks'''
               Ximinus2LambdaPiDDD = self.createCombinationSel(OutputList = "Ximinus2LambdaPiDDD"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -243,12 +243,12 @@ class StrippingChargedHyperonsConf(LineBuilder) :
 ## This one will pass all candidates
               NullFilter= FilterDesktop(Code = "ALL")
 
-## Ximinus2Lambda2PiSelection is *also* a Selection, but it is "more selective" 
+## Ximinus2Lambda2PiSelection is *also* a Selection, but it is "more selective"
 ## than  Ximinus2LambdaPi in the sense that it passes only events when something
 ## is in the output list
               Ximinus2LambdaPiSelection = Selection( "Ximinus2LambdaPiSelection"+self.name,
                                                     Algorithm = NullFilter,
-                                                    RequiredSelections = [Ximinus2LambdaPi]) 
+                                                    RequiredSelections = [Ximinus2LambdaPi])
               Ximinus2LambdaPiLine = StrippingLine (self.name + "Ximinus2LambdaPi",
                                                          algos = [Ximinus2LambdaPiSelection])
               self.registerLine (Ximinus2LambdaPiLine)
@@ -257,7 +257,7 @@ class StrippingChargedHyperonsConf(LineBuilder) :
 #------------------------------------------------------------------------------------------
 
        def makeOmegaminus( self ):
-            
+
               ''' Make an Omega minus candidate '''
               Omegaminus2LambdaKLLL = self.createCombinationSel(OutputList = "Omegaminus2LambdaKLLL"+ self.name,
                                                            DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -270,8 +270,8 @@ class StrippingChargedHyperonsConf(LineBuilder) :
                                                                              "(BPVVDZ>0) & "\
                                                                              "(CHILD(VFASPF(VZ),1)-VFASPF(VZ) > %(LambdaDeltaZ_MIN)s )"% self.config
                                                            )
-             
-            
+
+
               ''' Make an Omega minus candidate '''
               Omegaminus2LambdaKDDL = self.createCombinationSel(OutputList = "Omegaminus2LambdaKDDL"+ self.name,
                                                            DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -284,7 +284,7 @@ class StrippingChargedHyperonsConf(LineBuilder) :
                                                                              "(BPVVDZ>0) & "\
                                                                              "(CHILD(VFASPF(VZ),1)-VFASPF(VZ) > %(LambdaDeltaZ_MIN)s )"% self.config
                                                            )
-             
+
               ''' Make an Omega minus candidate '''
               Omegaminus2LambdaKDDD = self.createCombinationSel(OutputList = "Omegaminus2LambdaKDDD"+ self.name,
                                                            DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -310,7 +310,7 @@ class StrippingChargedHyperonsConf(LineBuilder) :
 ## This one will pass all candidates
               NullFilter= FilterDesktop(Code = "ALL")
 
-## Omegaminus2Lambda2PiSelection is *also* a Selection, but it is "more selective" 
+## Omegaminus2Lambda2PiSelection is *also* a Selection, but it is "more selective"
 ## than  Omegaminus2LambdaK in the sense that it passes only events when something
 ## is in the output list
               Omegaminus2LambdaKSelection = Selection( "Omegaminus2LambdaKSelection"+self.name,
@@ -321,4 +321,3 @@ class StrippingChargedHyperonsConf(LineBuilder) :
               self.registerLine (Omegaminus2LambdaKLine)
 
 ##  --------------------  end of makeOmegaminus  ------------
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py
index 23a69ab1c588aa701e2212175582131afa4ae150..f9005edee01a76006bebe56cadbe3c7f1ae47d34 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py
@@ -146,7 +146,7 @@ class StrippingCharm2PPXConf(LineBuilder):
         hc2ppkpi_name = '{0}Hc2PPKPi'.format(name)
         hc2ppk_name = '{0}Hc2PPK'.format(name)
         hc2ppkpipi_name = '{0}Hc2PPKPiPi'.format(name)
-        
+
         hs2pppi_name = '{0}Hs2PPPi'.format(name)
         hs2pppiDown_name = '{0}Hs2PPPiDown'.format(name)
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py
index d1d29c70e38242f9b2d7c77cb79f98efd6756f95..3140b5a0c989803a93573542044bc7a8d6965768 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py
@@ -91,7 +91,7 @@ class CharmForVubConf(LineBuilder) :
     Exports as instance data members:
     selKaons                   : Kaons for D+->K*0(K+pi-)MuNu
     selMuons                   : Muons for D*->D0(HMuNu)pi, D+->K*0(K+pi-)MuNu and D+->Rho(pi+pi-)MuNu
-    selPions                   : Hard pions from D0/D+ 
+    selPions                   : Hard pions from D0/D+
     selSlowPions               : Soft pions from D*+
     selKstar                   : K*0 for D+->K*0MuNu
     selRho                     : Rho0 for D+->RhoMuNu
@@ -102,13 +102,13 @@ class CharmForVubConf(LineBuilder) :
     selBtoDplus2RhoMuNu        : B->(D+->RhoMu+Nu)+tracks  selection object
     selBtoDplusD02HMuNu       : B->(D+->D+->K*Mu+Nu)+tracks selection object
     prescaled_KstarMuNu        : StrippingLine made out of selBtoDplusVMuNu
-    prescaled_HMuNu           : StrippingLine made out of selDstarD02HMuNu 
+    prescaled_HMuNu           : StrippingLine made out of selDstarD02HMuNu
     lines                      : List of lines
 
     Exports as class data member:
     CharmForVub.__configuration_keys__ : List of required configuration parameters.
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config) :
@@ -117,25 +117,25 @@ class CharmForVubConf(LineBuilder) :
 
         prescaled_name = name
 
-        self.selMuons = makeMuons( 'MuonsFor'+prescaled_name, 
+        self.selMuons = makeMuons( 'MuonsFor'+prescaled_name,
 				     MUON_MinPT = config['MUON_MinPT'],
                                      MUON_PIDmu = config['MUON_PIDmu'])
 
         self.selMuonsFromB = makeMuonsFromB( 'MuonsFromBFor'+prescaled_name,
-                                     muonSel = self.selMuons, 
+                                     muonSel = self.selMuons,
                                      TRACK_MINIPCHI2 = config['TRACK_MINIPCHI2'])
 
 
 
-        self.selKaons = makeKaons( 'KaonsFor'+prescaled_name, 
-				     KAON_PIDK = config['KAON_PIDK'], 
+        self.selKaons = makeKaons( 'KaonsFor'+prescaled_name,
+				     KAON_PIDK = config['KAON_PIDK'],
 				     KAON_MinPT = config['KAON_MinPT'])
 
         self.selKaonsFromB = makeKaonsFromB( 'KaonsFromBFor'+prescaled_name,
                                      kaonSel = self.selKaons,
                                      TRACK_MINIPCHI2 = config['TRACK_MINIPCHI2'])
 
-        self.selPions = makePions( 'PionsFor'+prescaled_name, 
+        self.selPions = makePions( 'PionsFor'+prescaled_name,
 				     PION_PIDmu = config['PION_PIDmu'],
                                      PION_PIDK = config['PION_PIDK'],
                                      PION_MinPT = config['PION_MinPT'])
@@ -144,17 +144,17 @@ class CharmForVubConf(LineBuilder) :
                                      pionSel = self.selPions,
                                      TRACK_MINIPCHI2 = config['TRACK_MINIPCHI2'])
 
-        self.selSlowPions = makeSlowPions( 'SlowPionsFor'+prescaled_name, 
+        self.selSlowPions = makeSlowPions( 'SlowPionsFor'+prescaled_name,
 				     PION_PIDmu = config['PION_PIDmu'])
 
 
-        self.selRho = makeRho( 'RhoFor'+prescaled_name, 
+        self.selRho = makeRho( 'RhoFor'+prescaled_name,
                                      pionFromBSel = self.selPionsFromB,
 				     Rho_MinPT = config['Rho_MinPT'],
 				     Rho_MassMax = config['Rho_MassMax'],
 				     Rho_MassMin = config['Rho_MassMin'])
 
-        self.selKstar = makeKstar( 'KstarFor'+prescaled_name, 
+        self.selKstar = makeKstar( 'KstarFor'+prescaled_name,
                                      pionFromBSel = self.selPionsFromB,
                                      kaonFromBSel = self.selKaonsFromB,
 				     Kstar_MinPT = config['Kstar_MinPT'],
@@ -163,8 +163,8 @@ class CharmForVubConf(LineBuilder) :
 
 
 
-        self.selDplus2VMuNu = makeDplus2VMuNu('Dplus2VMuNuFor'+prescaled_name,  
-                                            muonFromBSel = self.selMuonsFromB, 
+        self.selDplus2VMuNu = makeDplus2VMuNu('Dplus2VMuNuFor'+prescaled_name,
+                                            muonFromBSel = self.selMuonsFromB,
                                             RhoSel = self.selRho,
                                             KstarSel = self.selKstar,
 					    PAIR_SumPTMin = config['PAIR_SumPTMin'],
@@ -177,8 +177,8 @@ class CharmForVubConf(LineBuilder) :
                                             D_BPVVDZ = config['D_BPVVDZ'],
                                             D_VtxChi2 = config['D_VtxChi2'])
 
-        self.selBtoDplusVMuNu = makeBtoDplusVMuNu('BtoDplusVMuNu'+prescaled_name,  
-                                            Dplus2VMuNuSel = self.selDplus2VMuNu, 
+        self.selBtoDplusVMuNu = makeBtoDplusVMuNu('BtoDplusVMuNu'+prescaled_name,
+                                            Dplus2VMuNuSel = self.selDplus2VMuNu,
                                             PionsFromBSel = self.selPionsFromB,
                                             BtoD_DeltaMass_MIN = config['BtoD_DeltaMass_MIN'],
                                             BtoD_DeltaMass_MAX = config['BtoD_DeltaMass_MAX'],
@@ -187,8 +187,8 @@ class CharmForVubConf(LineBuilder) :
 
 
 
-        self.selD02HMuNu = makeD02HMuNu('D0HMuNuFor'+prescaled_name,  
-                                            muonSel = self.selMuons, 
+        self.selD02HMuNu = makeD02HMuNu('D0HMuNuFor'+prescaled_name,
+                                            muonSel = self.selMuons,
                                             pionSel = self.selPions,
                                             kaonSel = self.selKaons,
 					    PAIR_SumPTMin = config['PAIR_SumPTMin'],
@@ -201,7 +201,7 @@ class CharmForVubConf(LineBuilder) :
                                             D_BPVVDZ = config['D_BPVVDZ'],
                                             D_VtxChi2 = config['D_VtxChi2'])
 
-        self.selDstarD02HMuNu = makeDstarD02HMuNu('DstarD0HMuNuFor'+prescaled_name,  
+        self.selDstarD02HMuNu = makeDstarD02HMuNu('DstarD0HMuNuFor'+prescaled_name,
                                             D02HMuNuSel = self.selD02HMuNu,
 					    slowPionSel = self.selSlowPions,
                                             Dstar_MassMin = config['Dstar_MassMin'],
@@ -225,29 +225,29 @@ class CharmForVubConf(LineBuilder) :
         self.registerLine(self.prescaled_lineHMuNu)
 
 
-def makeMuons(name, 
+def makeMuons(name,
               MUON_MinPT,
               MUON_PIDmu) :
     """
     Create muons for all channels
     """
     _code = " ( 'mu+'  == ABSID ) & ISMUON & (PT > %(MUON_MinPT)s *MeV) & (PIDmu > %(MUON_PIDmu)s )" % locals()
-    _muonFilter = FilterDesktop (Code = _code ) 
+    _muonFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _muonFilter,
-		      RequiredSelections = [StdLooseMuons]) 
+		      RequiredSelections = [StdLooseMuons])
 
 def makeMuonsFromB(name,
-              muonSel, 
+              muonSel,
               TRACK_MINIPCHI2) :
     """
     Create muons for all channels
     """
     _code = "(MIPCHI2DV(PRIMARY) > %(TRACK_MINIPCHI2)s )" % locals()
-    _muonFilter = FilterDesktop (Code = _code ) 
+    _muonFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _muonFilter,
-		      RequiredSelections = [muonSel]) 
+		      RequiredSelections = [muonSel])
 
 
 def makeKaons(name,
@@ -258,24 +258,24 @@ def makeKaons(name,
     """
     _code = " ( 'K+'  == ABSID ) &  "\
     "( %(KAON_PIDK)s < PIDK - PIDpi) & (PT > %(KAON_MinPT)s *MeV)" % locals()
-    _kaonFilter = FilterDesktop (Code = _code ) 
+    _kaonFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _kaonFilter,
-		      RequiredSelections = [StdLooseKaons]) 
+		      RequiredSelections = [StdLooseKaons])
 
 def makeKaonsFromB(name,
-          kaonSel, 
+          kaonSel,
           TRACK_MINIPCHI2) :
     """
     Create hard kaons for all channels.
     """
     _code = "(MIPCHI2DV(PRIMARY) > %(TRACK_MINIPCHI2)s )" % locals()
-    _kaonFromBFilter = FilterDesktop (Code = _code ) 
+    _kaonFromBFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _kaonFromBFilter,
-		      RequiredSelections = [kaonSel]) 
+		      RequiredSelections = [kaonSel])
 
-def makePions(name, 
+def makePions(name,
 	  PION_PIDmu,
           PION_PIDK,
           PION_MinPT) :
@@ -283,33 +283,33 @@ def makePions(name,
     Create hard pions for all channels
     """
     _code = "(PT > %(PION_MinPT)s ) & (PIDK < %(PION_PIDK)s ) & ( %(PION_PIDmu)s < PIDpi - PIDmu) " % locals()
-    _pionFilter = FilterDesktop (Code = _code ) 
+    _pionFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _pionFilter,
-		      RequiredSelections = [StdLoosePions]) 
+		      RequiredSelections = [StdLoosePions])
 
 def makePionsFromB(name,
-          pionSel, 
+          pionSel,
           TRACK_MINIPCHI2) :
     """
     Create hard pions for all channels
     """
     _code = "(MIPCHI2DV(PRIMARY) > %(TRACK_MINIPCHI2)s )" % locals()
-    _pionFromBFilter = FilterDesktop (Code = _code ) 
+    _pionFromBFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _pionFromBFilter,
-		      RequiredSelections = [pionSel]) 
+		      RequiredSelections = [pionSel])
 
-def makeSlowPions(name, 
+def makeSlowPions(name,
 	  PION_PIDmu) :
     """
     Create soft pions for D*->D0 pi
     """
     _code = "( %(PION_PIDmu)s < PIDpi - PIDmu) " % locals()
-    _slowPionFilter = FilterDesktop (Code = _code ) 
+    _slowPionFilter = FilterDesktop (Code = _code )
     return Selection (name,
 	              Algorithm = _slowPionFilter,
-		      RequiredSelections = [StdAllLoosePions]) 
+		      RequiredSelections = [StdAllLoosePions])
 
 
 
@@ -369,7 +369,7 @@ def makeDplus2VMuNu(name,
     """
     Create and return a D+ -> VMuNu selection object.
     """
-    
+
     hadrons = MergedSelection("MergedVectorHadrons"+name,
                                 RequiredSelections = [KstarSel,RhoSel])
 
@@ -408,7 +408,7 @@ def makeBtoDplusVMuNu(name,
     _BtoDplus2KstarMuNu = CombineParticles( DecayDescriptors = [
                                          " [B0 -> D+ pi-]cc" ,
 					 " [B0 -> D+ pi- pi+ pi-]cc"
-					 ],					 
+					 ],
                             MotherCut = _motherCuts)
     return Selection (name,
                       Algorithm = _BtoDplus2KstarMuNu,
@@ -473,12 +473,10 @@ def makeDstarD02HMuNu(name,
     _DstarD02HMuNu = CombineParticles( DecayDescriptors = [
                                          " [D*(2010)+ -> D0 pi+]cc" ,
 					 " [D*(2010)- -> D0 pi-]cc"
-					 ],					 
+					 ],
                             MotherCut = _motherCuts,
 			    CombinationCut = _combinationCuts )
 
     return Selection (name,
                       Algorithm = _DstarD02HMuNu,
                       RequiredSelections = [D02HMuNuSel, slowPionSel])
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmFromBSemi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmFromBSemi.py
index 17f3f0b387ab2ee45d5a231cccaee2273b23a5e6..9064192ed0b50cc3fbfd198418e3c462ecdc4bfa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmFromBSemi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmFromBSemi.py
@@ -1250,8 +1250,8 @@ class CharmFromBSemiAllLinesConf(LineBuilder) :
                "IgnoreUnmatchedDescriptors" : True,
                "DaughterLocations" : {
                    "^[Beauty -> (Charm -> p+ X- X+) mu-]CC" : 'VertexIsoInfo_B',
-                   "[Beauty -> ^(Charm -> p+ X- X+) mu-]CC" : 'VertexIsoInfo_C'} } ]                        
-        return relInfo 
+                   "[Beauty -> ^(Charm -> p+ X- X+) mu-]CC" : 'VertexIsoInfo_C'} } ]
+        return relInfo
 
     def _getRelInfoD3BodyKsHH(self):
         relInfo = []
@@ -1273,8 +1273,8 @@ class CharmFromBSemiAllLinesConf(LineBuilder) :
                "IgnoreUnmatchedDescriptors" : True,
                "DaughterLocations" : {
                    "^[Beauty -> (Charm -> KS0 X- X+) mu-]CC" : 'VertexIsoInfo_B',
-                   "[Beauty -> ^(Charm -> KS0 X- X+) mu-]CC" : 'VertexIsoInfo_C'} } ]                        
-        return relInfo 
+                   "[Beauty -> ^(Charm -> KS0 X- X+) mu-]CC" : 'VertexIsoInfo_C'} } ]
+        return relInfo
 
     def _getRelInfoDstarD3BodyKsHH(self):
         relInfo = []
@@ -1300,7 +1300,7 @@ class CharmFromBSemiAllLinesConf(LineBuilder) :
                    "^[Beauty -> (D*(2010)+ -> (Charm -> KS0 X- X+) pi+) [mu-]cc]CC" :'VertexIsoInfo_B' ,
                    "[Beauty -> ^(D*(2010)+ -> (Charm -> KS0 X- X+) pi+) [mu-]cc]CC" :'VertexIsoInfo_Dst' ,
                    "[Beauty -> (D*(2010)+ -> ^(Charm -> KS0 X- X+) pi+) [mu-]cc]CC" :'VertexIsoInfo_C' } } ]
-        return relInfo 
+        return relInfo
 
 
 
@@ -1327,7 +1327,7 @@ class CharmFromBSemiAllLinesConf(LineBuilder) :
                 "^[Beauty -> (Charm -> X- X+ X- X+) mu+]CC" : 'VertexIsoInfo_B',
                 "[Beauty -> ^(Charm -> X- X+ X- X+) mu+]CC" : 'VertexIsoInfo_D'} } ]
         return relInfo
- 
+
 def makeDstar(_name, inputD0,_softPi,Dstar_cuts,_isSelfConjFS=False) :
     _inputD0_conj = Selection("SelConjugateD0For"+_name,
                              Algorithm = ConjugateNeutralPID('ConjugateD0For'+_name),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py
index b6379cf5056dbdb6c6a4deb028f3cdb3594b72e5..ccf9d36fc2c4c4a3600a2119a5afe83787980360 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py
@@ -47,12 +47,12 @@ default_config = {
                     ,'MinD0stMass'       : 1750      # MeV
                     ,'MaxD0stMass'       : 2120      # MeV
                     ,'MinD0stPT'         : 2000      # MeV
-                    ,'MaxD0stVertChi2DOF': 16        # Dimensionless 
+                    ,'MaxD0stVertChi2DOF': 16        # Dimensionless
                     #Ds1
                     ,'MinKaonPT'         : 250       # MeV
-                    ,'Ds1PT'             : 4000      # MeV 
+                    ,'Ds1PT'             : 4000      # MeV
                     ,'QValueDs1Decay'    : 80        # MeV
-                    ,'MaxDs1VertChi2DOF' : 9         # Dimensionless 
+                    ,'MaxDs1VertChi2DOF' : 9         # Dimensionless
                     # Pre- and postscales
                     ,'CharmWeakDecaysPreScale'     : 1.0
                     ,'CharmWeakDecaysPostScale'    : 1.0
@@ -65,7 +65,7 @@ default_config = {
 class CharmWeakDecaysConf(LineBuilder):
     """
     Definition of Ds1 -> D(*)0 K stripping
-    
+
     Constructs Bc -> Ds1 Gamma Selections and StrippingLines from
     a configuration dictionary.
     Usage:
@@ -78,14 +78,14 @@ class CharmWeakDecaysConf(LineBuilder):
 
     Exports as instance data members:
     selD0                        : nominal D0 -> K pi Selection object
-    selDs1                       : nominal Ds1 -> D0 K Selection object 
+    selDs1                       : nominal Ds1 -> D0 K Selection object
     selDs1WS                     : nominal Ds1 -> D~0 K Selection object
     lines                  : List of lines
 
     Exports as class data member:
-    StrippingB2XGammaConf.__configuration_keys__ : List of required configuration parameters.    
+    StrippingB2XGammaConf.__configuration_keys__ : List of required configuration parameters.
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config):
@@ -93,7 +93,7 @@ class CharmWeakDecaysConf(LineBuilder):
 
         # if name not set outside, set it to empty
         #if name == None:
-        #    name = ""   
+        #    name = ""
 
         # Selection of D0 and Ds1
 
@@ -145,22 +145,22 @@ class CharmWeakDecaysConf(LineBuilder):
                                            postscale=config['CharmWeakDecaysPostScale'],
                                            selection=self.selDs1WS)
         self.registerLine(self.Ds12D0stKWSLine)
-        
+
 def makeD0st(name, KaonPID, PionPID, TrGhostProb, MinTrackPT, MinTrackIPchi2, MinD0stMass, MaxD0stMass, MinD0stPT, MaxD0stVertChi2DOF, DaugPtMax) :
     """
     Create and return a D(*)0->Kpi Selection object
-    
+
     @arg name: name of the Selection.
     @arg KaonPID: PID of Kaon
     @arg PionPID: PID of pion
     @arg TrGhostProb: Ghost probability of pion/kaon
     @return: Selection object
-    
+
     """
 
     _daughterCutK  = "(TRGHOSTPROB<%(TrGhostProb)s) & (PT > %(MinTrackPT)s) & (MIPCHI2DV(PRIMARY) < %(MinTrackIPchi2)s) & (PIDK  > %(KaonPID)s)" % locals()
     _daughterCutpi = "(TRGHOSTPROB<%(TrGhostProb)s) & (PT > %(MinTrackPT)s) & (MIPCHI2DV(PRIMARY) < %(MinTrackIPchi2)s) & (PIDK  < %(PionPID)s)" % locals()
-    
+
     _combinationCut = "(in_range( (%(MinD0stMass)s*MeV-100*MeV), AM, (%(MaxD0stMass)s*MeV+100*MeV))) & (APT > (%(MinD0stPT)s*MeV-500*MeV)) & (AHASCHILD( PT > %(DaugPtMax)s* MeV))" % locals()
     _motherCut = "(in_range( %(MinD0stMass)s*MeV, M, %(MaxD0stMass)s*MeV)) & (PT > %(MinD0stPT)s*MeV) & (VFASPF(VCHI2/VDOF) < %(MaxD0stVertChi2DOF)s)" % locals()
     _D0st = CombineParticles(DecayDescriptor = "[D*(2007)0 -> K- pi+]cc",
@@ -168,10 +168,10 @@ def makeD0st(name, KaonPID, PionPID, TrGhostProb, MinTrackPT, MinTrackIPchi2, Mi
                                               "pi+" : _daughterCutpi},
                              CombinationCut  = _combinationCut,
                              MotherCut       =_motherCut)
-    
+
     _stdANNKaon = DataOnDemand(Location="Phys/StdAllLooseANNKaons/Particles")
     _stdANNPion = DataOnDemand(Location="Phys/StdAllLooseANNPions/Particles")
-    
+
     return Selection(name, Algorithm=_D0st, RequiredSelections=[_stdANNKaon, _stdANNPion])
 
 
@@ -196,8 +196,8 @@ def makeDs1(name, D0stSel, DecDescr, KaonPID, TrGhostProb, MinKaonPT, MinTrackIP
                             DaughtersCuts   = {"K+" : _daughterCutK},
                             CombinationCut  = _combinationCut,
                             MotherCut       = _motherCut)
-    
+
     _stdANNKaon = DataOnDemand(Location="Phys/StdAllLooseANNKaons/Particles")
     return Selection(name, Algorithm=_Ds1, RequiredSelections=[D0stSel, _stdANNKaon])
-                                
+
 # EOF
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py
index 8a3823c1d9079a3a6fe2a0d24799ded1bec42961..cb49ef639e049132fbda346724c54230c5298493 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py
@@ -44,7 +44,7 @@ default_config = {
     'WGs'           : ['Charm'],
     'BUILDERTYPE'   : 'D02KSKSConf',
     'CONFIG'        : {'D0_MassWindowBeforeFit'          : 150.0, # D0 mass window cut in MeV before vertex fit
-                       'D0_MassWindow'                   : 100.0, # D0 mass window cut in MeV 
+                       'D0_MassWindow'                   : 100.0, # D0 mass window cut in MeV
                        'D0_DOCA_LL'                      : 1.0, # DOCA cut in mm for D0->KSLL KSLL
                        'D0_DOCA_DD'                      : 4.0, # DOCA cut in mm for D0->KSLL KSDD and D0->KSDD KSDD
                        'KS_LL_nu2prime'                  : 0.0, # nu'_2 = log((piplus_BPVIPCHI2*piminus_BPVIPCHI2)/(KS0_BPVIPCHI2^2 + KS0_DOCAMAX^2)), preselection cut for KsLL
@@ -53,34 +53,34 @@ default_config = {
                        'KS_DD_nu2prime'                  : 0.0, # nu'_2, preselection cut for KsLL
                        'KS_DD_signedFLchi2'              : 50.0, # KsDD siged flight length chi2 preselection cut
                        'KS_DD_TRGHOSTPROB'		    : 1.0,		# Track ghost probability KSDD
-                       
+
                        'D0_vertexChi2_LL'                : 20.0, # D0LL reduced vertex chi2 cut
                        'D0_IPchi2_LL'                    : 50.0, # D0LL IP chi2 cut
                        'D0_KS_signedFLchi2_LL'           : 200.0, # D0LL signed flight length of the Ks
                        'D0_signedFLchi2_LL'              : -1.0, # D0LL signed flight length chi2 cut
-                       
+
                        'D0_vertexChi2_LD'                : 20.0, # D0LD reduced vertex chi2 cut
                        'D0_IPchi2_LD'                    : 10.0, # D0LD IP chi2 cut
                        'D0_KSLL_signedFLchi2_LD'         : 500.0, # D0LD signed flight length of the KsLL cut
                        'D0_signedFLchi2_LD'              : 1.0, # D0LD signed flight length chi2 cut
-                       
+
                        'D0_vertexChi2_DD'                : 20.0, # D0DD reduced vertex chi2 cut
                        'D0_IPchi2_DD'                    : 10.0, # D0DD IP chi2 cut
                        'D0_KS_nu2prime'                  : 4.0, # D0DD KS nu'_2 cut
                        'D0_lnPt_DD'                      : 21.0, # D0DD ln(D0_PT*KS0_PT*KS00_PT)
-                       
+
                        'slowPi_IPchi2_LL'                : 40.0, # slow pi IP chi2 cut for LL
                        'slowPi_IPchi2_LD'                : 40.0, # slow pi IP chi2 cut for LD
                        'slowPi_IPchi2_DD'                : 40.0, # slow pi IP chi2 cut for DD
-	
+
                        'slowPi_LLL_TRGHOSTPROB'	    : 1.0,  # Track ghost probability slow pi LL
                        'slowPi_LDL_TRGHOSTPROB'	    : 1.0,  # Track ghost probability slow pi LD
                        'slowPi_DDL_TRGHOSTPROB'	    : 1.0,  # Track ghost probability slow pi DD
-                       
+
                        'slowPi_LLU_TRGHOSTPROB'	    : 1.0,  # Track ghost probability slow pi LL
                        'slowPi_LDU_TRGHOSTPROB'	    : 1.0,  # Track ghost probability slow pi LD
                        'slowPi_DDU_TRGHOSTPROB'	    : 1.0,  # Track ghost probability slow pi DD
-	
+
                        'Dst_mass_LL'                     : 200, # mass window on D* cut LL in MeV
                        'Dst_mass_LD'                     : 200, # mass window on D* cut LD in MeV
                        'Dst_mass_DD'                     : 200, # mass window on D* cut DD in MeV
@@ -94,21 +94,21 @@ default_config = {
                        'Dst_massDiffHigh_LD'             : 160, # m_D* - m_D0 high mass difference cut in MeV
                        'Dst_massDiffLow_DD'              : 135, # m_D* - m_D0 low mass difference cut in MeV
                        'Dst_massDiffHigh_DD'             : 160, # m_D* - m_D0 high mass difference cut in MeV
-                  
+
                        'PrescaleLL'                        : 1.0,
                        'PostscaleLL'                       : 1.0,
                        'PrescaleLD'                        : 1.0,
                        'PostscaleLD'                       : 1.0,
                        'PrescaleDD'                        : 1.0,
                        'PostscaleDD'                       : 1.0,
-                       
+
                        'DstPrescaleLL'                        : 1.0,
                        'DstPostscaleLL'                       : 1.0,
                        'DstPrescaleLD'                        : 1.0,
                        'DstPostscaleLD'                       : 1.0,
                        'DstPrescaleDD'                        : 1.0,
                        'DstPostscaleDD'                       : 1.0
-                       
+
                        },
     'STREAMS'      : ['Charm']
     }
@@ -307,10 +307,10 @@ class D02KSKSConf(LineBuilder) :
     def makeKS2LL( self, name, config ) :
 #        # define all the cuts
 #
-#        #1st daughters cuts 
+#        #1st daughters cuts
 #
 #
-#        # before vretex fit cuts 
+#        # before vretex fit cuts
 #
 ##        _DaughterCuts = {"pi-" : _cut_prob_KNDL,
 ##                         "pi+" : _cut_prob_KPDL}
@@ -344,9 +344,9 @@ class D02KSKSConf(LineBuilder) :
         _signedFLchi2_cut = "(BPVLTSIGNCHI2() > %s)" % config['KS_LL_signedFLchi2'] # 50
         _trghost_cut1 = "(CHILD(TRGHOSTPROB, 1) <=%s )" % config['KS_LL_TRGHOSTPROB']
         _trghost_cut2 = "(CHILD(TRGHOSTPROB, 2) <=%s )" % config['KS_LL_TRGHOSTPROB']
-	
+
         _allCuts = _nu2prime_cut + "&" + _signedFLchi2_cut + "&" + _trghost_cut1 + "&" + _trghost_cut2
-        
+
         ## make the filter
         _filterKSLL = FilterDesktop( Code = _allCuts )
 
@@ -360,15 +360,15 @@ class D02KSKSConf(LineBuilder) :
 
         # define all the cuts
 
-        #1st daughters cuts 
+        #1st daughters cuts
 
 
-        # before vretex fit cuts 
+        # before vretex fit cuts
 
 
 #        #_DaughterCuts = {"pi+" : "(P>2*GeV) & (MIPDV(PRIMARY)<100.*mm) & (PT>200*MeV)"}
 #        _DaughterCuts = {}
-#        
+#
 #        _CombinationCuts = "(ACUTDOCA(4.0*mm,'')) & (ADAMASS('KS0')<100*MeV)"
 #
 #
@@ -389,7 +389,7 @@ class D02KSKSConf(LineBuilder) :
 #
         # get the KS's to filter
         _stdKSDD = DataOnDemand( Location = "Phys/StdLooseKsDD/Particles" )
-#        _allCuts = "(DOCAMAX<4.0*mm) & (ADMASS('KS0')<100*MeV)" 
+#        _allCuts = "(DOCAMAX<4.0*mm) & (ADMASS('KS0')<100*MeV)"
 #        _doca_cut = "(DOCAMAX < %s*mm)" % config['KS_DD_DOCA']
 #        _mass_cut = "(ADMASS('KS0')<%s*MeV)" % config['KS_DD_MASS']
 #        _allCuts = _doca_cut + "&" + _mass_cut
@@ -397,7 +397,7 @@ class D02KSKSConf(LineBuilder) :
         _signedFLchi2_cut = "(BPVLTSIGNCHI2() > %s)" % config['KS_DD_signedFLchi2'] # 50
         _trghost_cut1 = "(CHILD(TRGHOSTPROB, 1) <=%s )" % config['KS_DD_TRGHOSTPROB']
         _trghost_cut2 = "(CHILD(TRGHOSTPROB, 2) <=%s )" % config['KS_DD_TRGHOSTPROB']
-	
+
         _allCuts = _nu2prime_cut + "&" + _signedFLchi2_cut + "&" + _trghost_cut1 + "&" + _trghost_cut2
 
         # make the filter
@@ -419,7 +419,7 @@ class D02KSKSConf(LineBuilder) :
 
         _daughterCuts = "(log((CHILD(BPVIPCHI2(),1)*CHILD(BPVIPCHI2(),2))/(BPVIPCHI2()*BPVIPCHI2() + DOCAMAX*DOCAMAX)) > %s)" % config['D0_KS_nu2prime'] # 4 # nu'_2
 
-        # before D vertex fit 
+        # before D vertex fit
         _doca_cut = "(ACUTDOCA(%s*mm,''))" % config['D0_DOCA_DD']
         _massBefore_cut = "(ADAMASS('D0') < %s*MeV)" % config['D0_MassWindowBeforeFit'] # 150
         _combCuts = _doca_cut + "&" + _massBefore_cut
@@ -429,12 +429,12 @@ class D02KSKSConf(LineBuilder) :
         _IPchi2_cut = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_DD'] # 10
         _lnPt_cut = "(log(PT*CHILD(PT,1)*CHILD(PT,2)) > %s) " % config['D0_lnPt_DD'] # 21
         _mass_cut = "(ADMASS('D0') < %s*MeV)" % config['D0_MassWindow'] # 100
-        
+
         _motherCuts = _vertexChi2_cut + "&" + _IPchi2_cut + "&" + _lnPt_cut + "&" + _mass_cut
-        
+
         _D = CombineParticles()
         _D.DecayDescriptors = [ "D0 -> KS0 KS0" ]
-        
+
         _D.CombinationCut = _combCuts
         _D.DaughtersCuts = { "KS0" : _daughterCuts }
         #_D.DaughtersCuts = _daughterCuts
@@ -447,7 +447,7 @@ class D02KSKSConf(LineBuilder) :
 
 #        _D.Preambulo        = _Preambulo
         self.selD02KSDDKSDD = Selection (name, Algorithm = _D, RequiredSelections = [ self.selKS2DD ])
-        
+
     def makeD02KSLLKSDD( self, name, config ) :
         """
         Create and store a D0 -> KS(LL) KS(DD) Selection object.
@@ -455,27 +455,27 @@ class D02KSKSConf(LineBuilder) :
         name             : name of the Selection.
         config           : config dictionary
         """
-        
+
         KsKsLD_mother_cut = "INTREE((ABSID=='pi+') & (ISLONG)) & INTREE((ABSID=='pi+') & (ISDOWN))"
 
         _daughterCuts = "(INTREE((ABSID=='pi+') & (ISDOWN)) | (BPVLTSIGNCHI2() > %s))" % config['D0_KSLL_signedFLchi2_LD'] # 500, signed flight length of the KsLL
-        
-        # before D vertex fit 
+
+        # before D vertex fit
         _doca_cut = "(ACUTDOCA(%s*mm,''))" % config['D0_DOCA_DD']
         _massBefore_cut = "(ADAMASS('D0') < %s*MeV)" % config['D0_MassWindowBeforeFit']
         _combCuts = _doca_cut + "&" + _massBefore_cut
         #_combCuts = "(ACUTDOCA(4.0*mm,'')) & (ADAMASS('D0') < 600*MeV)"
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['D0_vertexChi2_LD'] # 20
         _IPchi2_cut = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_LD'] # 10
         _signedFLchi2_cut = "(BPVLTSIGNCHI2() > %s)" % config['D0_signedFLchi2_LD'] # 1.0
         _mass_cut = "(ADMASS('D0') < %s*MeV)" % config['D0_MassWindow'] # 100
 
         _motherCuts = KsKsLD_mother_cut + " & " + _vertexChi2_cut + " & " + _IPchi2_cut + " & " + _signedFLchi2_cut + " & " + _mass_cut
-        
+
         _D = CombineParticles()
         _D.DecayDescriptors = [ "D0 -> KS0 KS0" ]
-        
+
         #_D.DaughtersCuts = _daughterCuts
         _D.DaughtersCuts = { "KS0" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? #_cut_prob_BCC
@@ -497,25 +497,25 @@ class D02KSKSConf(LineBuilder) :
         config           : config dictionary
         """
 
-        
+
         _daughterCuts = "(BPVLTSIGNCHI2() > %s)" % config['D0_KS_signedFLchi2_LL'] # 200, signed flight length of the Ks
-        
+
         # before D vertex fit
         _doca_cut = "(ACUTDOCA(%s*mm,''))" % config['D0_DOCA_LL']
         _massBefore_cut = "(ADAMASS('D0') < %s*MeV)" % config['D0_MassWindowBeforeFit']
         _combCuts = _doca_cut + "&" + _massBefore_cut
         ##_combCuts = "(ACUTDOCA(1.0*mm,'')) & (ADAMASS('D0') < 600*MeV)"
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['D0_vertexChi2_LL'] # 20
         _IPchi2_cut = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_LL'] # 50
         _signedFLchi2_cut = "(BPVLTSIGNCHI2() > %s)" % config['D0_signedFLchi2_LL'] # -1.0
         _mass_cut = "(ADMASS('D0') < %s*MeV)" % config['D0_MassWindow'] # 100
 
         _motherCuts =  _vertexChi2_cut + " & " + _IPchi2_cut + " & " + _signedFLchi2_cut  + " & " + _mass_cut # _cut_prob_BCu
-        
+
         _D = CombineParticles()
         _D.DecayDescriptors = [ "D0 -> KS0 KS0" ]
-        
+
         _D.DaughtersCuts = { "KS0" : _daughterCuts }
         #_D.DaughtersCuts = _daughterCuts
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
@@ -533,7 +533,7 @@ class D02KSKSConf(LineBuilder) :
 
         #_daughterCuts = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_LL'] # 40
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL'] # 40
 
         _combCuts  = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL'] # 200
@@ -541,12 +541,12 @@ class D02KSKSConf(LineBuilder) :
         _massDiffHigh_cut = "(switch(CHILD(ABSID, 2) == 211, MM - CHILD(MM,1), MM - CHILD(MM,2)) < %s*MeV)" % config['Dst_massDiffHigh_LL'] # 160
         #_motherCuts =  _vertexChi2_cut + " & " + _massDiffLow_cut + " & " + _massDiffHigh_cut
         _motherCuts =  _massDiffLow_cut + " & " + _massDiffHigh_cut
-        
+
         _D = CombineParticles()
         #_D.DecayDescriptors = [ "[D*(2010)+ -> (D0-> (KS0 -> pi+ pi-) (KS0 -> pi+ pi-)) pi+]cc" ]
         #_D.DecayDescriptors = [ "[D*(2010)+ -> D0 pi+]cc" ]
         _D.DecayDescriptors = [ "D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-" ]
-        
+
         _D.DaughtersCuts = { "pi+" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
         _D.MotherCut = _motherCuts
@@ -571,12 +571,12 @@ class D02KSKSConf(LineBuilder) :
         _massDiffHigh_cut = "(switch(CHILD(ABSID, 2) == 211, MM - CHILD(MM,1), MM - CHILD(MM,2)) < %s*MeV)" % config['Dst_massDiffHigh_LL'] # 160
         #_motherCuts =  _vertexChi2_cut + " & " + _massDiffLow_cut + " & " + _massDiffHigh_cut
         _motherCuts =  _massDiffLow_cut + " & " + _massDiffHigh_cut
-        
+
         _D = CombineParticles()
         #_D.DecayDescriptors = [ "[D*(2010)+ -> (D0-> (KS0 -> pi+ pi-) (KS0 -> pi+ pi-)) pi+]cc" ]
         #_D.DecayDescriptors = [ "[D*(2010)+ -> D0 pi+]cc" ]
         _D.DecayDescriptors = [ "D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-" ]
-        
+
         _D.DaughtersCuts = { "pi+" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
         _D.MotherCut = _motherCuts
@@ -593,7 +593,7 @@ class D02KSKSConf(LineBuilder) :
 
         #_daughterCuts = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_LD'] # 40
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 40
 
         _combCuts  = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] # 200
@@ -601,12 +601,12 @@ class D02KSKSConf(LineBuilder) :
         _massDiffHigh_cut = "(switch(CHILD(ABSID, 2) == 211, MM - CHILD(MM,1), MM - CHILD(MM,2)) < %s*MeV)" % config['Dst_massDiffHigh_LD'] # 160
         #_motherCuts =  _vertexChi2_cut + " & " + _massDiffLow_cut + " & " + _massDiffHigh_cut
         _motherCuts =  _massDiffLow_cut + " & " + _massDiffHigh_cut
-        
+
         _D = CombineParticles()
         #_D.DecayDescriptors = [ "[D*(2010)+ -> (D0-> (KS0 -> pi+ pi-) (KS0 -> pi+ pi-)) pi+]cc" ]
         #_D.DecayDescriptors = [ "[D*(2010)+ -> D0 pi+]cc" ]
         _D.DecayDescriptors = [ "D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-" ]
-        
+
         _D.DaughtersCuts = { "pi+" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
         _D.MotherCut = _motherCuts
@@ -624,7 +624,7 @@ class D02KSKSConf(LineBuilder) :
         #_daughterCuts = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_LD'] # 40
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD'] # 40
 
         _combCuts  = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD'] # 200
@@ -632,12 +632,12 @@ class D02KSKSConf(LineBuilder) :
         _massDiffHigh_cut = "(switch(CHILD(ABSID, 2) == 211, MM - CHILD(MM,1), MM - CHILD(MM,2)) < %s*MeV)" % config['Dst_massDiffHigh_LD'] # 160
         #_motherCuts =  _vertexChi2_cut + " & " + _massDiffLow_cut + " & " + _massDiffHigh_cut
         _motherCuts =  _massDiffLow_cut + " & " + _massDiffHigh_cut
-        
+
         _D = CombineParticles()
         #_D.DecayDescriptors = [ "[D*(2010)+ -> (D0-> (KS0 -> pi+ pi-) (KS0 -> pi+ pi-)) pi+]cc" ]
         #_D.DecayDescriptors = [ "[D*(2010)+ -> D0 pi+]cc" ]
         _D.DecayDescriptors = [ "D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-" ]
-        
+
         _D.DaughtersCuts = { "pi+" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
         _D.MotherCut = _motherCuts
@@ -654,7 +654,7 @@ class D02KSKSConf(LineBuilder) :
 
         #_daughterCuts = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_DD'] # 40
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 40
 
         _combCuts  = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] # 200
@@ -662,12 +662,12 @@ class D02KSKSConf(LineBuilder) :
         _massDiffHigh_cut = "(switch(CHILD(ABSID, 2) == 211, MM - CHILD(MM,1), MM - CHILD(MM,2)) < %s*MeV)" % config['Dst_massDiffHigh_DD'] # 160
         #_motherCuts =  _vertexChi2_cut + " & " + _massDiffLow_cut + " & " + _massDiffHigh_cut
         _motherCuts =  _massDiffLow_cut + " & " + _massDiffHigh_cut
-        
+
         _D = CombineParticles()
         #_D.DecayDescriptors = [ "[D*(2010)+ -> (D0-> (KS0 -> pi+ pi-) (KS0 -> pi+ pi-)) pi+]cc" ]
         #_D.DecayDescriptors = [ "[D*(2010)+ -> D0 pi+]cc" ]
         _D.DecayDescriptors = [ "D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-" ]
-        
+
         _D.DaughtersCuts = { "pi+" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
         _D.MotherCut = _motherCuts
@@ -684,7 +684,7 @@ class D02KSKSConf(LineBuilder) :
 
         #_daughterCuts = "(BPVIPCHI2() < %s)" % config['D0_IPchi2_DD'] # 40
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
-        
+
         _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD'] # 40
 
         _combCuts  = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD'] # 200
@@ -692,12 +692,12 @@ class D02KSKSConf(LineBuilder) :
         _massDiffHigh_cut = "(switch(CHILD(ABSID, 2) == 211, MM - CHILD(MM,1), MM - CHILD(MM,2)) < %s*MeV)" % config['Dst_massDiffHigh_DD'] # 160
         #_motherCuts =  _vertexChi2_cut + " & " + _massDiffLow_cut + " & " + _massDiffHigh_cut
         _motherCuts =  _massDiffLow_cut + " & " + _massDiffHigh_cut
-        
+
         _D = CombineParticles()
         #_D.DecayDescriptors = [ "[D*(2010)+ -> (D0-> (KS0 -> pi+ pi-) (KS0 -> pi+ pi-)) pi+]cc" ]
         #_D.DecayDescriptors = [ "[D*(2010)+ -> D0 pi+]cc" ]
         _D.DecayDescriptors = [ "D*(2010)+ -> D0 pi+", "D*(2010)- -> D0 pi-" ]
-        
+
         _D.DaughtersCuts = { "pi+" : _daughterCuts }
         _D.CombinationCut = _combCuts #+  " & " + ? # _cut_prob_BCC
         _D.MotherCut = _motherCuts
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py
index 888f0e23b5e6ed8ad88f73e73238766c50d5e269..a46e7d5ec201cc12df4ccfe30a1aa72ed87a2735 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py
@@ -93,7 +93,7 @@ class D2HHHGammaLines( LineBuilder ) :
         LineBuilder.__init__(self, name, config)
 
         self.D2HHHGamma, self.lineD2HHHGamma = {}, {}
-	
+
 	# Select photons
         self.selPhotons = {'': self.makePhoton('GammaFor'+name,
                                                 config['photonPT'],
@@ -115,7 +115,7 @@ class D2HHHGammaLines( LineBuilder ) :
                    'KKPiGamma'    : ['[D+ -> K+ K- pi+ gamma]cc', '[D+ -> K+ K+ pi- gamma]cc'],
                      }
 
-        
+
 
         for decay, decayDescriptors in decays.iteritems():
             # make the various stripping selections
@@ -262,5 +262,3 @@ class D2HHHGammaLines( LineBuilder ) :
         return Selection(name,
                          Algorithm = CombineD2HHHKs,
                          RequiredSelections = inputSel )
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py
index 46882c5783e5c3c5a077c7a9653b9d5923a75f80..63493cf9eb395053a0350902e2cd6d4c29a1672b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py
@@ -14,7 +14,7 @@ __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
 '''
-D* -> D0 pis, D0 -> h- mu+(e+) nu exclusive reconstruction 
+D* -> D0 pis, D0 -> h- mu+(e+) nu exclusive reconstruction
 '''
 # =============================================================================
 ##
@@ -27,8 +27,8 @@ to final states with hadron+muon, where the hadron is
 a charged track.
 The two hadronic signal modes for D+ from D*+ -> D0 pi+ are:
 
-D0 -> K-  mu+(e+) nu, 
-D0 -> pi-  mu+(e+) nu, 
+D0 -> K-  mu+(e+) nu,
+D0 -> pi-  mu+(e+) nu,
 
 Last modification $Date: 12/9/2015 $
                by $Author: adavis$
@@ -60,7 +60,7 @@ default_config = {
         #K channel
         "KaonP"           : 3000.,#MeV
         "KaonPT"          : 800. ,#MeV
-        "KaonPIDK"        : 5.   ,#adimensional 
+        "KaonPIDK"        : 5.   ,#adimensional
         "KaonPIDmu"       : 5.   ,#adimensional
         "KaonPIDp"        : 5.   ,#adimensional
         "KaonMINIPCHI2"   : 9    ,#adimensional
@@ -77,7 +77,7 @@ default_config = {
         ,"TOSFilter" : { 'Hlt2CharmHad.*HHX.*Decision%TOS' : 0}  #adimensional
         ,"SSonly" : 2 # swith: 0==signal only (h-l+), 1==same sign hl, 2==both, 3 == 2016 EOY restripping
         },
-    'STREAMS'     : ['CharmCompleteEvent']    
+    'STREAMS'     : ['CharmCompleteEvent']
 }
 
 from Gaudi.Configuration import *
@@ -90,30 +90,30 @@ class D2HLepNuBuilder(LineBuilder):
     """
     Definition of D* tagged D0 -> H- mu+(e+) nu stripping
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self,name,config):
         LineBuilder.__init__(self, name, config)
         self._config=config
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                       "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         self._muonSel=None
         self._muonFilter()
-        
+
         self._electronSel=None
         self._electronFilter()
-        
+
         self._slowpionSel =None
         self._pionSel=None
         self._kaonSel=None
         self._kaonFilter()
         self._pionFilter()
         self._slowpionFilter()
-        
+
         ## OPPOSITE SIGN hl (BACKGROUND)
         if self._config["SSonly"]==2 or self._config["SSonly"]==0:
             self.registerLine(self._D2PiMuNuLine())
@@ -170,7 +170,7 @@ class D2HLepNuBuilder(LineBuilder):
     def _electronFilter( self ):
         if self._electronSel is not None:
             return self._electronSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseElectrons
@@ -178,16 +178,16 @@ class D2HLepNuBuilder(LineBuilder):
         _electronSel=Selection("Electron_for"+self._name,
                          Algorithm=_el,
                          RequiredSelections = [StdLooseElectrons])
-        
+
         self._electronSel=_electronSel
-        
+
         return _electronSel
 
     ######--######
     def _muonFilter( self ):
         if self._muonSel is not None:
             return self._muonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -195,19 +195,19 @@ class D2HLepNuBuilder(LineBuilder):
         _muSel=Selection("Mu_for"+self._name,
                          Algorithm=_mu,
                          RequiredSelections = [StdLooseMuons])
-        
+
         self._muonSel=_muSel
-        
+
         return _muSel
 
     def _pionFilter( self ):
         if self._pionSel is not None:
             return self._pionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _ka = FilterDesktop( Code = self._NominalPiSelection() % self._config )
         _kaSel=Selection("Pi_for"+self._name,
                          Algorithm=_ka,
@@ -219,11 +219,11 @@ class D2HLepNuBuilder(LineBuilder):
     def _kaonFilter( self ):
         if self._kaonSel is not None:
             return self._kaonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._NominalKSelection() % self._config )
         _kaSel=Selection("K_for"+self._name,
                          Algorithm=_ka,
@@ -235,11 +235,11 @@ class D2HLepNuBuilder(LineBuilder):
     def _slowpionFilter( self ):
         if self._slowpionSel is not None:
             return self._slowpionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
-        
+
         _ka = FilterDesktop( Code = self._NominalSlowPiSelection() % self._config )
         _kaSel=Selection("pis_for"+self._name,
                          Algorithm=_ka,
@@ -277,7 +277,7 @@ class D2HLepNuBuilder(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StrippingConf.StrippingLine import StrippingLine
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = _D0Decays,
             CombinationCut = "(AM>%(KLepMassLow)s*MeV) & (AM<%(KLepMassHigh)s*MeV)" % self._config,
@@ -313,7 +313,7 @@ class D2HLepNuBuilder(LineBuilder):
         #                    "solution_b = ((-quadb - sqrt(max(Discriminant,0)))/(2*quada))",
         #                    "ratio = (solution_a/solution_b)"
         #                    ]
-        
+
         _D0Sel=Selection("SelD0_for"+_name,
                          Algorithm=_KMu,
                          RequiredSelections = [lfilter, hfiler])
@@ -332,8 +332,8 @@ class D2HLepNuBuilder(LineBuilder):
         DstSelTOS = TOSFilter( "SelDstHMu_Hlt2TOS"+_name
                 ,DstSel
                 ,_tosFilter)
-    
-        hlt2 = ""        
+
+        hlt2 = ""
         the_prescale = 1.0
         if self._config["useTOS"] == True: # and _name.find('E') < 0:
             if "K" in _name:
@@ -344,7 +344,7 @@ class D2HLepNuBuilder(LineBuilder):
                     prescale = the_prescale,
                     FILTER=self.GECs,
                     HLT2 = hlt2,
-                    selection = DstSelTOS) 
+                    selection = DstSelTOS)
         else:
             if "K" in _name:
                 the_prescale = 0.1
@@ -352,16 +352,16 @@ class D2HLepNuBuilder(LineBuilder):
                     prescale = the_prescale,
                     FILTER=self.GECs,
                     HLT2 = hlt2,
-                    selection = DstSel) 
-        
+                    selection = DstSel)
+
         return Line
-                                                    
+
 def TOSFilter( name, _input, _specs ) :
     from Configurables import TisTosParticleTagger
-    from PhysSelPython.Wrappers import Selection 
+    from PhysSelPython.Wrappers import Selection
     _tisTosFilter = TisTosParticleTagger( name + "Tagger" )
-    _tisTosFilter.TisTosSpecs = _specs 
+    _tisTosFilter.TisTosSpecs = _specs
     return Selection( name
                       , Algorithm = _tisTosFilter
                       , RequiredSelections = [ _input ]
-                      )        
+                      )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py
index 7e0f4c6a360ac81b7a437666446384663243c388..848042e49ed8c56da38454672cd3e853ded20ef6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py
@@ -10,10 +10,10 @@
 ###############################################################################
 # $Id: StrippingD2KS0H.py,v 1.0 2010-02-21 sgregson
 '''
-Module for construction of D(s)->KS0H (H=pi/K) 
+Module for construction of D(s)->KS0H (H=pi/K)
 stripping Selections and StrippingLines.
 Provides functions to build D(s) selections.
-Provides class D2KS0HConf, which constructs the Selections and 
+Provides class D2KS0HConf, which constructs the Selections and
 StrippingLines given a configuration dictionary.
 Exported symbols (use python help!):
    - D2KS0HConf
@@ -67,18 +67,18 @@ default_config = {
    # KS0 daughter pion cuts
        ,'KS0DaugP'  : 2000 * MeV
        ,'KS0DaugPT'  : 200 * MeV
-       ,'KS0DaugTrackChi2' : 4  
+       ,'KS0DaugTrackChi2' : 4
        ,'KS0DaugMIPChi2' : 40
        ,'KS0DaugPIDK' : 10
 
    # KS0 mother cuts
-       ,'KS0MassWindow' : 35 * MeV   
+       ,'KS0MassWindow' : 35 * MeV
        ,'KS0MIPChi2'     : 7
        ,'KS0MIPChi2DD'     : 0
        ,'KS0VertexChi2'  : 10
        ,'KS0PT' : 500 * MeV
-       ,'KS0BPVVDCHI2' : 300 
-       ,'KS0BPVVDCHI2DD' : 200  
+       ,'KS0BPVVDCHI2' : 300
+       ,'KS0BPVVDCHI2DD' : 200
        ,'KsLL_BPVLTIME_MIN'  :  0.5 * picosecond
        ,'KsDD_VZ_MIN'       : 300. * mm
        ,'KsDD_VZ_MAX'       : 2275. * mm
@@ -87,18 +87,18 @@ default_config = {
        , 'TrGhostProbMax'   : 0.5
 
    # Bachelor pion cuts
-       ,'BachPionP' : 2000 * MeV              
-       ,'BachPionPT' : 200 * MeV   
+       ,'BachPionP' : 2000 * MeV
+       ,'BachPionPT' : 200 * MeV
        ,'BachPionTrackChi2' : 3
-       ,'BachPionMIPChi2' : 15 
-       ,'BachPionPIDK'   : 0  
+       ,'BachPionMIPChi2' : 15
+       ,'BachPionPIDK'   : 0
 
    # Bachelor kaon cuts
-       ,'BachKaonP' : 2000 * MeV               
-       ,'BachKaonPT'  : 200 * MeV      
+       ,'BachKaonP' : 2000 * MeV
+       ,'BachKaonPT'  : 200 * MeV
        ,'BachKaonTrackChi2': 3
-       ,'BachKaonMIPChi2'   : 15  
-       ,'BachKaonPIDK'   : 0      
+       ,'BachKaonMIPChi2'   : 15
+       ,'BachKaonPIDK'   : 0
 
    # D meson cuts - pion
    # Combo cuts
@@ -111,23 +111,23 @@ default_config = {
        ,'DMesonMotherLowMass' : 1770 * MeV
        ,'DMesonMotherHighMass'   : 2070 * MeV
        ,'DMesonMotherVertexChi2' : 10
-       ,'DMesonMotherMIPChi2'  : 15  
+       ,'DMesonMotherMIPChi2'  : 15
        ,'DMesonMotherPT' : 2000 * MeV
        ,'KS0ZDiff' : 10 * mm
        ,'DMesonFlightDistChi2' : 10
        ,'D_BPVLTIME_MIN'   : 0.25 * picosecond  ## 0.25 ps used in Hlt2 by default
- 
+
    # Prescales
        ,'PionLinePrescale' : 1
        ,'KaonLinePrescale' : 1
        ,'PionLinePrescaleDD' : 1
        ,'KaonLinePrescaleDD' : 1
 
-   # Postscales     
-       ,'PionLinePostscale' : 1 
-       ,'KaonLinePostscale' : 1    
-       ,'PionLinePostscaleDD' : 1 
-       ,'KaonLinePostscaleDD' : 1          
+   # Postscales
+       ,'PionLinePostscale' : 1
+       ,'KaonLinePostscale' : 1
+       ,'PionLinePostscaleDD' : 1
+       ,'KaonLinePostscaleDD' : 1
     } ##  end of CONFIG
 }  ## end of default_config
 
@@ -144,30 +144,30 @@ class StrippingD2KS0HConf(LineBuilder) :
 
     # Class constructor
     def __init__(self, name, config) :
-        
+
     # Use the constructor of the base class from which we inherit
         LineBuilder.__init__(self, name, config)
 
         self.name = name
-        
+
         # Names for different lines
         pion_name = self.name+'Pion'
         kaon_name = self.name+'Kaon'
         pion_nameDD = self.name+'PionDD'
         kaon_nameDD = self.name+'KaonDD'
-        
 
-        # Define the selections that go forward to the lines - combine particles, combine particles etc 
+
+        # Define the selections that go forward to the lines - combine particles, combine particles etc
 
         # Bachelor pions
         self.selBachPions = makeBachelorPions(self.name + 'BachelorPionsForD2KS0H'
                                     # Cuts
                                     # Bachelor pion cuts
-                                    ,BachPionP = config['BachPionP']                 
-                                    ,BachPionPT = config['BachPionPT']         
-                                    ,BachPionTrackChi2 = config['BachPionTrackChi2']  
-                                    ,BachPionMIPChi2 = config['BachPionMIPChi2']     
-                                    ,BachPionPIDK = config['BachPionPIDK']   
+                                    ,BachPionP = config['BachPionP']
+                                    ,BachPionPT = config['BachPionPT']
+                                    ,BachPionTrackChi2 = config['BachPionTrackChi2']
+                                    ,BachPionMIPChi2 = config['BachPionMIPChi2']
+                                    ,BachPionPIDK = config['BachPionPIDK']
                                     ,BachPionGhostProbMax = config['TrGhostProbMax']
                                                       )
 
@@ -175,11 +175,11 @@ class StrippingD2KS0HConf(LineBuilder) :
         self.selBachKaons = makeBachelorKaons(self.name + 'BachelorKaonsForD2KS0H'
                                     # Cuts
                                     # Bachelor kaon cuts
-                                    ,BachKaonP = config['BachKaonP']                 
-                                    ,BachKaonPT = config['BachKaonPT']         
-                                    ,BachKaonTrackChi2 = config['BachKaonTrackChi2']  
-                                    ,BachKaonMIPChi2 = config['BachKaonMIPChi2']     
-                                    ,BachKaonPIDK = config['BachKaonPIDK']   
+                                    ,BachKaonP = config['BachKaonP']
+                                    ,BachKaonPT = config['BachKaonPT']
+                                    ,BachKaonTrackChi2 = config['BachKaonTrackChi2']
+                                    ,BachKaonMIPChi2 = config['BachKaonMIPChi2']
+                                    ,BachKaonPIDK = config['BachKaonPIDK']
                                     ,BachKaonGhostProbMax = config['TrGhostProbMax']
                                                       )
 
@@ -187,15 +187,15 @@ class StrippingD2KS0HConf(LineBuilder) :
         self.selKS0LL = makeKS02PiPi(self.name + 'KS0LLForD2KS0H'
                                     # Cuts
                                     # KS0 daughter pion cuts
-                                   ,KS0DaugP = config['KS0DaugP']  
+                                   ,KS0DaugP = config['KS0DaugP']
                                    ,KS0DaugPT = config['KS0DaugPT']
-                                   ,KS0DaugTrackChi2 = config['KS0DaugTrackChi2'] 
+                                   ,KS0DaugTrackChi2 = config['KS0DaugTrackChi2']
                                    ,KS0DaugMIPChi2 = config['KS0DaugMIPChi2']
                                    ,KS0DaugPIDK = config['KS0DaugPIDK']
                                    # KS0 mother cuts
-                                   ,KS0MassWindow = config['KS0MassWindow']   
-                                   ,KS0MIPChi2 = config['KS0MIPChi2']     
-                                   ,KS0VertexChi2 = config['KS0VertexChi2']  
+                                   ,KS0MassWindow = config['KS0MassWindow']
+                                   ,KS0MIPChi2 = config['KS0MIPChi2']
+                                   ,KS0VertexChi2 = config['KS0VertexChi2']
                                    ,KS0PT = config['KS0PT']
                                    ,KS0BPVVDCHI2 = config['KS0BPVVDCHI2']
                                    ,KsLL_BPVLTIME_MIN = config['KsLL_BPVLTIME_MIN']
@@ -205,127 +205,127 @@ class StrippingD2KS0HConf(LineBuilder) :
         self.selKS0DD = makeKS02PiPiDD(self.name + 'KS0DDForD2KS0H'
                                     # Cuts
                                     # KS0 daughter pion cuts
-                                   ,KS0DaugP = config['KS0DaugP']  
+                                   ,KS0DaugP = config['KS0DaugP']
                                    ,KS0DaugPT = config['KS0DaugPT']
-                                   ,KS0DaugTrackChi2 = config['KS0DaugTrackChi2'] 
+                                   ,KS0DaugTrackChi2 = config['KS0DaugTrackChi2']
                                    ,KS0DaugMIPChi2 = config['KS0DaugMIPChi2']
                                    ,KS0DaugPIDK = config['KS0DaugPIDK']
                                    # KS0 mother cuts
-                                   ,KS0MassWindow = config['KS0MassWindow']   
-                                   ,KS0MIPChi2DD = config['KS0MIPChi2DD']     
-                                   ,KS0VertexChi2 = config['KS0VertexChi2']  
+                                   ,KS0MassWindow = config['KS0MassWindow']
+                                   ,KS0MIPChi2DD = config['KS0MIPChi2DD']
+                                   ,KS0VertexChi2 = config['KS0VertexChi2']
                                    ,KS0PT = config['KS0PT']
-                                   ,KS0BPVVDCHI2DD = config['KS0BPVVDCHI2DD']   
+                                   ,KS0BPVVDCHI2DD = config['KS0BPVVDCHI2DD']
                                    ,KsDD_VZ_MIN = config['KsDD_VZ_MIN']
                                    ,KsDD_VZ_MAX = config['KsDD_VZ_MAX']
                                                                   )
 
-       
+
         # D(s)->KS0Pi selection
         self.selD2KS0Pi = makeD2KS0Pi(pion_name
-                                     # Pass the KS0LL selection 
+                                     # Pass the KS0LL selection
                                      ,KS0LLSel = self.selKS0LL
                                      # Pass the bachelor pions selection
-                                     ,BachPionsSel = self.selBachPions 
+                                     ,BachPionsSel = self.selBachPions
                                      # D meson cuts
                                      # Combo cuts
-                                     ,DMesonComboLowMass = config['DMesonComboLowMass']           
-                                     ,DMesonComboHighMass = config['DMesonComboHighMass']    
+                                     ,DMesonComboLowMass = config['DMesonComboLowMass']
+                                     ,DMesonComboHighMass = config['DMesonComboHighMass']
                                      ,DMesonComboDOCA = config['DMesonComboDOCA']
                                      ,DMesonAPT = config['DMesonAPT']
-                                     ,DMesonADOCAChi2 = config['DMesonADOCAChi2'] 
+                                     ,DMesonADOCAChi2 = config['DMesonADOCAChi2']
                                      # Mother cuts
-                                     ,DMesonMotherLowMass = config['DMesonMotherLowMass']               
-                                     ,DMesonMotherHighMass = config['DMesonMotherHighMass']     
-                                     ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']   
-                                     ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']    
+                                     ,DMesonMotherLowMass = config['DMesonMotherLowMass']
+                                     ,DMesonMotherHighMass = config['DMesonMotherHighMass']
+                                     ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']
+                                     ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']
                                      ,DMesonMotherPT = config['DMesonMotherPT']
                                      ,KS0ZDiff = config['KS0ZDiff']
-                                     ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2'] 
+                                     ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2']
                                      ,D_BPVLTIME_MIN = config['D_BPVLTIME_MIN']
-                                     ,UseTOS =  config['UseTOS'] 
-                                     ,TisTosSpecs =  config['TisTosSpecs_KS0Pi'] 
-                                     )   
+                                     ,UseTOS =  config['UseTOS']
+                                     ,TisTosSpecs =  config['TisTosSpecs_KS0Pi']
+                                     )
 
         # D(s)->KS0DDPi selection
         self.selD2KS0PiDD = makeD2KS0PiDD(pion_nameDD
-                                          # Pass the KS0DD selection 
+                                          # Pass the KS0DD selection
                                           ,KS0DDSel = self.selKS0DD
                                           # Pass the bachelor pions selection
-                                          ,BachPionsSel = self.selBachPions 
+                                          ,BachPionsSel = self.selBachPions
                                           # D meson cuts
                                           # Combo cuts
-                                          ,DMesonComboLowMass = config['DMesonComboLowMass']           
-                                          ,DMesonComboHighMass = config['DMesonComboHighMass']    
+                                          ,DMesonComboLowMass = config['DMesonComboLowMass']
+                                          ,DMesonComboHighMass = config['DMesonComboHighMass']
                                           ,DMesonComboDOCA = config['DMesonComboDOCA']
                                           ,DMesonAPT = config['DMesonAPT']
-                                          ,DMesonADOCAChi2 = config['DMesonADOCAChi2'] 
+                                          ,DMesonADOCAChi2 = config['DMesonADOCAChi2']
                                           # Mother cuts
-                                          ,DMesonMotherLowMass = config['DMesonMotherLowMass']               
-                                          ,DMesonMotherHighMass = config['DMesonMotherHighMass']     
-                                          ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']   
-                                          ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']    
+                                          ,DMesonMotherLowMass = config['DMesonMotherLowMass']
+                                          ,DMesonMotherHighMass = config['DMesonMotherHighMass']
+                                          ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']
+                                          ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']
                                           ,DMesonMotherPT = config['DMesonMotherPT']
                                           ,KS0ZDiff = config['KS0ZDiff']
-                                          ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2']      
+                                          ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2']
                                           ,D_BPVLTIME_MIN = config['D_BPVLTIME_MIN']
-                                          ,UseTOS =  config['UseTOS'] 
-                                          ,TisTosSpecs =  config['TisTosSpecs_KS0PiDD'] 
-                                          )  
-                                
+                                          ,UseTOS =  config['UseTOS']
+                                          ,TisTosSpecs =  config['TisTosSpecs_KS0PiDD']
+                                          )
+
 
         # D(s)->KS0K selection
         self.selD2KS0K = makeD2KS0K(kaon_name
-                                    # Pass the KS0LL selection 
+                                    # Pass the KS0LL selection
                                     ,KS0LLSel = self.selKS0LL
                                     # Pass the bachelor kaons selection
-                                    ,BachKaonsSel = self.selBachKaons  
+                                    ,BachKaonsSel = self.selBachKaons
                                     # D meson cuts
                                     # Combo cuts
-                                    ,DMesonComboLowMass = config['DMesonComboLowMass']           
-                                    ,DMesonComboHighMass = config['DMesonComboHighMass']    
+                                    ,DMesonComboLowMass = config['DMesonComboLowMass']
+                                    ,DMesonComboHighMass = config['DMesonComboHighMass']
                                     ,DMesonComboDOCA = config['DMesonComboDOCA']
                                     ,DMesonAPT = config['DMesonAPT']
-                                    ,DMesonADOCAChi2 = config['DMesonADOCAChi2'] 
+                                    ,DMesonADOCAChi2 = config['DMesonADOCAChi2']
                                     # Mother cuts
-                                    ,DMesonMotherLowMass = config['DMesonMotherLowMass']               
-                                    ,DMesonMotherHighMass = config['DMesonMotherHighMass']     
-                                    ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']   
-                                    ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']    
+                                    ,DMesonMotherLowMass = config['DMesonMotherLowMass']
+                                    ,DMesonMotherHighMass = config['DMesonMotherHighMass']
+                                    ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']
+                                    ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']
                                     ,DMesonMotherPT = config['DMesonMotherPT']
                                     ,KS0ZDiff = config['KS0ZDiff']
-                                    ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2'] 
+                                    ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2']
                                     ,D_BPVLTIME_MIN = config['D_BPVLTIME_MIN']
-                                    ,UseTOS =  config['UseTOS'] 
-                                    ,TisTosSpecs =  config['TisTosSpecs_KS0K'] 
+                                    ,UseTOS =  config['UseTOS']
+                                    ,TisTosSpecs =  config['TisTosSpecs_KS0K']
                                     )
 
         # D(s)->KS0DDK selection
         self.selD2KS0KDD = makeD2KS0KDD(kaon_nameDD
-                                        # Pass the KS0LL selection 
+                                        # Pass the KS0LL selection
                                         ,KS0DDSel = self.selKS0DD
                                         # Pass the bachelor kaons selection
-                                        ,BachKaonsSel = self.selBachKaons  
+                                        ,BachKaonsSel = self.selBachKaons
                                         # D meson cuts
                                         # Combo cuts
-                                        ,DMesonComboLowMass = config['DMesonComboLowMass']           
-                                        ,DMesonComboHighMass = config['DMesonComboHighMass']    
+                                        ,DMesonComboLowMass = config['DMesonComboLowMass']
+                                        ,DMesonComboHighMass = config['DMesonComboHighMass']
                                         ,DMesonComboDOCA = config['DMesonComboDOCA']
                                         ,DMesonAPT = config['DMesonAPT']
-                                        ,DMesonADOCAChi2 = config['DMesonADOCAChi2'] 
+                                        ,DMesonADOCAChi2 = config['DMesonADOCAChi2']
                                         # Mother cuts
-                                        ,DMesonMotherLowMass = config['DMesonMotherLowMass']               
-                                        ,DMesonMotherHighMass = config['DMesonMotherHighMass']     
-                                        ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']   
-                                        ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']    
+                                        ,DMesonMotherLowMass = config['DMesonMotherLowMass']
+                                        ,DMesonMotherHighMass = config['DMesonMotherHighMass']
+                                        ,DMesonMotherVertexChi2 = config['DMesonMotherVertexChi2']
+                                        ,DMesonMotherMIPChi2 = config['DMesonMotherMIPChi2']
                                         ,DMesonMotherPT = config['DMesonMotherPT']
                                         ,KS0ZDiff = config['KS0ZDiff']
-                                        ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2'] 
+                                        ,DMesonFlightDistChi2 = config['DMesonFlightDistChi2']
                                         ,D_BPVLTIME_MIN = config['D_BPVLTIME_MIN']
-                                        ,UseTOS =  config['UseTOS'] 
-                                        ,TisTosSpecs =  config['TisTosSpecs_KS0KDD'] 
+                                        ,UseTOS =  config['UseTOS']
+                                        ,TisTosSpecs =  config['TisTosSpecs_KS0KDD']
                                         )
-        
+
 
         # Define/declare the lines
         self.pion_line = StrippingLine(pion_name+"Line",
@@ -349,7 +349,7 @@ class StrippingD2KS0HConf(LineBuilder) :
                                        selection = self.selD2KS0KDD
                                        )
 
-        
+
 
         # Register the lines
         self.registerLine(self.pion_line)
@@ -361,11 +361,11 @@ class StrippingD2KS0HConf(LineBuilder) :
 
 def makeBachelorPions(name
                       # Bachelor pion cuts
-                     ,BachPionP               
-                     ,BachPionPT         
-                     ,BachPionTrackChi2 
-                     ,BachPionMIPChi2   
-                     ,BachPionPIDK  
+                     ,BachPionP
+                     ,BachPionPT
+                     ,BachPionTrackChi2
+                     ,BachPionMIPChi2
+                     ,BachPionPIDK
                      ,BachPionGhostProbMax
                      ) :
         """
@@ -380,7 +380,7 @@ def makeBachelorPions(name
         _code = (" (PIDK < %(BachPionPIDK)s) & (P > %(BachPionP)s) & (PT > %(BachPionPT)s) &"\
                  " (TRCHI2DOF < %(BachPionTrackChi2)s) & (MIPCHI2DV(PRIMARY) > %(BachPionMIPChi2)s) &"\
                  " (TRGHOSTPROB < %(BachPionGhostProbMax)s) ") % locals()
- 
+
          # Define the pion filter
         _BachPionsFilter = FilterDesktop(Code = _code)
         _stdLoosePions = StdLoosePions
@@ -393,11 +393,11 @@ def makeBachelorPions(name
 
 def makeBachelorKaons(name
                      # Bachelor pion cuts
-                     ,BachKaonP               
-                     ,BachKaonPT         
-                     ,BachKaonTrackChi2 
-                     ,BachKaonMIPChi2   
-                     ,BachKaonPIDK  
+                     ,BachKaonP
+                     ,BachKaonPT
+                     ,BachKaonTrackChi2
+                     ,BachKaonMIPChi2
+                     ,BachKaonPIDK
                      ,BachKaonGhostProbMax
                      ) :
 
@@ -415,7 +415,7 @@ def makeBachelorKaons(name
                  " (TRGHOSTPROB < %(BachKaonGhostProbMax)s) ") % locals()
 
 ## mds        _code = "(PIDK > %(BachKaonPIDK)s) & (P > %(BachKaonP)s) & (PT > %(BachKaonPT)s) & (TRCHI2DOF < %(BachKaonTrackChi2)s) & (MIPCHI2DV(PRIMARY) > %(BachKaonMIPChi2)s)" % locals()
- 
+
          # Define the pion filter
         _BachKaonsFilter = FilterDesktop(Code = _code)
         _stdLooseKaons = StdLooseKaons
@@ -431,15 +431,15 @@ def makeKS02PiPi(name,
 
                  # Cuts
                  # KS0 daughter pion cuts
-                 KS0DaugP     
+                 KS0DaugP
                 ,KS0DaugPT
-                ,KS0DaugTrackChi2  
+                ,KS0DaugTrackChi2
                 ,KS0DaugMIPChi2
                 ,KS0DaugPIDK
                 # KS0 mother cuts
-                ,KS0MassWindow    
-                ,KS0MIPChi2      
-                ,KS0VertexChi2   
+                ,KS0MassWindow
+                ,KS0MIPChi2
+                ,KS0VertexChi2
                 ,KS0PT
                 ,KS0BPVVDCHI2
                 ,KsLL_BPVLTIME_MIN
@@ -463,11 +463,11 @@ def makeKS02PiPi(name,
 
 ##         # Vanya suggestion
 ##        # _Preambulo = [
-##        #  goodChild =           " (TRCHI2DOF < %(KS0DaugTrackChi2)s)" % locals (), 
-##        #  goodChild = goodChild & "(PIDK < %(KS0DaugPIDK)s)" % locals (), 
-##        #  goodChild = goodChild & "(MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)" % locals (), 
+##        #  goodChild =           " (TRCHI2DOF < %(KS0DaugTrackChi2)s)" % locals (),
+##        #  goodChild = goodChild & "(PIDK < %(KS0DaugPIDK)s)" % locals (),
+##        #  goodChild = goodChild & "(MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)" % locals (),
 ##         #             ]
-        
+
 ##         # Define the cuts to be used
 ##      #   _code = """
 ##      #  (PT > %(KS0PT)s) &
@@ -475,7 +475,7 @@ def makeKS02PiPi(name,
 ##      #  CHILDCUT ( goodChild ,1) &
 ##      #  CHILDCUT ( goodchild, 2) &
 ##      #  (MIPCHI2DV(PRIMARY) > %(KS0MIPChi2)s)
-##      #  """ % locals() 
+##      #  """ % locals()
 
 
         # Define the KS0 LL filter
@@ -490,15 +490,15 @@ def makeKS02PiPiDD(name,
 
                  # Cuts
                  # KS0 daughter pion cuts
-                 KS0DaugP     
+                 KS0DaugP
                 ,KS0DaugPT
-                ,KS0DaugTrackChi2  
+                ,KS0DaugTrackChi2
                 ,KS0DaugMIPChi2
                 ,KS0DaugPIDK
                 # KS0 mother cuts
-                ,KS0MassWindow    
-                ,KS0MIPChi2DD      
-                ,KS0VertexChi2   
+                ,KS0MassWindow
+                ,KS0MIPChi2DD
+                ,KS0VertexChi2
                 ,KS0PT
                 ,KS0BPVVDCHI2DD
                 ,KsDD_VZ_MIN
@@ -521,11 +521,11 @@ def makeKS02PiPiDD(name,
 
 ##         # Vanya suggestion
 ##        # _Preambulo = [
-##        #  goodChild =           " (TRCHI2DOF < %(KS0DaugTrackChi2)s)" % locals (), 
-##        #  goodChild = goodChild & "(PIDK < %(KS0DaugPIDK)s)" % locals (), 
-##        #  goodChild = goodChild & "(MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)" % locals (), 
+##        #  goodChild =           " (TRCHI2DOF < %(KS0DaugTrackChi2)s)" % locals (),
+##        #  goodChild = goodChild & "(PIDK < %(KS0DaugPIDK)s)" % locals (),
+##        #  goodChild = goodChild & "(MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)" % locals (),
 ##         #             ]
-        
+
 ##         # Define the cuts to be used
 ##      #   _code = """
 ##      #  (PT > %(KS0PT)s) &
@@ -533,7 +533,7 @@ def makeKS02PiPiDD(name,
 ##      #  CHILDCUT ( goodChild ,1) &
 ##      #  CHILDCUT ( goodchild, 2) &
 ##      #  (MIPCHI2DV(PRIMARY) > %(KS0MIPChi2)s)
-##      #  """ % locals() 
+##      #  """ % locals()
 
 
         # Define the KS0 LL filter
@@ -549,23 +549,23 @@ def makeD2KS0Pi(name,
                 # KS0 selection
                 KS0LLSel
                 # Bach pions selection
-               ,BachPionsSel   
-                # Cuts to be used                  
+               ,BachPionsSel
+                # Cuts to be used
                 # D meson cuts
                 # Combo cuts
-               ,DMesonComboLowMass         
-               ,DMesonComboHighMass  
+               ,DMesonComboLowMass
+               ,DMesonComboHighMass
                ,DMesonComboDOCA
-               ,DMesonAPT 
+               ,DMesonAPT
                ,DMesonADOCAChi2
                # Mother cuts
-               ,DMesonMotherLowMass             
-               ,DMesonMotherHighMass   
-               ,DMesonMotherVertexChi2 
-               ,DMesonMotherMIPChi2  
+               ,DMesonMotherLowMass
+               ,DMesonMotherHighMass
+               ,DMesonMotherVertexChi2
+               ,DMesonMotherMIPChi2
                ,DMesonMotherPT
                ,KS0ZDiff
-               ,DMesonFlightDistChi2 
+               ,DMesonFlightDistChi2
                ,D_BPVLTIME_MIN
                ,UseTOS
                ,TisTosSpecs
@@ -593,7 +593,7 @@ def makeD2KS0Pi(name,
                       " (BPVLTIME() > %(D_BPVLTIME_MIN)s) & (BPVVDCHI2 > %(DMesonFlightDistChi2)s)") % locals()
 
 
-    
+
         # Define the combine particles
         _Dmeson = CombineParticles( DecayDescriptor = "[D+ -> KS0 pi+]cc", CombinationCut = _combCuts, MotherCut = _motherCuts)
 
@@ -611,20 +611,20 @@ def makeD2KS0PiDD(name,
                   # KS0 selection
                   KS0DDSel
                   # Bach pions selection
-                  ,BachPionsSel   
-                  # Cuts to be used                  
+                  ,BachPionsSel
+                  # Cuts to be used
                   # D meson cuts
                   # Combo cuts
-                  ,DMesonComboLowMass         
-                  ,DMesonComboHighMass  
+                  ,DMesonComboLowMass
+                  ,DMesonComboHighMass
                   ,DMesonComboDOCA
-                  ,DMesonAPT 
+                  ,DMesonAPT
                   ,DMesonADOCAChi2
                   # Mother cuts
-                  ,DMesonMotherLowMass             
-                  ,DMesonMotherHighMass   
-                  ,DMesonMotherVertexChi2 
-                  ,DMesonMotherMIPChi2  
+                  ,DMesonMotherLowMass
+                  ,DMesonMotherHighMass
+                  ,DMesonMotherVertexChi2
+                  ,DMesonMotherMIPChi2
                   ,DMesonMotherPT
                   ,KS0ZDiff
                   ,DMesonFlightDistChi2
@@ -666,28 +666,28 @@ def makeD2KS0PiDD(name,
                               , Algorithm = TisTosParticleTagger( name + "TOSTagger",TisTosSpecs = TisTosSpecs )
                               , RequiredSelections = [ sel ]
                               )
-    
+
 def makeD2KS0K(name,
                # KS0 selection
                KS0LLSel
                # Bach kaons selection
-               ,BachKaonsSel 
-               # Cuts to be used                  
+               ,BachKaonsSel
+               # Cuts to be used
                # D meson cuts
                # Combo cuts
-               ,DMesonComboLowMass         
-               ,DMesonComboHighMass  
+               ,DMesonComboLowMass
+               ,DMesonComboHighMass
                ,DMesonComboDOCA
-               ,DMesonAPT 
+               ,DMesonAPT
                ,DMesonADOCAChi2
                # Mother cuts
-               ,DMesonMotherLowMass             
-               ,DMesonMotherHighMass   
-               ,DMesonMotherVertexChi2 
-               ,DMesonMotherMIPChi2  
+               ,DMesonMotherLowMass
+               ,DMesonMotherHighMass
+               ,DMesonMotherVertexChi2
+               ,DMesonMotherMIPChi2
                ,DMesonMotherPT
                ,KS0ZDiff
-               ,DMesonFlightDistChi2 
+               ,DMesonFlightDistChi2
                ,D_BPVLTIME_MIN
                ,UseTOS
                ,TisTosSpecs
@@ -728,29 +728,29 @@ def makeD2KS0K(name,
                               , Algorithm = TisTosParticleTagger( name + "TOSTagger",TisTosSpecs = TisTosSpecs )
                               , RequiredSelections = [ sel ]
                               )
-        
+
 
 def makeD2KS0KDD(name,
                  # KS0 selection
                  KS0DDSel
                  # Bach kaons selection
-                 ,BachKaonsSel 
-                 # Cuts to be used                  
+                 ,BachKaonsSel
+                 # Cuts to be used
                  # D meson cuts
                  # Combo cuts
-                 ,DMesonComboLowMass         
-                 ,DMesonComboHighMass  
+                 ,DMesonComboLowMass
+                 ,DMesonComboHighMass
                  ,DMesonComboDOCA
-                 ,DMesonAPT 
+                 ,DMesonAPT
                  ,DMesonADOCAChi2
                  # Mother cuts
-                 ,DMesonMotherLowMass             
-                 ,DMesonMotherHighMass   
-                 ,DMesonMotherVertexChi2 
-                 ,DMesonMotherMIPChi2  
+                 ,DMesonMotherLowMass
+                 ,DMesonMotherHighMass
+                 ,DMesonMotherVertexChi2
+                 ,DMesonMotherMIPChi2
                  ,DMesonMotherPT
                  ,KS0ZDiff
-                 ,DMesonFlightDistChi2 
+                 ,DMesonFlightDistChi2
                  ,D_BPVLTIME_MIN
                  ,UseTOS
                  ,TisTosSpecs
@@ -782,7 +782,7 @@ def makeD2KS0KDD(name,
         sel =  Selection ( name,
                            Algorithm = _Dmeson,
                            RequiredSelections = [KS0DDSel, BachKaonsSel])
-        
+
         if not UseTOS:
             return sel
         else:
@@ -790,6 +790,3 @@ def makeD2KS0KDD(name,
                               , Algorithm = TisTosParticleTagger( name + "TOSTagger",TisTosSpecs = TisTosSpecs )
                               , RequiredSelections = [ sel ]
                               )
-        
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py
index f89abc01b5503413afffd3ec824292c538ff4eb7..c19ce6bde4ff174ef6a63f40b84ce545033e910a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py
@@ -17,7 +17,7 @@ StrippingD2PhiHConf      : D+ -> h+ (phi/omega -> pi+ pi- pi0) prompt
 StrippingD2EtaEEGHConf   : D+ -> h+ (eta -> e+ e- gamma) prompt
 StrippingDst2PiD0EEGConf : D*+ -> (D0 -> e+ e- gamma) pi+ and D*+ -> (D0 -> e+ e-) pi+
 '''
-                                                               
+
 __author__ = ['Simone Stracka simone.stracka@unipi.it']
 __date__ = '26/10/2015'
 __version__ = '$Revision$'
@@ -30,7 +30,7 @@ __all__ = (
     'StrippingD2EtaHConf',
     'StrippingD2EtaPrimeHConf',
     'StrippingD2PhiHConf',
-    
+
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
@@ -60,56 +60,56 @@ default_config = {
           'STREAMS': ['Charm'],
           'CONFIG': {
                 # Minimum best primary vertex IP chi^2 for charged D daughters
-                'Bachelor_IPCHI2_MIN'      : 25.0,        
-                # Minimum PT for charged D daughters 
-                'Bachelor_PT_MIN'          : 350  *MeV,   
-                # Minimum momentum for charged D daughters 
+                'Bachelor_IPCHI2_MIN'      : 25.0,
+                # Minimum PT for charged D daughters
+                'Bachelor_PT_MIN'          : 350  *MeV,
+                # Minimum momentum for charged D daughters
                 'Bachelor_P_MIN'           : 1000 *MeV,
-                # Bachelor particle PID requirement 
+                # Bachelor particle PID requirement
                 'Bachelor_PIDK_MIN'        : -10.0, # not used if < -10
                 # Minimum best primary vertex IP chi^2 for charged D daughters
-                'Daug_IPCHI2_MIN'      : 25.0,     
-                # Minimum PT for charged D daughters 
+                'Daug_IPCHI2_MIN'      : 25.0,
+                # Minimum PT for charged D daughters
                 'Daug_PT_MIN'          : 350  *MeV,   # 600 --> 300
-                # Minimum momentum for charged D daughters 
+                # Minimum momentum for charged D daughters
                 'Daug_P_MIN'           : 1000 *MeV,
-                # Maximum momentum for charged D daughters 
+                # Maximum momentum for charged D daughters
                 'Daug_P_MAX'           : 100000 *MeV,
-                # Minimum pseudorapidity for charged D daughters 
+                # Minimum pseudorapidity for charged D daughters
                 'Daug_ETA_MIN'         : 2.0,
-                # Maximum pseudorapidity for charged D daughters 
+                # Maximum pseudorapidity for charged D daughters
                 'Daug_ETA_MAX'         : 5.0,
                 # Track quality requirement for charged D daughters
-                'Daug_TRCHI2DOF_MAX'   : 5,    
+                'Daug_TRCHI2DOF_MAX'   : 5,
                 # Maximum ghost probability for charged D daughters
                 'Daug_TRGHOSTPROB_MAX' : 0.5,
                 # Minimum PT for intermediate resonance neutral daughters
                 'Neut_PT_MIN'        : 350  *MeV,
-                # Maximum mass for dielectron                
+                # Maximum mass for dielectron
                 'DiElectron_Mass_MAX'       : 210  *MeV,
-                # Minimum PT for dielectron                
-                'DiElectron_PT_MIN'       : 350  *MeV, 
+                # Minimum PT for dielectron
+                'DiElectron_PT_MIN'       : 350  *MeV,
                 # Minimum mass for intermediate resonance
-                'Res_Mass_MIN'       : 70   *MeV, 
+                'Res_Mass_MIN'       : 70   *MeV,
                 # Maximum mass for intermediate resonance
-                'Res_Mass_MAX'       : 210  *MeV, 
+                'Res_Mass_MAX'       : 210  *MeV,
                 # Minimum D PT
-                'D_PT_Min'           : 3000 *MeV, 
+                'D_PT_Min'           : 3000 *MeV,
                 # Minimum D mass
                 'D_Mass_MIN'          : 1600 *MeV,
                 # Maximum D mass
                 'D_Mass_MAX'          : 2200 *MeV,
                 # Maximum chi^2 on D end vertex
                 'D_VCHI2PDOF_MAX'         : 5,
-                # minimum flight time                
+                # minimum flight time
                 'D_BPVLTIME_MIN'       : 0.15*picosecond,
                 # max chi^2 per DOF of DTF fit
-                'DTF_CHI2NDOF_MAX'   : 100, # added 
+                'DTF_CHI2NDOF_MAX'   : 100, # added
                 # Track quality requirement for soft pion from Dstar
                 'Soft_TRCHI2DOF_MAX'   : 5,
                 # Maximum Dstar-D0 mass difference
                 'Dstar_AMDiff_MAX': 165. * MeV,
-                'Dstar_MDiff_MAX': 160. * MeV,                
+                'Dstar_MDiff_MAX': 160. * MeV,
                 # Maximum chi^2 on Dstar vertex
                 'Dstar_VCHI2VDOF_MAX': 100.,
                 # HLT filters, only process events firing triggers matching the RegEx
@@ -130,51 +130,51 @@ default_config = {
           'STREAMS': ['Charm'],
           'CONFIG': {
                 # Minimum best primary vertex IP chi^2 for charged D daughters
-                'Bachelor_IPCHI2_MIN'      : 25.0,        
-                # Minimum PT for charged D daughters 
-                'Bachelor_PT_MIN'          : 1000  *MeV,   
-                # Minimum momentum for charged D daughters 
+                'Bachelor_IPCHI2_MIN'      : 25.0,
+                # Minimum PT for charged D daughters
+                'Bachelor_PT_MIN'          : 1000  *MeV,
+                # Minimum momentum for charged D daughters
                 'Bachelor_P_MIN'           : 1000 *MeV,
-                # Bachelor particle PID requirement 
+                # Bachelor particle PID requirement
                 'Bachelor_PIDK_MIN'        : -10.0, # not used if < -10
                 # Minimum best primary vertex IP chi^2 for charged D daughters
-                'Daug_IPCHI2_MIN'      : 25.0,     
-                # Minimum PT for charged D daughters 
+                'Daug_IPCHI2_MIN'      : 25.0,
+                # Minimum PT for charged D daughters
                 'Daug_PT_MIN'          : 350  *MeV,   # 600 --> 300
-                # Minimum momentum for charged D daughters 
+                # Minimum momentum for charged D daughters
                 'Daug_P_MIN'           : 1000 *MeV,
-                # Maximum momentum for charged D daughters 
+                # Maximum momentum for charged D daughters
                 'Daug_P_MAX'           : 100000 *MeV,
-                # Minimum pseudorapidity for charged D daughters 
+                # Minimum pseudorapidity for charged D daughters
                 'Daug_ETA_MIN'         : 2.0,
-                # Maximum pseudorapidity for charged D daughters 
+                # Maximum pseudorapidity for charged D daughters
                 'Daug_ETA_MAX'         : 5.0,
                 # Track quality requirement for charged D daughters
-                'Daug_TRCHI2DOF_MAX'   : 5,    
+                'Daug_TRCHI2DOF_MAX'   : 5,
                 # Maximum ghost probability for charged D daughters
                 'Daug_TRGHOSTPROB_MAX' : 0.5,
                 # Minimum PT for intermediate resonance neutral daughters
                 'Neut_PT_MIN'          : 600  *MeV,
-                # Maximum mass for dielectron                
+                # Maximum mass for dielectron
                 'DiElectron_Mass_MAX'       : 650  *MeV,
-                # Minimum PT for dielectron                
-                'DiElectron_PT_MIN'       : 350  *MeV, 
+                # Minimum PT for dielectron
+                'DiElectron_PT_MIN'       : 350  *MeV,
                 # Minimum mass for intermediate resonance
-                'Res_Mass_MIN'       : 450  *MeV, 
+                'Res_Mass_MIN'       : 450  *MeV,
                 # Maximum mass for intermediate resonance
-                'Res_Mass_MAX'       : 650  *MeV, 
+                'Res_Mass_MAX'       : 650  *MeV,
                 # Minimum D PT
-                'D_PT_Min'           : 3000 *MeV, 
+                'D_PT_Min'           : 3000 *MeV,
                 # Minimum D mass
                 'D_Mass_MIN'          : 1600 *MeV,
                 # Maximum D mass
                 'D_Mass_MAX'          : 2200 *MeV,
                 # Maximum chi^2 on D end vertex
                 'D_VCHI2PDOF_MAX'         : 5,
-                # minimum flight time                
+                # minimum flight time
                 'D_BPVLTIME_MIN'       : 0.25*picosecond,
                 # max chi^2 per DOF of DTF fit
-                'DTF_CHI2NDOF_MAX'   : 100, #added 
+                'DTF_CHI2NDOF_MAX'   : 100, #added
                 # HLT filters, only process events firing triggers matching the RegEx
                 'Hlt1Filter'         : None,
                 'Hlt2Filter'      : "HLT_PASS_RE('Hlt2CharmHadDp2Eta.*_Eta2EmEpG.*Decision')",
@@ -192,31 +192,31 @@ default_config = {
           'CONFIG': {
                 # Minimum PT for gamma in D0-> e+ e- gamma
                 'Neut_PT_MIN'        : 600  *MeV, # 350
-                # Maximum mass for dielectron in D0-> e+ e- gamma                
+                # Maximum mass for dielectron in D0-> e+ e- gamma
                 'DiElectron_Mass_MAX'       : 1914  *MeV,
-                # Minimum PT for dielectron in D0-> e+ e- gamma              
-                'DiElectron_PT_MIN'       : 2600  *MeV, 
+                # Minimum PT for dielectron in D0-> e+ e- gamma
+                'DiElectron_PT_MIN'       : 2600  *MeV,
                 # Minimum mass for intermediate resonance
-                'Res_Mass_MIN'       : 1814   *MeV, 
+                'Res_Mass_MIN'       : 1814   *MeV,
                 # Maximum mass for intermediate resonance
-                'Res_Mass_MAX'       : 1914  *MeV, 
+                'Res_Mass_MAX'       : 1914  *MeV,
                 # Track quality requirement for soft pion from Dstar
                 'Soft_TRCHI2DOF_MAX'   : 3,
                 # Maximum Dstar-D0 mass difference
                 'Dstar_AMDiff_MAX': 165. * MeV,
-                'Dstar_MDiff_MAX': 160. * MeV,                
+                'Dstar_MDiff_MAX': 160. * MeV,
                 # Maximum chi^2 on Dstar vertex
                 'Dstar_VCHI2VDOF_MAX': 9.,
                 # Minimum P for electrons in D0-> e+ e-
                 'Electron_P_MIN'       : 1000  *MeV,
-                # Minimum PT for electrons in D0-> e+ e-                
+                # Minimum PT for electrons in D0-> e+ e-
                 'Electron_PT_MIN'       : 350  *MeV,
                 # Track quality requirement for electrons in in D0-> e+ e-
-                'Electron_TRCHI2DOF_MAX'   : 6,    
+                'Electron_TRCHI2DOF_MAX'   : 6,
                 # Maximum ghost probability for electrons in in D0-> e+ e-
                 'Electron_TRGHOSTPROB_MAX' : 0.5,
                 # Minimum best primary vertex IP chi^2 for electrons in in D0-> e+ e-
-                'Electron_IPCHI2_MIN'      : 16.0,   
+                'Electron_IPCHI2_MIN'      : 16.0,
                 # HLT filters, only process events firing triggers matching the RegEx
                 'Hlt1Filter'         : None,
                 'Hlt2Filter'      : "HLT_PASS_RE('Hlt2CharmHadDstp2.*EmEp.*Decision')", # removed Topo
@@ -224,7 +224,7 @@ default_config = {
                 'PrescaleDst2PiD0EEG'  : 1,
                 'PostscaleDst2PiD0EEG' : 1,
                 'PrescaleDst2PiD0EE'   : 1,
-                'PostscaleDst2PiD0EE'  : 1                
+                'PostscaleDst2PiD0EE'  : 1
                 }
           },
     'D2EtaH' : {
@@ -238,7 +238,7 @@ default_config = {
                 'Bachelor_PT_MIN'          : 600  *MeV,   # 600
                 # Minimum momentum for charged D daughters
                 'Bachelor_P_MIN'           : 1000 *MeV,
-                # Bachelor particle PID requirement 
+                # Bachelor particle PID requirement
                 'Bachelor_PIDK_MIN'        : -999.0, # not used
                 # Minimum best primary vertex IP chi^2 for charged D daughters
                 'Daug_IPCHI2_MIN'      : 16.0,        # 25 --> 4
@@ -273,7 +273,7 @@ default_config = {
                 # Maximum mass for intermediate resonance
                 'Res_Mass_MAX'       : 720  *MeV,   # 600 --> 700
                 # Minimum D PT
-                'D_PT_Min'           : 2000 *MeV,   # 
+                'D_PT_Min'           : 2000 *MeV,   #
                 # Minimum D mass
                 'D_Mass_MIN'          : 1600 *MeV,
                 # Maximum D mass
@@ -308,13 +308,13 @@ default_config = {
           'STREAMS': ['Charm'],
           'CONFIG': {
                 # Minimum best primary vertex IP chi^2 for charged D daughters
-                'Bachelor_IPCHI2_MIN'      : 25.0,        # 25 
+                'Bachelor_IPCHI2_MIN'      : 25.0,        # 25
                 # Minimum PT for charged D daughters
                 'Bachelor_PT_MIN'          : 600  *MeV,   # 600
                 # Minimum momentum for charged D daughters
                 'Bachelor_P_MIN'           : 1000 *MeV,
-                # Bachelor particle PID requirement 
-                'Bachelor_PIDK_MIN'        : -999.0, # not used 
+                # Bachelor particle PID requirement
+                'Bachelor_PIDK_MIN'        : -999.0, # not used
                 # Minimum best primary vertex IP chi^2 for charged D daughters
                 'Daug_IPCHI2_MIN'      : 25.0,        # 25 --> 16
                 # Minimum PT for charged D daughters
@@ -381,11 +381,11 @@ default_config = {
                 # Minimum best primary vertex IP chi^2 for charged D daughters
                 'Bachelor_IPCHI2_MIN'      : 25.0,        # 25 --> 16
                 # Minimum PT for charged D daughters
-                'Bachelor_PT_MIN'          : 1000  *MeV,   # 600 
+                'Bachelor_PT_MIN'          : 1000  *MeV,   # 600
                 # Minimum momentum for charged D daughters
                 'Bachelor_P_MIN'           : 1000 *MeV,
-                # Bachelor particle PID requirement 
-                'Bachelor_PIDK_MIN'        : -999.0, # not used 
+                # Bachelor particle PID requirement
+                'Bachelor_PIDK_MIN'        : -999.0, # not used
                 # Minimum best primary vertex IP chi^2 for charged D daughters
                 'Daug_IPCHI2_MIN'      : 25.0,        # 25 --> 4
                 # Minimum PT for charged D daughters
@@ -449,39 +449,39 @@ default_config = {
 
 class StrippingD2Pi0HConf(LineBuilder):
     """Creates LineBuilder object containing the stripping lines."""
-    
+
     # Allowed configuration keys
     __configuration_keys__ = default_config['D2Pi0H']['CONFIG'].keys()
-    
+
     # Decay descriptors
     Dst2D0Pi = ['D*(2010)+ -> D0 pi+','D*(2010)- -> D0 pi-']
     D02Pi0Pi0 = ['D0 -> pi0 pi0']
     D2PiPi0 = ['[D+ -> pi0 pi+]cc']
     D2KPi0 = ['[D+ -> pi0 K+]cc']
-    
+
     Pi0EEG = ['pi0 -> J/psi(1S) gamma']
-    
+
     def __init__(self, name, config):
         """Initialise this LineBuilder instance."""
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         pi0eeg_name = '{0}Pi0EEG'.format(name)
-        
-        d2pipi0eeg_name = '{0}D2PiPi0EEG'.format(name)        
+
+        d2pipi0eeg_name = '{0}D2PiPi0EEG'.format(name)
         d2kpi0eeg_name = '{0}D2KPi0EEG'.format(name)
 
-        d02pi0pi0eeg_name = '{0}D02Pi0Pi0EEG'.format(name)        
+        d02pi0pi0eeg_name = '{0}D02Pi0Pi0EEG'.format(name)
         dst2d0pieeg_name = '{0}Dst2D0PiEEG'.format(name)
 
         self.selPi0EEG = makeEEGResonance(
-            pi0eeg_name, 
+            pi0eeg_name,
             config,
             inputSel=[StdLooseAllPhotons,StdDiElectronFromTracks],
             decDescriptors=self.Pi0EEG
             )
-        
+
         self.selD2PiPi0EEG = makeD(
             d2pipi0eeg_name,
             config,
@@ -495,9 +495,9 @@ class StrippingD2Pi0HConf(LineBuilder):
             usePIDforKaon = True
         else :
             usePIDforKaon = False
-            
+
         self.selD2KPi0EEG = makeD(
-            d2kpi0eeg_name, 
+            d2kpi0eeg_name,
             config,
             inputSel=[self.selPi0EEG, StdAllNoPIDsKaons],
             decDescriptors=self.D2KPi0,
@@ -505,7 +505,7 @@ class StrippingD2Pi0HConf(LineBuilder):
             )
 
         self.selD02Pi0Pi0EEG = makeD(
-            d02pi0pi0eeg_name, 
+            d02pi0pi0eeg_name,
             config,
             inputSel=[self.selPi0EEG],
             decDescriptors=self.D02Pi0Pi0,
@@ -538,7 +538,7 @@ class StrippingD2Pi0HConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_Dst2D0PiEEG = make_line(
             self,
             '{0}Line'.format(dst2d0pieeg_name),
@@ -551,42 +551,42 @@ class StrippingD2Pi0HConf(LineBuilder):
 
 class StrippingDst2PiD0EEGConf(LineBuilder):
     """Creates LineBuilder object containing the stripping lines."""
-    
+
     # Allowed configuration keys
     __configuration_keys__ = default_config['Dst2PiD0EEG']['CONFIG'].keys()
-    
+
     # Decay descriptors
     Dst2D0Pi = ['D*(2010)+ -> D0 pi+','D*(2010)- -> D0 pi-']
-    
+
     D0EEG = ['D0 -> J/psi(1S) gamma']
     D0EE  = ['D0 -> e+ e-']
-    
+
     def __init__(self, name, config):
         """Initialise this LineBuilder instance."""
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         d0eeg_name = '{0}D0EEG'.format(name)
         dst2pid0eeg_name = '{0}Dst2PiD0EEG'.format(name)
-        
+
         d0ee_name = '{0}D0EE'.format(name)
         dst2pid0ee_name = '{0}Dst2PiD0EE'.format(name)
 
         self.selD0EEG = makeEEGResonance(
-            d0eeg_name, 
+            d0eeg_name,
             config,
             inputSel=[StdLooseAllPhotons,StdDiElectronFromTracks],
             decDescriptors=self.D0EEG
-            )      
+            )
 
         self.selD0EE = makeEEResonance(
-            d0ee_name, 
+            d0ee_name,
             config,
             inputSel=[StdAllLooseElectrons],
             decDescriptors=self.D0EE
             )
-                    
+
         self.selDst2PiD0EEG = makeDstar(
             dst2pid0eeg_name,
             config,
@@ -624,34 +624,34 @@ class StrippingDst2PiD0EEGConf(LineBuilder):
 
 class StrippingD2EtaEEGHConf(LineBuilder):
     """Creates LineBuilder object containing the stripping lines."""
-    
+
     # Allowed configuration keys
     __configuration_keys__ = default_config['D2EtaEEGH']['CONFIG'].keys()
-    
+
     # Decay descriptors
     D2PiEta = ['[D+ -> eta pi+]cc']
     D2KEta = ['[D+ -> eta K+]cc']
-    
+
     EtaEEG = ['eta -> J/psi(1S) gamma']
-    
+
     def __init__(self, name, config):
         """Initialise this LineBuilder instance."""
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         etaeeg_name = '{0}EtaEEG'.format(name)
-        
-        d2pietaeeg_name = '{0}D2PiEtaEEG'.format(name)        
+
+        d2pietaeeg_name = '{0}D2PiEtaEEG'.format(name)
         d2ketaeeg_name = '{0}D2KEtaEEG'.format(name)
 
         self.selEtaEEG = makeEEGResonance(
-            etaeeg_name, 
+            etaeeg_name,
             config,
             inputSel=[StdLooseAllPhotons,StdDiElectronFromTracks],
             decDescriptors=self.EtaEEG
             )
-        
+
         self.selD2PiEtaEEG = makeD(
             d2pietaeeg_name,
             config,
@@ -665,9 +665,9 @@ class StrippingD2EtaEEGHConf(LineBuilder):
             usePIDforKaon = True
         else :
             usePIDforKaon = False
-            
+
         self.selD2KEtaEEG = makeD(
-            d2ketaeeg_name, 
+            d2ketaeeg_name,
             config,
             inputSel=[self.selEtaEEG, StdAllNoPIDsKaons],
             decDescriptors=self.D2KEta,
@@ -693,18 +693,18 @@ class StrippingD2EtaEEGHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
-        
+
+
 class StrippingD2EtaHConf(LineBuilder):
     """Creates LineBuilder object containing the stripping lines."""
-    
+
     # Allowed configuration keys
     __configuration_keys__ = default_config['D2EtaH']['CONFIG'].keys()
-    
+
     # Decay descriptors
     D2PiEta = ['[D+ -> eta pi+]cc']
     D2KEta = ['[D+ -> eta K+]cc']
-    
+
     EtaPPG = ['eta -> pi+ pi- gamma']
     Eta3H = ['eta -> pi+ pi- pi0']
 
@@ -713,15 +713,15 @@ class StrippingD2EtaHConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         etappg_name = '{0}EtaPPG'.format(name)
         eta3hr_name = '{0}Eta3HR'.format(name)
         eta3hm_name = '{0}Eta3HM'.format(name)
-        
+
         d2pietappg_name = '{0}D2PiEtaPPG'.format(name)
         d2pieta3hr_name = '{0}D2PiEta3HR'.format(name)
         d2pieta3hm_name = '{0}D2PiEta3HM'.format(name)
-        
+
         d2ketappg_name = '{0}D2KEtaPPG'.format(name)
         d2keta3hr_name = '{0}D2KEta3HR'.format(name)
         d2keta3hm_name = '{0}D2KEta3HM'.format(name)
@@ -762,7 +762,7 @@ class StrippingD2EtaHConf(LineBuilder):
             decDescriptors=self.D2KEta,
             useBachelorPID=False,
             )
-        
+
         self.selD2PiEta3HR = makeD(
             d2pieta3hr_name,
             config,
@@ -778,7 +778,7 @@ class StrippingD2EtaHConf(LineBuilder):
             decDescriptors=self.D2KEta,
             useBachelorPID=False,
             )
-                                        
+
         self.selD2PiEta3HM = makeD(
             d2pieta3hm_name,
             config,
@@ -786,7 +786,7 @@ class StrippingD2EtaHConf(LineBuilder):
             decDescriptors=self.D2PiEta,
             useBachelorPID=False,
             )
-        
+
 
         self.selD2KEta3HM = makeD(
             d2keta3hm_name,
@@ -795,7 +795,7 @@ class StrippingD2EtaHConf(LineBuilder):
             decDescriptors=self.D2KEta,
             useBachelorPID=False,
             )
-        
+
 
         self.line_D2PiEtaPPG = make_line(
             self,
@@ -836,7 +836,7 @@ class StrippingD2EtaHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2KEta3HM = make_line(
             self,
             name='{0}Line'.format(d2keta3hm_name),
@@ -846,7 +846,7 @@ class StrippingD2EtaHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2KEta3HR = make_line(
             self,
             name='{0}Line'.format(d2keta3hr_name),
@@ -861,43 +861,43 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
     """Creates LineBuilder object containing the stripping lines."""
     # Allowed configuration keys
     __configuration_keys__ = default_config['D2EtaPrimeH']['CONFIG'].keys()
-    
+
     # Decay descriptors
     D2PiEtaPrime = ["[D+ -> eta_prime pi+]cc"]
     D2KEtaPrime = ["[D+ -> eta_prime K+]cc"]
-    
+
     EtaPrimePPG = ["eta_prime -> pi+ pi- gamma"]
     EtaPrime3H = ["eta_prime -> pi+ pi- eta"]
-    
+
     def __init__(self, name, config):
         """Initialise this LineBuilder instance."""
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         etaprimeppg_name = '{0}EtaPrimePPG'.format(name)
         etaprime3hr_name = '{0}EtaPrime3HR'.format(name)
-        
+
         d2pietaprimeppg_name = '{0}D2PiEtaPrimePPG'.format(name)
         d2pietaprime3hr_name = '{0}D2PiEtaPrime3HR'.format(name)
-        
+
         d2ketaprimeppg_name = '{0}D2KEtaPrimePPG'.format(name)
         d2ketaprime3hr_name = '{0}D2KEtaPrime3HR'.format(name)
-        
+
         self.selEtaPrimePPG = makeResonance(
             etaprimeppg_name,
             config,
             inputSel=[StdAllNoPIDsPions,StdLooseAllPhotons],
             decDescriptors=self.EtaPrimePPG
             )
-        
+
         self.selEtaPrime3HR = makeResonance(
             etaprime3hr_name,
             config,
             inputSel=[StdAllNoPIDsPions,StdLooseResolvedEta],
             decDescriptors=self.EtaPrime3H
             )
-        
+
         self.selD2PiEtaPrimePPG = makeD(
             d2pietaprimeppg_name,
             config,
@@ -905,7 +905,7 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
             decDescriptors=self.D2PiEtaPrime,
             useBachelorPID=False,
             )
-        
+
         self.selD2KEtaPrimePPG = makeD(
             d2ketaprimeppg_name,
             config,
@@ -913,15 +913,15 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
             decDescriptors=self.D2KEtaPrime,
             useBachelorPID=False,
             )
-        
+
         self.selD2PiEtaPrime3HR = makeD(
             d2pietaprime3hr_name,
             config,
             inputSel=[self.selEtaPrime3HR, StdAllNoPIDsPions],
             decDescriptors=self.D2PiEtaPrime,
-            useBachelorPID=False,            
+            useBachelorPID=False,
             )
-        
+
         self.selD2KEtaPrime3HR = makeD(
             d2ketaprime3hr_name,
             config,
@@ -929,7 +929,7 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
             decDescriptors=self.D2KEtaPrime,
             useBachelorPID=False,
             )
-        
+
         self.line_D2PiEtaPrimePPG = make_line(
             self,
             name='{0}Line'.format(d2pietaprimeppg_name),
@@ -939,7 +939,7 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2PiEtaPrime3HR = make_line(
             self,
             name='{0}Line'.format(d2pietaprime3hr_name),
@@ -949,7 +949,7 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2KEtaPrimePPG = make_line(
             self,
             name='{0}Line'.format(d2ketaprimeppg_name),
@@ -959,7 +959,7 @@ class StrippingD2EtaPrimeHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2KEtaPrime3HR = make_line(
             self,
             name='{0}Line'.format(d2ketaprime3hr_name),
@@ -974,28 +974,28 @@ class StrippingD2PhiHConf(LineBuilder):
     """Creates LineBuilder object containing the stripping lines."""
     # Allowed configuration keys
     __configuration_keys__ = default_config['D2PhiH']['CONFIG'].keys()
-    
+
     # Decay descriptors
     D2PiPhi = ["[D+ -> phi(1020) pi+]cc"]
     D2KPhi = ["[D+ -> phi(1020) K+]cc"]
-    
+
     Phi3H = ["phi(1020) -> pi+ pi- pi0"]
-    
+
     def __init__(self, name, config):
         """Initialise this LineBuilder instance."""
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         phi3hm_name = '{0}Phi3HM'.format(name)
         phi3hr_name = '{0}Phi3HR'.format(name)
-        
+
         d2piphi3hm_name = '{0}D2PiPhi3HM'.format(name)
         d2piphi3hr_name = '{0}D2PiPhi3HR'.format(name)
-        
+
         d2kphi3hm_name = '{0}D2KPhi3HM'.format(name)
         d2kphi3hr_name = '{0}D2KPhi3HR'.format(name)
-        
+
 
         self.selPhi3HM = makeResonance(
             phi3hm_name,
@@ -1010,7 +1010,7 @@ class StrippingD2PhiHConf(LineBuilder):
             inputSel=[StdAllNoPIDsPions,StdLooseResolvedPi0],
             decDescriptors=self.Phi3H
             )
-        
+
         self.selD2PiPhi3HM = makeD(
             d2piphi3hm_name,
             config,
@@ -1018,7 +1018,7 @@ class StrippingD2PhiHConf(LineBuilder):
             decDescriptors=self.D2PiPhi,
             useBachelorPID=False,
             )
-        
+
         self.selD2KPhi3HM = makeD(
             d2kphi3hm_name,
             config,
@@ -1026,7 +1026,7 @@ class StrippingD2PhiHConf(LineBuilder):
             decDescriptors=self.D2KPhi,
             useBachelorPID=False,
             )
-        
+
         self.selD2PiPhi3HR = makeD(
             d2piphi3hr_name,
             config,
@@ -1034,7 +1034,7 @@ class StrippingD2PhiHConf(LineBuilder):
             decDescriptors=self.D2PiPhi,
             useBachelorPID=False,
             )
-        
+
         self.selD2KPhi3HR = makeD(
             d2kphi3hr_name,
             config,
@@ -1042,7 +1042,7 @@ class StrippingD2PhiHConf(LineBuilder):
             decDescriptors=self.D2KPhi,
             useBachelorPID=False,
             )
-        
+
         self.line_D2PiPhi3HM = make_line(
             self,
             name='{0}Line'.format(d2piphi3hm_name),
@@ -1052,7 +1052,7 @@ class StrippingD2PhiHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2PiPhi3HR = make_line(
             self,
             name='{0}Line'.format(d2piphi3hr_name),
@@ -1071,7 +1071,7 @@ class StrippingD2PhiHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
+
         self.line_D2KPhi3HR = make_line(
             self,
             name='{0}Line'.format(d2kphi3hr_name),
@@ -1081,11 +1081,11 @@ class StrippingD2PhiHConf(LineBuilder):
             HLT1=config['Hlt1Filter'],
             HLT2=config['Hlt2Filter']
             )
-        
-        
+
+
 def make_line(self, name, selection, prescale, postscale, **kwargs):
     """Create the stripping line defined by the selection.
-    
+
     Keyword arguments:
     name -- Base name for the Line
     selection -- Selection instance
@@ -1108,49 +1108,49 @@ def make_line(self, name, selection, prescale, postscale, **kwargs):
     else:
         return False
 
-    
-    
-def makeEEGResonance(name, config, inputSel, decDescriptors):  
-    
-    
+
+
+def makeEEGResonance(name, config, inputSel, decDescriptors):
+
+
     combCuts = "in_range( {0[Res_Mass_MIN]},AM,{0[Res_Mass_MAX]} )".format(config)
-    
+
     dielectronCuts = (
         "(MM < {0[DiElectron_Mass_MAX]})"
         " & ( PT > {0[DiElectron_PT_MIN]})"
         ).format(config)
-    
+
     gammaCuts = (
         "(PT > {0[Neut_PT_MIN]})"
         ).format(config)
-    
+
     resCuts = "ALL"
-    
+
     _combiner = CombineParticles(
         DecayDescriptors=decDescriptors,
         DaughtersCuts={
-        'J/psi(1S)'  : '{0}'.format(dielectronCuts), 
+        'J/psi(1S)'  : '{0}'.format(dielectronCuts),
         'gamma': '{0}'.format(gammaCuts)
         },
         CombinationCut=combCuts,
         MotherCut=resCuts
         )
-    
+
     return Selection(name, Algorithm=_combiner, RequiredSelections=inputSel)
 
-def makeEEResonance(name, config, inputSel, decDescriptors):  
-    
+def makeEEResonance(name, config, inputSel, decDescriptors):
+
     combCuts = "in_range( {0[Res_Mass_MIN]},AM,{0[Res_Mass_MAX]} )".format(config)
-    
-    electronCuts = ( 
+
+    electronCuts = (
         '(PT > {0[Electron_PT_MIN]})'
         '& (P > {0[Electron_P_MIN]}) '
         '& (MIPCHI2DV(PRIMARY) > {0[Electron_IPCHI2_MIN]})'
         '& (TRCHI2DOF < {0[Electron_TRCHI2DOF_MAX]}) '
         '& (TRGHOSTPROB < {0[Electron_TRGHOSTPROB_MAX]}) '
-        ).format(config)   
+        ).format(config)
     resCuts = "ALL"
-    
+
     _combiner = CombineParticles(
         DecayDescriptors=decDescriptors,
         DaughtersCuts={
@@ -1159,10 +1159,10 @@ def makeEEResonance(name, config, inputSel, decDescriptors):
         CombinationCut=combCuts,
         MotherCut=resCuts
         )
-    
+
     return Selection(name, Algorithm=_combiner, RequiredSelections=inputSel)
 
-def makeResonance( name, config, inputSel, decDescriptors):  
+def makeResonance( name, config, inputSel, decDescriptors):
 
     daugCuts = (
         '(PT > {0[Daug_PT_MIN]})'
@@ -1171,19 +1171,19 @@ def makeResonance( name, config, inputSel, decDescriptors):
         '& (TRCHI2DOF < {0[Daug_TRCHI2DOF_MAX]}) '
         '& (TRGHOSTPROB < {0[Daug_TRGHOSTPROB_MAX]}) '
         ).format(config)
-    
+
     pidFiducialCuts = (
         '(in_range({0[Daug_P_MIN]}, P, {0[Daug_P_MAX]}))'
         '& (in_range({0[Daug_ETA_MIN]}, ETA, {0[Daug_ETA_MAX]}))'
         ).format(config)
-    
+
     pionPIDCuts = (
         pidFiducialCuts +
         '& (PIDK-PIDpi < {0[Pi_PIDK_MAX]})'
         ).format(config)
-    
+
     combCuts = "in_range( {0[Res_Mass_MIN]},AM,{0[Res_Mass_MAX]} )".format(config)
-    
+
     etaggCuts = (
         "(PT > {0[Neut_PT_MIN]})"
         "& (ADMASS('eta') < {0[Neut_Mass_Win]})"
@@ -1197,20 +1197,20 @@ def makeResonance( name, config, inputSel, decDescriptors):
     gammaCuts = (
         "(PT > {0[Neut_PT_MIN]})"
         ).format(config)
-    
+
     resCuts = "ALL"
-    
+
     comb12Cuts = (
         "( in_range( {0[Dipion_Mass_MIN]},AM,{0[Dipion_Mass_MAX]}) )"
         "& ( ACUTDOCACHI2( {0[Dipion_DOCACHI2_MAX]} , '') ) "
         ).format(config)
-    
+
     piCuts = ''
     if (config['Pi_PIDK_MAX'] < 10):
         piCuts = ('{0} & {1}'.format(daugCuts, pionPIDCuts))
     else:
         piCuts = ('{0}'.format(daugCuts))
-        
+
     _combiner = DaVinci__N3BodyDecays(
         Combination12Cut = comb12Cuts,
         DecayDescriptors=decDescriptors,
@@ -1223,23 +1223,23 @@ def makeResonance( name, config, inputSel, decDescriptors):
         CombinationCut=combCuts,
         MotherCut=resCuts
         )
-    
+
     return Selection(name, Algorithm=_combiner, RequiredSelections=inputSel)
 
 
-def makeD(name, config, inputSel, decDescriptors, useBachelorPID):        
-    
-    
-    pidFiducialCuts = ( 
+def makeD(name, config, inputSel, decDescriptors, useBachelorPID):
+
+
+    pidFiducialCuts = (
         '(in_range({0[Daug_P_MIN]}, P, {0[Daug_P_MAX]}))'
         '& (in_range({0[Daug_ETA_MIN]}, ETA, {0[Daug_ETA_MAX]}))'
         ).format(config)
-    
-    bachelorPIDCuts = (  
+
+    bachelorPIDCuts = (
         pidFiducialCuts +
         '& (PIDK-PIDpi > {0[Bachelor_PIDK_MIN]})'
         ).format(config)
-    
+
     daugCuts = (
         '(PT > {0[Bachelor_PT_MIN]})'
         '& (P > {0[Bachelor_P_MIN]}) '
@@ -1247,24 +1247,24 @@ def makeD(name, config, inputSel, decDescriptors, useBachelorPID):
         '& (TRCHI2DOF < {0[Daug_TRCHI2DOF_MAX]}) ' # common TRCHI2DOF and TRGHOSTPROB for all pions
         '& (TRGHOSTPROB < {0[Daug_TRGHOSTPROB_MAX]}) '
         ).format(config)
-    
+
     bachelorCuts = ''
     if (useBachelorPID):
         bachelorCuts = ('{0} & {1}'.format(daugCuts, bachelorPIDCuts))
     else:
         bachelorCuts = ('{0}'.format(daugCuts))
-        
+
     combCuts = (
         "(APT > {0[D_PT_Min]})"
         "& ( in_range( {0[D_Mass_MIN]},AM,{0[D_Mass_MAX]}) )"
         ).format(config)
-    
+
     dCuts = (
         '(VFASPF(VCHI2PDOF) < {0[D_VCHI2PDOF_MAX]})'
         '& (BPVLTIME() > {0[D_BPVLTIME_MIN]})'
-        '& (DTF_CHI2NDOF(True) < {0[DTF_CHI2NDOF_MAX]})' 
+        '& (DTF_CHI2NDOF(True) < {0[DTF_CHI2NDOF_MAX]})'
         ).format(config)
-    
+
     _D = CombineParticles(
         #name='Combine{0}'.format(name),
         DecayDescriptors=decDescriptors,
@@ -1275,7 +1275,7 @@ def makeD(name, config, inputSel, decDescriptors, useBachelorPID):
         CombinationCut=combCuts,
         MotherCut=dCuts
         )
-    
+
     return Selection(name, Algorithm=_D, RequiredSelections=inputSel)
 
 
@@ -1283,24 +1283,22 @@ def makeD(name, config, inputSel, decDescriptors, useBachelorPID):
 def makeDstar(name, config , inputSel , decDescriptors):
 
     daugCuts = (
-        '(TRCHI2DOF < {0[Soft_TRCHI2DOF_MAX]}) ' 
+        '(TRCHI2DOF < {0[Soft_TRCHI2DOF_MAX]}) '
         ).format(config)
-    
+
     combCuts = (
         '( (AM - AM1) < {0[Dstar_AMDiff_MAX]})'
         ).format(config)
-    
+
     dstarCuts = (
         '( VFASPF(VCHI2/VDOF) < {0[Dstar_VCHI2VDOF_MAX]} )'
         '& ( (M - M1) < {0[Dstar_MDiff_MAX]}  )'
         ).format(config)
-    
+
     _Dstar = CombineParticles( DecayDescriptors = decDescriptors
                                , DaughtersCuts = { "pi+" : daugCuts }
                                , CombinationCut = combCuts
                                , MotherCut = dstarCuts
                                )
-    
-    return Selection( name , Algorithm = _Dstar, RequiredSelections = inputSel )
 
-    
+    return Selection( name , Algorithm = _Dstar, RequiredSelections = inputSel )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py
index 7f66c4c9de8846c72848c60d7a8682699e55c7b0..a8dad486ead8e12dc8d43083d417f28b6b4f18f1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py
@@ -28,12 +28,12 @@ default_config =  {
                   'MuonPT'        : 300.  ,    #MeV
                   'MuonMINIPCHI2' : 5     ,    #adminensional
                   'MuonTRCHI2'    : 5     ,    #adminensional
-                  
+
                   'PionP'         : 2000. ,    #MeV
                   'PionPT'        : 300.  ,    #MeV
                   'PionMINIPCHI2' : 5     ,    #adminensional
                   'PionTRCHI2'    : 5     ,    #adminensional
-                  
+
                   'KaonP'         : 2000. ,    #MeV
                   'KaonPT'        : 300.  ,    #MeV
                   'KaonPIDK'      : -1.   ,    #adimensional
@@ -49,20 +49,20 @@ default_config =  {
                   'ElePT'        : 300.  ,    #MeV
                   'EleMINIPCHI2' : 5     ,    #adminensional
                   'EleTRCHI2'    : 5     ,    #adminensional
-                  
+
 
 
                   #3 body
                   'DVCHI2DOF'     : 5     ,    #adminensional
                   'DMAXDOCA'      : 0.15  ,    #mm
                   'DIPCHI2'       : 25    ,    #adimensional
-                  
+
                   #4body
                   'MINIPCHI2_hhmumu' : 2. ,  #adminensional
                   'PT_hhmumu'        : 300 , #MeV
                   'MuonPIDmu_hhmumu' : -1,   #adimensional
                   'DPT_hhmumu'           : 2500.,     #MeV
-                  'DVCHI2DOF_hhmumu'     : 8     ,    #adminensional         
+                  'DVCHI2DOF_hhmumu'     : 8     ,    #adminensional
                   'DMAXDOCA_hhmumu'      : 0.2  ,    #mm
                   'DdauMAXIPCHI2_hhmumu' : 15    ,    #adimensinal
                   'DFDCHI2_hhmumu'       : 36     ,   #adimensional
@@ -79,9 +79,9 @@ default_config =  {
                   'LambdacMassWinRare'         : 200. ,     #MeV, mass window
                   'DMassLow'                   :1763.  ,    #MeV, low-mass veto
 
-             
+
                   'GhostProbCut_hhmumu'     : 0.5,
-                  
+
                   'D2PiMuMuOSLinePrescale'     : 1 ,
                   'D2PiMuMuOSLinePostscale'    : 1 ,
 
@@ -142,7 +142,7 @@ default_config =  {
                   'D02K3PiLinePostscale'       : 1,
                   'D02PiPiPiPiLinePrescale'    : 0.01 ,
                   'D02PiPiPiPiLinePostscale'   : 1,
-                  
+
                   'Lambdac2PMuMuLinePrescale'  : 1 ,
                   'Lambdac2PMuMuLinePostscale' : 1 ,
 
@@ -163,10 +163,10 @@ default_config =  {
 
                   'Lambdac2PPiPiLinePrescale'  : 0.01 ,
                   'Lambdac2PPiPiLinePostscale' : 1,
-                 
-                  'Lambdac2PKPiLinePrescale'  : 0.1 , 
-                  'Lambdac2PKPiLinePostscale' : 1 , 
-                  
+
+                  'Lambdac2PKPiLinePrescale'  : 0.1 ,
+                  'Lambdac2PKPiLinePostscale' : 1 ,
+
                   'D2PiMuMuCalLinePrescale'    : 1 ,
                   'D2PiMuMuCalLinePostscale'   : 1 ,
                   'D2PiEMuCalLinePrescale'    : 1 ,
@@ -263,22 +263,22 @@ default_name = "D2XMuMuSS"
 
 class StrippingD2XMuMuSSConf(LineBuilder) :
     """
-    Builder for D2XMuMu, X = pi/K 
+    Builder for D2XMuMu, X = pi/K
     """
-    
+
     PiCalLine = None
 
-    PiOSLine = None      
+    PiOSLine = None
     Pi_EE_OSLine = None
-    Pi_EMu_OSLine = None 
-    Pi_MuE_OSLine = None 
+    Pi_EMu_OSLine = None
+    Pi_MuE_OSLine = None
     Pi_EE_SSLine = None
     Pi_MuE_SSLine = None
 
     KOSLine = None
     K_EE_OSLine = None
-    K_EMu_OSLine = None 
-    K_MuE_OSLine = None 
+    K_EMu_OSLine = None
+    K_MuE_OSLine = None
     K_EE_SSLine = None
     K_MuE_SSLine = None
 
@@ -302,19 +302,19 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
 
     Lambdac2PPiPiLine = None
     Lambdac2PKPiLine = None
-    
+
     PiMuMuCalLine = None
     PiEMuCalLine = None
     PiEECalLine = None
     KMuMuCalLine = None
     KEMuCalLine = None
     KEECalLine = None
-        
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
-        
+
         PiCalLine_name = name+"_PiCal"
         PiOSLine_name = name+"_PiOS"
         Pi_EE_OSLine_name = name+"_Pi_EE_OS"
@@ -342,7 +342,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
         KKPiPiLine_name = name+"_KKPiPi"
         K3PiLine_name = name+"_K3Pi"
         PiPiPiPiLine_name = name+"_PiPiPiPi"
-        
+
         Lambdac2PMuMuLine_name = name+"_Lambdac2PMuMu"
         Lambdac2PEELine_name = name+"_Lambdac2PEE"
         Lambdac2PEMuLine_name = name+"_Lambdac2PEMu"
@@ -352,14 +352,14 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
 
         Lambdac2PPiPiLine_name = name+"_Lambdac2PPiPi"
         Lambdac2PKPiLine_name = name+"_Lambdac2PKPi"
-        
+
         PiMuMuCalLine_name = name+"_PiMuMuCal"
         PiEMuCalLine_name = name+"_PiEMuCal"
         PiEECalLine_name = name+"_PiEECal"
         KMuMuCalLine_name = name+"_KMuMuCal"
         KEMuCalLine_name = name+"_KEMuCal"
         KEECalLine_name = name+"_KEECal"
-        
+
         # 1 : Make kaons
         selKaons = makeKaons(name="KaonsFor"+name
                              , KaonP = config['KaonP']
@@ -367,14 +367,14 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                              , KaonPIDK = config['KaonPIDK']
                              , KaonMINIPCHI2 = config['KaonMINIPCHI2']
                              , KaonTRCHI2 = config['KaonTRCHI2'])
-        
+
         # 2 : Make pions
         selPions = makePions(name="PionsFor"+name
                              , PionP = config['PionP']
                              , PionPT = config['PionPT']
                              , PionMINIPCHI2 = config['PionMINIPCHI2']
                              , PionTRCHI2 = config['PionTRCHI2'])
-        
+
         # 3 : Make muons
         selMuons = makeMuons(name="MuonsFor"+name
                              , MuonP = config['MuonP']
@@ -389,7 +389,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                         , MuonMINIPCHI2 = config['MuonMINIPCHI2']
                                         , MuonTRCHI2 = config['MuonTRCHI2'])
 
-        # 4 : Make protons 
+        # 4 : Make protons
         selProtons = makeProtons(name="ProtonsFor"+name
                                  , ProtonP = config['ProtonP']
                                  , ProtonPT = config['ProtonPT']
@@ -398,14 +398,14 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
 
 
 
-        # 5 : Make Electrons 
+        # 5 : Make Electrons
         selElectrons = makeElectrons(name="ElectronsFor"+name
                                  , EleP = config['EleP']
                                  , ElePT = config['ElePT']
                                  , EleMINIPCHI2 = config['EleMINIPCHI2']
                                  , EleTRCHI2 = config['EleTRCHI2'])
-                                                             
-                
+
+
 
         # 1a : Make Kaons for 3 body Control Samples
         selKaonsFor3bodyCS  = makeKaonsFor3bodyCS(name="HadFor3bodyCSAndFor"+name
@@ -413,15 +413,15 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                              , KaonPT = config['KaonPT']
                                              , KaonMINIPCHI2 = config['KaonMINIPCHI2']
                                              , KaonTRCHI2 = config['KaonTRCHI2'])
-        
-        # 2a : Make Pions for 3 body  Control samples 
+
+        # 2a : Make Pions for 3 body  Control samples
         selPionsFor3bodyCS = makePionsFor3bodyCS(name="PionsFor3bodyCSAndFor"+name
                                                  , PionP = config['PionP']
                                                  , PionPT = config['PionPT']
                                                  , PionMINIPCHI2 = config['PionMINIPCHI2']
                                                  , PionTRCHI2 = config['PionTRCHI2'])
 
-        # 4 : Make protons for 3 body  Control samples 
+        # 4 : Make protons for 3 body  Control samples
         selProtonsFor3bodyCS = makeProtonsFor3bodyCS(name="ProtonsFor3bodyCSAndFor"+name
                                  , ProtonP = config['ProtonP']
                                  , ProtonPT = config['ProtonPT']
@@ -430,7 +430,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
 
 
 
-        # 5 : Make Muons for hhmumu 
+        # 5 : Make Muons for hhmumu
         selMuonsForhhmumu = makeMuonsForhhmumu(name="MuonsForhhmumuAndFor"+name
                                                , MuonP = config['MuonP']
                                                , MuonPT = config['PT_hhmumu']
@@ -439,7 +439,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                                , MuonPIDmu_CS_hhmumu = config['MuonPIDmu_hhmumu']
                                                , ghostProbCut = config['GhostProbCut_hhmumu'])
 
-        # 6 : Make Kaons for hhmumu 
+        # 6 : Make Kaons for hhmumu
         selKaonsForhhmumu  = makeKaonsForhhmumu(name="KaonsForhhmumuAndFor"+name
                                                 , KaonP = config['KaonP']
                                                 , KaonPT = config['PT_hhmumu']
@@ -448,7 +448,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                                 , KaonTRCHI2 = config['KaonTRCHI2']
                                                 , ghostProbCut = config['GhostProbCut_hhmumu'])
 
-        # 7 : Make Pions for hhmumu 
+        # 7 : Make Pions for hhmumu
         selPionsForhhmumu = makePionsForhhmumu(name="PionsForForhhmumuAndFor"+name
                                                , PionP = config['PionP']
                                                , PionPT = config['PT_hhmumu']
@@ -465,8 +465,8 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                                   , KaonMINIPCHI2 = config['MINIPCHI2_4bodyCS']
                                                   , KaonTRCHI2 = config['KaonTRCHI2']
                                                   , ghostProbCut = config['GhostProbCut_hhmumu'])
-        
-        # 7a : Make Pions for 4 body Control samples 
+
+        # 7a : Make Pions for 4 body Control samples
         selPionsFor4bodyCS = makePionsFor4bodyCS(name="PionsFor4bodyCSAndFor"+name
                                                  , PionP = config['PionP']
                                                  , PionPT = config['PT_hhmumu']
@@ -474,17 +474,17 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                                  , PionTRCHI2 = config['PionTRCHI2']
                                                  , ghostProbCut = config['GhostProbCut_hhmumu'])
 
-      
 
-        
 
-                                        
+
+
+
         # 7 : Combine
         selD2PiPiPi   = self._makeD2PiPiPi(name=PiCalLine_name,
                                              pionSel = selPions,
                                              muonSel = pionsAsMuons,
                                              config = config)
-        
+
         selD2PiMuMuOS = self._makeD2PiMuMuOS(name=PiOSLine_name,
                                              pionSel = selPions,
                                              muonSel = selMuons,
@@ -565,30 +565,30 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                      kaonSel = selKaonsFor3bodyCS,
                                      pionSel = selPionsFor3bodyCS,
                                      config = config)
-        
+
         selD22KPi = self._makeD22KPi(name=TwoKPiLine_name,
                                      kaonSel = selKaonsFor3bodyCS,
                                      pionSel = selPionsFor3bodyCS,
                                      config = config)
-        
-        
-        
+
+
+
         selD02KKMuMu = self._makeD02KKMuMu(name=KKLine_name,
                                            kaonSel = selKaonsForhhmumu,
                                            muonSel = selMuonsForhhmumu,
                                            config = config)
-        
+
         selD02PiPiMuMu = self._makeD02PiPiMuMu(name=PiPiLine_name,
                                            pionSel = selPionsForhhmumu,
                                            muonSel = selMuonsForhhmumu,
                                            config = config)
-        
+
         selD02KPiMuMu = self._makeD02KPiMuMu(name=KPiLine_name,
                                              kaonSel = selKaonsForhhmumu,
                                              pionSel = selPionsForhhmumu,
                                              muonSel = selMuonsForhhmumu,
                                              config = config)
-        
+
         selD02KKPiPi = self._makeD02KKPiPi(name=KKPiPiLine_name,
                                            kaonSel = selKaonsFor4bodyCS,
                                            pionSel = selPionsFor4bodyCS,
@@ -677,7 +677,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                              kaonSel = selKaons,
                                              eleSel = selElectrons,
                                              config = config)
-       
+
         # 8 : Declare Lines
         self.PiCalLine = StrippingLine(PiCalLine_name+"Line",
                                       prescale = config['D2PiPiPiCalLinePrescale'],
@@ -699,7 +699,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                       selection = selD2PiEEOS,
                                       RelatedInfoTools = _format_related_info(selD2PiEEOS, config['RelatedInfoTools'])
                                       )
-        
+
         self.Pi_EMu_OSLine = StrippingLine(Pi_EMu_OSLine_name+"Line",
                                       prescale = config['D2PiEMuOSLinePrescale'],
                                       postscale = config['D2PiEMuOSLinePostscale'],
@@ -713,7 +713,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                       selection = selD2PiMuEOS,
                                       RelatedInfoTools = _format_related_info(selD2PiMuEOS, config['RelatedInfoTools'])
                                       )
-        
+
         self.PiSSLine = StrippingLine(PiSSLine_name+"Line",
                                       prescale = config['D2PiMuMuSSLinePrescale'],
                                       postscale = config['D2PiMuMuSSLinePostscale'],
@@ -773,7 +773,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                          selection = selD2KEESS,
                                          RelatedInfoTools = _format_related_info(selD2KEESS, config['RelatedInfoTools'])
                                          )
-        
+
         self.K_MuE_SSLine = StrippingLine(K_MuE_SSLine_name+"Line",
                                           prescale = config['D2KMuESSLinePrescale'],
                                           postscale = config['D2KMuESSLinePostscale'],
@@ -795,26 +795,26 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                         RelatedInfoTools = _format_related_info(selD22KPi, config['RelatedInfoTools'])
                                         )
 
-        
-        
+
+
         self.KKLine = StrippingLine(KKLine_name+"Line",
                                     prescale = config['D02KKMuMuLinePrescale'],
                                     postscale = config['D02KKMuMuLinePostscale'],
                                     selection = selD02KKMuMu
                                     )
-        
+
         self.PiPiLine = StrippingLine(PiPiLine_name+"Line",
                                     prescale = config['D02PiPiMuMuLinePrescale'],
                                     postscale = config['D02PiPiMuMuLinePostscale'],
                                     selection = selD02PiPiMuMu
                                     )
-        
+
         self.KPiLine = StrippingLine(KPiLine_name+"Line",
                                      prescale = config['D02KPiMuMuLinePrescale'],
                                      postscale = config['D02KPiMuMuLinePostscale'],
                                      selection = selD02KPiMuMu
                                      )
-        
+
         self.KKPiPiLine = StrippingLine(KKPiPiLine_name+"Line",
                                     prescale = config['D02KKPiPiLinePrescale'],
                                     postscale = config['D02KKPiPiLinePostscale'],
@@ -833,7 +833,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                         selection = selD02PiPiPiPi
                                         )
 
- 
+
         self.Lambdac2PMuMuLine = StrippingLine(Lambdac2PMuMuLine_name+"Line",
                                                prescale = config['Lambdac2PMuMuLinePrescale'],
                                                postscale = config['Lambdac2PMuMuLinePostscale'],
@@ -859,7 +859,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                                postscale = config['Lambdac2PMuELinePostscale'],
                                                selection = selLambdac2PMuE,
                                                RelatedInfoTools = _format_related_info(selLambdac2PMuE, config['RelatedInfoTools'])
-                                               )        
+                                               )
 
         self.Lambdac2PMuMuSSLine = StrippingLine(Lambdac2PMuMuSSLine_name+"Line",
                                                prescale = config['Lambdac2PMuMuSSLinePrescale'],
@@ -889,15 +889,15 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                                selection = selLambdac2PKPi,
                                                RelatedInfoTools = _format_related_info(selLambdac2PKPi, config['RelatedInfoTools'])
                                                )
- 
-        
+
+
         self.PiMuMuCalLine = StrippingLine(PiMuMuCalLine_name+"Line",
                                       prescale = config['D2PiMuMuCalLinePrescale'],
                                       postscale = config['D2PiMuMuCalLinePostscale'],
                                       selection = selD2PiMuMuCal,
                                       RelatedInfoTools = _format_related_info(selD2PiMuMuCal, config['RelatedInfoTools'])
                                        )
-        
+
         self.PiEMuCalLine = StrippingLine(PiEMuCalLine_name+"Line",
                                       prescale = config['D2PiEMuCalLinePrescale'],
                                       postscale = config['D2PiEMuCalLinePostscale'],
@@ -918,7 +918,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                                       selection = selD2KMuMuCal,
                                       RelatedInfoTools = _format_related_info(selD2KMuMuCal, config['RelatedInfoTools'])
                                        )
-        
+
         self.KEMuCalLine = StrippingLine(KEMuCalLine_name+"Line",
                                       prescale = config['D2KEMuCalLinePrescale'],
                                       postscale = config['D2KEMuCalLinePostscale'],
@@ -953,7 +953,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
         self.registerLine( self.PiCalLine )
         self.registerLine( self.K2PiLine )
         self.registerLine( self.TwoKPiLine )
-        
+
         self.registerLine( self.KKLine )
         self.registerLine( self.PiPiLine )
         self.registerLine( self.KPiLine )
@@ -971,7 +971,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
 
         self.registerLine( self.Lambdac2PPiPiLine )
         self.registerLine( self.Lambdac2PKPiLine )
-        
+
         self.registerLine( self.PiMuMuCalLine )
         self.registerLine( self.PiEMuCalLine )
         self.registerLine( self.PiEECalLine )
@@ -1328,7 +1328,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                               , DMassWin = config['DMassWin_CS_hhmumu']
                               , DMassLow = config['DMassLow']
                               , DimuonMass = config['DimuonMass'])
-    
+
 #####################################################
     def _makeD02KKPiPi(self, name, kaonSel, pionSel, config):
         """
@@ -1357,7 +1357,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                              , kaonSel
                              , pionSel
                              , OneKaonPID = config['KaonPIDK']
-                             , DPT = config['DPT_hhmumu'] 
+                             , DPT = config['DPT_hhmumu']
                              , DMAXDOCA = config['DMAXDOCA_hhmumu']
                              , DdauMAXIPCHI2= config['DdauMAXIPCHI2_hhmumu']
                              , DFDCHI2= config['DFDCHI2_hhmumu']
@@ -1494,7 +1494,7 @@ class StrippingD2XMuMuSSConf(LineBuilder) :
                             , DVCHI2DOF = config['DVCHI2DOF']
                             , DDIRA = config['DDIRA']
                             , DIPCHI2 = config['DIPCHI2']
-                            , LambdacMassWin = config['LambdacMassWin'] 
+                            , LambdacMassWin = config['LambdacMassWin']
                             , DimuonMass = config['DimuonMass'])
 
 
@@ -1646,7 +1646,7 @@ def makeD2PiPiPi(name, pionSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass
 #####################################################
 def makeD2PiMuMuOS(name, pionSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ mu+ mu- 
+    Makes the D+ -> pi+ mu+ mu-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1670,7 +1670,7 @@ def makeD2PiMuMuOS(name, pionSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMa
 #####################################################
 def makeD2PiEEOS(name, pionSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ e+ e- 
+    Makes the D+ -> pi+ e+ e-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1693,7 +1693,7 @@ def makeD2PiEEOS(name, pionSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass,
 #####################################################
 def makeD2PiEMuOS(name, pionSel, muonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ e+ mu- 
+    Makes the D+ -> pi+ e+ mu-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1716,7 +1716,7 @@ def makeD2PiEMuOS(name, pionSel, muonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, D
 #####################################################
 def makeD2PiMuEOS(name, pionSel, muonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ mu+ e- 
+    Makes the D+ -> pi+ mu+ e-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1742,7 +1742,7 @@ def makeD2PiMuMuSS(name, pionSel, muonSel, DMAXDOCA, DMassWin, DMassLow, DimuonM
     """
     Makes the D- -> pi+ mu- mu-
     """
-    
+
     _combcut = "(ADAMASS('D-') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -1751,7 +1751,7 @@ def makeD2PiMuMuSS(name, pionSel, muonSel, DMAXDOCA, DMassWin, DMassLow, DimuonM
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D- -> pi+ mu- mu-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1765,7 +1765,7 @@ def makeD2PiEESS(name, pionSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass
     """
     Makes the D- -> pi+ e- e-
     """
-    
+
     _combcut = "(ADAMASS('D-') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -1774,7 +1774,7 @@ def makeD2PiEESS(name, pionSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D- -> pi+ e- e-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1788,7 +1788,7 @@ def makeD2PiMuESS(name, pionSel, muonSel, eleSel, DMAXDOCA, DMassWin, DMassLow,
     """
     Makes the D- -> pi+ mu- e-
     """
-    
+
     _combcut = "(ADAMASS('D-') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -1797,7 +1797,7 @@ def makeD2PiMuESS(name, pionSel, muonSel, eleSel, DMAXDOCA, DMassWin, DMassLow,
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D- -> pi+ mu- e-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1811,16 +1811,16 @@ def makeD2KMuMuOS(name, kaonSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMas
     """
     Makes the D+ -> K+ mu+ mu-
     """
-    
+
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
                "(AM23 > %(DimuonMass)s *MeV)" % locals()
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D+ -> K+ mu+ mu-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1833,7 +1833,7 @@ def makeD2KMuMuOS(name, kaonSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMas
 #####################################################
 def makeD2KEEOS(name, kaonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> K+ e+ e- 
+    Makes the D+ -> K+ e+ e-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1856,7 +1856,7 @@ def makeD2KEEOS(name, kaonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass,
 #####################################################
 def makeD2KEMuOS(name, kaonSel, muonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> K+ e+ mu- 
+    Makes the D+ -> K+ e+ mu-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1879,7 +1879,7 @@ def makeD2KEMuOS(name, kaonSel, muonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, Di
 #####################################################
 def makeD2KMuEOS(name, kaonSel, muonSel, eleSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> K+ mu+ e- 
+    Makes the D+ -> K+ mu+ e-
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -1907,16 +1907,16 @@ def makeD2KMuMuSS(name, kaonSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMas
     """
     Makes the D- -> K+ mu- mu-
     """
-    
+
     _combcut = "(ADAMASS('D-') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
                "(AM23 > %(DimuonMass)s *MeV)" % locals()
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D- -> K+ mu- mu-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1930,7 +1930,7 @@ def makeD2KEESS(name, kaonSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass,
     """
     Makes the D- -> K+ e- e-
     """
-    
+
     _combcut = "(ADAMASS('D-') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -1939,7 +1939,7 @@ def makeD2KEESS(name, kaonSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass,
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D- -> K+ e- e-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1953,7 +1953,7 @@ def makeD2KMuESS(name, kaonSel, muonSel, eleSel, DMAXDOCA, DMassWin, DMassLow, D
     """
     Makes the D- -> K+ mu- e-
     """
-    
+
     _combcut = "(ADAMASS('D-') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -1962,7 +1962,7 @@ def makeD2KMuESS(name, kaonSel, muonSel, eleSel, DMAXDOCA, DMassWin, DMassLow, D
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D- -> K+ mu- e-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -1973,23 +1973,23 @@ def makeD2KMuESS(name, kaonSel, muonSel, eleSel, DMAXDOCA, DMassWin, DMassLow, D
 
 #####################################################
 def makeD2K2Pi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
-    
+
     """
-    Makes the D+ -> K- pi+ pi+ 
+    Makes the D+ -> K- pi+ pi+
     """
-    
+
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
                "(AM23 > %(DimuonMass)s *MeV) &" \
                "(AHASCHILD( (ABSID=='K+') & (PIDK-PIDpi > %(OneKaonPID)s)  ))" %locals()
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
 
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D+ -> K- pi+ pi+]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2002,21 +2002,21 @@ def makeD2K2Pi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DMassWin, DMassLow,
 
 #####################################################
 def makeD22KPi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
-    
+
     """
-    Makes the D+ -> K- K+ pi+ 
+    Makes the D+ -> K- K+ pi+
     """
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM23 > %(DimuonMass)s *MeV) &" \
                "(AM > %(DMassLow)s *MeV) &" \
                "(AHASCHILD( (ABSID=='K+') & (PIDK-PIDpi > %(OneKaonPID)s)  ))" %locals()
-    
-    
+
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D+ -> K+ K- pi+]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2032,11 +2032,11 @@ def makeD22KPi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DMassWin, DMassLow,
 
 #####################################################
 def makeD02KKMuMu(name, kaonSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCHI2DOF, DDIRA, DIPCHI2, DMassWin, DMassLow, DimuonMass, DPT):
-    
+
     """
     Makes the D0 -> K+ K- mu+ mu-
     """
-    
+
     _combcut = "(ADAMASS('D0') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -2044,12 +2044,12 @@ def makeD02KKMuMu(name, kaonSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCH
                "(AHASCHILD( (MIPCHI2DV(PRIMARY)>%(DdauMAXIPCHI2)s)  )   )" %locals()
 
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(PT > %(DPT)s *MeV) &"\
               "(BPVVDCHI2>%(DFDCHI2)s) & (BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "D0 -> K+ K- mu+ mu-",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2061,11 +2061,11 @@ def makeD02KKMuMu(name, kaonSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCH
 
 #####################################################
 def makeD02PiPiMuMu(name, pionSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCHI2DOF, DDIRA, DIPCHI2, DMassWin, DMassLow, DimuonMass, DPT):
-    
+
     """
     Makes the D0 -> pi+ pi- mu+ mu-
     """
-    
+
     _combcut = "(ADAMASS('D0') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -2073,12 +2073,12 @@ def makeD02PiPiMuMu(name, pionSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DV
                "(AHASCHILD( (MIPCHI2DV(PRIMARY)>%(DdauMAXIPCHI2)s)  )   )" %locals()
 
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(PT > %(DPT)s *MeV) &"\
               "(BPVVDCHI2>%(DFDCHI2)s) & (BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "D0 -> pi+ pi- mu+ mu-",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2089,11 +2089,11 @@ def makeD02PiPiMuMu(name, pionSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DV
 
 #####################################################
 def makeD02KPiMuMu(name, kaonSel, pionSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCHI2DOF, DDIRA, DIPCHI2, DMassWin, DMassLow, DimuonMass, DPT):
-    
+
     """
     Makes the D0 -> K- pi+ mu+ mu-
     """
-    
+
     _combcut = "(ADAMASS('D0') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
@@ -2101,12 +2101,12 @@ def makeD02KPiMuMu(name, kaonSel, pionSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFD
                "(AHASCHILD( (MIPCHI2DV(PRIMARY)>%(DdauMAXIPCHI2)s)  )   )" %locals()
 
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(PT > %(DPT)s *MeV) &"\
               "(BPVVDCHI2>%(DFDCHI2)s) & (BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D0 -> K- pi+ mu+ mu-]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2118,23 +2118,23 @@ def makeD02KPiMuMu(name, kaonSel, pionSel, muonSel, DMAXDOCA, DdauMAXIPCHI2, DFD
 
 #####################################################
 def makeD02KKPiPi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCHI2DOF, DDIRA, DIPCHI2, DMassWin, DMassLow, DPT):
-    
+
     """
     Makes the D0 -> K+ K- pi+ pi-
     """
-    
+
     _combcut = "(ADAMASS('D0') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
                "(AHASCHILD( (ABSID=='K+') & (PIDK-PIDpi > %(OneKaonPID)s)  )) &"\
                "(AHASCHILD( (MIPCHI2DV(PRIMARY)>%(DdauMAXIPCHI2)s)  )   )" %locals()
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(PT > %(DPT)s *MeV) &"\
               "(BPVVDCHI2>%(DFDCHI2)s) & (BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "D0 -> K+ K- pi+ pi-",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2147,23 +2147,23 @@ def makeD02KKPiPi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DdauMAXIPCHI2, D
 
 #####################################################
 def makeD02K3Pi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCHI2DOF, DDIRA, DIPCHI2, DMassWin, DMassLow, DPT):
-    
+
     """
     Makes the D0 -> K- pi+ pi+ pi-
     """
-    
+
     _combcut = "(ADAMASS('D0') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
                "(AHASCHILD( (ABSID=='K+') & (PIDK-PIDpi > %(OneKaonPID)s)  )) &"\
                "(AHASCHILD( (MIPCHI2DV(PRIMARY)>%(DdauMAXIPCHI2)s)  )   )" %locals()
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(PT > %(DPT)s *MeV) &"\
               "(BPVVDCHI2>%(DFDCHI2)s) & (BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "[D0 -> K- pi+ pi- pi+]cc",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2176,22 +2176,22 @@ def makeD02K3Pi(name, kaonSel, pionSel, OneKaonPID, DMAXDOCA, DdauMAXIPCHI2, DFD
 
 #####################################################
 def makeD02PiPiPiPi(name, pionSel, DMAXDOCA, DdauMAXIPCHI2, DFDCHI2, DVCHI2DOF, DDIRA, DIPCHI2, DMassWin, DMassLow, DPT):
-    
+
     """
     Makes the D0 -> pi+ pi- pi+ pi-
     """
-    
+
     _combcut = "(ADAMASS('D0') < %(DMassWin)s *MeV) & "\
                "(AMAXDOCA('')<%(DMAXDOCA)s) & " \
                "(AM > %(DMassLow)s *MeV) &"\
                "(AHASCHILD( (MIPCHI2DV(PRIMARY)>%(DdauMAXIPCHI2)s)  )   )" %locals()
 
-    
+
     _bcut   = "(VFASPF(VCHI2/VDOF) < %(DVCHI2DOF)s) & "\
               "(BPVVDCHI2>%(DFDCHI2)s) & (BPVIPCHI2()< %(DIPCHI2)s) & "\
               "(PT > %(DPT)s *MeV) &"\
               "(BPVDIRA > %(DDIRA)s)" % locals()
-    
+
     _Combine = CombineParticles(DecayDescriptor = "D0 -> pi+ pi- pi+ pi-",
                                 CombinationCut = _combcut,
                                 MotherCut = _bcut)
@@ -2387,7 +2387,7 @@ def makeLambdac2PPiPi(name, protonSel, muonSel,DMAXDOCA, LambdacMassWin, DimuonM
 #####################################################
 def makeD2PiMuMuCal(name, pionSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ mu+ mu+ 
+    Makes the D+ -> pi+ mu+ mu+
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -2410,7 +2410,7 @@ def makeD2PiMuMuCal(name, pionSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonM
 #####################################################
 def makeD2PiEMuCal(name, pionSel, eleSel, muonSel,DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ e+ mu+ 
+    Makes the D+ -> pi+ e+ mu+
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -2433,7 +2433,7 @@ def makeD2PiEMuCal(name, pionSel, eleSel, muonSel,DMAXDOCA, DMassWin, DMassLow,
 #####################################################
 def makeD2PiEECal(name, pionSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> pi+ e+ e+ 
+    Makes the D+ -> pi+ e+ e+
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -2452,11 +2452,11 @@ def makeD2PiEECal(name, pionSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMas
     return Selection(name,
                      Algorithm = _Combine,
                      RequiredSelections = [ eleSel, pionSel ] )
-                    
+
 #####################################################
 def makeD2KMuMuCal(name, kaonSel, muonSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> K+ mu+ mu+ 
+    Makes the D+ -> K+ mu+ mu+
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -2479,7 +2479,7 @@ def makeD2KMuMuCal(name, kaonSel, muonSel, DMAXDOCA, DMassWin, DMassLow, DimuonM
 #####################################################
 def makeD2KEMuCal(name, kaonSel, eleSel, muonSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> K+ e+ mu+ 
+    Makes the D+ -> K+ e+ mu+
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -2502,7 +2502,7 @@ def makeD2KEMuCal(name, kaonSel, eleSel, muonSel, DMAXDOCA, DMassWin, DMassLow,
 #####################################################
 def makeD2KEECal(name, kaonSel, eleSel, DMAXDOCA, DMassWin, DMassLow, DimuonMass, DVCHI2DOF, DIPCHI2, DDIRA):
     """
-    Makes the D+ -> K+ e+ e+ 
+    Makes the D+ -> K+ e+ e+
     """
 
     _combcut = "(ADAMASS('D+') < %(DMassWin)s *MeV) & "\
@@ -2550,11 +2550,11 @@ def makePions(name, PionP, PionPT, PionMINIPCHI2, PionTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(PionMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdLoosePions ] )
-                    
+
 #####################################################
 def makeMuons(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2):
     """
@@ -2566,7 +2566,7 @@ def makeMuons(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(MuonMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdLooseMuons ] )
@@ -2583,7 +2583,7 @@ def makeElectrons(name, EleP, ElePT, EleMINIPCHI2, EleTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(EleMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllLooseElectrons ] )
@@ -2601,11 +2601,11 @@ def makeProtons(name, ProtonP, ProtonPT, ProtonMINIPCHI2, ProtonTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(ProtonMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdLooseProtons ] )
-                        
+
 #####################################################
 def makePionsAsMuons(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2):
     """
@@ -2617,11 +2617,11 @@ def makePionsAsMuons(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(MuonMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdLoosePions ] )
-                    
+
 
 
 
@@ -2653,7 +2653,7 @@ def makePionsFor3bodyCS(name, PionP, PionPT, PionMINIPCHI2, PionTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(PionMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllNoPIDsPions ] )
@@ -2670,7 +2670,7 @@ def makeProtonsFor3bodyCS(name, ProtonP, ProtonPT, ProtonMINIPCHI2, ProtonTRCHI2
             "(MIPCHI2DV(PRIMARY) > %(ProtonMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllNoPIDsProtons ] )
@@ -2710,7 +2710,7 @@ def makeMuonsForhhmumu(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2, MuonPIDmu
             "( TRGHOSTPROB < %(ghostProbCut)s )" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllLooseMuons ] )
@@ -2727,7 +2727,7 @@ def makePionsForhhmumu(name, PionP, PionPT, PionMINIPCHI2, PionTRCHI2, ghostProb
             "( TRGHOSTPROB < %(ghostProbCut)s )" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllLoosePions ] )
@@ -2764,7 +2764,7 @@ def makePionsFor4bodyCS(name, PionP, PionPT, PionMINIPCHI2, PionTRCHI2, ghostPro
             "( TRGHOSTPROB < %(ghostProbCut)s )" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllNoPIDsPions ] )
@@ -2804,14 +2804,14 @@ def _format_related_info(selection, config):
 
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from Configurables import FilterDesktop, CombineParticles 
+from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
 
 class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
     """
     Definition of nominal D->Xu mu nu stripping
     """
-    
+
     __slots__ = {
   "prefix"  : "",
         #Muons
@@ -2849,12 +2849,12 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
     def _NominalMuSelection( self ):
         return "(TRCHI2DOF < %(MuonTRCHI2)s ) &  (P> %(MuonP)s *MeV) &  (PT> %(MuonPT)s* MeV)"\
                "& (MIPCHI2DV(PRIMARY)> %(MuonMINIPCHI2)s )"
-      
+
     def _NominalPiSelection( self ):
         return "(TRCHI2DOF < %(PionTRCHI2)s )&  (P> %(PionP)s *MeV) &  (PT> %(PionPT)s *MeV)"\
                "& (PIDpi-PIDK> %(PionPIDK)s ) "\
                "& (MIPCHI2DV(PRIMARY)> %(PionMINIPCHI2)s )"
-      
+
     def _NominalKSelection( self ):
         return "(TRCHI2DOF < %(KaonTRCHI2)s )&  (P> %(KaonP)s *MeV) &  (PT> %(KaonPT)s *MeV)"\
                "& (PIDK-PIDpi> %(KaonPIDK)s ) "\
@@ -2862,27 +2862,27 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
 
     def PiSS_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
-        return StrippingLine(self.getProp("prefix") + 'D2PiMuMuSSLine', prescale = 1., 
+        return StrippingLine(self.getProp("prefix") + 'D2PiMuMuSSLine', prescale = 1.,
                              algos = [self._muonFilter(),
                                       self._pionFilter(),
                                       self._D2PiMuMuSS()])
     def PiOS_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
-        return StrippingLine(self.getProp("prefix") + 'D2PiMuMuOSLine', prescale = 1., 
+        return StrippingLine(self.getProp("prefix") + 'D2PiMuMuOSLine', prescale = 1.,
                              algos = [self._muonFilter(),
                                       self._pionFilter(),
                                       self._D2PiMuMuOS()])
 
     def KSS_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
-        return StrippingLine(self.getProp("prefix") + 'D2KMuMuSSLine', prescale = 1., 
+        return StrippingLine(self.getProp("prefix") + 'D2KMuMuSSLine', prescale = 1.,
                              algos = [self._muonFilter(),
                                       self._kaonFilter(),
                                       self._D2KMuMuSS()])
-    
+
     def KOS_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
-        return StrippingLine(self.getProp("prefix") + 'D2KMuMuOSLine', prescale = 1., 
+        return StrippingLine(self.getProp("prefix") + 'D2KMuMuOSLine', prescale = 1.,
                              algos = [self._muonFilter(),
                                       self._kaonFilter(),
                                       self._D2KMuMuOS()])
@@ -2907,7 +2907,7 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
                             InputLocations = ["Phys/StdLooseKaons"])
         _ka.Code = self._NominalKSelection() % self.getProps()
         return _ka
-    
+
     def _D2PiMuMuSS( self ):
         from Configurables import CombineParticles, OfflineVertexFitter
         _PiMuMu = CombineParticles(self.getProp("prefix") + "D2PiMuMuSS")
@@ -2931,7 +2931,7 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
                           "&(BPVDIRA> %(DDIRA)s )" % self.getProps()
         _PiMuMu.ReFitPVs = True
         return _PiMuMu
-    
+
     def _D2KMuMuSS( self ):
         from Configurables import CombineParticles, OfflineVertexFitter
         _KMuMu = CombineParticles(self.getProp("prefix") + "D2KMuMuSS")
@@ -2943,7 +2943,7 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
             "&(BPVDIRA> %(DDIRA)s )" % self.getProps()
         _KMuMu.ReFitPVs = True
         return _KMuMu
-    
+
     def _D2KMuMuOS( self ):
         from Configurables import CombineParticles, OfflineVertexFitter
         _KMuMu = CombineParticles(self.getProp("prefix") + "D2KMuMuOS")
@@ -2955,7 +2955,7 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
             "&(BPVDIRA> %(DDIRA)s )" % self.getProps()
         _KMuMu.ReFitPVs = True
         return _KMuMu
-    
+
     def getProps(self) :
         """
         From HltLinesConfigurableUser
@@ -2965,5 +2965,5 @@ class StrippingD2XMuMuSSConf(LHCbConfigurableUser):
         for (k,v) in self.getDefaultProperties().iteritems() :
             d[k] = getattr(self,k) if hasattr(self,k) else v
         return d
-        
+
 '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py
index ec820d0db8810b329972cb7f703e8eda5be7c732..677fcfcbd8c9fed4b391a81d2874c153aae8db45 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py
@@ -32,7 +32,7 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 
 
-default_config = { 
+default_config = {
     'NAME'        : 'D2hh',
     'WGs'         : ['Charm'],
     'STREAMS'     : [ 'Charm' ],
@@ -142,7 +142,7 @@ class D2hhBuilder(LineBuilder) :
 
         # D0 -> hh' selections
 
-        self.selD2Kpi = makeD2hhAsymm(d2kpi_name,  
+        self.selD2Kpi = makeD2hhAsymm(d2kpi_name,
                                  config,
                                  KPIDK_string = ' & (PIDK > %(HighPIDK)s)',
                                  PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -156,7 +156,7 @@ class D2hhBuilder(LineBuilder) :
                                  Hlt2TOS = config['Hlt2TOSKPi']
                                 )
 
-        self.selD0WS = makeD2hhAsymm(d0WS_name,  
+        self.selD0WS = makeD2hhAsymm(d0WS_name,
                                  config,
                                  KPIDK_string = ' & (PIDK > %(HighPIDK)s)',
                                  PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -170,7 +170,7 @@ class D2hhBuilder(LineBuilder) :
                                  Hlt2TOS = config['Hlt2TOSKPi']
                                 )
 
-        self.selD0KKsgl = makeD2hhAsymm(d2kk_name+'_single',  
+        self.selD0KKsgl = makeD2hhAsymm(d2kk_name+'_single',
                                 config,
                                 KPIDK_string = ' & (PIDK > %(LowPIDK)s)',
                                 PiPIDK_string = '',
@@ -184,7 +184,7 @@ class D2hhBuilder(LineBuilder) :
                                 Hlt2TOS = config['Hlt2TOSKK']
                                )
 
-        self.selD0PiPisgl = makeD2hhAsymm(d2pipi_name+'_single',  
+        self.selD0PiPisgl = makeD2hhAsymm(d2pipi_name+'_single',
                                   config,
                                   KPIDK_string = '',
                                   PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -192,13 +192,13 @@ class D2hhBuilder(LineBuilder) :
                                   Mass_high_string = '& (DAMASS(%(D0MassWindowCentre)s* MeV) < %(D0PiPiMassWindowWidthHigh)s* MeV)',
                                   CombPIDK_string = '',
                                   DecayDescriptor = 'D0 -> pi+ pi-',
-                                  inputSel = [stdNoPIDsPions], 
+                                  inputSel = [stdNoPIDsPions],
                                   useTOS = config['UseTOSFilter'],
                                   Hlt1TOS = config['Hlt1TOS'],
                                   Hlt2TOS = config['Hlt2TOSPiPi']
                                  )
 
-        self.selD0KK = makeD2hhAsymm(d2kk_name,  
+        self.selD0KK = makeD2hhAsymm(d2kk_name,
                                 config,
                                 KPIDK_string = ' & (PIDK > %(LowPIDK)s)',
                                 PiPIDK_string = '',
@@ -212,7 +212,7 @@ class D2hhBuilder(LineBuilder) :
                                 Hlt2TOS = config['Hlt2TOSKK']
                                )
 
-        self.selD0PiPi = makeD2hhAsymm(d2pipi_name,  
+        self.selD0PiPi = makeD2hhAsymm(d2pipi_name,
                                   config,
                                   KPIDK_string = '',
                                   PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -220,13 +220,13 @@ class D2hhBuilder(LineBuilder) :
                                   Mass_high_string = '& (DAMASS(%(D0MassWindowCentre)s* MeV) < %(D0PiPiMassWindowWidthHigh)s* MeV)',
                                   CombPIDK_string = '',
                                   DecayDescriptor = '[D0 -> pi+ pi-]cc',
-                                  inputSel = [stdNoPIDsPions], 
+                                  inputSel = [stdNoPIDsPions],
                                   useTOS = config['UseTOSFilter'],
                                   Hlt1TOS = config['Hlt1TOS'],
                                   Hlt2TOS = config['Hlt2TOSPiPi']
                                  )
 
-        self.selD2KpiSS = makeD2hhAsymm(d2kpi_name+'SS',  
+        self.selD2KpiSS = makeD2hhAsymm(d2kpi_name+'SS',
                                  config,
                                  KPIDK_string = ' & (PIDK > %(HighPIDK)s)',
                                  PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -240,7 +240,7 @@ class D2hhBuilder(LineBuilder) :
                                  Hlt2TOS = config['Hlt2TOSKPi']
                                 )
 
-        self.selD0KKSS = makeD2hhAsymm(d2kk_name+'SS',  
+        self.selD0KKSS = makeD2hhAsymm(d2kk_name+'SS',
                                 config,
                                 KPIDK_string = ' & (PIDK > %(LowPIDK)s)',
                                 PiPIDK_string = '',
@@ -254,7 +254,7 @@ class D2hhBuilder(LineBuilder) :
                                 Hlt2TOS = config['Hlt2TOSKK']
                                )
 
-        self.selD0PiPiSS = makeD2hhAsymm(d2pipi_name+'SS',  
+        self.selD0PiPiSS = makeD2hhAsymm(d2pipi_name+'SS',
                                   config,
                                   KPIDK_string = '',
                                   PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -262,13 +262,13 @@ class D2hhBuilder(LineBuilder) :
                                   Mass_high_string = '& (DAMASS(%(D0MassWindowCentre)s* MeV) < %(D0PiPiMassWindowWidthHigh)s* MeV)',
                                   CombPIDK_string = '',
                                   DecayDescriptor = '[D0 -> pi- pi-]cc',
-                                  inputSel = [stdNoPIDsPions], 
+                                  inputSel = [stdNoPIDsPions],
                                   useTOS = False,
                                   Hlt1TOS = config['Hlt1TOS'],
                                   Hlt2TOS = config['Hlt2TOSPiPi']
                                  )
 
-        self.selD2KpiTIS = makeD2hhAsymm(d2kpi_name+'TIS',  
+        self.selD2KpiTIS = makeD2hhAsymm(d2kpi_name+'TIS',
                                  config,
                                  KPIDK_string = ' & (PIDK > %(HighPIDK)s)',
                                  PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -282,7 +282,7 @@ class D2hhBuilder(LineBuilder) :
                                  Hlt2TOS = { 'Hlt2Global%TIS' : 0 }
                                 )
 
-        self.selD0KKTIS = makeD2hhAsymm(d2kk_name+'TIS',  
+        self.selD0KKTIS = makeD2hhAsymm(d2kk_name+'TIS',
                                 config,
                                 KPIDK_string = ' & (PIDK > %(LowPIDK)s)',
                                 PiPIDK_string = '',
@@ -296,7 +296,7 @@ class D2hhBuilder(LineBuilder) :
                                 Hlt2TOS = { 'Hlt2Global%TIS' : 0 }
                                )
 
-        self.selD0PiPiTIS = makeD2hhAsymm(d2pipi_name+'TIS',  
+        self.selD0PiPiTIS = makeD2hhAsymm(d2pipi_name+'TIS',
                                   config,
                                   KPIDK_string = '',
                                   PiPIDK_string = ' & (PIDK < %(LowPIDK)s)',
@@ -304,7 +304,7 @@ class D2hhBuilder(LineBuilder) :
                                   Mass_high_string = '& (DAMASS(%(D0MassWindowCentre)s* MeV) < %(D0PiPiMassWindowWidthHigh)s* MeV)',
                                   CombPIDK_string = '',
                                   DecayDescriptor = 'D0 -> pi+ pi-',
-                                  inputSel = [stdNoPIDsPions], 
+                                  inputSel = [stdNoPIDsPions],
                                   useTOS = True,
                                   Hlt1TOS = { 'Hlt1Global%TIS' : 0 },
                                   Hlt2TOS = { 'Hlt2Global%TIS' : 0 }
@@ -514,7 +514,7 @@ def makeD2hhAsymm(name,
             return Selection( name
                               , Algorithm = _tisTosFilter
                               , RequiredSelections = [ _input ]
-                              )        
+                              )
 
     _Kcuts1  = "~ISMUON & (PT > %(DaugPtMin)s* MeV) & (MIPCHI2DV(PRIMARY) > %(DaugIPChi2)s)" % locals()['config']
     _KcutsPIDK  = KPIDK_string % locals()['config']
@@ -560,7 +560,7 @@ def makeD2hhAsymm(name,
                                             , _selD2hhHlt1TOS
                                             , Hlt2TOS
                                             )
-       
+
     return _selD2hhHlt2TOS
 
 def makeDstar2D0Pi( name
@@ -705,4 +705,3 @@ def makePseudoPsi( name
                       Algorithm = _Psi,
                       RequiredSelections = inputSel
                     )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py
index d381fb278969857c26c8b310fa25598641c0298a..613619e77b8795d58eae56f1892e19bf9bccd180 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -15,7 +15,7 @@ Module for construction of D->HHH for FT calibrations (asymmetries in SSK and SS
 based on StrippingD2hhh_conf.py from Erica Polycarpo and Alberto Reis
 
 Provides functions to build D2KKP, D2KPP, selections using StdLooseDplus
-Provides class D2hhhFTCalibConf, which constructs the Selections and 
+Provides class D2hhhFTCalibConf, which constructs the Selections and
 StrippingLines given a configuration dictionary.
 Exported symbols (use python help!):
    - D2hhhFTCalibConf
@@ -35,12 +35,12 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import ( StdNoPIDsPions,
-                                StdTightKaons ) 
+                                StdTightKaons )
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
 # Valid for Stripping 21 (27/8)
-# 
+#
 
 default_config = {
     'NAME'        :  'D2hhhFTCalib',
@@ -88,15 +88,15 @@ class D2hhhFTCalibConf(LineBuilder) :
     The lines can be used directly to build a StrippingStream object.
 
     Exports as instance data members:
-    selKKP             :  get StdLooseDplus2KKP 
-    selKPP             :  get StdLooseDplus2KPP 
-    selPPP             :  get StdTightDplus2PPP 
+    selKKP             :  get StdLooseDplus2KKP
+    selKPP             :  get StdLooseDplus2KPP
+    selPPP             :  get StdTightDplus2PPP
     selKPPos           :  get StdLooseDplus2KPPi (DCS)
     selTightKaon       :  get StdTightKaons
-    selNoPIDsPion      :  get StdNoPIDsPion 
-    D2KKP_line         :  StrippingLine made out of selKKP 
-    D2KPP_line         :  StrippingLine made out of selKPP 
-    D2PPP_line         :  StrippingLine made out of selPPP 
+    selNoPIDsPion      :  get StdNoPIDsPion
+    D2KKP_line         :  StrippingLine made out of selKKP
+    D2KPP_line         :  StrippingLine made out of selKPP
+    D2PPP_line         :  StrippingLine made out of selPPP
     D2KPPos_line       :  StrippingLine made out of selKPPos
     D2KKK_line         :  StrippingLine made out of 3K combinations
     Ds2KKPos_line      :  StrippingLine made out of 3K combinations
@@ -124,8 +124,8 @@ class D2hhhFTCalibConf(LineBuilder) :
 
         self.selKKP = DataOnDemand(Location = "Phys/StdLooseDplus2KKPi/Particles")
 
-        self.selD2KKP = makeStdD2hhhFT(D2KKP_name,  
-                                       hhhSel = self.selKKP, 
+        self.selD2KKP = makeStdD2hhhFT(D2KKP_name,
+                                       hhhSel = self.selKKP,
                                        DaughterPT= config['DaughterPT'],
                                        DaughterP = config['DaughterP'],
                                        DaughterIPChi2 = config['DaughterIPChi2'],
@@ -145,7 +145,7 @@ class D2hhhFTCalibConf(LineBuilder) :
 						   MinKKMass = config['MinKKMass'],
 						   MaxKKMass = config['MaxKKMass']
                                        )
-        self.filterGE = globalEventCutFilter(name + 'GECFilter', 
+        self.filterGE = globalEventCutFilter(name + 'GECFilter',
                                     MaxTrSIZE = config['MaxTracksInEvent'])
 
         self.D2KKP_line = StrippingLine(D2KKP_name+"Line",
@@ -163,8 +163,8 @@ def makeStdD2hhhFT(name,
 		 DaughterPT,
 		 DaughterP,
 		 DaughterIPChi2,
-		 Daughter2IPChi2, 
-		 DaughterDOCAChi2, 
+		 Daughter2IPChi2,
+		 DaughterDOCAChi2,
 		 PTSum,
 		 DDIRA,
 		 DIPChi2,
@@ -183,12 +183,12 @@ def makeStdD2hhhFT(name,
     Create and return a D -> HHH Selection object.
     Arguments:
     name           : name of the Selection.
-    hhhSel         : Standard Specific D2HHH selection    
+    hhhSel         : Standard Specific D2HHH selection
     DaughterPT     : Minimum PT among daughters
     DaughterIPChi2 : Minimum IPChi2 among daughters
-    Daughter2IPChi2: Minimum IPChi2 required to at least 2 daughters 
+    Daughter2IPChi2: Minimum IPChi2 required to at least 2 daughters
     DaughterP      : Minimum P among daughters
-    DaughterDOCAChi2:Maximum distance of closest approach between 2 daughters in error units 
+    DaughterDOCAChi2:Maximum distance of closest approach between 2 daughters in error units
     PTSum          : Minimum sum of daughters momenta
     DDIRA          : Minimum opening angle between sum_p and FD-direction
     DIPChi2        : Maximum IPChi2 of the D
@@ -206,59 +206,58 @@ def makeStdD2hhhFT(name,
     _Daughtercuts_pi = """
                        (MINTREE('pi+'==ABSID, PT) > %(DaughterPT)s*MeV ) &
                        (MINTREE('pi+'==ABSID, P ) > %(DaughterP)s*MeV) &
-                       (MINTREE('pi+'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s ) 
+                       (MINTREE('pi+'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s )
                        """ %locals()
     _Daughtercuts_K = """
                       (MINTREE('K-'==ABSID, PT) > %(DaughterPT)s*MeV ) &
-                      (MINTREE('K-'==ABSID, P ) > %(DaughterP)s*MeV) & 
-                      (MINTREE('K-'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s ) 
-                      """ %locals() 
-    _Combcuts_HHH =""" 
+                      (MINTREE('K-'==ABSID, P ) > %(DaughterP)s*MeV) &
+                      (MINTREE('K-'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s )
+                      """ %locals()
+    _Combcuts_HHH ="""
                    ((SUMTREE( ISBASIC , PT ) > %(PTSum)s*MeV) &
-                   (2 <= NINGENERATION((MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) , 1))) 
+                   (2 <= NINGENERATION((MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) , 1)))
                    """ % locals()
-                    
-    _Mothercuts_HHH = """ 
-                      (PT > %(DPt)s) & (VFASPF(VCHI2/VDOF) < %(DVXChi2NDOF)s) & 
-                      (BPVDIRA > %(DDIRA)s) & (BPVIPCHI2() < %(DIPChi2)s) & 
+
+    _Mothercuts_HHH = """
+                      (PT > %(DPt)s) & (VFASPF(VCHI2/VDOF) < %(DVXChi2NDOF)s) &
+                      (BPVDIRA > %(DDIRA)s) & (BPVIPCHI2() < %(DIPChi2)s) &
                       (VFASPF(VMINVDCHI2DV(PRIMARY)) > %(DdcaFDChi2)s) & (BPVLTIME() > %(DPVLTIME)s*picosecond)
-                      & (DOCACHI2MAX < %(DaughterDOCAChi2)s)  
+                      & (DOCACHI2MAX < %(DaughterDOCAChi2)s)
                       """ % locals()
     _cutsMassPosFit = " (in_range ( %(MinMassPosFit)s ,  M  , %(MaxMassPosFit)s )) " % locals()
     _cutsKKMass = " (in_range ( %(MinKKMass)s ,  M12  , %(MaxKKMass)s )) " % locals()
     _DaughterCuts = _Daughtercuts_pi
-    
+
     if piPIDK != None :
-       _DaughterCuts += " & (MAXTREE('pi+'==ABSID, PIDK-PIDpi) < %(piPIDK)s) " % locals() 
-   
+       _DaughterCuts += " & (MAXTREE('pi+'==ABSID, PIDK-PIDpi) < %(piPIDK)s) " % locals()
+
     if KPIDK != None :
        _DaughterCuts += " & (MINTREE('K-'==ABSID, PIDK-PIDpi) > %(KPIDK)s )" %locals()
-       _DaughterCuts += " & "+_Daughtercuts_K   
-  
+       _DaughterCuts += " & "+_Daughtercuts_K
+
     _code = '('+_DaughterCuts+'&'+_Combcuts_HHH+'&'+_Mothercuts_HHH+'&'+_cutsMassPosFit+'&'+_cutsKKMass+')'
- 
-    _filterHHH = FilterDesktop( Code = _code ) 
-   
+
+    _filterHHH = FilterDesktop( Code = _code )
+
     return Selection ( name,
                        Algorithm = _filterHHH,
                        RequiredSelections = [hhhSel])
 
 
 
-def globalEventCutFilter(name, 
-                         MaxTrSIZE = None 
+def globalEventCutFilter(name,
+                         MaxTrSIZE = None
                          ) :
-#  
+#
   if MaxTrSIZE == None : return None
-  
+
   from Configurables import LoKi__VoidFilter as VoidFilter
   from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
   modules = CoreFactory('CoreFactory').Modules
   for i in ['LoKiTracks.decorators']:
      if i not in modules : modules.append(i)
-  
+
   _code = "(recSummary(LHCb.RecSummary.nTracks, 'Rec/Track/Best') < %(MaxTrSIZE)s )" % locals()
-  
-  
-  return _code          
 
+
+  return _code
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py
index f1cacf3d92ba55cf1e7ce404ee356bf6ac102589..f06b0339e03ec9a4bcbe953d45b5af3d28297d83 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py
@@ -11,12 +11,12 @@
 ###############################################################################
 # $Id: StrippingD2hhh_conf.py,v 1.1 2011-02-14 12:53:17 polye Exp $
 '''
-Module for construction of D->HHH based on 
+Module for construction of D->HHH based on
  Bs->JpsiPhi pre-scaled and detatched stripping Selections and StrippingLines
  from Greig and Juan and D->HHH selections cuts from Hamish and Mat.
-Provides functions to build D2KKP, D2KPP, D2PPP, D2KPPos selections using 
+Provides functions to build D2KKP, D2KPP, D2PPP, D2KPPos selections using
  StdLooseDplus and D2KKK and D2hhh inclusive using CombineParticles.
-Provides class D2hhhConf, which constructs the Selections and 
+Provides class D2hhhConf, which constructs the Selections and
 StrippingLines given a configuration dictionary.
 Exported symbols (use python help!):
    - D2hhhConf
@@ -39,12 +39,12 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import ( StdNoPIDsPions,
-                                StdTightKaons ) 
+                                StdTightKaons )
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
 # Valid for Stripping 21 (27/8)
-# 
+#
 
 default_config = {
     'NAME'        :  'D2hhhLines',
@@ -106,15 +106,15 @@ class D2hhhConf(LineBuilder) :
     The lines can be used directly to build a StrippingStream object.
 
     Exports as instance data members:
-    selKKP             :  get StdLooseDplus2KKP 
-    selKPP             :  get StdLooseDplus2KPP 
-    selPPP             :  get StdTightDplus2PPP 
+    selKKP             :  get StdLooseDplus2KKP
+    selKPP             :  get StdLooseDplus2KPP
+    selPPP             :  get StdTightDplus2PPP
     selKPPos           :  get StdLooseDplus2KPPi (DCS)
     selTightKaon       :  get StdTightKaons
-    selNoPIDsPion      :  get StdNoPIDsPion 
-    D2KKP_line         :  StrippingLine made out of selKKP 
-    D2KPP_line         :  StrippingLine made out of selKPP 
-    D2PPP_line         :  StrippingLine made out of selPPP 
+    selNoPIDsPion      :  get StdNoPIDsPion
+    D2KKP_line         :  StrippingLine made out of selKKP
+    D2KPP_line         :  StrippingLine made out of selKPP
+    D2PPP_line         :  StrippingLine made out of selPPP
     D2KPPos_line       :  StrippingLine made out of selKPPos
     D2KKK_line         :  StrippingLine made out of 3K combinations
     Ds2KKPos_line      :  StrippingLine made out of 3K combinations
@@ -153,8 +153,8 @@ class D2hhhConf(LineBuilder) :
         self.selKKK = DataOnDemand(Location = "Phys/StdLooseDplus2KKK/Particles")
         self.selKKPos = DataOnDemand(Location = "Phys/StdLooseDsplus2KKPiOppSign/Particles")
 
-        self.selD2KKP = makeStdD2hhh(D2KKP_name,  
-                                     hhhSel = self.selKKP, 
+        self.selD2KKP = makeStdD2hhh(D2KKP_name,
+                                     hhhSel = self.selKKP,
                                      DaughterPT= config['DaughterPT'],
                                      DaughterP = config['DaughterP'],
                                      DaughterIPChi2 = config['DaughterIPChi2'],
@@ -172,8 +172,8 @@ class D2hhhConf(LineBuilder) :
                                      KPIDK = config['KPIDK'],
                                      piPIDK = config['piPIDK']
 			             )
-        self.selD2KPP = makeStdD2hhh(D2KPP_name,  
-                                     hhhSel = self.selKPP, 
+        self.selD2KPP = makeStdD2hhh(D2KPP_name,
+                                     hhhSel = self.selKPP,
                                      DaughterPT= config['DaughterPT'],
                                      DaughterP = config['DaughterP'],
                                      DaughterIPChi2 = config['DaughterIPChi2'],
@@ -191,8 +191,8 @@ class D2hhhConf(LineBuilder) :
                                      KPIDK = config['KPIDK'],
                                      piPIDK = config['piPIDK']
 			             )
-        self.selD2PPP = makeStdD2hhh(D2PPP_name,  
-                                     hhhSel = self.selPPP, 
+        self.selD2PPP = makeStdD2hhh(D2PPP_name,
+                                     hhhSel = self.selPPP,
                                      DaughterPT= config['DaughterPT'],
                                      DaughterP = config['DaughterP'],
                                      DaughterIPChi2 = config['DaughterIPChi2'],
@@ -209,8 +209,8 @@ class D2hhhConf(LineBuilder) :
 				     MaxMassPosFit= config['MaxMassPosFit'],
                                      piPIDK = config['piPIDK']
                                      )
-        self.selD2KPPos = makeStdD2hhh(D2KPPos_name,  
-                                     hhhSel = self.selKPPos, 
+        self.selD2KPPos = makeStdD2hhh(D2KPPos_name,
+                                     hhhSel = self.selKPPos,
                                      DaughterPT= config['DaughterPT'],
                                      DaughterP = config['DaughterP'],
                                      DaughterIPChi2 = config['DaughterIPChi2'],
@@ -265,7 +265,7 @@ class D2hhhConf(LineBuilder) :
                                      KPIDK = config['KPIDK'],
                                      piPIDK = config['piPIDK']
                                      )
-        self.selD2HHHInc = makeD2HHHInc(D2HHHInc_name,  
+        self.selD2HHHInc = makeD2HHHInc(D2HHHInc_name,
                                      DaughterPT= config['DaughterPT'],
                                      DaughterP = config['DaughterP'],
                                      DaughterIPChi2 = config['DaughterIPChi2'],
@@ -282,7 +282,7 @@ class D2hhhConf(LineBuilder) :
 				     MinMassPosFit= config['D2HHHIncMinMassPosFit'],
 				     MaxMassPosFit= config['D2HHHIncMaxMassPosFit']
                                      )
-        self.filterGE = globalEventCutFilter(name + 'GECFilter', 
+        self.filterGE = globalEventCutFilter(name + 'GECFilter',
                                     MaxTrSIZE = config['MaxTracksInEvent'])
 
         self.D2KKP_line = StrippingLine(D2KKP_name+"Line",
@@ -304,21 +304,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selD2KKP,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KKP,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KKP,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KKP,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -342,21 +342,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selD2KPP,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KPP,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KPP,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KPP,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -380,21 +380,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selD2PPP,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2PPP,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2PPP,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2PPP,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -418,21 +418,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selD2KPPos,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KPPos,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KPPos,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KPPos,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -456,21 +456,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selD2KKK,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KKK,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KKK,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2KKK,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -494,21 +494,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selDs2KKPos,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selDs2KKPos,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selDs2KKPos,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selDs2KKPos,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -532,21 +532,21 @@ class D2hhhConf(LineBuilder) :
                                         "Variables"    : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                         "TopSelection" : self.selD2HHHInc,
                                         "Location"     : 'D2ConeVar15' },
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 0.5,  
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 0.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2HHHInc,
-					"Location" : 'DNCone05'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.0,  
+					"Location" : 'DNCone05'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.0,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2HHHInc,
-					"Location" : 'DNCone10'}, 
-					{ "Type" : "RelInfoConeVariablesForEW", 
-					"ConeAngle" : 1.5,  
+					"Location" : 'DNCone10'},
+					{ "Type" : "RelInfoConeVariablesForEW",
+					"ConeAngle" : 1.5,
 					"Variables" : ['EWCONENMULT'],
                                         "TopSelection" : self.selD2HHHInc,
-					"Location" : 'DNCone15'}, 
+					"Location" : 'DNCone15'},
                                         { "Type"         : "RelInfoVertexIsolation",
                                         "Location"     : "VertexIsoInfo" } ],
                                         FILTER = self.filterGE
@@ -566,8 +566,8 @@ def makeStdD2hhh(name,
 		 DaughterPT,
 		 DaughterP,
 		 DaughterIPChi2,
-		 Daughter2IPChi2, 
-		 DaughterDOCAChi2, 
+		 Daughter2IPChi2,
+		 DaughterDOCAChi2,
 		 PTSum,
 		 DDIRA,
 		 DIPChi2,
@@ -584,12 +584,12 @@ def makeStdD2hhh(name,
     Create and return a D -> HHH Selection object.
     Arguments:
     name           : name of the Selection.
-    hhhSel         : Standard Specific D2HHH selection    
+    hhhSel         : Standard Specific D2HHH selection
     DaughterPT     : Minimum PT among daughters
     DaughterIPChi2 : Minimum IPChi2 among daughters
-    Daughter2IPChi2: Minimum IPChi2 required to at least 2 daughters 
+    Daughter2IPChi2: Minimum IPChi2 required to at least 2 daughters
     DaughterP      : Minimum P among daughters
-    DaughterDOCAChi2:Maximum distance of closest approach between 2 daughters in error units 
+    DaughterDOCAChi2:Maximum distance of closest approach between 2 daughters in error units
     PTSum          : Minimum sum of daughters momenta
     DDIRA          : Minimum opening angle between sum_p and FD-direction
     DIPChi2        : Maximum IPChi2 of the D
@@ -605,38 +605,38 @@ def makeStdD2hhh(name,
     _Daughtercuts_pi = """
                        (MINTREE('pi+'==ABSID, PT) > %(DaughterPT)s*MeV ) &
                        (MINTREE('pi+'==ABSID, P ) > %(DaughterP)s*MeV) &
-                       (MINTREE('pi+'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s ) 
+                       (MINTREE('pi+'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s )
                        """ %locals()
     _Daughtercuts_K = """
                       (MINTREE('K-'==ABSID, PT) > %(DaughterPT)s*MeV ) &
-                      (MINTREE('K-'==ABSID, P ) > %(DaughterP)s*MeV) & 
-                      (MINTREE('K-'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s ) 
-                      """ %locals() 
-    _Combcuts_HHH =""" 
+                      (MINTREE('K-'==ABSID, P ) > %(DaughterP)s*MeV) &
+                      (MINTREE('K-'==ABSID, MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s )
+                      """ %locals()
+    _Combcuts_HHH ="""
                    ((SUMTREE( ISBASIC , PT ) > %(PTSum)s*MeV) &
-                   (2 <= NINGENERATION((MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) , 1))) 
+                   (2 <= NINGENERATION((MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) , 1)))
                    """ % locals()
-                    
-    _Mothercuts_HHH = """ 
-                      (PT > %(DPt)s) & (VFASPF(VCHI2/VDOF) < %(DVXChi2NDOF)s) & 
-                      (BPVDIRA > %(DDIRA)s) & (BPVIPCHI2() < %(DIPChi2)s) & 
+
+    _Mothercuts_HHH = """
+                      (PT > %(DPt)s) & (VFASPF(VCHI2/VDOF) < %(DVXChi2NDOF)s) &
+                      (BPVDIRA > %(DDIRA)s) & (BPVIPCHI2() < %(DIPChi2)s) &
                       (VFASPF(VMINVDCHI2DV(PRIMARY)) > %(DdcaFDChi2)s) & (BPVLTIME() > %(DPVLTIME)s*picosecond)
-                      & (DOCACHI2MAX < %(DaughterDOCAChi2)s)  
+                      & (DOCACHI2MAX < %(DaughterDOCAChi2)s)
                       """ % locals()
     _cutsMassPosFit = " (in_range ( %(MinMassPosFit)s ,  M  , %(MaxMassPosFit)s )) " % locals()
     _DaughterCuts = _Daughtercuts_pi
-    
+
     if piPIDK != None :
-       _DaughterCuts += " & (MAXTREE('pi+'==ABSID, PIDK-PIDpi) < %(piPIDK)s) " % locals() 
-   
+       _DaughterCuts += " & (MAXTREE('pi+'==ABSID, PIDK-PIDpi) < %(piPIDK)s) " % locals()
+
     if KPIDK != None :
        _DaughterCuts += " & (MINTREE('K-'==ABSID, PIDK-PIDpi) > %(KPIDK)s )" %locals()
-       _DaughterCuts += " & "+_Daughtercuts_K   
-  
+       _DaughterCuts += " & "+_Daughtercuts_K
+
     _code = '('+_DaughterCuts+'&'+_Combcuts_HHH+'&'+_Mothercuts_HHH+'&'+_cutsMassPosFit+')'
- 
-    _filterHHH = FilterDesktop( Code = _code ) 
-   
+
+    _filterHHH = FilterDesktop( Code = _code )
+
     return Selection ( name,
                        Algorithm = _filterHHH,
                        RequiredSelections = [hhhSel])
@@ -660,16 +660,16 @@ def makeD2HHHInc(name,
               MaxMassPosFit
               ):
     """
-    Create and return a D -> HHHInclusive selection 
+    Create and return a D -> HHHInclusive selection
     Arguments:
     name           : name of the Selection.
-    pionSel        : Pion Selection (from CommonParticles) 
+    pionSel        : Pion Selection (from CommonParticles)
     DaughterPT     : Minimum PT among daughters
     DaughterP      : Minimum P among daughters
     DaughterIPChi2 : Minimum IPChi2 among daughters
-    Daughter2IPChi2: Minimum IPChi2 required to at least 2 daughters 
-    DaughterDOCA   : Maximum distance of closest approach between 2 daughters 
-    DaughterDOCAChi2:Maximum distance of closest approach between 2 daughters in error units 
+    Daughter2IPChi2: Minimum IPChi2 required to at least 2 daughters
+    DaughterDOCA   : Maximum distance of closest approach between 2 daughters
+    DaughterDOCAChi2:Maximum distance of closest approach between 2 daughters in error units
     PTSum          : Minimum sum of daughters momenta
     DDIRA          : Minimum opening angle between sum_p and FD-direction
     DIPChi2        : Maximum IPChi2 of the D
@@ -681,22 +681,22 @@ def makeD2HHHInc(name,
     MaxMassPosFit  : Maximum value of HHH invariant mass (MeV).
     """
 
-    _DaughterCuts = "((MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s ) & (P > %(DaughterP)s*MeV) & (PT > %(DaughterPT)s*MeV) " % locals() 
-                      
+    _DaughterCuts = "((MIPCHI2DV(PRIMARY)) > %(DaughterIPChi2)s ) & (P > %(DaughterP)s*MeV) & (PT > %(DaughterPT)s*MeV) " % locals()
+
     _Combcuts_HHH = "(ADOCACHI2CUT(%(DaughterDOCAChi2)s,'')) & (ADOCACUT(%(DaughterDOCA)s*mm,'')) & (ACHILD(PT,1)+ACHILD(PT,2)+ACHILD(PT,3) > %(PTSum)s*MeV) & (ANUM(MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) >= 2) " % locals()
-                   
-    _Mothercuts_HHH = """ 
-                      (PT > %(DPt)s) & (VFASPF(VCHI2/VDOF) < %(DVXChi2NDOF)s) & 
-                      (BPVDIRA > %(DDIRA)s) & (BPVIPCHI2() < %(DIPChi2)s) & 
+
+    _Mothercuts_HHH = """
+                      (PT > %(DPt)s) & (VFASPF(VCHI2/VDOF) < %(DVXChi2NDOF)s) &
+                      (BPVDIRA > %(DDIRA)s) & (BPVIPCHI2() < %(DIPChi2)s) &
                       (VFASPF(VMINVDCHI2DV(PRIMARY)) > %(DdcaFDChi2)s) & (BPVLTIME() > %(DPVLTIME)s*picosecond)
                       """ % locals()
     _cutsMassPosFit = " (in_range ( %(MinMassPosFit)s ,  M  , %(MaxMassPosFit)s )) " % locals()
-                   
+
     _combHHH = CombineParticles()
-    _combHHH.DecayDescriptor = '[D+ -> pi- pi+ pi+]cc' 
-    _combHHH.DaughtersCuts = { "pi+" : '(' + _DaughterCuts + ')' } 
-    _combHHH.CombinationCut = '(' + _Combcuts_HHH + ')' 
-    _combHHH.MotherCut = '(' + _Mothercuts_HHH + ' & ' + _cutsMassPosFit  + ')' 
+    _combHHH.DecayDescriptor = '[D+ -> pi- pi+ pi+]cc'
+    _combHHH.DaughtersCuts = { "pi+" : '(' + _DaughterCuts + ')' }
+    _combHHH.CombinationCut = '(' + _Combcuts_HHH + ')'
+    _combHHH.MotherCut = '(' + _Mothercuts_HHH + ' & ' + _cutsMassPosFit  + ')'
 
 
     return Selection ( name,
@@ -704,20 +704,19 @@ def makeD2HHHInc(name,
                        RequiredSelections = [StdNoPIDsPions])
 
 
-def globalEventCutFilter(name, 
-                         MaxTrSIZE = None 
+def globalEventCutFilter(name,
+                         MaxTrSIZE = None
                          ) :
-#  
+#
   if MaxTrSIZE == None : return None
-  
+
   from Configurables import LoKi__VoidFilter as VoidFilter
   from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
   modules = CoreFactory('CoreFactory').Modules
   for i in ['LoKiTracks.decorators']:
      if i not in modules : modules.append(i)
-  
+
   _code = "(recSummary(LHCb.RecSummary.nTracks, 'Rec/Track/Best') < %(MaxTrSIZE)s )" % locals()
-  
-  
-  return _code          
 
+
+  return _code
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py
index cbe0817cacbb3918cd9e34d3464d87d077ac9f16..9a6fdc55ae60a0f2a37bb72e0c3e734d1a5f11f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py
@@ -23,7 +23,7 @@ __all__ = ('StrippingDstarD02xxConf'
 '''
   Stripping for D*(2010)+ -> pi+ (D0->xx) selection:
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
-            
+
 '''
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
@@ -72,12 +72,12 @@ default_config = {'NAME': 'DstarD02xx',
                   ,'DDira'              : 0.9997     # adimensional
                   ,'D0MinPT'            : 1800.      # MeV
                   ,'DMaxIPChi2'        :15.
-                  ,'DVChi2'            :10. 
+                  ,'DVChi2'            :10.
                   ,'PiMinPT'            : 110.       # MeV
                   ,'PiMaxIPCHI2'        : 10.         # adimensional
                   ,'DstMassWin'         : 300.       # MeV
                   ,'DstD0DMWin'         : 10.        # MeV
-                  ,'DstD0DMWinMuMu'      : 30.        # MeV  
+                  ,'DstD0DMWinMuMu'      : 30.        # MeV
                   ,'RequireHlt'         : 1
                   ,'HLT2String'          :  "Hlt2RareCharmD02LAB1LAB2*Decision"
                   ,'HLT1MB'             : "HLT_PASS_RE('Hlt1(MB|L0).*Decision')"
@@ -86,7 +86,7 @@ default_config = {'NAME': 'DstarD02xx',
                   #hltname = "Hlt2Dst2PiD02"+Xplus+Xminus+"*Decision"
                  ,'ConeAngles'     : {"08":0.8,"10":1.0,"12":1.2,"14":1.4}
                  ,'ConeVariables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM']
-                 ,'prefix'         : '' 
+                 ,'prefix'         : ''
                  }
     }
 
@@ -94,12 +94,12 @@ class StrippingDstarD02xxConf(LineBuilder):
     """
     Builder for  D*(2010)+ -> pi+ (D0->xx) stripping lines
     """
-  
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config) :
         LineBuilder.__init__(self, name, config)
-        
+
         line_pipi_box = self.baseLine(name,config,"pi", "pi")
         line_mumu_box = self.baseLine(name,config,"mu", "mu")
         line_Kpi_box  = self.baseLine(name,config,"K",  "pi")
@@ -111,7 +111,7 @@ class StrippingDstarD02xxConf(LineBuilder):
 
 
         # Tagged lines
-        
+
         line_mumu_untagged_box  = self.baseLine_untagged(name,config,"mu",  "mu", 0)
         line_Kmu_untagged_box  = self.baseLine_untagged(name,config,"K",  "mu" ,  0)
         line_pipi_untagged_box  = self.baseLine_untagged(name,config,"pi",  "pi", 0)
@@ -120,17 +120,17 @@ class StrippingDstarD02xxConf(LineBuilder):
 
 
         # Untagged minimum bias lines for trigger efficiency estimate
-        
+
         line_Kpi_minbias =  self.baseLine_untagged(name,config,"K",  "pi",   1)
         #line_pipi_minbias =  self.baseLine_untagged(name,config,"pi",  "pi", 1) #removed in St20
-        
+
         line_Kpi_minbias_treff =  self.baseLine_untagged(name,config,"K",  "pi",   2)
-        
+
         lines_to_be = [line_pipi_box,  line_mumu_box, line_Kpi_box, line_mue_box, line_Kmu_box,line_mumu_untagged_box ,line_Kmu_untagged_box, line_pipi_untagged_box,line_Kpi_untagged_box, line_Kpi_minbias,  line_Kpi_minbias_treff]
-        
+
         for i in lines_to_be:
             self.registerLine(i)
-            
+
 
     ###### Full line
     def baseLine(self, name, config,  xplus, xminus) :
@@ -144,53 +144,53 @@ class StrippingDstarD02xxConf(LineBuilder):
         dst_req_sel = [DataOnDemand( "Phys/StdAllNoPIDsPions/Particles" ) ,
                        DataOnDemand( "Phys/StdNoPIDsUpPions/Particles"),
                        xxCombSel]
-        
+
         pres = "Prescale"+combname+"Box"
         _tag_sel = Selection (name+"_seq_"+combname+"_box",
                               Algorithm = dstar_box,
                               RequiredSelections = dst_req_sel)####
-        
+
         # Capitalize particle names to match Hlt2 D*->pi D0-> xx lines
-        Xplus  = xplus[0].upper() + xplus[1:]    
+        Xplus  = xplus[0].upper() + xplus[1:]
         Xminus = xminus[0].upper() + xminus[1:]
-        
+
         coneinfo = []
         for conekey, coneitem in (config['ConeAngles']).iteritems():
-            coneinfo.append({ 
-                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'], 
+            coneinfo.append({
+                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'],
                                         'Location' : 'P2CVDst'+conekey,
                                         'DaughterLocations' : {
                                           '[D*(2010)+ -> ^(Charm -> X+ X- ) pi+]CC' : 'P2CVD0'+conekey,
                                           '[D*(2010)+ -> (Charm -> X+ X- ) ^pi+]CC' : 'P2CVpis'+conekey,
                                           '[D*(2010)+ -> (Charm -> ^X+ X- ) pi+]CC' : 'P2CVplus'+conekey,
                                           '[D*(2010)+ -> (Charm -> X+ ^X- ) pi+]CC' : 'P2CVminus'+conekey,
-                                        } 
+                                        }
                                       })
-          
-        
+
+
         if (xplus == "e" and xminus =="mu") or (xplus == "mu" and xminus == "e"):
-            
+
             line_box = StrippingLine(name+config['prefix']+"Dst2PiD02"+combname+"Box",
                                      algos = [ _tag_sel ],
                                      prescale = config[ pres ],
-                                     #RequiredRawEvents = ["Muon"],                                   
+                                     #RequiredRawEvents = ["Muon"],
                                      RelatedInfoTools = coneinfo
                                      )
-            
+
         else:
             hltname = config['HLT2String']  # * matches Signal, Sidebands and Box lines
             hltname = hltname.replace('LAB1',Xplus)
             hltname = hltname.replace('LAB2',Xminus)
             line_box = StrippingLine(name+config['prefix']+"Dst2PiD02"+combname+"Box",
                                      HLT2 = "HLT_PASS_RE('"+hltname+"')",
-                                     algos = [ _tag_sel ], 
+                                     algos = [ _tag_sel ],
                                      prescale = config[ pres ],
                                      #RequiredRawEvents = ["Muon"],
                                      RelatedInfoTools = coneinfo
                                       )
-        
+
         return line_box
-    
+
     def baseLine_untagged(self, name, config, xplus, xminus, minbias) :
         """
         Returns the stripping line for the untagged decay
@@ -201,65 +201,65 @@ class StrippingDstarD02xxConf(LineBuilder):
             suffix = "MB"
         elif minbias ==2 :
             suffix = "MBTrEff"
-            
+
         xxCombSel= combinetwobody(name+suffix, config,xplus, xminus)
         combname = xplus+xminus
         pres = "Prescale"+combname+"_untagged_Box"
         # Capitalize particle names to match Hlt2 D*->pi D0-> xx lines
-        Xplus  = xplus[0].upper() + xplus[1:]    
+        Xplus  = xplus[0].upper() + xplus[1:]
         Xminus = xminus[0].upper() + xminus[1:]
         hltname = config['HLT2String']  # * matches Signal, Sidebands and Box lines
         hltname = hltname.replace('LAB1',Xplus)
         hltname = hltname.replace('LAB2',Xminus)
         coneinfo = []
         for conekey, coneitem in (config['ConeAngles']).iteritems():
-            coneinfo.append({ 
-                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'], 
+            coneinfo.append({
+                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'],
                                         'Location' : 'P2CVD0'+conekey,
                                         'DaughterLocations' : {
                                           '[Charm -> ^X+ X- ]CC' : 'P2CVplus'+conekey,
                                           '[Charm -> X+ ^X- ]CC' : 'P2CVminus'+conekey,
-                                        } 
+                                        }
                                       })
-        
+
         if(minbias==1):
             line_untagged_box = StrippingLine(name+config['prefix']+"Dst2PiD02"+combname+"_untagged_BoxMB",
                                               HLT1 = config['HLT1MB'],
-                                              algos = [ xxCombSel ], 
+                                              algos = [ xxCombSel ],
                                               prescale = config[ pres+"MB" ],
                                               RelatedInfoTools = coneinfo
                                               )
         elif(minbias==2):
             line_untagged_box = StrippingLine(name+config['prefix']+"Dst2PiD02"+combname+"_untagged_BoxMBTrEff",
                                               HLT2 = config['HLT2MB'],
-                                              algos = [ xxCombSel ], 
+                                              algos = [ xxCombSel ],
                                               prescale = config[ pres+"MBTrEff" ],
                                               RelatedInfoTools = coneinfo
                                               )
         else :
             line_untagged_box = StrippingLine(name+config['prefix']+"Dst2PiD02"+combname+"_untagged_Box",
                                               HLT2 = "HLT_PASS_RE('"+hltname+"')",
-                                              algos = [ xxCombSel ], 
+                                              algos = [ xxCombSel ],
                                               prescale = config[ pres ],
                                               RelatedInfoTools = coneinfo
                                               )
 
-        return line_untagged_box    
+        return line_untagged_box
 
 
 
 ####### Template for combine particles for D0 -> x+ y-  ######
 def combinetwobody(name, config, xplus, xminus, postfix="") :
-    if(xplus == "mu") and (xminus == "mu") :                                     
+    if(xplus == "mu") and (xminus == "mu") :
         d0comb_combcut =       "(AMAXDOCA('')< %(doca)s *mm) & (DAMASS('D0')< %(DMassWinMuMuHigh)s *MeV) & (DAMASS('D0')> %(DMassWinMuMuLow)s *MeV) & (AMAXCHILD(PT)>%(XmaxPT)s *MeV) & (APT> %(D0MinPT)s)"
     elif (((xplus == "mu") and (xminus == "e")) or ((xplus == "e") and (xminus == "mu"))) :
         d0comb_combcut =       "(AMAXDOCA('')< %(doca)s *mm) & (ADAMASS('D0')< %(DMassWinEMu)s *MeV) & (AMAXCHILD(PT)>%(XmaxPT)s *MeV) & (APT> %(D0MinPT)s)"
     else :
         d0comb_combcut =       "(AMAXDOCA('')< %(doca)s *mm) & (ADAMASS('D0')< %(DMassWin)s *MeV) & (AMAXCHILD(PT)>%(XmaxPT)s *MeV) & (APT> %(D0MinPT)s)"
-        
-    d0comb_childcut = "(PT> %(XminPT)s *MeV) & (P>%(XminP)s *MeV) & (TRCHI2DOF<%(XTrackChi2)s) & (MIPCHI2DV(PRIMARY)> %(XminIPChi2)s) & ( TRGHOSTPROB < %(ghostProbCut)s )" 
+
+    d0comb_childcut = "(PT> %(XminPT)s *MeV) & (P>%(XminP)s *MeV) & (TRCHI2DOF<%(XTrackChi2)s) & (MIPCHI2DV(PRIMARY)> %(XminIPChi2)s) & ( TRGHOSTPROB < %(ghostProbCut)s )"
     d0comb_d0cut = "(BPVDIRA> %(DDira)s) & (INGENERATION( (MIPCHI2DV(PRIMARY)>%(XmaxIPChi2)s),1 ) ) & (BPVVDCHI2> %(DMinFlightChi2)s) & (MIPCHI2DV(PRIMARY)< %(DMaxIPChi2)s) & (VFASPF(VCHI2/VDOF)< %(DVChi2)s)"
-    
+
 
     inputLoc = {
           "pi" : "Phys/StdAllNoPIDsPions/Particles"
@@ -298,7 +298,7 @@ def combineDstar(config) :
     dstcomb_combcut =  "(ADAMASS('D*(2010)+')<%(DstMassWin)s * MeV)"
     dstcomb_picut = "(PT> %(PiMinPT)s * MeV) &  ( MIPCHI2DV(PRIMARY)< %(PiMaxIPCHI2)s) & (TRCHI2DOF<%(XTrackChi2Pi)s) "
     dstcomb_d0cut = "PT>0"
-    
+
     dstar = CombineParticles( DecayDescriptors = ['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'],
                             DaughtersCuts = {    "pi+" : dstcomb_picut % config ,
                                                  "D0"    : dstcomb_d0cut % config
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
index d36e37a7020fc5e4e1395ce8de35f2aeb28485b0..8bb4fc91eaa7ca8c385e25b595829b54aee0128f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -43,11 +43,11 @@ default_config = {
             ,"Pi0_MassConstraint" : False # adimensional
             ,"D0_M_WINDOW" : 150 #MeV
             ,"DELTA_MASS_MAX" : 180 #MeV
-            ,"Pion_PIDK" : 0 #adimensional 
-            ,"Kaon_PIDK" : 7 #adimensional 
-            ,"Pion_PT" : 500 #MeV 
+            ,"Pion_PIDK" : 0 #adimensional
+            ,"Kaon_PIDK" : 7 #adimensional
+            ,"Pion_PT" : 500 #MeV
             ,"Kaon_PT" : 500 #MeV
-            ,"Slowpion_PT" : 300 #MeV 
+            ,"Slowpion_PT" : 300 #MeV
             ,"Pion_TRGHOSTPROB" : 0.35 #adimensional
             ,"Kaon_TRGHOSTPROB" : 0.35 #adimensional
             ,"Slowpion_TRGHOSTPROB" : 0.35 #adimensional
@@ -63,34 +63,34 @@ default_config = {
 class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-    
-    
+
+
     def __init__(self, _name, config) :
 
         LineBuilder.__init__(self, _name, config)
         self.__confdict__=config
-        
+
         ### define the global event cuts
         ### max number of long tracks
-        GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 180)", 
+        GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 180)",
                  "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
-        ### define the muon cuts                                                                                                       
-        
-        self.PionCuts = "(PT > %(Pion_PT)s *MeV) & (TRGHOSTPROB < %(Pion_TRGHOSTPROB)s) & (PIDK < %(Pion_PIDK)s)" %self.__confdict__ 
+
+        ### define the muon cuts
+
+        self.PionCuts = "(PT > %(Pion_PT)s *MeV) & (TRGHOSTPROB < %(Pion_TRGHOSTPROB)s) & (PIDK < %(Pion_PIDK)s)" %self.__confdict__
 
         self.KaonCuts = "(PT > %(Kaon_PT)s *MeV) & (TRGHOSTPROB < %(Kaon_TRGHOSTPROB)s) & (PIDK > %(Kaon_PIDK)s)" %self.__confdict__
-        
+
         self.SlowpionCuts = "(PT > %(Slowpion_PT)s *MeV) & (TRGHOSTPROB < %(Slowpion_TRGHOSTPROB)s) & (PIDe < %(Slowpion_PIDe)s) & (MIPCHI2DV(PRIMARY)< 9.0)" %self.__confdict__
-        
-        self.Pi0RCuts = "(PT > %(Pi0R_PT)s *MeV) & (M > 135 - %(Pi0R_DMASS)s *MeV) & (M < 135 + %(Pi0R_DMASS)s *MeV)" %self.__confdict__                
-        self.Pi0RWIDEMASSCuts = "(PT > %(Pi0R_PT)s *MeV)" %self.__confdict__ 
-        
+
+        self.Pi0RCuts = "(PT > %(Pi0R_PT)s *MeV) & (M > 135 - %(Pi0R_DMASS)s *MeV) & (M < 135 + %(Pi0R_DMASS)s *MeV)" %self.__confdict__
+        self.Pi0RWIDEMASSCuts = "(PT > %(Pi0R_PT)s *MeV)" %self.__confdict__
+
         self.Pi0MCuts = "(PT > %(Pi0R_PT)s *MeV)" %self.__confdict__
 
-        self.Pions = Selection( "PionsFor" + _name, 
+        self.Pions = Selection( "PionsFor" + _name,
                                 Algorithm = FilterDesktop(name = "PionFilterFor"+_name, Code = self.PionCuts ),
                                 RequiredSelections = [StdLoosePions])
         self.Kaons = Selection( "KaonsFor" + _name,
@@ -99,11 +99,11 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
         self.Slowpions = Selection( "SlowpionsFor" + _name,
                                     Algorithm = FilterDesktop(name = "SlowpionFilterFor"+_name, Code = self.SlowpionCuts ),
                                     RequiredSelections = [StdAllLoosePions])
-        
+
         self.Pi0R_WIDEMASS = Selection( "Pi0R_WIDEMASS_For" + _name,
                                Algorithm = FilterDesktop(name = "Pi0RFilterFor"+_name, Code = self.Pi0RWIDEMASSCuts ),
                                RequiredSelections = [StdLooseResolvedPi0])
-        
+
         self.Pi0R = Selection( "Pi0RFor" + _name,
                                Algorithm = FilterDesktop(name = "Pi0RFilterFor"+_name, Code = self.Pi0RCuts ),
                                RequiredSelections = [StdLooseResolvedPi0])
@@ -111,10 +111,10 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
         self.Pi0M = Selection( "Pi0MFor" + _name,
                                Algorithm = FilterDesktop(name = "Pi0MFilterFor"+_name, Code = self.Pi0MCuts ),
                                RequiredSelections = [StdLooseMergedPi0])
-                
+
         self.Kpipi0_R_Line = DstarMaker(_name+"_Kpipi0_R_",
-                                        ['[K*(892)0 -> K- pi+]cc','[K*(892)0 -> K+ pi-]cc'],                                                  
-                                        ['[D0 -> K*(892)0 pi0]cc'],    
+                                        ['[K*(892)0 -> K- pi+]cc','[K*(892)0 -> K+ pi-]cc'],
+                                        ['[D0 -> K*(892)0 pi0]cc'],
                                         ['[D*(2010)+ -> D0 pi+]cc'],
                                         [self.Pions,self.Kaons],
                                         self.Pi0R,
@@ -125,8 +125,8 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                         )
 
         self.Kpipi0_R_WIDEMASS_Line = DstarMaker(_name+"_Kpipi0_R_WIDEMASS_",
-                                                 ['[K*(892)0 -> K- pi+]cc'],                                                  
-                                                 ['[D0 -> K*(892)0 pi0]cc'],    
+                                                 ['[K*(892)0 -> K- pi+]cc'],
+                                                 ['[D0 -> K*(892)0 pi0]cc'],
                                                  ['[D*(2010)+ -> D0 pi+]cc'],
                                                  [self.Pions,self.Kaons],
                                                  self.Pi0R_WIDEMASS,
@@ -137,8 +137,8 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                                  )
 
         self.pipipi0_R_Line = DstarMaker(_name+"_pipipi0_R_",
-                                         ['[K*(892)0 -> pi- pi+]cc'],                                                  
-                                         ['[D0 -> K*(892)0 pi0]cc'],    
+                                         ['[K*(892)0 -> pi- pi+]cc'],
+                                         ['[D0 -> K*(892)0 pi0]cc'],
                                          ['[D*(2010)+ -> D0 pi+]cc'],
                                          [self.Pions],
                                          self.Pi0R,
@@ -147,10 +147,10 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                          self.__confdict__,
                                          1.0
                                          )
-        
+
         self.KKpi0_R_Line = DstarMaker(_name+"_KKpi0_R_",
-                                       ['[K*(892)0 -> K- K+]cc'],                                                  
-                                       ['[D0 -> K*(892)0 pi0]cc'],    
+                                       ['[K*(892)0 -> K- K+]cc'],
+                                       ['[D0 -> K*(892)0 pi0]cc'],
                                        ['[D*(2010)+ -> D0 pi+]cc'],
                                        [self.Kaons],
                                        self.Pi0R,
@@ -159,10 +159,10 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                        self.__confdict__,
                                        1.0
                                        )
-        
+
         self.Kpipi0_M_Line = DstarMaker(_name+"_Kpipi0_M_",
-                                        ['[K*(892)0 -> K- pi+]cc','[K*(892)0 -> K+ pi-]cc'],                                                  
-                                        ['[D0 -> K*(892)0 pi0]cc'],    
+                                        ['[K*(892)0 -> K- pi+]cc','[K*(892)0 -> K+ pi-]cc'],
+                                        ['[D0 -> K*(892)0 pi0]cc'],
                                         ['[D*(2010)+ -> D0 pi+]cc'],
                                         [self.Pions,self.Kaons],
                                         self.Pi0M,
@@ -171,10 +171,10 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                         self.__confdict__ ,
                                         1.0
                                         )
-        
+
         self.pipipi0_M_Line = DstarMaker(_name+"_pipipi0_M_",
-                                         ['[K*(892)0 -> pi- pi+]cc'],                                                  
-                                         ['[D0 -> K*(892)0 pi0]cc'],    
+                                         ['[K*(892)0 -> pi- pi+]cc'],
+                                         ['[D0 -> K*(892)0 pi0]cc'],
                                          ['[D*(2010)+ -> D0 pi+]cc'],
                                          [self.Pions],
                                          self.Pi0M,
@@ -185,8 +185,8 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                          )
 
         self.KKpi0_M_Line = DstarMaker(_name+"_KKpi0_M_",
-                                       ['[K*(892)0 -> K- K+]cc'],                                                  
-                                       ['[D0 -> K*(892)0 pi0]cc'],    
+                                       ['[K*(892)0 -> K- K+]cc'],
+                                       ['[D0 -> K*(892)0 pi0]cc'],
                                        ['[D*(2010)+ -> D0 pi+]cc'],
                                        [self.Kaons],
                                        self.Pi0M,
@@ -195,8 +195,8 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
                                        self.__confdict__ ,
                                        1.0
                                        )
-        
-        
+
+
         self.registerLine(self.Kpipi0_R_Line)
         self.registerLine(self.pipipi0_R_Line)
         self.registerLine(self.KKpi0_R_Line)
@@ -204,69 +204,69 @@ class DstarD0ToHHPi0AllLinesBuilder(LineBuilder) :
         self.registerLine(self.pipipi0_M_Line)
         self.registerLine(self.KKpi0_M_Line)
         self.registerLine(self.Kpipi0_R_WIDEMASS_Line)
-        
+
 def DstarMaker(_name,_KstDecays,_D0Decays,_DstDecays,_ChargedTracks,_Pi0s,_Slowpions,_Filter,config,prescale):
-    
+
     KstSel = Selection("SelKst"+_name,
                        Algorithm = CombineParticles( name = "CombKst"+_name,
                                                      DecayDescriptors = _KstDecays,
                                                      CombinationCut = "(((ACHILD(PT,1) > 1.7*GeV) & (ACHILD(BPVIPCHI2(),1) > 36)) | ((ACHILD(PT,2) > 1.7*GeV) & (ACHILD(BPVIPCHI2(),2) > 36))) & (AM < 1850*MeV) & (ADOCACHI2CUT(15,''))",
                                                      MotherCut = "(VFASPF(VCHI2/VDOF) < 3) & (BPVVDCHI2 > 100)"),
-                       RequiredSelections = _ChargedTracks)  
-    
+                       RequiredSelections = _ChargedTracks)
+
     D0Comb = CombineParticles( name = "CombD0"+_name,
                                DecayDescriptors = _D0Decays,
                                CombinationCut = "(ADAMASS('D0') < %(D0_M_WINDOW)s + 10 *MeV) & (APT > %(D0_APT)s *MeV)" %config,
                                MotherCut = "(VFASPF(VCHI2/VDOF) < 20.0) & (DMASS('D0') < %(D0_M_WINDOW)s *MeV)" %config)
-    
+
     D0Sel = Selection("SelD0"+_name,
                       Algorithm =  D0Comb,
-                      RequiredSelections = [KstSel,_Pi0s]) 
-    
+                      RequiredSelections = [KstSel,_Pi0s])
+
     DstComb = CombineParticles( name = "CombDst"+_name,
                                 DecayDescriptors = _DstDecays,
                                 CombinationCut = "(AM - ACHILD(M,1) < %(DELTA_MASS_MAX)s+5 *MeV) & (ADOCACHI2CUT(20,''))" %config,
                                 MotherCut = "(M - CHILD(M,1) < %(DELTA_MASS_MAX)s *MeV) & (VFASPF(VCHI2/VDOF) < 9.0)" %config)
     if config["Pi0_MassConstraint"] == True:
-        DstComb.addTool( OfflineVertexFitter )                                                                                                  
-        DstComb.ParticleCombiners.update( {"" : "OfflineVertexFitter"} )                                                                                    
+        DstComb.addTool( OfflineVertexFitter )
+        DstComb.ParticleCombiners.update( {"" : "OfflineVertexFitter"} )
         DstComb.OfflineVertexFitter.useResonanceVertex = False
-        DstComb.OfflineVertexFitter.applyDauMassConstraint = True                                                                                      
-        DstComb.ReFitPVs = True   
-        
+        DstComb.OfflineVertexFitter.applyDauMassConstraint = True
+        DstComb.ReFitPVs = True
+
     DstSel = Selection("SelDst"+_name,
                        Algorithm = DstComb,
                        RequiredSelections = [D0Sel,_Slowpions])
-    
+
     _tosFilter = config['TOSFilter']
     DstSelTOS = TOSFilter( "SelDstKPiPi0_Hlt2TOS"+_name
                            ,DstSel
                            ,_tosFilter)
-    
+
     hlt2 = ""
     if config["useHLT2"] == True:
         _hlt2 =  "%(Hlt2Filter)s" %config
         hlt2 = _hlt2
-        
+
     if config["useTOS"] == True:
         Line = StrippingLine(_name+'Line',
                              prescale = prescale,
                              FILTER=_Filter,
                              HLT2 = hlt2,
-                             selection = DstSelTOS) 
+                             selection = DstSelTOS)
     else:
         Line = StrippingLine(_name+'Line',
                              prescale = prescale,
                              FILTER=_Filter,
                              HLT2 = hlt2,
-                             selection = DstSel) 
+                             selection = DstSel)
     return Line
-                                                    
+
 def TOSFilter( name, _input, _specs ) :
 
     from Configurables import TisTosParticleTagger
     _tisTosFilter = TisTosParticleTagger( name + "Tagger" )
-    _tisTosFilter.TisTosSpecs = _specs 
+    _tisTosFilter.TisTosSpecs = _specs
     return Selection( name
                       , Algorithm = _tisTosFilter
                       , RequiredSelections = [ _input ]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py
index ef701e77ffdfce7c1b9ed90ea519a55b94aca923..b4e0541a6c6ab4738216f915b1664c2bf0d74d8a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py
@@ -42,7 +42,7 @@ from StrippingUtils.Utils import LineBuilder
 
 name = "DstarD2KShh"
 
-default_config = { 
+default_config = {
     'NAME'        : "DstarD2KShh",
     'WGs'         : ['Charm'],
     'STREAMS'     : [ 'Charm' ],
@@ -276,4 +276,3 @@ def makeDstar(name, inputD0, preFitDstarMassCut, cutChi2, SoftPionCutPIDe, cutPT
     return Selection ( name,
                        Algorithm = _Dstar,
                        RequiredSelections = inputD0 + [_softPi])
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py
index 8bab99546488b7f20191d3cd314f90f20220c85d..29f59864d6ec6407134f2377e31f86bafb88199b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py
@@ -15,7 +15,7 @@ Authors: Maurizio Martinelli
 
 Looser kinematic cuts & TOS requirements for S29r2 S24r1 S28r1 by Jolanta Brodzicka
 
-Campaign in 2019: wider (delta)mass range, instead cuts on GammaCL, D IPCHI2, tighter K PID 
+Campaign in 2019: wider (delta)mass range, instead cuts on GammaCL, D IPCHI2, tighter K PID
 """
 
 ########################################################################
@@ -54,7 +54,7 @@ default_config = {
                       'PrescaleDstarD2KPiGamma_CNVDD' : 1,
                       'PrescaleDstarD2KKGamma_CNVDD'  : 1,
                       # Gamma
-                      'photonPT'                : 1.7 * GeV, 
+                      'photonPT'                : 1.7 * GeV,
                       'MaxMass_CNV_LL'          : 100 * MeV,
                       'MaxVCHI2_CNV_LL'         : 9,
                       'MinPT_CNV_LL'            : 1000 * MeV,
@@ -65,13 +65,13 @@ default_config = {
                       # X -> HH
                       'TrChi2'                  : 4,
                       'TrGhostProb'             : 0.5,
-                      'MinTrkPT'                : 500 * MeV, 
+                      'MinTrkPT'                : 500 * MeV,
                       'MinTrkIPChi2'            : 6,
                       'HighPIDK'                : 0, #pions
                       'LowPIDK'                 : 5, #kaons #0->5 in 2019 campaign
                       'CombMassLow_HH'          : 0 * MeV,
                       'CombMassHigh_HH'         : 1865 * MeV, #1820 * MeV,
-                      'MinCombPT'               : 0 * GeV, 
+                      'MinCombPT'               : 0 * GeV,
                       'MaxADOCACHI2'            : 10.0,
                       'MinVDCHI2_HHComb'        : 1000.0,
                       'MassLow_HH'              : 0 * MeV,
@@ -83,10 +83,10 @@ default_config = {
                       'CombMassHigh'            : 2130 * MeV, #2075 * MeV,
                       'MassLow'                 : 1640 * MeV, #1685 * MeV,
                       'MassHigh'                : 2100 * MeV, #2055 * MeV,
-                      'MinPT'                   : 2.0 * GeV, 
+                      'MinPT'                   : 2.0 * GeV,
                       'MaxVCHI2NDOF'            : 12.0,
                       'MinBPVDIRA'              : 0.99995,
-                      'MinBPVTAU'               : 0.1 * picosecond, 
+                      'MinBPVTAU'               : 0.1 * picosecond,
                       'MaxIPChi2'               : 25., #added in 2019 campaign
                       # D* -> D0 pi+
                       'Daug_TRCHI2DOF_MAX'      : 3,
@@ -97,7 +97,7 @@ default_config = {
                       'Hlt1Filter': None,
                       'Hlt2Filter': None, #"HLT_PASS_RE('Hlt2CharmHadInclDst2PiD02HHXBDTDecision')", #jb
                       'Hlt1Tos': {'Hlt1.*Track.*Decision%TOS' : 0, 'Hlt1IncPhi.*Decision%TOS' : 0}, #jb
-                      'Hlt2Tos': {'Hlt2CharmHadInclDst2PiD02HHXBDTDecision%TOS' : 0, 'Hlt2PhiIncPhiDecision%TOS' : 0, 'Hlt2CharmHadDst2PiD02.*Gamma.*Decision%TOS' : 0,} #jb #including an exclusive line 
+                      'Hlt2Tos': {'Hlt2CharmHadInclDst2PiD02HHXBDTDecision%TOS' : 0, 'Hlt2PhiIncPhiDecision%TOS' : 0, 'Hlt2CharmHadDst2PiD02.*Gamma.*Decision%TOS' : 0,} #jb #including an exclusive line
                     },
     'STREAMS'     : ['CharmCompleteEvent']
     }
@@ -183,7 +183,7 @@ class DstarD2XGammaLines( LineBuilder ) :
                 self.Dst2D0pi[decay+phName] = self.makeDstar2D0Pi(DstarD2XGammaName+phName,
                                                                   config,
                                                                   ['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'],
-                                                                  inputSel = [self.D2XGamma[decay+phName], StdAllNoPIDsPions], 
+                                                                  inputSel = [self.D2XGamma[decay+phName], StdAllNoPIDsPions],
                                                                   Hlt1TOS = config['Hlt1Tos'],
                                                                   Hlt2TOS = config['Hlt2Tos'] )
 
@@ -347,7 +347,7 @@ class DstarD2XGammaLines( LineBuilder ) :
             return Selection( name
                               , Algorithm = _tisTosFilter
                               , RequiredSelections = [ _input ]
-                              )        
+                              )
 #jb
         daugCuts = "(TRCHI2DOF < %(Daug_TRCHI2DOF_MAX)s)" % locals()['config']
         combCuts = "((AM - AM1) < %(Dstar_AMDiff_MAX)s)" % locals()['config']
@@ -379,7 +379,7 @@ class DstarD2XGammaLines( LineBuilder ) :
                                             , _selDstarHlt1TOS
                                             , Hlt2TOS
                                             )
-       
+
         return _selDstarHlt2TOS
 
 ########################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 5bc7e484f16b20f70419a9012135760160216c28..1dbe27825f701ba637d3cf044c734baad5f81591 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -209,15 +209,15 @@ class DstarPromptWithD02HHHHConf(LineBuilder):
 
     coneinfo=[]
     for conekey, coneitem in (config['ConeAngles']).iteritems():
-            coneinfo.append({ 
-                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'], 
+            coneinfo.append({
+                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'],
                                         'Location' : 'P2CVDst'+conekey,
                                         'DaughterLocations' : {
                                           #'[^D*(2010)+ -> Charm pi+]CC' : 'P2CVDst'+conekey,
                                           '[D*(2010)+ -> ^Charm pi+]CC' : 'P2CVD0'+conekey,
                                           '[D*(2010)+ -> Charm ^pi+]CC' : 'P2CVpis'+conekey,
-                                          
-                                        } 
+
+                                        }
                                       })
     self.line_tagged_d02hhhh = StrippingLine(
       name+"Line"
@@ -311,7 +311,7 @@ def makeD02hhhh (
     _pionCutsOLD = copy(_pionCuts)
     _kaonCuts = _kaonCutsOLD + " & " + _ghostCut
     _pionCuts = _pionCutsOLD + " & " + _ghostCut
-    
+
 
   from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons
   from StandardParticles import StdAllLoosePions, StdAllLooseKaons
@@ -375,13 +375,13 @@ def makeD02hhhh (
 
   _selectionsToRun = []
 
-  if runK3pi: 
+  if runK3pi:
     _selectionsToRun += [_selD02K3Pi, _selD02K3PiConj]
-  if run4pi: 
+  if run4pi:
     _selectionsToRun += [_selD02FourPi, _selD02FourPiConj]
-  if run2K2pi: 
+  if run2K2pi:
     _selectionsToRun += [_selD02KKPiPi, _selD02KKPiPiConj]
-  if run3Kpi: 
+  if run3Kpi:
     _selectionsToRun += [_selD02Pi3K, _selD02Pi3KConj]
 
   _d0Sel = MergedSelection('D02hhhhFor'+moduleName
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index d2f6e84c689ecface1bf4bb1afac8481dacf26ba..7578f23a05cfa924a916118e914dcebc6ac3c4d8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -206,15 +206,15 @@ class DstarPromptWithD02HHLLConf(LineBuilder):
                       }
     coneinfo=[]
     for conekey, coneitem in (config['ConeAngles']).iteritems():
-            coneinfo.append({ 
-                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'], 
+            coneinfo.append({
+                                        'Type' : 'RelInfoConeVariables', 'ConeAngle' : coneitem, 'Variables' : config['ConeVariables'],
                                         'Location' : 'P2CVDst'+conekey,
                                         'DaughterLocations' : {
                                           #'[^D*(2010)+ -> Charm pi+]CC' : 'P2CVDst'+conekey,
                                           '[D*(2010)+ -> ^Charm pi+]CC' : 'P2CVD0'+conekey,
                                           '[D*(2010)+ -> Charm ^pi+]CC' : 'P2CVpis'+conekey,
-                                          
-                                        } 
+
+                                        }
                                       })
 
     self.line_tagged_d02hhll = StrippingLine(
@@ -303,7 +303,7 @@ def makeD02hhll(
 
   PiMuPair_Mu_Cut = "(INTREE( (ID=='mu+') & (PT> %(dauPt)s *MeV) & (TRCHI2DOF < %(trackChi2DOF)s) & ((MIPCHI2DV(PRIMARY)) > %(dauIPChi2)s) & (TRGHOSTPROB<%(ghostProbCut)s ) ))" % locals()
   PiMuPair_Pi_Cut = "(INTREE( (ID=='pi-') & (PT> %(dauPt)s *MeV) & (TRCHI2DOF < %(trackChi2DOF)s) & ((MIPCHI2DV(PRIMARY)) > %(dauIPChi2)s) & (TRGHOSTPROB<%(ghostProbCut)s ) ))" % locals()
-  _PiMuCuts = PiMuPair_Mu_Cut + " & " + PiMuPair_Pi_Cut 
+  _PiMuCuts = PiMuPair_Mu_Cut + " & " + PiMuPair_Pi_Cut
 
   PiMuPair_Pi_Cut_PID = "(INTREE( (ID=='pi-') & (PT> %(dauPt)s *MeV) & (TRCHI2DOF < %(trackChi2DOF)s) & ((MIPCHI2DV(PRIMARY)) > %(dauIPChi2)s) & (PIDK<%(pionPIDK)s) & (TRGHOSTPROB<%(ghostProbCut)s ) ))" % locals()
 
@@ -316,7 +316,7 @@ def makeD02hhll(
     _pionCutsOLD = copy(_pionCuts)
     _pionCuts="(PIDK<%(pionPIDK)s) & (HASRICH) & " %locals()
     _pionCuts+=_pionCutsOLD
-    _PiMuCuts = PiMuPair_Mu_Cut + " & " + PiMuPair_Pi_Cut_PID 
+    _PiMuCuts = PiMuPair_Mu_Cut + " & " + PiMuPair_Pi_Cut_PID
 
   if applyElePIDe:
     _eleCutsOLD = copy(_eleCuts)
@@ -334,14 +334,14 @@ def makeD02hhll(
 
 
 
-    
 
 
-    
+
+
 
   from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsElectrons
-  from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons 
-  from StandardParticles import StdAllLooseElectrons 
+  from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons
+  from StandardParticles import StdAllLooseElectrons
   from StandardParticles import StdAllLooseMuPion
 
 
@@ -353,16 +353,16 @@ def makeD02hhll(
 
   if applyElePIDe:
     _eles = StdAllLooseElectrons
-  
+
   if noPIDele:
     _eles = StdAllNoPIDsElectrons
-  
+
   if noPIDmu:
     _muons = StdAllNoPIDsMuons
 
   if noPIDpi:
     _pions = StdAllNoPIDsPions
-  
+
   if noPIDmu:
     _kaons = StdAllNoPIDsKaons
 
@@ -699,4 +699,4 @@ Note that the delta mass is defined here as the difference between the D* and D0
      ,Algorithm=_dstar
      ,RequiredSelections=[StdAllNoPIDsPions, selection]
      )
-   return _selDstar
\ No newline at end of file
+   return _selDstar
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 390af6f314ee445a28c3643b1a9bb382156e8883..66eab8ebe3532fa256395b5a0d20784f7a226ab7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -10,10 +10,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Module for construction of Ds->KKPi based on 
+Module for construction of Ds->KKPi based on
  StrippingD2hhh_conf.py stripping Selections and StrippingLines.
 Provides functions to build Ds2KKPi selections using StdVeryTightDsplus2KKPi.
-Provides class Ds2KKpiConf, which constructs the Selections and 
+Provides class Ds2KKpiConf, which constructs the Selections and
 StrippingLines given a configuration dictionary.
 Exported symbols (use python help!):
    - Ds2KKpiConf
@@ -52,7 +52,7 @@ default_config = {
                 'MaxMassKstar'              :  956., # 956
                 'piPIDK'                    :    3.,
                 'KPIDK'                     :    7.,
-                'DsDIRA'                    :    0., 
+                'DsDIRA'                    :    0.,
                 'MinCosHelAngleKstar'       :    0.4, # 0.4
                 'MaxTracksInEvent'          :  500,
                 'DsstGammaLinePrescale'     :    1.0,
@@ -68,7 +68,7 @@ default_config = {
                 'DeltaMassDsgg'             :  1300.,
                 'MaxMassDsst'               :  2300.
                 },
-    
+
     'WGs' : [ 'Charm' ],
     'STREAMS' : [ 'Charm' ]
     }
@@ -88,7 +88,7 @@ class ExcitedDsSpectroscopyConf(LineBuilder) :
 
     Exports as instance data members:
     selKKPi            :  get StdVeryTightDsplus2KKPi
-    Ds2KKPi_line       :  StrippingLine made out of selKKPi 
+    Ds2KKPi_line       :  StrippingLine made out of selKKPi
     lines              :  List of lines [Ds2KKPi_line]
 
     Exports as class data member:
@@ -104,7 +104,7 @@ class ExcitedDsSpectroscopyConf(LineBuilder) :
         self.selKKPi = DataOnDemand(Location = "Phys/StdVeryTightDsplus2KKPi/Particles")
 
         self.selDs2KKPi = makeStdDs2KKpi('DsFor%s' % name,
-                                         KKPiSel = self.selKKPi, 
+                                         KKPiSel = self.selKKPi,
                                          Daughter2IPChi2 = config['Daughter2IPChi2'],
                                          PTSum = config['PTSum'],
                                          DsIPChi2= config['DsIPChi2'],
@@ -132,7 +132,7 @@ class ExcitedDsSpectroscopyConf(LineBuilder) :
         self.selDsg_vetoed = makeDsg_vetoed('Pi0VetoDsgFor%s' % name,
                                             DsgSel = self.selDsg
                                             )
-        
+
 
         self.selDsgg = makeDsgg('DsggFor%s' % name,
                                 DsstSel = self.selDsg_vetoed,
@@ -146,7 +146,7 @@ class ExcitedDsSpectroscopyConf(LineBuilder) :
                                               DsggSel = self.selDsgg
                                               )
 
-        self.filterGE = globalEventCutFilter(name + 'GECFilter', 
+        self.filterGE = globalEventCutFilter(name + 'GECFilter',
                                     MaxTrSIZE = config['MaxTracksInEvent'])
 
 
@@ -158,10 +158,10 @@ class ExcitedDsSpectroscopyConf(LineBuilder) :
                                       #selection = self.selDsgg_vetoed,
                                       FILTER = self.filterGE,
                                       )
-        
+
         self.registerLine(self.Dsg_line)
-                
-        
+
+
         self.Dsgg_line = StrippingLine("DsstGammaFor"+name+"Line",
                                        prescale = config['DsstGammaLinePrescale'],
                                        postscale = config['DsstGammaLinePostscale'],
@@ -172,39 +172,39 @@ class ExcitedDsSpectroscopyConf(LineBuilder) :
                                        )
 
         self.registerLine(self.Dsgg_line)
-        
+
 def makeDsgg_vetoed(name,
                     DsggSel
                     ):
 
     from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-    
+
     _g = Pi0Veto__Tagger(
         MassWindow     = 25,
         MassChi2       = -1           ,
         ExtraInfoIndex = 25041     ## unique !
         )
-    
+
     return Selection(name, Algorithm=_g, RequiredSelections=[DsggSel])
-                        
+
 
 def makeDsg_vetoed(name,
                    DsgSel
                    ):
-    
+
     from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-    
+
     _g = Pi0Veto__Tagger(
         MassWindow     = 25,
         MassChi2       = -1           ,
         ExtraInfoIndex = 25040     ## unique !
         )
-    
+
     return Selection(name, Algorithm=_g, RequiredSelections=[DsgSel])
 
 def makeStdDs2KKpi(name,
                    KKPiSel,
-                   Daughter2IPChi2, 
+                   Daughter2IPChi2,
                    PTSum,
                    DsIPChi2,
                    DsPt,
@@ -222,14 +222,14 @@ def makeStdDs2KKpi(name,
     Create and return a Ds -> KKPi Selection object.
     Arguments:
     name            : name of the Selection.
-    KKPiSel         : Standard Specific Ds2KKPi selection    
-    Daughter2IPChi2 : Minimum IPChi2 required to at least 2 daughters 
+    KKPiSel         : Standard Specific Ds2KKPi selection
+    Daughter2IPChi2 : Minimum IPChi2 required to at least 2 daughters
     PTSum           : Minimum sum of daughters momenta
     DsIPChi2        : Maximum IPChi2 of the Ds
     DsPt            : Minimum Ds Momentum
     DsVXChi2NDOF    : Maximum Chi2 of the Ds Vertex
     MinMassPhi      : Lower bound for phi mass
-    MaxMassPhi      : Upper bound for phi mass   
+    MaxMassPhi      : Upper bound for phi mass
     MinMassKstar    : Lower bound for K*(892) mass
     MaxMassKstar    : Upper bound for K*(892) mass
     piPIDK          : Kaon - pion DLL for pions
@@ -238,11 +238,11 @@ def makeStdDs2KKpi(name,
     MinCosHelAngleKstar: Cosine of the helicity angle in the K*(892) rest frame
     """
 
-    _Combcuts =""" 
+    _Combcuts ="""
                (SUMTREE( ISBASIC , PT ) > %(PTSum)s*MeV) &
-               (2 <= NINGENERATION((MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) , 1)) 
+               (2 <= NINGENERATION((MIPCHI2DV(PRIMARY) > %(Daughter2IPChi2)s ) , 1))
                """ % locals()
-                    
+
     _Mothercuts = """
                   (PT > %(DsPt)s) & (VFASPF(VCHI2/VDOF) < %(DsVXChi2NDOF)s) &
                   (BPVDIRA > %(DsDIRA)s) & (BPVIPCHI2() < %(DsIPChi2)s)
@@ -258,9 +258,9 @@ def makeStdDs2KKpi(name,
     _cutsDP = '('+_cutsDP_phi + '|' +_cutsDP_Kst + ')'
 
     _code = '('+_DaughterCuts+'&'+_cutsDP+'&'+_Combcuts+'&'+_Mothercuts+')'
- 
-    _filter = FilterDesktop( Code = _code ) 
-   
+
+    _filter = FilterDesktop( Code = _code )
+
     return Selection ( name,
                        Algorithm = _filter,
                        RequiredSelections = [KKPiSel])
@@ -272,19 +272,19 @@ def makeDsg(name,
             GammaCL,
             DeltaMassDsg
             ):
-    
+
     _daughterPhotonCut   = "(PT > %(GammaPT)s) & (CL > %(GammaCL)s)" % locals()
-    _combinationCut = "(AM - AM1) < %(DeltaMassDsg)s*MeV" % locals() 
+    _combinationCut = "(AM - AM1) < %(DeltaMassDsg)s*MeV" % locals()
     _motherCut      = "ALL"
 
-    _Dsg = CombineParticles(DecayDescriptor = "[D*_s+ -> D_s+ gamma]cc", 
+    _Dsg = CombineParticles(DecayDescriptor = "[D*_s+ -> D_s+ gamma]cc",
                             DaughtersCuts = {"gamma"  : _daughterPhotonCut
                                              },
                             CombinationCut = _combinationCut,
                             MotherCut = _motherCut)
-    
+
     _stdPhoton = DataOnDemand(Location="Phys/StdLooseAllPhotons/Particles")
-    
+
     return Selection(name, Algorithm=_Dsg, RequiredSelections=[DsSel, _stdPhoton])
 
 def makeDsgg(name,
@@ -299,31 +299,30 @@ def makeDsgg(name,
     _daughterPhotonCut   = "(PT > %(Gamma2PT)s) & (CL > %(Gamma2CL)s)" % locals()
     _combinationCut = "(AM - AM1) < %(DeltaMassDsgg)s*MeV" % locals()
     _motherCut      = "ALL"
-    
+
     _Dsgg = CombineParticles(DecayDescriptor = "[D_s1(2536)+ -> D*_s+ gamma]cc",
                              DaughtersCuts = {"gamma"  : _daughterPhotonCut,
                                               "D*_s+"  : _daughterDsstCut
                                               },
                              CombinationCut = _combinationCut,
                              MotherCut = _motherCut)
-    
+
     _stdPhoton = DataOnDemand(Location="Phys/StdLooseAllPhotons/Particles")
-    
+
     return Selection(name, Algorithm=_Dsgg, RequiredSelections=[DsstSel, _stdPhoton])
 
-def globalEventCutFilter(name, 
-                         MaxTrSIZE = None 
+def globalEventCutFilter(name,
+                         MaxTrSIZE = None
                          ) :
-#  
+#
   if MaxTrSIZE == None : return None
-  
+
   from Configurables import LoKi__VoidFilter as VoidFilter
   from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
   modules = CoreFactory('CoreFactory').Modules
   for i in ['LoKiTracks.decorators']:
      if i not in modules : modules.append(i)
-  
+
   _code = "(recSummary(LHCb.RecSummary.nTracks, 'Rec/Track/Best') < %(MaxTrSIZE)s )" % locals()
-  
-  return _code          
 
+  return _code
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py
index ea983e436a517041afe29ceb162748e81fb0315c..98b90d0c2983f56e78478accb54baab949bd9fb0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py
@@ -11,7 +11,7 @@
 """
 Stripping lines for selection of general decay topologies
     [Xi_c0 -> (V0 -> h+ h-) h+ h-]CC
-In this file the stripping line for this decay is build 
+In this file the stripping line for this decay is build
     [Xi_c0 -> (Lambda0 -> p+ pi-) K+ K-]CC
     [Xi_c0 -> (Lambda0 -> p+ pi-) K+ pi-]CC
 Throughout this file, 'Bachelor' refers to the children of the Xi_c0 which is
@@ -103,23 +103,23 @@ class StrippingHc2V02HConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         # Decay descriptors
         self.Xic2LambdaPiPi  = ['[Xi_c0 -> Lambda0 pi+ pi-]cc']
         self.Xic2LambdaKPi   = ['[Xi_c0 -> Lambda0 K-  pi+]cc' ]
-        
+
         # Line names
         # 'LL' and 'DD' will be appended to these names for the LL and DD
         # Selection and StrippingLine instances
         self.Xic2LambdaPiPi_name  = '{0}_Xic2LambdaPiPi' .format(name)
         self.Xic2LambdaKPi_name   = '{0}_Xic2LambdaKPi'.format(name)
-        
+
         # Build bachelor pion and kaon cut strings
         # Cuts MIPCHI2DV(PRIMARY)>4 & PT>250*MeV already present in the InputsParticles
         childCuts = (
             '(P > {0[Bach_P_MIN]})'
         ).format(self.config)
-        
+
         kineticCuts = '{0}'.format(childCuts)
 
         # Build Lambda0 cut strings
@@ -131,7 +131,7 @@ class StrippingHc2V02HConf(LineBuilder):
         # Define any additional cuts on LL/DD difference
         lambda0LLCuts = lambda0Cuts
         lambda0DDCuts = lambda0Cuts
-        
+
         # Filter Input particles
         self.Pions = Selection(
             'PionsFor{0}'.format(name),
@@ -148,28 +148,28 @@ class StrippingHc2V02HConf(LineBuilder):
             ),
             RequiredSelections=[InputKaons]
         )
-        
+
         # Filter Input Lambdas
         self.LambdaListLooseDD = MergedSelection("StdLooseDDLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")])
-        
+
         self.LambdaListLooseLL = MergedSelection("StdLooseLLLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")])
-        
+
         self.LambdaListLL =  self.createSubSel(OutputList = "LambdaLLFor" + self.name,
                                                InputList = self.LambdaListLooseLL ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_LL)s ) "
-                                               '& (BPVVDCHI2 > %(Lambda0_FDCHI2_MIN_LL)s )'                                               
+                                               '& (BPVVDCHI2 > %(Lambda0_FDCHI2_MIN_LL)s )'
                                                %self.config
                                                )
-        
+
         self.LambdaListDD =  self.createSubSel(OutputList = "LambdaDDFor" + self.name,
                                                InputList = self.LambdaListLooseDD ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_DD)s ) "
                                                '& (BPVVDCHI2 > %(Lambda0_FDCHI2_MIN_DD)s )'
                                                %self.config
                                                )
-        
+
         self.Lambda0LL = Selection(
             'Lambda0LLFor{0}'.format(name),
             Algorithm=FilterDesktop(
@@ -340,4 +340,4 @@ class StrippingHc2V02HConf(LineBuilder):
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
-                          RequiredSelections = [ InputList ] ) 
+                          RequiredSelections = [ InputList ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py
index 662de6135c9999aa84ff7d074d6448eb26b486ca..513e48566725427c23c0fe25c9f8e6789c5fa9d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py
@@ -11,7 +11,7 @@
 """
 Stripping lines for selection of general decay topologies
     [Lambda_c+ -> (V0 -> h+ h-) h+ h+ h-]CC
-In this file the stripping line for this decay is build 
+In this file the stripping line for this decay is build
     [Lambda_c+ -> (Lambda0 -> p+ pi-) pi+ pi+ pi-]CC
     [Lambda_c+ -> (Lambda0 -> p+ pi-) K+ pi+ pi-]CC
 Throughout this file, 'Bachelor' refers to the children of the Lambda_c+ which is
@@ -113,25 +113,25 @@ class StrippingHc2V03HConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         # Decay descriptors
         self.Lambdac2Lambda3Pi  = ['[Lambda_c+ -> Lambda0 pi+ pi+ pi-]cc']
         self.Lambdac2LambdaK2Pi = ['[Lambda_c+ -> Lambda0 K+ pi+ pi-]cc' ]
         self.Xic2LambdaK2Pi     = ['[Xi_c+     -> Lambda0 K+ pi+ pi-]cc' ]
-        
+
         # Line names
         # 'LL' and 'DD' will be appended to these names for the LL and DD
         # Selection and StrippingLine instances
         self.Lambdac2Lambda3Pi_name  = '{0}_Lambdac2Lambda3Pi' .format(name)
         self.Lambdac2LambdaK2Pi_name = '{0}_Lambdac2LambdaK2Pi'.format(name)
         self.Xic2LambdaK2Pi_name     = '{0}_Xic2LambdaK2Pi'    .format(name)
-        
+
         # Build bachelor pion and kaon cut strings
         # Cuts MIPCHI2DV(PRIMARY)>4 & PT>250*MeV already present in the InputsParticles
         childCuts = (
             '(P > {0[Bach_P_MIN]})'
         ).format(self.config)
-        
+
         kineticCuts = '{0}'.format(childCuts)
 
         # Build Lambda0 cut strings
@@ -144,7 +144,7 @@ class StrippingHc2V03HConf(LineBuilder):
         # Define any additional cuts on LL/DD difference
         lambda0DDCuts = lambda0Cuts
         lambda0LLCuts = lambda0Cuts
-        
+
         # Filter Input particles
         self.Pions = Selection(
             'PionsFor{0}'.format(name),
@@ -161,24 +161,24 @@ class StrippingHc2V03HConf(LineBuilder):
             ),
             RequiredSelections=[InputKaons]
         )
-        
+
         # Filter Input Lambdas
         self.LambdaListLooseDD = MergedSelection("StdLooseDDLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")])
-        
+
         self.LambdaListLooseLL = MergedSelection("StdLooseLLLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")])
-        
+
         self.LambdaListLL =  self.createSubSel(OutputList = "LambdaLLFor" + self.name,
                                                InputList = self.LambdaListLooseLL ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_LL)s ) " %self.config
                                                )
-        
+
         self.LambdaListDD =  self.createSubSel(OutputList = "LambdaDDFor" + self.name,
                                                InputList = self.LambdaListLooseDD ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_DD)s ) " %self.config
                                                )
-        
+
         self.Lambda0LL = Selection(
             'Lambda0LLFor{0}'.format(name),
             Algorithm=FilterDesktop(
@@ -329,7 +329,7 @@ class StrippingHc2V03HConf(LineBuilder):
             "& (ADMASS('Lambda_c+') < {0[Lambdac_ADMASS_WIN]})"
             "& ((CHILD(VFASPF(VZ),1) - VFASPF(VZ)) > {0[LambdaMinFD_LL]})"
             ).format(self.config)
-        
+
         lambdacCuts_DD = (
             "(VFASPF(VCHI2/VDOF) < {0[Lambdac_VCHI2VDOF_MAX_DD]})"
             "& ({0[Lambdac_PVDispCut_DD]})"
@@ -337,7 +337,7 @@ class StrippingHc2V03HConf(LineBuilder):
             "& (ADMASS('Lambda_c+') < {0[Lambdac_ADMASS_WIN]})"
             "& ((CHILD(VFASPF(VZ),1) - VFASPF(VZ)) > {0[LambdaMinFD_DD]})"
             ).format(self.config)
-        
+
         comb12Cuts = (
             "(DAMASS('Lambda_c+') < {0[Comb_ADAMASS_WIN]})"
             "& (ADOCA(1,2) < {0[Comb_ADOCAMAX_MAX]})"
@@ -467,4 +467,4 @@ class StrippingHc2V03HConf(LineBuilder):
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
-                          RequiredSelections = [ InputList ] ) 
+                          RequiredSelections = [ InputList ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py
index eed2a9e3952f3a83f8d10247e728b256d2299e72..3af5352b55aff59cf1447830e97d9b2c66cde668 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py
@@ -116,7 +116,7 @@ class StrippingHc2V2HConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         # Decay descriptors
         self.Lambdac2XiKpi = ['[Lambda_c+ -> Xi- K+ pi+]cc']
         self.Xic2Xipipi    = ['[Xi_c+ -> Xi- pi+ pi+]cc']
@@ -131,7 +131,7 @@ class StrippingHc2V2HConf(LineBuilder):
         childCuts = (
             '(P > {0[Bach_P_MIN]})'
         ).format(self.config)
-        
+
         kineticCuts = '{0}'.format(childCuts)
 
         # Build Lambda0 cut strings
@@ -150,10 +150,10 @@ class StrippingHc2V2HConf(LineBuilder):
         # Define any additional cuts on LL/DD difference
         lambda0LLCuts = lambda0Cuts
         lambda0DDCuts = lambda0Cuts
-        ximLLLCuts = ximCuts + ("& ((CHILD(VFASPF(VZ),1) - VFASPF(VZ)) > {0[LambdaMinFD_LL]})").format(self.config)        
+        ximLLLCuts = ximCuts + ("& ((CHILD(VFASPF(VZ),1) - VFASPF(VZ)) > {0[LambdaMinFD_LL]})").format(self.config)
         ximDDDCuts = ximCuts
         ximDDLCuts = ximCuts + ("& ((CHILD(VFASPF(VZ),1) - VFASPF(VZ)) > {0[LambdaMinFD_LL]})").format(self.config)
-        
+
         # Filter Input particles
         self.Pions = Selection(
             'PionsFor{0}'.format(name),
@@ -181,20 +181,20 @@ class StrippingHc2V2HConf(LineBuilder):
         # Filter Input Lambdas
         self.LambdaListLooseDD = MergedSelection("StdLooseDDLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")])
-        
+
         self.LambdaListLooseLL = MergedSelection("StdLooseLLLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")])
-        
+
         self.LambdaListLL =  self.createSubSel(OutputList = "LambdaLLFor" + self.name,
                                                InputList = self.LambdaListLooseLL ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_LL)s ) " %self.config
                                                )
-        
+
         self.LambdaListDD =  self.createSubSel(OutputList = "LambdaDDFor" + self.name,
                                                InputList = self.LambdaListLooseDD ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_DD)s ) " %self.config
                                                )
-        
+
         self.Lambda0LL = Selection(
             'Lambda0LLFor{0}'.format(name),
             Algorithm=FilterDesktop(
@@ -373,7 +373,7 @@ class StrippingHc2V2HConf(LineBuilder):
             Algorithm=_XimDDD,
             RequiredSelections=inputSelDDD
         )
-        
+
         return {'LLL':selXimLLL,'DDL':selXimDDL,'DDD':selXimDDD}
 
     def makeLambdac2VHH(self, name, inputSelLLL, inputSelDDL, inputSelDDD, decDescriptors):
@@ -467,7 +467,7 @@ class StrippingHc2V2HConf(LineBuilder):
             Algorithm=_Lambdac_DDD,
             RequiredSelections=inputSelDDD
         )
-        
+
         return {'LLL': selLLL, 'DDD': selDDD, 'DDL': selDDL}
 
     def makeXic2VHH(self, name, inputSelLLL, inputSelDDL, inputSelDDD, decDescriptors):
@@ -495,7 +495,7 @@ class StrippingHc2V2HConf(LineBuilder):
             "& (ADOCA(1,2) < {0[Comb_ADOCAMAX_MAX]})"
             "& (ADOCA(1,3) < {0[Comb_ADOCAMAX_MAX]})"
         ).format(self.config)
-        
+
         xicCuts_LLL = (
             "(VFASPF(VCHI2/VDOF) < {0[Hc_VCHI2VDOF_MAX_LLL]})"
             "& ({0[Hc_PVDispCut_LLL]})"
@@ -561,7 +561,7 @@ class StrippingHc2V2HConf(LineBuilder):
             Algorithm=_Xic_DDD,
             RequiredSelections=inputSelDDD
         )
-        
+
         return {'LLL': selLLL, 'DDD': selDDD, 'DDL': selDDL}
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
@@ -569,4 +569,4 @@ class StrippingHc2V2HConf(LineBuilder):
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
-                          RequiredSelections = [ InputList ] ) 
+                          RequiredSelections = [ InputList ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py
index 859d5c458100b4a16f7610f5566ca337c5988280..e48597d1cca14f464c2abd1388aa0d601db110ee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py
@@ -11,7 +11,7 @@
 """
 Stripping lines for selection of general decay topologies
     [Lambda_c+ -> (V0 -> h+ h-) h+ h+ h-]CC
-In this file the stripping line for this decay is build 
+In this file the stripping line for this decay is build
     [Lambda_c+ -> (Lambda0 -> p+ pi-) pi+ pi+ pi-]CC
     [Lambda_c+ -> (Lambda0 -> p+ pi-) K+ pi+ pi-]CC
 Throughout this file, 'Bachelor' refers to the children of the Lambda_c+ which is
@@ -109,22 +109,22 @@ class StrippingHc2V3HConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         # Decay descriptors
         self.Xic2XimPiPiPi     = ['[Xi_c0 -> Xi- pi+ pi- pi+]cc' ]
         self.Xi2Lambdapi = ['[Xi- -> Lambda0 pi-]cc']
-        
+
         # Line names
         # 'LLL', 'DDL', and 'DDD' will be appended to these names for
         # the corresponding selection and strippingLine instances
         self.Xic2XimPiPiPi_name     = '{0}_Xic2XimPiPiPi'    .format(name)
-        
+
         # Build bachelor pion and kaon cut strings
         # Cuts MIPCHI2DV(PRIMARY)>4 & PT>250*MeV already present in the InputsParticles
         childCuts = (
             '(P > {0[Bach_P_MIN]})'
         ).format(self.config)
-        
+
         kineticCuts = '{0}'.format(childCuts)
 
         # Build Lambda0 cut strings
@@ -177,20 +177,20 @@ class StrippingHc2V3HConf(LineBuilder):
         # Filter Input Lambdas
         self.LambdaListLooseDD = MergedSelection("StdLooseDDLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")])
-        
+
         self.LambdaListLooseLL = MergedSelection("StdLooseLLLambdaFor" + self.name,
                                                  RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")])
-        
+
         self.LambdaListLL =  self.createSubSel(OutputList = "LambdaLLFor" + self.name,
                                                InputList = self.LambdaListLooseLL ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_LL)s ) " %self.config
                                                )
-        
+
         self.LambdaListDD =  self.createSubSel(OutputList = "LambdaDDFor" + self.name,
                                                InputList = self.LambdaListLooseDD ,
                                                Cuts = "(MAXTREE('p+'==ABSID,PROBNNp) > %(ProbNNpMin_DD)s ) " %self.config
                                                )
-        
+
         self.Lambda0LL = Selection(
             'Lambda0LLFor{0}'.format(name),
             Algorithm=FilterDesktop(
@@ -332,7 +332,7 @@ class StrippingHc2V3HConf(LineBuilder):
             Algorithm=_XimDDD,
             RequiredSelections=inputSelDDD
         )
-        
+
         return {'LLL':selXimLLL,'DDL':selXimDDL,'DDD':selXimDDD}
 
     def makeXic2V3H(self, name, inputSelLLL, inputSelDDL, inputSelDDD, decDescriptors):
@@ -361,7 +361,7 @@ class StrippingHc2V3HConf(LineBuilder):
             "& (ADOCA(1,3) < {0[Comb_ADOCAMAX_MAX]})"
             "& (ADOCA(1,4) < {0[Comb_ADOCAMAX_MAX]})"
             ).format(self.config)
-        
+
         xicCuts_LLL = (
             "(VFASPF(VCHI2/VDOF) < {0[Xic_VCHI2VDOF_MAX_LLL]})"
             "& ({0[Xic_PVDispCut_LLL]})"
@@ -446,4 +446,4 @@ class StrippingHc2V3HConf(LineBuilder):
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
-                          RequiredSelections = [ InputList ] ) 
+                          RequiredSelections = [ InputList ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py
index bd3d4fabfcaed8f2278240eb4d6b5cd8915626ae..644cf13ae4103639facc8528a5c8454b95d179dd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py
@@ -41,21 +41,21 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
 class KKPiPiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         """
@@ -63,36 +63,36 @@ class KKPiPiConf(LineBuilder):
         """
 
         self.SelDetachedKaons = self.createSubSel( OutputList = self.name + "SelDetachedKaons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsKaons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsKaons/Particles' ),
                                            Cuts = config['DetachedKaonCuts']
                                            )
         self.SelDetachedPions = self.createSubSel( OutputList = self.name + "DetachedSelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllNoPIDsPions/Particles' ),
                                            Cuts = config['DetachedPionCuts']
                                            )
         self.SelDetached2KKPiPi = self.createN4BodySel( OutputList = self.name + "SelDetached2KKPiPi",
                                                      DaughterLists = [ self.SelDetachedKaons, self.SelDetachedPions ],
                                                      DecayDescriptor = "h_c(1P) -> K+ K+ pi- pi-",
                                                      ComAMCuts      = config['DetachedComAMCuts'],
-                                                     PreVertexCuts  = config['DetachedComN4Cuts'], 
+                                                     PreVertexCuts  = config['DetachedComN4Cuts'],
                                                      PostVertexCuts = config['DetachedMomN4Cuts']
                                                      )
-        self.Detached2KKPiPiLine = StrippingLine( self.name + 'DetachedLine',                                                
-                                               prescale  = config['Prescale'],                                               
+        self.Detached2KKPiPiLine = StrippingLine( self.name + 'DetachedLine',
+                                               prescale  = config['Prescale'],
                                                algos     = [ self.SelDetached2KKPiPi ],
                                                MDSTFlag  = False
                                                )
         self.registerLine( self.Detached2KKPiPiLine )
 
 
-        
+
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
         filter = FilterDesktop(Code = Cuts)
         return Selection( OutputList,
                           Algorithm = filter,
                           RequiredSelections = [ InputList ] )
-    
+
     def createN4BodySel( self, OutputList,
                          DecayDescriptor,
                          DaughterLists,
@@ -101,7 +101,7 @@ class KKPiPiConf(LineBuilder):
                          PreVertexCuts  = "AALL",
                          PostVertexCuts = "ALL" ) :
         '''create a selection using a ParticleCombiner with a single decay descriptor'''
-        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,      
+        combiner = DaVinci__N4BodyDecays ( DecayDescriptor = DecayDescriptor,
                                            DaughtersCuts = DaughterCuts,
                                            Combination12Cut  = ComAMCuts + "&" + "( ACHI2DOCA(1,2)<15 )",
                                            Combination123Cut = ComAMCuts + "&" + "( ACHI2DOCA(1,3)<15 ) & ( ACHI2DOCA(2,3)<15 )",
@@ -111,4 +111,3 @@ class KKPiPiConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py
index 60c2d808fe245c115338e61247d0f044f6b94eea..ce21478f6117608719cd4e63e3699d2f0b2407a9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py
@@ -11,7 +11,7 @@
 """
 Stripping lines for selection of general decay topologies
     [Lambda_c+ -> (V0 -> h+ h-) h+ h+ h-]CC
-In this file the stripping line for this decay is build 
+In this file the stripping line for this decay is build
     [Lambda_c+ -> (Lambda0 -> p+ pi-) pi+ pi+ pi-]CC
     [Lambda_c+ -> (Lambda0 -> p+ pi-) K+ pi+ pi-]CC
 Throughout this file, 'Bachelor' refers to the children of the Lambda_c+ which is
@@ -93,23 +93,23 @@ class StrippingLambdac2V03HConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         # Decay descriptors
         self.Lambdac2Lambda3Pi = ['[Lambda_c+ -> Lambda0 pi+ pi+ pi-]cc']
         self.Lambdac2LambdaK2Pi = ['[Lambda_c+ -> Lambda0 K+ pi+ pi-]cc']
-        
+
         # Line names
         # 'LL' and 'DD' will be appended to these names for the LL and DD
         # Selection and StrippingLine instances
         self.Lambdac2Lambda3Pi_name = '{0}_Lambdac2Lambda3Pi'.format(name)
         self.Lambdac2LambdaK2Pi_name = '{0}_Lambdac2LambdaK2Pi'.format(name)
-        
+
         # Build bachelor pion and kaon cut strings
         # Cuts MIPCHI2DV(PRIMARY)>4 & PT>250*MeV already present in the InputsParticles
         childCuts = (
             '(P > {0[Bach_P_MIN]})'
         ).format(self.config)
-        
+
         kineticCuts = '{0}'.format(childCuts)
 
         # Build Lambda0 cut strings
@@ -122,7 +122,7 @@ class StrippingLambdac2V03HConf(LineBuilder):
         # Define any additional cuts on LL/DD difference
         lambda0LLCuts = lambda0Cuts
         lambda0DDCuts = lambda0Cuts
-        
+
         # Filter Input particles
         self.Pions = Selection(
             'PionsFor{0}'.format(name),
@@ -139,7 +139,7 @@ class StrippingLambdac2V03HConf(LineBuilder):
             ),
             RequiredSelections=[InputKaons]
         )
-        
+
         # Filter Input Lambdas
         self.Lambda0LL = Selection(
             'Lambda0LLFor{0}'.format(name),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V2H.py
index ff6c214e0262230d32cc44653a563563badd4cea..1f6bc206b08a9e548eb3ffa69c91ceeadc1953c0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V2H.py
@@ -98,7 +98,7 @@ class StrippingLambdac2V2HConf(LineBuilder):
         self.name = name
         self.config = config
         LineBuilder.__init__(self, name, config)
-        
+
         # Decay descriptors
         self.Lambdac2XiKpi = ['[Lambda_c+ -> Xi- K+ pi+]cc']
         self.Xi2Lambdapi = ['[Xi- -> Lambda0 pi-]cc']
@@ -111,7 +111,7 @@ class StrippingLambdac2V2HConf(LineBuilder):
         childCuts = (
             '(P > {0[Bach_P_MIN]})'
         ).format(self.config)
-        
+
         kineticCuts = '{0}'.format(childCuts)
 
         # Build Lambda0 cut strings
@@ -133,7 +133,7 @@ class StrippingLambdac2V2HConf(LineBuilder):
         ximLLLCuts = ximCuts
         ximDDDCuts = ximCuts
         ximDDLCuts = ximCuts
-        
+
         # Filter Input particles
         self.Pions = Selection(
             'PionsFor{0}'.format(name),
@@ -301,7 +301,7 @@ class StrippingLambdac2V2HConf(LineBuilder):
             RequiredSelections=inputSelDDL
         )
 
-        
+
         return {'LLL':selXimLLL,'DDD':selXimDDD,'DDL':selXimDDL}
 
     def makeLambdac2VHH(self, name, inputSelLLL, inputSelDDD, inputSelDDL, decDescriptors):
@@ -365,5 +365,5 @@ class StrippingLambdac2V2HConf(LineBuilder):
             Algorithm=_Lambdac,
             RequiredSelections=inputSelDDL
         )
-        
+
         return {'LLL': selLLL, 'DDD': selDDD, 'DDL': selDDL}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0DDpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0DDpi.py
index af2c227438ccfb23446b3fe564722f954911524c..2ec3bf4ed890e7ef816c18434e18a25c37cd7407 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0DDpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0DDpi.py
@@ -34,7 +34,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 default_config = {
-    'NAME': 'Lambdac2L0DDpi', 
+    'NAME': 'Lambdac2L0DDpi',
     'WGs': ['Charm'],
     'BUILDERTYPE': 'StrippingLambdac2L0DDpiConf',
     'STREAMS': ['Charm'],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py
index 99e34f63acf421689b4d6df273232fd7be7cf6da..0112a1f40a3af76d428055b6b1f561a09e9c41c0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py
@@ -28,12 +28,12 @@ default_config = {
     'CONFIG'    : {
         'ProtonCuts'      : "(P > 2000*MeV) & (MIPCHI2DV(PRIMARY) > 9.) ",
         'PiminusCuts'      : "(PT > 50*MeV) & (P > 2000*MeV) & (MIPCHI2DV(PRIMARY) > 9.) ",
-        'PionCuts'      : "(PT > 400*MeV) & (MIPCHI2DV(PRIMARY) > 4.) & (BPVIPCHI2() > 4.0) & (in_range(2000.0*MeV, P, 100000.0)) & (in_range(2.0, ETA, 5.0)) & ((PIDK - PIDpi) < 3.0) ", 
+        'PionCuts'      : "(PT > 400*MeV) & (MIPCHI2DV(PRIMARY) > 4.) & (BPVIPCHI2() > 4.0) & (in_range(2000.0*MeV, P, 100000.0)) & (in_range(2.0, ETA, 5.0)) & ((PIDK - PIDpi) < 3.0) ",
         #'PionCuts'      : "(PT > 100*MeV) & (P > 1000*MeV) & (MIPCHI2DV(PRIMARY) > 9.) ",
         #'Lambda0ComAMCuts' : "(P > 2000.0*MeV) & (PT > 500.0*MeV) & (BPVVDCHI2 > 100) & (VFASPF(VCHI2/VDOF) < 10.0)",
         'Lambda0MomN4Cuts' : """
-                           (VFASPF(VCHI2) < 30.) 
-                           & (ADMASS('Lambda0')<35*MeV) 
+                           (VFASPF(VCHI2) < 30.)
+                           & (ADMASS('Lambda0')<35*MeV)
                            & (P > 2000.0*MeV)
                            & (PT > 500.0*MeV)
                            & (BPVVDCHI2 > 100)
@@ -42,8 +42,8 @@ default_config = {
         'Lambda0ComCuts'   : "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(30, ''))",
         'LcComCuts'     : "(ADAMASS('Lambda_c+') < 90.0*MeV) & (ACUTDOCA(0.5, ''))",
         'LcMomCuts'     : """
-                          (VFASPF(VCHI2/VDOF) < 10.) 
-                          & (BPVDIRA> 0.999) 
+                          (VFASPF(VCHI2/VDOF) < 10.)
+                          & (BPVDIRA> 0.999)
                           & (BPVVDCHI2>16.)
                           """,
         'Prescale'      : 1.,
@@ -56,19 +56,19 @@ default_config = {
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 1.0,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_1.0'
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 1.5,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_1.5'
                   }, {
                       'Type'              : 'RelInfoConeVariables',
                       'ConeAngle'         : 2.0,
-                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                      "Variables" : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                       'Location'          : 'RelInfoConeVariables_2.0'
-                  }]        
+                  }]
         },
     'STREAMS'           : ['Charm' ],
     'WGs'               : ['Charm'],
@@ -76,7 +76,7 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
@@ -89,45 +89,45 @@ from StandardParticles import ( StdAllLoosePions, StdLooseProtons,
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
 
 class Lc2L0LLpiConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         self.SelPiminus = self.createSubSel( OutputList = self.name + "SelPiminus",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles' ),
                                            Cuts = config['PiminusCuts']
                                            )
 
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles' ),
                                            Cuts = config['PionCuts']
                                            )
 
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseProtons/Particles' ), 
+                                           InputList =  DataOnDemand(Location = 'Phys/StdLooseProtons/Particles' ),
                                            Cuts = config['ProtonCuts']
                                            )
 
-        
+
         #"""
         #Lambda0
         #"""
-        ## Both LL and DD 
+        ## Both LL and DD
         #self.InputLambda0 = MergedSelection( self.name + "InputLambda0",
         #                                RequiredSelections = [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles"),
         #                                                      DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")] )
 
         #self.SelLambda0 = self.createSubSel( OutputList = self.name + "SelLambda0",
         #                                InputList = self.InputLambda0,
-        #                                Cuts = config['Lambda0Cuts'] ) 
+        #                                Cuts = config['Lambda0Cuts'] )
 
-        #                                             
+        #
 
         """
         Lambda0-> p Pi
@@ -135,30 +135,30 @@ class Lc2L0LLpiConf(LineBuilder):
         self.SelLambda02pPi = self.createCombinationSel( OutputList = self.name + "SelLambda02pPi",
                                                         DaughterLists = [ self.SelPiminus, self.SelProtons],
                                                         DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
-                                                        PreVertexCuts  = config['Lambda0ComCuts'], 
+                                                        PreVertexCuts  = config['Lambda0ComCuts'],
                                                         PostVertexCuts = config['Lambda0MomN4Cuts']
                                                         )
         """
-        Lc-> Lambda0 Pi 
+        Lc-> Lambda0 Pi
         """
         self.SelLc2Lambda0Pi_pPiPi = self.createCombinationSel( OutputList = self.name + "SelLc2Lambda0Pi_pPiPi",
                                                               DecayDescriptor = "[Lambda_c+ -> Lambda0 pi+]cc",
-                                                              DaughterLists = [ self.SelLambda02pPi, self.SelPions],                    
+                                                              DaughterLists = [ self.SelLambda02pPi, self.SelPions],
                                                               PreVertexCuts  = config['LcComCuts'],
                                                               PostVertexCuts = config['LcMomCuts'] )
 
-        self.SelLc2Lambda0Pi_pPiPiLine = StrippingLine( self.name + '_pPiPiLine',                                                
+        self.SelLc2Lambda0Pi_pPiPiLine = StrippingLine( self.name + '_pPiPiLine',
                                                    prescale  = config['Prescale'],
                                                  #  HLT       = config['HLTCuts'],
                                                    algos     = [ self.SelLc2Lambda0Pi_pPiPi ],
                                                    EnableFlavourTagging = False,
                                                    MDSTFlag = False,
-                                                   RelatedInfoTools = self.config['RelatedInfoTools']                                                   
+                                                   RelatedInfoTools = self.config['RelatedInfoTools']
                                                    )
 
         self.registerLine( self.SelLc2Lambda0Pi_pPiPiLine )
-        
-        
+
+
 
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
@@ -184,7 +184,3 @@ class Lc2L0LLpiConf(LineBuilder):
         return Selection ( OutputList,
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
-
-
-    
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py
index 3e6d44f09ed1d6190b2341f8f87aef3b433c7ab4..2f45a950b4a49baf34d08bc6c87cd5ef57b3a5a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py
@@ -64,7 +64,7 @@ default_config={
                    , 'LambdaDeltaZ_MIN'       :  5.0 * mm
                    , 'LambdaPr_PT_MIN'        : 500. * MeV
                    , 'LambdaPi_PT_MIN'        : 100. * MeV
-      } ## end of 'CONFIG' 
+      } ## end of 'CONFIG'
 }  ## end of default_config
 #-------------------------------------------------------------------------------------------------------------
 class StrippingNeutralCBaryonsConf(LineBuilder) :
@@ -74,22 +74,22 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
            LineBuilder.__init__(self, name, config)
            self.name = name
            self.config = config
-       
+
            self.LongPionsList = MergedSelection("LongPionsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")]) # take all long tracks
- 
-           
+
+
            self.DownstreamPionsList = MergedSelection("DownstreamPionsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")]) # take all long tracks
- 
+
            self.LongKaonsList = MergedSelection("LongKaonsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdAllLooseKaons/Particles")]) # take all long tracks
- 
-           
+
+
            self.DownstreamKaonsList = MergedSelection("DownstreamKaonsFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseDownKaons/Particles")]) # take all long tracks
- 
-           
+
+
 
            self.GoodLongPionsList = self.createSubSel( OutputList = "GoodLongPionsFor" + self.name,
                                                InputList = self.LongPionsList,
@@ -116,7 +116,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                Cuts = "(TRCHI2DOF < %(TRCHI2DOFMax)s )"\
                                                " & (PROBNNk > %(ProbNNkMin)s )" \
                                                " & (PIDK > %(KaonPIDK)s )" % self.config )
-           
+
            self.LambdaListLooseDD = MergedSelection("StdLooseDDLambdaFor" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")])
 
@@ -136,7 +136,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                 "& (VFASPF(VZ) < %(LambdaLLMaxVZ)s ) " \
                                                 "& (BPVLTIME() > %(LambdaLLMinDecayTime)s )" % self.config \
                                                 )
-           
+
            self.LambdaListDD =  self.createSubSel(OutputList = "LambdaDDFor" + self.name,
                                                 InputList = self.LambdaListLooseDD ,
                                                 Cuts = "(MAXTREE('p+'==ABSID, PT) > %(LambdaPr_PT_MIN)s ) "\
@@ -151,7 +151,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
            self.LambdaList = MergedSelection("LambdaFor" + self.name,
                                              RequiredSelections = [self.LambdaListLL, self.LambdaListDD]
                                              )
-           
+
            self.KS0ListLooseDD = MergedSelection("StdLooseDDKS0For" + self.name,
                                                   RequiredSelections =  [DataOnDemand(Location = "Phys/StdLooseKsDD/Particles")])
 
@@ -166,7 +166,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                 "& (ADMASS('KS0') < 40.0 *MeV) " \
                                                 "& (BPVVDCHI2> 100)" % self.config \
                                                 )
-           
+
            self.KS0ListDD =  self.createSubSel(OutputList = "KS0DDFor" + self.name,
                                                 InputList = self.KS0ListLooseDD ,
                                                 Cuts = "(BPVVDZ > -1000.0 * mm) " \
@@ -178,16 +178,16 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
 
            self.KS0List = MergedSelection("KS0For" + self.name,
                                              RequiredSelections = [self.KS0ListLL, self.KS0ListDD])
-           
+
            self.Xic0List = self.makeXic0()
            self.Omegac0List = self.makeOmegac0()
-           
+
        def createSubSel( self, OutputList, InputList, Cuts ) :
            '''create a selection using a FilterDesktop'''
            filter = FilterDesktop(Code = Cuts)
            return Selection( OutputList,
                              Algorithm = filter,
-                             RequiredSelections = [ InputList ] ) 
+                             RequiredSelections = [ InputList ] )
        def createCombinationSel( self, OutputList,
                                  DecayDescriptor,
                                  DaughterLists,
@@ -203,7 +203,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
            return Selection ( OutputList,
                               Algorithm = combiner,
                               RequiredSelections = DaughterLists)
-       
+
 
 
 #------------------------------------------------------------------------------------------
@@ -218,7 +218,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            )
               Xic02LambdaKS0Line = StrippingLine( self.name + "Xic02LambdaKS0Line", algos = [ Xic02LambdaKS0 ], EnableFlavourTagging = True )
               self.registerLine (Xic02LambdaKS0Line)
-              
+
               ''' Stripping Xi_c0->Lambda0 K- pi+'''
               Xic02LambdaKpi = self.createCombinationSel(OutputList = "Xic02LambdaKpi"+ self.name,
                                                            DecayDescriptor = "[Xi_c0 -> Lambda0 K- pi+ ]cc",
@@ -230,7 +230,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            )
               Xic02LambdaKpiLine = StrippingLine( self.name + "Xic02LambdaKpiLine", algos = [ Xic02LambdaKpi ], EnableFlavourTagging = True )
               self.registerLine (Xic02LambdaKpiLine)
-              
+
               ''' Make a Xi minus candidate  from a LambdaDD and along pion'''
               Ximinus2LambdaPiDDL = self.createCombinationSel(OutputList = "Ximinus2LambdaPiDDL"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -238,8 +238,8 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            DaughterCuts    = {"pi-"      : "(MIPCHI2DV(PRIMARY)>4) "},
                                                            PreVertexCuts   = "(ADAMASS('Xi-') < 80*MeV) & (ADOCACHI2CUT(30, ''))",
                                                            PostVertexCuts  = "(ADMASS('Xi-')<64*MeV) & (VFASPF(VCHI2)<25) & (P> 2000*MeV) &(PT > 250*MeV) & (BPVVDCHI2 > 49.0 ) & (VFASPF(VCHI2/VDOF) < 12.0)"
-                                                           ) 
-            
+                                                           )
+
               ''' Make a Xi minus candidate from long tracks '''
               Ximinus2LambdaPiLLL = self.createCombinationSel(OutputList = "Ximinus2LambdaPiLLL"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -248,7 +248,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            PreVertexCuts   = "(ADAMASS('Xi-') < 50*MeV) & (ADOCACHI2CUT(30, ''))",
                                                            PostVertexCuts  = "(ADMASS('Xi-')<35*MeV) & (VFASPF(VCHI2)<25) & (P> 2000*MeV) &(PT > 250*MeV) & (BPVVDCHI2 > 49.0 ) & (VFASPF(VCHI2/VDOF) < 12.0)"
                                                            )
-              
+
               ''' Make a Xi minus candidate  from downstream tracks'''
               Ximinus2LambdaPiDDD = self.createCombinationSel(OutputList = "Ximinus2LambdaPiDDD"+ self.name,
                                                            DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
@@ -266,12 +266,12 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
 ## This one will pass all candidates
               NullFilter= FilterDesktop(Code = "ALL")
 
-## Ximinus2Lambda2PiSelection is *also* a Selection, but it is "more selective" 
+## Ximinus2Lambda2PiSelection is *also* a Selection, but it is "more selective"
 ## than  Ximinus2LambdaPi in the sense that it passes only events when something
 ## is in the output list
               Ximinus2LambdaPiSelection = Selection( "Ximinus2LambdaPiSelection"+self.name,
                                                     Algorithm = NullFilter,
-                                                    RequiredSelections = [Ximinus2LambdaPi]) 
+                                                    RequiredSelections = [Ximinus2LambdaPi])
 
               ''' Stripping Xi_c0->Xi- pi+'''
               Xic02Xipi = self.createCombinationSel(OutputList = "Xic02Xipi"+ self.name,
@@ -280,11 +280,11 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            DaughterCuts    = {"pi+"      : "(PT> %(Bachelor_PT_MIN)s ) "% self.config},
                                                            PreVertexCuts   = "(ADAMASS('Xi_c0') < 120 *MeV)",
                                                            PostVertexCuts  = "(ADMASS('Xi_c0') < 90 *MeV) &(VFASPF(VCHI2/VDOF)< 12.) & (BPVVDCHI2 > 16.0) & (BPVDIRA >0.999) "
-                                                           ) 
-            
+                                                           )
+
               Xic02XipiLine = StrippingLine( self.name + "Xic02XipiLine", algos = [ Xic02Xipi ], EnableFlavourTagging = True )
               self.registerLine (Xic02XipiLine)
-              
+
               ''' Stripping Xi_c0->Xi- K+'''
               Xic02XiK = self.createCombinationSel(OutputList = "Xic02XiK"+ self.name,
                                                            DecayDescriptor = "[Xi_c0 -> Xi- K+]cc",
@@ -292,8 +292,8 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            DaughterCuts    = {"K+"      : "(PT> %(Bachelor_PT_MIN)s ) "% self.config},
                                                            PreVertexCuts   = "(ADAMASS('Xi_c0') < 120 *MeV)",
                                                            PostVertexCuts  = "(ADMASS('Xi_c0') < 90 *MeV) &(VFASPF(VCHI2/VDOF)< 12.) & (BPVVDCHI2 > 16.0) & (BPVDIRA >0.999) "
-                                                           ) 
-            
+                                                           )
+
               Xic02XiKLine = StrippingLine( self.name + "Xic02XiKLine", algos = [ Xic02XiK ], EnableFlavourTagging = True )
               self.registerLine (Xic02XiKLine)
 
@@ -301,7 +301,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
 #------------------------------------------------------------------------------------------
 
        def makeOmegac0( self ):
-            
+
               ''' Make an Omega minus candidate '''
               Omegaminus2LambdaKLLL = self.createCombinationSel(OutputList = "Omegaminus2LambdaKLLL"+ self.name,
                                                            DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -310,8 +310,8 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            PreVertexCuts   = "(ADAMASS('Omega-') < 50*MeV) & (ADOCACHI2CUT(30, ''))",
                                                            PostVertexCuts  = "(ADMASS('Omega-')<35*MeV) & (VFASPF(VCHI2)<25) & (P> 2000*MeV) &(PT > 250*MeV) & (BPVVDCHI2 > 49.0 ) & (VFASPF(VCHI2/VDOF) < 12.0)"
                                                            )
-             
-            
+
+
               ''' Make an Omega minus candidate '''
               Omegaminus2LambdaKDDL = self.createCombinationSel(OutputList = "Omegaminus2LambdaKDDL"+ self.name,
                                                            DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -320,7 +320,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            PreVertexCuts   = "(ADAMASS('Omega-') < 80*MeV) & (ADOCACHI2CUT(30, ''))",
                                                            PostVertexCuts  = "(ADMASS('Omega-')<64*MeV) & (VFASPF(VCHI2)<25) & (P> 2000*MeV) &(PT > 250*MeV) & (BPVVDCHI2 > 49.0 ) & (VFASPF(VCHI2/VDOF) < 12.0)"
                                                            )
-             
+
               ''' Make an Omega minus candidate '''
               Omegaminus2LambdaKDDD = self.createCombinationSel(OutputList = "Omegaminus2LambdaKDDD"+ self.name,
                                                            DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
@@ -341,7 +341,7 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
 ## This one will pass all candidates
               NullFilter= FilterDesktop(Code = "ALL")
 
-## Omegaminus2Lambda2PiSelection is *also* a Selection, but it is "more selective" 
+## Omegaminus2Lambda2PiSelection is *also* a Selection, but it is "more selective"
 ## than  Omegaminus2LambdaK in the sense that it passes only events when something
 ## is in the output list
               Omegaminus2LambdaKSelection = Selection( "Omegaminus2LambdaKSelection"+self.name,
@@ -355,10 +355,9 @@ class StrippingNeutralCBaryonsConf(LineBuilder) :
                                                            DaughterCuts    = {"pi+"      : "(PT> %(Bachelor_PT_MIN)s ) "% self.config},
                                                            PreVertexCuts   = "(ADAMASS('Omega_c0') < 120 *MeV)",
                                                            PostVertexCuts  = "(VFASPF(VCHI2/VDOF)< 12.) & (BPVVDCHI2 > 16.0) & (BPVDIRA >0.999) & (ADMASS('Omega_c0') < 90 *MeV)"
-                                                           ) 
-            
+                                                           )
+
               Omegac02OmegapiLine = StrippingLine( self.name + "Omegac02OmegapiLine", algos = [ Omegac02Omegapi ], EnableFlavourTagging = True )
               self.registerLine (Omegac02OmegapiLine)
 
 ##  --------------------  end of makeOmegaminus  ------------
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingPromptCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingPromptCharm.py
index 4d44108d67644f61811bbc41e42327da911e5626..859a9ed120fe17a76ebfdcfd2ef02b4254b406bd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingPromptCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingPromptCharm.py
@@ -18,27 +18,27 @@
 #    - D+        -> K pi pi
 #    - Ds+/D+    -> ( phi -> K K ) pi
 #    - D*+       -> ( D0 -> K pi ) pi+
-#    
-#    - D0        -> KK, pipi                 ## for Eva 
-#    - D*+       ->  ( D0 -> KK , pipi) pi+  ## for Eva 
-#    
-#    - Lambda_c+/Xi_c -> p K pi              ## for Lesha Dziuba  
-#    - Lambda_c+/Xi_c -> p K K               ## for Lesha Dziuba 
-#    - Xic0           -> Lc+ pi-             ## for Lesha Dziuba 
+#
+#    - D0        -> KK, pipi                 ## for Eva
+#    - D*+       ->  ( D0 -> KK , pipi) pi+  ## for Eva
+#
+#    - Lambda_c+/Xi_c -> p K pi              ## for Lesha Dziuba
+#    - Lambda_c+/Xi_c -> p K K               ## for Lesha Dziuba
+#    - Xic0           -> Lc+ pi-             ## for Lesha Dziuba
 #    - Xi_c0          -> p K K pi            ## for Marco Pappagallo
-#    - Omega_c0       -> p K K pi            ## for Marco Pappagallo  
-# 
-#  Excited charm baryons 
+#    - Omega_c0       -> p K K pi            ## for Marco Pappagallo
+#
+#  Excited charm baryons
 #
 #    - Sigma_c(0,++) -> Lambda_c+ pi        ( 2455 & 2520 )
-#    - Xi_c0*        -> Xi_c+ pi                            
+#    - Xi_c0*        -> Xi_c+ pi
 #    - Lambda_c+*    -> Lambda_c+ pi+ pi-   ( 2595, 2625 & 2880 )
 #    - Xi'_c+        -> Xi_c+ gamma          ## for Marco Pappagallo
-#    - Xi_c+*        -> Xi_c0 pi+            ## for Marco Pappagallo  
-#    - Omega_c0*     -> Lambda_c+/Xic+ K-    ## for Marco Pappagallo 
+#    - Xi_c+*        -> Xi_c0 pi+            ## for Marco Pappagallo
+#    - Omega_c0*     -> Lambda_c+/Xic+ K-    ## for Marco Pappagallo
 #    - Omega_c0*     -> Xic0 pi+ K-          ## for Marco Pappagallo
 #    - Omega_c0*     -> Xic'+ K-             ## for Marco Pappagallo
-#    - Xi_c(2815)+   -> Lambda_c+ pi+ K-     ## for Marco Pappagallo 
+#    - Xi_c(2815)+   -> Lambda_c+ pi+ K-     ## for Marco Pappagallo
 #    - Omega_cc+     -> Xic+ pi+ K-          ## for Marco Pappagallo
 #    - Omega_cc+     -> Xic+ K+ K-           ## for Marco Pappagallo
 #
@@ -54,11 +54,11 @@
 #    - dimuons   & W+
 #    - chi_(c,b) & W+
 #
-#  Triple charm (added Apr 6, 2k+17) :  
+#  Triple charm (added Apr 6, 2k+17) :
 #    - Charm  + Charm  + Charm  ( including Charm  + Charm + anti-Charm )
 #    - DiMuon + Charm  + Charm  ( including DiMuon + Charm + anti-Charm )
 #    - DiMuon + DiMuon + DiMuon
-# 
+#
 #  The cuts more or less correspond to D*+ selection by Alexandr Kozlinzkiy.
 #  In addition the PT-cut for the long-lived charmed particle has been applied.
 #  Thanks to Marco Gersabeck & Harry Cliff for nice idea.
@@ -71,11 +71,11 @@
 #   stream = ...
 #
 #   from StrippingSelections.StirppingPromptCharm import StrippingPromptCharmConf
-#   from StrippingSelections.StirppingPromptCharm import default_config 
+#   from StrippingSelections.StirppingPromptCharm import default_config
 #
 #   conf = default_config['CONFIG']
 #   name = default_config['NAME'  ]
-#   
+#
 #   builder = StrippingPromptCharmConf ( name , config = conf )
 #
 #   stream.appendLines ( builder.lines() )
@@ -86,31 +86,31 @@
 #
 # =============================================================================
 """The attempt for coherent stripping of all stable charm hadrons :
-   
+
     - D0        -> K pi ,
     - D+        -> K pi pi
     - Ds+/D+    -> ( phi -> K K ) pi
     - D*+       -> ( D0 -> K pi ) pi+
-    
-    - D0        -> KK, pipi                 ## for Eva 
-    - D*+       ->  ( D0 -> KK , pipi) pi+  ## for Eva 
-    
-    - Lambda_c+/Xi_c -> p K pi              ## for Lesha Dziuba  
-    - Lambda_c+/Xi_c -> p K K               ## for Lesha Dziuba 
 
-    Excited charm baryons 
+    - D0        -> KK, pipi                 ## for Eva
+    - D*+       ->  ( D0 -> KK , pipi) pi+  ## for Eva
+
+    - Lambda_c+/Xi_c -> p K pi              ## for Lesha Dziuba
+    - Lambda_c+/Xi_c -> p K K               ## for Lesha Dziuba
+
+    Excited charm baryons
 
     - Sigma_c(0,++) -> Lambda_c+ pi        ( 2455 & 2520 )
     - Lambda_c+*    -> Lambda_c+ pi+ pi-   ( 2595, 2625 & 2880 )
-    
+
     Also one has the combinations for 2xCharm studies
-    
+
     - Charm +   Charm            ( both Charm/Charm and Charm/anti-Charm )
     - Charm +   Dimuon
     - Charm + ( Dimuon + gamma ) ( get for free chi_(c,b) )
 
     Associative production of  charm & W+ :
-    
+
     - Charm     & W+
     - dimuons   & W+
     - chi_(c,b) & W+
@@ -118,18 +118,18 @@
   Usage:
 
   stream = ...
-  
+
   from StrippingSelections.StirppingPromptCharm import StrippingPromptCharmConf
-  from StrippingSelections.StirppingPromptCharm import default_config 
-  
+  from StrippingSelections.StirppingPromptCharm import default_config
+
   conf = default_config['CONFIG']
   name = default_config['NAME'  ]
-  
+
   builder = StrippingPromptCharmConf ( name , config = conf )
-  
+
   stream.appendLines ( builder.lines() )
 
-  
+
 """
 # =============================================================================
 __author__  = 'Vanya BELYAEV Ivan.Belyaev@itep.ru'
@@ -138,7 +138,7 @@ __version__ = '$Revision: 177629 $'
 # =============================================================================
 __all__ = (
     'StrippingPromptCharmConf',
-    'default_config' 
+    'default_config'
     )
 # =============================================================================
 from Gaudi.Configuration import *
@@ -157,7 +157,7 @@ logger.setLevel(logging.INFO)
 _default_configuration_ = {
     #
     # use for simulation:
-    'NOPIDHADRONS'   : False   , 
+    'NOPIDHADRONS'   : False   ,
     #
     ## PT-cuts
     ## attention: with 1GeV pt-cut prescale is needed for D0,D+,D*+ and Ds
@@ -169,7 +169,7 @@ _default_configuration_ = {
     'pT(Xic0)'   :  1.0 * GeV ,    ## pt-cut for  prompt   Xic0/Omegac0
     'pT(Omgcc)'  :  1.0 * GeV ,    ## pt-cut for  prompt   Omegacc
     #
-    'pT(D0->HH)' :  1.0 * GeV ,    ## pt-cut for  prompt   D0->KK,pipi models 
+    'pT(D0->HH)' :  1.0 * GeV ,    ## pt-cut for  prompt   D0->KK,pipi models
     #
     # Selection of basic particles
     #
@@ -179,10 +179,10 @@ _default_configuration_ = {
     in_range ( 2  , ETA , 4.9 ) &
     HASRICH
     """ ,
-    # 
+    #
     'PionCut'   : """
-    ( PT          > 250 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 250 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
     in_range ( 2          , ETA , 4.9       ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
@@ -191,8 +191,8 @@ _default_configuration_ = {
     """ ,
     #
     'KaonCut'   : """
-    ( PT          > 250 * MeV ) & 
-    ( CLONEDIST   > 5000      ) & 
+    ( PT          > 250 * MeV ) &
+    ( CLONEDIST   > 5000      ) &
     ( TRGHOSTPROB < 0.5       ) &
     in_range ( 2          , ETA , 4.9       ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
@@ -201,13 +201,13 @@ _default_configuration_ = {
     """ ,
     #
     'ProtonCut'   : """
-    ( PT           > 250 * MeV ) & 
-    ( CLONEDIST    > 5000      ) & 
-    ( TRGHOSTPROB  < 0.5       ) & 
+    ( PT           > 250 * MeV ) &
+    ( CLONEDIST    > 5000      ) &
+    ( TRGHOSTPROB  < 0.5       ) &
     in_range ( 2         , ETA , 4.9       ) &
     in_range ( 10 * GeV  , P   , 150 * GeV ) &
     HASRICH                      &
-    ( MIPCHI2DV()  > 9         ) 
+    ( MIPCHI2DV()  > 9         )
     """ ,
     ##
     'MuonCut'   : """
@@ -215,18 +215,18 @@ _default_configuration_ = {
     in_range ( 2 , ETA , 4.9     ) &
     ( PT            >  550 * MeV ) &
     ( PIDmu - PIDpi >    0       ) &
-    ( CLONEDIST     > 5000       )     
+    ( CLONEDIST     > 5000       )
     """ ,
     ## cust for prompt kaon
     'PromptKaonCut'   : """
-    ( CLONEDIST   > 5000         ) & 
+    ( CLONEDIST   > 5000         ) &
     ( TRGHOSTPROB < 0.5          ) &
     in_range ( 2          , ETA , 4.9       ) &
     in_range ( 3.2 * GeV  , P   , 150 * GeV ) &
-    HASRICH                     
+    HASRICH
     """ ,
     #
-    ## PID-cuts for hadrons 
+    ## PID-cuts for hadrons
     #
     'PionPIDCut'   : " PROBNNpi > 0.1 " ,
     'KaonPIDCut'   : " PROBNNk  > 0.1 " ,
@@ -315,7 +315,7 @@ _default_configuration_ = {
     'Charm&WPrescale'              : 1.0 ,
     'DiMuon&WPrescale'             : 1.0 ,
     'Chi&WPrescale'                : 1.0 ,
-    ## triple charm & friends 
+    ## triple charm & friends
     'TripleDiMuPrescale'           : 1.0 ,
     'TriCharmPrescale'             : 1.0 ,
     'DiMuonAndDiCharmPrescale'     : 1.0 ,
@@ -323,18 +323,18 @@ _default_configuration_ = {
     ## ========================================================================
     }
 # =============================================================================
-## the mandatory element for stripping framework 
+## the mandatory element for stripping framework
 default_config = {
     #
     'NAME'        :   'PromptCharm'          ,
     'WGs'         : [ 'BandQ' ] ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'StrippingPromptCharmConf'    ,
     'STREAMS'     : {
     'Charm'    : [
-    'StrippingD02KpiForPromptCharm'                 , 
-    'StrippingDstarForPromptCharm'                  , 
-    'StrippingDForPromptCharm'                      , 
+    'StrippingD02KpiForPromptCharm'                 ,
+    'StrippingDstarForPromptCharm'                  ,
+    'StrippingDForPromptCharm'                      ,
     'StrippingDsForPromptCharm'                     ,
     'StrippingLambdaCForPromptCharm'                ,
     'StrippingLambdaCLooseChi2IPForPromptCharm'     ,
@@ -354,16 +354,16 @@ default_config = {
     'StrippingChiAndCharmForPromptCharm'            ,
     'StrippingCharmAndWForPromptCharm'              ,
     'StrippingDiMuonAndCharmForPromptCharm'         ,
-    'StrippingDiCharmForPromptCharm'                ,  
-    ## triple charm and friends 
+    'StrippingDiCharmForPromptCharm'                ,
+    ## triple charm and friends
     'StrippingTriCharmForPromptCharm'               , ## added 2017-04-06
     'StrippingDiMuonAndDiCharmForPromptCharm'       , ## added 2017-04-06
     'StrippingDoubleDiMuonAndCharmForPromptCharm'   , ## added 2017-04-06
     ## for Eva
-    'StrippingD02KKForPromptCharm'                  , 
+    'StrippingD02KKForPromptCharm'                  ,
     'StrippingD02pipiForPromptCharm'                ,
     'StrippingDstarCPForPromptCharm'
-    ] , 
+    ] ,
     ##
     'CharmCompleteEvent' : [
     'StrippingOmegaC0ForPromptCharm'
@@ -371,11 +371,11 @@ default_config = {
     'Leptonic'           : [
     'StrippingDiMuonAndWForPromptCharm'     ,
     'StrippingChiAndWForPromptCharm'        ,
-    'StrippingDoubleDiMuonForPromptCharm'   , 
+    'StrippingDoubleDiMuonForPromptCharm'   ,
     'StrippingTripleDiMuonForPromptCharm'   , ## added 2017-04-06
     ]
-    } ## STREAM 
-    } ## CONFIG 
+    } ## STREAM
+    } ## CONFIG
 
 ## ============================================================================
 ## @class  StrippingPromptCharmConf
@@ -457,12 +457,12 @@ class StrippingPromptCharmConf(LineBuilder) :
     ## pure technical method for creation of selections
     # =========================================================================
     def make_selection ( self      ,
-                         tag       , 
+                         tag       ,
                          algotype  ,
-                         inputs    , 
+                         inputs    ,
                          *args     ,
                          **kwargs  ) :
-        """Technical method for creation of 1-step selections 
+        """Technical method for creation of 1-step selections
         """
         sel_tag  = '%s_Selection' % tag
         sel_name = 'Sel%sFor%s'   % ( tag , self.name() )
@@ -470,8 +470,8 @@ class StrippingPromptCharmConf(LineBuilder) :
         ## check existing selection
         #
         sel      = self._selection ( sel_tag )
-        if sel : return sel 
-        
+        if sel : return sel
+
         #
         ## adjust a bit the arguments
         if not kwargs.has_key('Preambulo')           :
@@ -487,12 +487,12 @@ class StrippingPromptCharmConf(LineBuilder) :
         sel = SimpleSelection (
             sel_name ,
             algotype ,
-            inputs   , 
+            inputs   ,
             *args    ,
             **kwargs )
-        # 
-        return self._add_selection( sel_tag , sel ) 
-                           
+        #
+        return self._add_selection( sel_tag , sel )
+
     ## get the selections
     def _selections_private ( self ) :
 
@@ -712,7 +712,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             checkPV  = self['CheckPV'         ] ,
             algos    =     [ self.LamCstar () ]
             ) ,
-            ## Xic0 -> Lc pi 
+            ## Xic0 -> Lc pi
             StrippingLine (
             "Xic02LcPiFor" + self.name() ,
             prescale = self['Xic02LcPiPrescale'] , ## ATTENTION! Prescale here !!
@@ -724,16 +724,16 @@ class StrippingPromptCharmConf(LineBuilder) :
             "DiCharmFor" + self.name() ,
             prescale = self['DiCharmPrescale'] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'        ] ,
-            algos    =     [ self.DiCharm () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.DiCharm () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ## TriCharm
             StrippingLine (
             "TriCharmFor" + self.name() ,
             prescale = self['TriCharmPrescale'] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'         ] ,
-            algos    =     [ self.TriCharm () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.TriCharm () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ##
             ## DiMuon+DiCharm
@@ -741,8 +741,8 @@ class StrippingPromptCharmConf(LineBuilder) :
             "DiMuonAndDiCharmFor" + self.name()       ,
             prescale = self['DiMuonAndDiCharmPrescale'] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'                 ] ,
-            algos    =     [ self.DiMuonAndDiCharm () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.DiMuonAndDiCharm () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
@@ -750,47 +750,47 @@ class StrippingPromptCharmConf(LineBuilder) :
             prescale = self['DiMu&CharmPrescale'    ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'               ] ,
             algos    =     [ self.DiMuonAndCharm () ] ,
-            MDSTFlag = False                             ## keep event in MDST.DST 
+            MDSTFlag = False                             ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
             "DoubleDiMuonFor" + self.name()         ,
             prescale = self['DoubleDiMuonPrescale'] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'             ] ,
-            algos    =     [ self.DoubleDiMuon () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.DoubleDiMuon () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
             "TripleDiMuonFor" + self.name()         ,
             prescale = self['TripleDiMuPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'             ] ,
-            algos    =     [ self.TripleDiMuon () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.TripleDiMuon () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
             "DoubleDiMuonAndCharmFor" + self.name()         ,
             prescale = self['DoubleDiMuonAndCharmPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'             ] ,
-            algos    =     [ self.DoubleDiMuonAndCharm () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.DoubleDiMuonAndCharm () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
             "ChiAndCharmFor" + self.name() ,
             prescale = self['Chi&CharmPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'            ] ,
-            algos    =     [ self.ChiAndCharm () ] , 
-            MDSTFlag = False                          ## keep event in MDST.DST 
+            algos    =     [ self.ChiAndCharm () ] ,
+            MDSTFlag = False                          ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
             "CharmAndWFor" + self.name() ,
             prescale   = self['Charm&WPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV    = self['CheckPV'          ] ,
-            algos      =     [ self.CharmAndW () ] , 
-            MDSTFlag   = False                        ## keep event in MDST.DST 
+            algos      =     [ self.CharmAndW () ] ,
+            MDSTFlag   = False                        ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
@@ -798,27 +798,27 @@ class StrippingPromptCharmConf(LineBuilder) :
             prescale   = self['DiMuon&WPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV    = self['CheckPV'           ] ,
             algos      =     [ self.DiMuonAndW () ] ,
-            MDSTFlag   = False                         ## keep event in MDST.DST 
+            MDSTFlag   = False                         ## keep event in MDST.DST
             ) ,
             ##
             StrippingLine (
             "ChiAndWFor" + self.name() ,
             prescale   = self['Chi&WPrescale'  ] , ## ATTENTION! Prescale here !!
             checkPV    = self['CheckPV'        ] ,
-            algos      =     [ self.ChiAndW () ] , 
-            MDSTFlag   = False                       ## keep event in MDST.DST 
+            algos      =     [ self.ChiAndW () ] ,
+            MDSTFlag   = False                       ## keep event in MDST.DST
             ) ,
             #
             ## For Eva
             #
-            ## D0 -> K- K+ 
+            ## D0 -> K- K+
             StrippingLine (
             "D02KKFor" + self.name() ,
             prescale = self['D02KKPrescale'   ] ,  ## ATTENTION! Prescale here !!
             checkPV  = self['CheckPV'         ] ,
             algos    =     [ self.D02KK ()    ]
             ) ,
-            ## D0 -> pi- pi+ 
+            ## D0 -> pi- pi+
             StrippingLine (
             "D02pipiFor" + self.name() ,
             prescale = self['D02pipiPrescale' ] ,  ## ATTENTION! Prescale here !!
@@ -844,18 +844,18 @@ class StrippingPromptCharmConf(LineBuilder) :
         get Charm stripping lines
         """
         return self._lines_charm ()
-    
+
     def muonCuts     ( self ) : return self [ 'MuonCut' ]
-    
+
     # ========================================================================
     ## muons:
     # ========================================================================
     def muons    ( self ) :
         """
-        Muons 
+        Muons
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-        from StandardParticles                     import StdAllLooseMuons as inpts 
+        from StandardParticles                     import StdAllLooseMuons as inpts
         ##
         return self.make_selection (
             'Muon'                 ,
@@ -878,7 +878,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             pioncut = self['PionCut']
         else                    :
             from StandardParticles import StdLooseANNPions as inpts
-            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] ) 
+            pioncut = "(%s)&(%s)" % ( self['PionCut'] , self['PionPIDCut'] )
         ##
         return self.make_selection (
             'Pion'                 ,
@@ -886,13 +886,13 @@ class StrippingPromptCharmConf(LineBuilder) :
             [ inpts ]              ,
             Code = pioncut         ,
             )
-    
+
     # ========================================================================
-    ## kaons 
+    ## kaons
     # ========================================================================
     def kaons     ( self ) :
         """
-        Kaons for   B -> psi X lines 
+        Kaons for   B -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         #
@@ -900,8 +900,8 @@ class StrippingPromptCharmConf(LineBuilder) :
             from StandardParticles import   StdNoPIDsKaons as inpts
             kaoncut = self['KaonCut']
         else                    :
-            from StandardParticles import StdLooseANNKaons as inpts 
-            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] ) 
+            from StandardParticles import StdLooseANNKaons as inpts
+            kaoncut = "(%s)&(%s)" % ( self['KaonCut'] , self['KaonPIDCut'] )
         #
         return self.make_selection (
             'Kaon'                 ,
@@ -914,7 +914,7 @@ class StrippingPromptCharmConf(LineBuilder) :
     ## protons :
     # ========================================================================
     def protons    ( self ) :
-        """Protons for   b -> psi X lines 
+        """Protons for   b -> psi X lines
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         ##
@@ -922,8 +922,8 @@ class StrippingPromptCharmConf(LineBuilder) :
             from StandardParticles import   StdNoPIDsProtons as inpts
             protoncut = self['ProtonCut']
         else                    :
-            from StandardParticles import StdLooseANNProtons as inpts 
-            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] ) 
+            from StandardParticles import StdLooseANNProtons as inpts
+            protoncut = "(%s)&(%s)" % ( self['ProtonCut'] , self['ProtonPIDCut'] )
         ##
         return self.make_selection (
             'Proton'                 ,
@@ -931,7 +931,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             [ inpts ]                ,
             Code = protoncut         ,
             )
-    
+
     # =========================================================================
     ## Prompt slow pions for D*+, Sigma_c, Lambda_c**: essentially no cuts at all
     # =========================================================================
@@ -940,17 +940,17 @@ class StrippingPromptCharmConf(LineBuilder) :
         - essentially no cuts at all
         """
         ##
-        if self['NOPIDHADRONS'] : from StandardParticles import StdAllNoPIDsPions   as slow_pions 
-        else                    : from StandardParticles import StdAllLooseANNPions as slow_pions  
+        if self['NOPIDHADRONS'] : from StandardParticles import StdAllNoPIDsPions   as slow_pions
+        else                    : from StandardParticles import StdAllLooseANNPions as slow_pions
         ##
-        return slow_pions 
-    
+        return slow_pions
+
 
     # =========================================================================
     ## prompt kaons fro Omega_c*
     # =========================================================================
     def promptKaons ( self ) :
-        """Prompt kaons for e.g. Omega_c* 
+        """Prompt kaons for e.g. Omega_c*
         """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         #
@@ -958,8 +958,8 @@ class StrippingPromptCharmConf(LineBuilder) :
             from StandardParticles import   StdAllNoPIDsKaons as inpts
             kaoncut = self['PromptKaonCut']
         else                    :
-            from StandardParticles import StdAllLooseANNKaons as inpts 
-            kaoncut = "(%s)&(%s)" % ( self['PromptKaonCut'] , self['KaonPIDCut'] ) 
+            from StandardParticles import StdAllLooseANNKaons as inpts
+            kaoncut = "(%s)&(%s)" % ( self['PromptKaonCut'] , self['KaonPIDCut'] )
             #
         return self.make_selection (
             'PromptKaon'           ,
@@ -967,12 +967,12 @@ class StrippingPromptCharmConf(LineBuilder) :
             [ inpts ]              ,
             Code = kaoncut         ,
             )
-    
-        
+
+
     ## get the common preambulo:
     def preambulo ( self ) : return self['Preambulo']
-    
-    
+
+
     # =========================================================================
     # D0 -> Kpi
     # =============================================================================
@@ -980,9 +980,9 @@ class StrippingPromptCharmConf(LineBuilder) :
         """Get D0->K-pi+
         """
         #
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         #
-        ## D0 -> K- pi+ 
+        ## D0 -> K- pi+
         return self.make_selection (
             'D02Kpi'       ,
             ## the algorithm type
@@ -1003,9 +1003,9 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( PT     > %s             ) &
             ( ADMASS('D0') < 75 * MeV ) &
             ( ctau > 0.1 * mm )
-            """ %  self['pT(D0)'] 
-            )           
-    
+            """ %  self['pT(D0)']
+            )
+
     # =============================================================================
     # D0 -> KK
     # =============================================================================
@@ -1013,9 +1013,9 @@ class StrippingPromptCharmConf(LineBuilder) :
         """Get D0->K-K+
         """
         #
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         #
-        ## D0 -> K- K+ 
+        ## D0 -> K- K+
         return self.make_selection (
             'D02KK'           ,
             ## the algorithm type
@@ -1036,8 +1036,8 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( PT     > %s             ) &
             ( ADMASS('D0') < 75 * MeV ) &
             ( ctau > 0.1 * mm )
-            """ %  self['pT(D0->HH)'] 
-            )           
+            """ %  self['pT(D0->HH)']
+            )
 
     # =============================================================================
     # D0 -> pipi
@@ -1046,9 +1046,9 @@ class StrippingPromptCharmConf(LineBuilder) :
         """Get D0->pi-pi+
         """
         #
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         #
-        ## D0 -> pi- pi+ 
+        ## D0 -> pi- pi+
         return self.make_selection (
             'D02pipi'           ,
             ## the algorithm type
@@ -1069,9 +1069,9 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( PT     > %s             ) &
             ( ADMASS('D0') < 75 * MeV ) &
             ( ctau > 0.1 * mm )
-            """ %  self['pT(D0->HH)'] 
-            )           
-    
+            """ %  self['pT(D0->HH)']
+            )
+
     # =============================================================================
     # Merged selection of D0 -> KK and D0 -> pi pi
     # =============================================================================
@@ -1088,14 +1088,14 @@ class StrippingPromptCharmConf(LineBuilder) :
         sel      = self._selection ( sel_tag )
         if sel : return sel
         #
-        ## make merged selections 
+        ## make merged selections
         from PhysSelPython.Wrappers import MergedSelection
         sel = MergedSelection (
-            sel_name , RequiredSelections = [ self.D02KK() , self.D02pipi() ] 
+            sel_name , RequiredSelections = [ self.D02KK() , self.D02pipi() ]
             )
-        # 
-        return self._add_selection( sel_tag , sel ) 
-    
+        #
+        return self._add_selection( sel_tag , sel )
+
     # =============================================================================
     # D*+ -> (D0 -> Kpi) pi+ selection
     # =============================================================================
@@ -1109,7 +1109,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             CombineParticles          ,
             [ self.D02Kpi() , self.slowPions() ] ,
             #
-            ## algorithm properties 
+            ## algorithm properties
             #
             DecayDescriptor = " [D*(2010)+ -> D0 pi+]cc" ,
             ##
@@ -1121,9 +1121,9 @@ class StrippingPromptCharmConf(LineBuilder) :
             MotherCut      = """
             ( chi2vx < 64        ) &
             ( M - M1 < 155 * MeV )
-            """ 
+            """
             )
-    
+
     # =============================================================================
     # D*+ -> (D0 -> KK, pipi) pi+ selection
     # =============================================================================
@@ -1137,11 +1137,11 @@ class StrippingPromptCharmConf(LineBuilder) :
             CombineParticles         ,
             [ self.D02CP() , self.slowPions() ] ,
             #
-            ## algorithm properties 
+            ## algorithm properties
             #
             DecayDescriptors = [
-            " D*(2010)+ -> D0 pi+ " , 
-            " D*(2010)- -> D0 pi- " , 
+            " D*(2010)+ -> D0 pi+ " ,
+            " D*(2010)- -> D0 pi- " ,
             ] ,
             ##
             CombinationCut = """
@@ -1152,27 +1152,27 @@ class StrippingPromptCharmConf(LineBuilder) :
             MotherCut      = """
             ( chi2vx < 64        ) &
             ( M - M1 < 155 * MeV )
-            """ 
+            """
             )
-    
+
     # =============================================================================
     # Ds+/D+ -> KKpi   selection
     # =============================================================================
     def Ds ( self ) :
         """``Preselection'' for Ds+
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
             'Ds' ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays           ,
-            ## required selections 
+            ## required selections
             [ self.kaons() , self.pions() ] ,
             #
             ## algorithm properties
-            # 
-            DecayDescriptor = " [D_s+ -> K-  K+  pi+ ]cc" , 
+            #
+            DecayDescriptor = " [D_s+ -> K-  K+  pi+ ]cc" ,
             ##
             Preambulo      = self.preambulo()  + [
             "admD  = ADAMASS ('D+'  )  <   65 * MeV " , ## D+  mass window for combination cut
@@ -1183,37 +1183,37 @@ class StrippingPromptCharmConf(LineBuilder) :
             ## # require phi
             ## Combination12Cut = """
             ## ( AM < 1050 * MeV      ) &
-            ## ( ACHI2DOCA(1,2)  < 16 ) 
+            ## ( ACHI2DOCA(1,2)  < 16 )
             ## """ ,
             # do not require phi anymore
             Combination12Cut = """
             ( AM < 2000 * MeV      ) &
-            ( ACHI2DOCA(1,2)  < 16 ) 
+            ( ACHI2DOCA(1,2)  < 16 )
             """ ,
             ## # require phi
             ## CombinationCut = """
             ## ( AM12 < 1050 * MeV   ) &
             ## ( APT  > %s           ) &
-            ## ( admD | admDs        ) & 
+            ## ( admD | admDs        ) &
             ## ( ACHI2DOCA(1,3) < 16 ) &
-            ## ( ACHI2DOCA(2,3) < 16 ) 
+            ## ( ACHI2DOCA(2,3) < 16 )
             ## """  %  ( 0.95 * self['pT(Ds+)'] ) ,
             ## #
             # do not require phi anymore
             CombinationCut = """
             ( APT  > %s           ) &
-            ( admD | admDs        ) & 
+            ( admD | admDs        ) &
             ( ACHI2DOCA(1,3) < 16 ) &
-            ( ACHI2DOCA(2,3) < 16 ) 
+            ( ACHI2DOCA(2,3) < 16 )
             """  %  ( 0.95 * self['pT(Ds+)'] ) ,
             #
-            ## 
+            ##
             MotherCut      = """
             ( chi2vx  < 25  ) &
-            ( PT      > %s  ) & 
+            ( PT      > %s  ) &
             ( dmD  | dmDs   ) &
             ( ctau    > 0.1 * mm )
-            """  % self['pT(Ds+)' ] 
+            """  % self['pT(Ds+)' ]
             )
 
     # =============================================================================
@@ -1222,26 +1222,26 @@ class StrippingPromptCharmConf(LineBuilder) :
     def Dplus ( self ) :
         """D+ -> Kpipi   selection
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         return self.make_selection (
             'D' ,
             DaVinci__N3BodyDecays ,
-            ## inputs 
+            ## inputs
             [ self.kaons() , self.pions()] ,
             #
-            ## algorithm properties 
+            ## algorithm properties
             #
             DecayDescriptor = " [D+ -> K-  pi+  pi+ ]cc" ,
             ##
             Combination12Cut = """
             ( AM < 1.9 * GeV      ) &
-            ( ACHI2DOCA(1,2) < 16 )  
+            ( ACHI2DOCA(1,2) < 16 )
             """ ,
             CombinationCut   = """
             ( ADAMASS('D+')  < 65 * MeV ) &
-            ( APT > %s                  ) & 
+            ( APT > %s                  ) &
             ( ACHI2DOCA(1,3) < 16       ) &
-            ( ACHI2DOCA(2,3) < 16       ) 
+            ( ACHI2DOCA(2,3) < 16       )
             """ % ( 0.95 * self['pT(D+)' ] ) ,
             ##
             MotherCut      = """
@@ -1251,57 +1251,57 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( ctau    > 0.1 * mm   )
             """ % self['pT(D+)' ] ,
             )
-    
+
     # =============================================================================
-    # preselection of Lambda_c,Xi_c -> ( pKpi )   NO POINTING HERE! 
+    # preselection of Lambda_c,Xi_c -> ( pKpi )   NO POINTING HERE!
     # =============================================================================
     def preLamC ( self ) :
         """Lambda_c,Xi_c -> ( pKpi )  pre-selection
-        """ 
+        """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         #
         return self.make_selection (
             'preLambdaC' ,
             DaVinci__N3BodyDecays ,
-            ## inputs 
+            ## inputs
             [ self.protons() , self.kaons() , self.pions()] ,
             ##
             DecayDescriptor = " [ Lambda_c+ -> p+  K-  pi+ ]cc" ,
             ##
             Combination12Cut  = """
             ( AM < 2.6 * GeV      ) &
-            ( ACHI2DOCA(1,2) < 16 ) 
+            ( ACHI2DOCA(1,2) < 16 )
             """ ,
-            ## 
+            ##
             CombinationCut = """
-            ( ( ADAMASS ( 'Lambda_c+' ) < 65 * MeV ) 
+            ( ( ADAMASS ( 'Lambda_c+' ) < 65 * MeV )
             | ( ADAMASS ( 'Xi_c+'     ) < 65 * MeV ) ) &
-            ( APT            > %s ) & 
+            ( APT            > %s ) &
             ( ACHI2DOCA(1,3) < 16 ) &
-            ( ACHI2DOCA(2,3) < 16 ) 
+            ( ACHI2DOCA(2,3) < 16 )
             """ % ( 0.85 * self[ 'pT(Lc+)' ] ) ,
             ##
             MotherCut      = """
             ( chi2vx  < 25 )                          &
             ( PT      > %s                          ) &
-            ( ( ADMASS ( 'Lambda_c+' ) < 55 * MeV ) 
-            | ( ADMASS ( 'Xi_c+'     ) < 55 * MeV ) ) 
-            """ %  self [ 'pT(Lc+)'] 
+            ( ( ADMASS ( 'Lambda_c+' ) < 55 * MeV )
+            | ( ADMASS ( 'Xi_c+'     ) < 55 * MeV ) )
+            """ %  self [ 'pT(Lc+)']
             )
-    
+
     # =============================================================================
-    # Lambda_c,Xi_c -> ( pKpi ) 
+    # Lambda_c,Xi_c -> ( pKpi )
     # =============================================================================
     ## selection of "prompt" Lambda_c
     def LamC ( self ) :
         """Lambda_c,Xi_c -> ( pKpi )  selection
-        """ 
+        """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         #
         return self.make_selection (
             'LambdaC'     ,
             FilterDesktop ,
-            ## inputs 
+            ## inputs
             [ self.preLamC() ] ,
             ##
             Code = """
@@ -1309,22 +1309,22 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( ctau > 0.1 * mm )
             """ % self['pT(Lc+)']
             )
-    
+
     # =============================================================================
-    # Lambda_c,Xi_c -> ( pKpi ) 
+    # Lambda_c,Xi_c -> ( pKpi )
     # =============================================================================
     ## selection of "prompt" Lambda_c with very loose IP-cut
     #  @attention: very loose chi2(IP) cuts here:  chi2(IP)<400
     def LamCLooseChi2IP ( self ) :
         """Lambda_c,Xi_c -> ( pKpi )  selection
         Attention: very loose chi2(IP) cuts here:  chi2(IP)<400
-        """ 
+        """
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         #
         return self.make_selection (
             'LambdaCLooseChi2IP' ,
             FilterDesktop        ,
-            ## inputs 
+            ## inputs
             [ self.preLamC() ]   ,
             ##
             Code = """
@@ -1373,7 +1373,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             | ( ADMASS ( 'Xi_c0'    ) < 55 * MeV ) )
             """ %  self [ 'pT(Xic0)']
             )
-                                    
+
     # =============================================================================
     # Xi_c0 -> ( pKKpi ) Marco Pappagallo
     # =============================================================================
@@ -1392,7 +1392,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( ADMASS ( 'Xi_c0' ) < 55 * MeV ) &
             ( PT > %s ) & ( ctau > 0.1 * mm )
             """ % self['pT(Xic0)']
-            )    
+            )
     # =============================================================================
     # Omega_c0 -> ( pKKpi ) Marco Pappagallo
     # =============================================================================
@@ -1412,81 +1412,81 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( PT > %s ) & ( ctau > 0.1 * mm )
             """ % self['pT(Xic0)']
             )
-    
+
     # =============================================================================
     #  Xi_c0 -> Lc+ pi-
-    # ============================================================================= 
+    # =============================================================================
     ## new decay mode \f$ \Xi_c^0 \rightarrow \Lambda_c^+ \pi^-\f$
-    #  the evidence for this decay is obtained by Belle in Phys.Rev. D89 (2014) 9, 091102 
+    #  the evidence for this decay is obtained by Belle in Phys.Rev. D89 (2014) 9, 091102
     #  @see http://dx.doi.org/10.1103/PhysRevD.89.091102
-    #  Also Alexey Dziuba and Alex Pearce see the hint for this peak in his charm baryon studies 
+    #  Also Alexey Dziuba and Alex Pearce see the hint for this peak in his charm baryon studies
     def Xic02LcPi ( self ) :
         """Xi_c0 -> Lc+ pi-
-        The peak seen by Belle in Phys.Rev. D89 (2014) 9, 091102 
-        There is a hint in LHCb data 
-        """ 
+        The peak seen by Belle in Phys.Rev. D89 (2014) 9, 091102
+        There is a hint in LHCb data
+        """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        ## 
-        from StandardParticles  import StdAllLoosePions as inpts 
+        ##
+        from StandardParticles  import StdAllLoosePions as inpts
         #
         return self.make_selection (
             'Xic02LcPi'      ,
             CombineParticles ,
-            ## inputs 
+            ## inputs
             [ self.preLamC() , inpts ] ,
             ##
             DecayDescriptor = " [ Xi_c0 -> Lambda_c+ pi-]cc" ,
             DaughtersCuts   = {
             ## use only Lambda_c+ here, skip Xi_c+
             'Lambda_c+' : "ADMASS ( 'Lambda_c+' ) < 60 * MeV"
-            }, 
+            },
             ##
             CombinationCut  = """
-            ( APT > %s ) & ( ( AM - AM1 ) < 240 * MeV ) 
+            ( APT > %s ) & ( ( AM - AM1 ) < 240 * MeV )
             """  % ( 0.95 * self['pT(Lc+)'] ) ,
             ##
             MotherCut      = """
             ( chi2vx  < 25 )              &
             ( PT      > %s              ) &
-            ( ctau    > 0.05 * mm )  
+            ( ctau    > 0.05 * mm )
             """ % self [ 'pT(Lc+)']
             )
-    
+
     # =============================================================================
-    # Lambda_c,Xi_c -> ( pKK ) 
+    # Lambda_c,Xi_c -> ( pKK )
     # =============================================================================
     def LamC2pKK ( self ) :
         """Lambda_c,Xi_c -> ( pKK )  selection
-        """ 
+        """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         #
         return self.make_selection (
             'LambdaCpKK' ,
             DaVinci__N3BodyDecays ,
-            ## inputs 
+            ## inputs
             [ self.protons() , self.kaons() ] ,
             ##
             DecayDescriptor = " [ Lambda_c+ -> p+ K- K+ ]cc" ,
             ##
             Combination12Cut  = """
             ( AM < 2.5 * GeV      ) &
-            ( ACHI2DOCA(1,2) < 16 ) 
+            ( ACHI2DOCA(1,2) < 16 )
             """ ,
-            ## 
+            ##
             CombinationCut = """
-            ( ( ADAMASS ( 'Lambda_c+' ) < 65 * MeV ) 
+            ( ( ADAMASS ( 'Lambda_c+' ) < 65 * MeV )
             | ( ADAMASS ( 'Xi_c+'     ) < 65 * MeV ) ) &
-            ( APT            > %s ) & 
+            ( APT            > %s ) &
             ( ACHI2DOCA(1,3) < 16 ) &
-            ( ACHI2DOCA(2,3) < 16 ) 
+            ( ACHI2DOCA(2,3) < 16 )
             """ % ( 0.95 * self[ 'pT(Lc+)' ] ) ,
             ##
             MotherCut      = """
             ( chi2vx  < 25 )                          &
             ( PT      > %s                          ) &
-            ( ( ADMASS ( 'Lambda_c+' ) < 55 * MeV ) 
+            ( ( ADMASS ( 'Lambda_c+' ) < 55 * MeV )
             | ( ADMASS ( 'Xi_c+'     ) < 55 * MeV ) ) &
-            ( ctau_400  > 0.1 * mm                  )  
+            ( ctau_400  > 0.1 * mm                  )
             """ % self [ 'pT(Lc+)']
             )
 
@@ -1500,16 +1500,16 @@ class StrippingPromptCharmConf(LineBuilder) :
         return self.make_selection (
             'SigmaC'         ,
             CombineParticles ,
-            [ self.LamC()    , self.slowPions() ] , 
+            [ self.LamC()    , self.slowPions() ] ,
             #
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptors = [
             " [ Sigma_c0  -> Lambda_c+ pi- ]cc" ,
             " [ Sigma_c++ -> Lambda_c+ pi+ ]cc" ,
             ] ,
             ##
             CombinationCut = """
-            ( AM - AM1 < ( 140 * MeV + 100 * MeV ) ) 
+            ( AM - AM1 < ( 140 * MeV + 100 * MeV ) )
             """ ,
             ##
             MotherCut      = """
@@ -1523,27 +1523,27 @@ class StrippingPromptCharmConf(LineBuilder) :
     def LamCstar ( self ) :
         """Lambda_C* -> Lambda_C pi pi selection
         """
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
-        ## 
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
+        ##
         return self.make_selection (
-            ## the unique tag 
+            ## the unique tag
             'LambdaCstar'                       ,
             ## algorithm type to be used
             DaVinci__N3BodyDecays               ,
             [ self.LamC() , self.slowPions() ]  ,
             #
-            ## algorithm properties 
-            # 
-            DecayDescriptor = " [ Lambda_c(2625)+ -> Lambda_c+ pi+ pi-]cc", 
+            ## algorithm properties
+            #
+            DecayDescriptor = " [ Lambda_c(2625)+ -> Lambda_c+ pi+ pi-]cc",
             ##
             Combination12Cut = """
             ( AM < 3 * GeV         ) &
-            ( ACHI2DOCA(1,2) < 16  ) 
-            """ , 
+            ( ACHI2DOCA(1,2) < 16  )
+            """ ,
             CombinationCut = """
-            ( AM - AM1 <  ( 2 * 140 * MeV + 80 * MeV ) ) & 
+            ( AM - AM1 <  ( 2 * 140 * MeV + 80 * MeV ) ) &
             ( ACHI2DOCA(1,3) < 16  ) &
-            ( ACHI2DOCA(2,3) < 16  ) 
+            ( ACHI2DOCA(2,3) < 16  )
             """ ,
             MotherCut      = """
             ( chi2vx  < 25 )
@@ -1556,16 +1556,16 @@ class StrippingPromptCharmConf(LineBuilder) :
     # =============================================================================
     def OmgCstar ( self ) :
         """Omega_C* -> Xi_c+ K- selection for Marco Pappagallo
-        The line also includes   Lambda_C+ K- 
+        The line also includes   Lambda_C+ K-
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         ##
         return self.make_selection (
             'OmegaCstar'         ,
             CombineParticles     ,
-            [ self.LamC() , self.promptKaons() ] , 
+            [ self.LamC() , self.promptKaons() ] ,
             #
-            ## algorithm properties 
+            ## algorithm properties
             DecayDescriptors  = [
             "[ Omega_c*0 -> Lambda_c+ K- ]cc",
             "[ Omega_c*0 -> Lambda_c+ K+ ]cc"
@@ -1585,7 +1585,7 @@ class StrippingPromptCharmConf(LineBuilder) :
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from StandardParticles import StdLooseAllPhotons as     inpts
         ##
-        photoncut = "CL > %s " % self['PhotonCLCut']                
+        photoncut = "CL > %s " % self['PhotonCLCut']
         ##
         pre_XiCprime = self.make_selection (
             'PreXiCprime'         ,
@@ -1604,7 +1604,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             ##
             MotherCut        = " ALL "
             )
-        
+
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
         ##
         return self.make_selection (
@@ -1654,8 +1654,8 @@ class StrippingPromptCharmConf(LineBuilder) :
     def OmgCstar2XiCPiK ( self ) :
         """Omega_c*0 -> Xi_C0 pi+ K- selection for Marco Pappagallo
         """
-        
-        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays        
+
+        from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
 
         return self.make_selection (
@@ -1676,13 +1676,13 @@ class StrippingPromptCharmConf(LineBuilder) :
             } ,
             ##
             Combination12Cut = """
-            ( ACHI2DOCA(1,2)  < 16 ) & ( AM < 6 * GeV ) 
+            ( ACHI2DOCA(1,2)  < 16 ) & ( AM < 6 * GeV )
             """,
             ##
             CombinationCut   = """
             ( AM - AM1 < ( 500 * MeV + %s ) ) &
-            ( ACHI2DOCA(1,3)  < 16 ) & 
-            ( ACHI2DOCA(2,3)  < 16 ) 
+            ( ACHI2DOCA(1,3)  < 16 ) &
+            ( ACHI2DOCA(2,3)  < 16 )
             """ %  self['QvalueXiCPiK'] ,
             ##
             MotherCut      = """
@@ -1734,7 +1734,7 @@ class StrippingPromptCharmConf(LineBuilder) :
     def XiCstarstar2LambdaCPiK ( self ) :
         """Xi_c(2815)+ -> Lambda_c+ pi+ K- selection for Marco Pappagallo
         """
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
 
@@ -1770,7 +1770,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             ( chi2vx  < 16 )
             """ ,
             )
-                                                                
+
 
     # =============================================================================
     # Omega_cc+ -> Xi_C+ K- pi+ selection for Marco Pappagallo
@@ -1799,13 +1799,13 @@ class StrippingPromptCharmConf(LineBuilder) :
             } ,
             ##
             Combination12Cut = """
-            ( ACHI2DOCA(1,2)  < 16 )  & ( AM < 6 * GeV ) 
+            ( ACHI2DOCA(1,2)  < 16 )  & ( AM < 6 * GeV )
             """,
             ##
             CombinationCut   = """
             ( AM <  %s )             &
-            ( ACHI2DOCA(1,3)  < 16 ) & 
-            ( ACHI2DOCA(2,3)  < 16 )              
+            ( ACHI2DOCA(1,3)  < 16 ) &
+            ( ACHI2DOCA(2,3)  < 16 )
             """ %  self['QvalueOmegaCC'],
             ##
             MotherCut      = """
@@ -1818,7 +1818,7 @@ class StrippingPromptCharmConf(LineBuilder) :
     # =============================================================================
     def OmgCC2XiCKK ( self ) :
         """Omega_cc+ -> Xi_c+ K- K+ selection for Marco Pappagallo
-        """        
+        """
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         ##
         return self.make_selection (
@@ -1838,13 +1838,13 @@ class StrippingPromptCharmConf(LineBuilder) :
             } ,
             ##
             Combination12Cut = """
-            ( ACHI2DOCA(1,2)  < 16 )  & ( AM < 6 * GeV ) 
+            ( ACHI2DOCA(1,2)  < 16 )  & ( AM < 6 * GeV )
             """,
             ##
             CombinationCut   = """
             ( AM <  %s )             &
-            ( ACHI2DOCA(1,3)  < 16 ) & 
-            ( ACHI2DOCA(2,3)  < 16 )              
+            ( ACHI2DOCA(1,3)  < 16 ) &
+            ( ACHI2DOCA(2,3)  < 16 )
             """ %  self['QvalueOmegaCC'],
             ##
             MotherCut      = """
@@ -1852,7 +1852,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             """ % self['pT(Omgcc)'],
             )
 
-    # =============================================================================    
+    # =============================================================================
     ## helper merged selection of all charmed particles
     def PromptCharm ( self ) :
         """Helper merged selection of all charmed particles
@@ -1870,28 +1870,28 @@ class StrippingPromptCharmConf(LineBuilder) :
                                    self.Dplus    () ,
                                    self.LamC     () ,
                                    self.SigC     () , ## added for pentaquark searches
-                                   self.LamCstar () , ## added 
-                                   ] 
+                                   self.LamCstar () , ## added
+                                   ]
             )
-        
+
         return self._add_selection ( 'PromptCharm_Selection' , sel )
 
-    
+
     ## selection of W+-
     def W ( self )  :
         """Get simple  W+-selection
         """
-        from GaudiConfUtils.ConfigurableGenerators      import FilterDesktop 
-        from StandardParticles  import StdAllLooseMuons as     inpts 
+        from GaudiConfUtils.ConfigurableGenerators      import FilterDesktop
+        from StandardParticles  import StdAllLooseMuons as     inpts
         #
         return self.make_selection (
             'W'           ,
             FilterDesktop ,
-            [ inpts ]     , 
+            [ inpts ]     ,
             #
             ## algorithm properties
             #
-            Preambulo = self.preambulo () + [ 
+            Preambulo = self.preambulo () + [
             "ptCone_ = SUMCONE (   0.25 , PT , '/Event/Phys/StdAllLoosePions/Particles'   )",
             "etCone_ = SUMCONE (   0.25 , PT , '/Event/Phys/StdLooseAllPhotons/Particles' )",
             "ptCone  =   SINFO (  55001 , ptCone_ , True ) " ,
@@ -1899,23 +1899,23 @@ class StrippingPromptCharmConf(LineBuilder) :
             ] ,
             ##
             Code = self [ 'WCuts'] + """
-            & ( -100 * GeV < ptCone ) 
-            & ( -100 * GeV < etCone ) 
-            """ 
+            & ( -100 * GeV < ptCone )
+            & ( -100 * GeV < etCone )
+            """
             )
-    
+
     ## get "Di-Charm"-selection
     def DiCharm ( self ) :
         """Di-Charm selection
         """
-        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
         return self.make_selection (
             'DiCharm'        ,
             CombineParticles ,
-            [ self.PromptCharm() ] , 
+            [ self.PromptCharm() ] ,
             #
             ## algorithm properties
-            # 
+            #
             ## the decays to be reconstructed
             DecayDescriptors = [
             #
@@ -1964,7 +1964,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             " [ psi(3770) -> Sigma_c++  Lambda_c(2625)~-]cc "    , ## addded 2017-04-06
             #
             "   psi(3770) -> Lambda_c(2625)+ Lambda_c(2625)~- "  , ## addded 2017-04-06
-            
+
             #
             # double charm
             #
@@ -1976,7 +1976,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             " [ psi(3770) -> D0        Sigma_c0       ]cc "  , ## addded 2015-07-21
             " [ psi(3770) -> D0        Sigma_c++      ]cc "  , ## addded 2015-07-21
             " [ psi(3770) -> D0        Lambda_c(2625)+]cc "  , ## addded 2017-04-06
-            
+
             #
             " [ psi(3770) -> D*(2010)+ D*(2010)+      ]cc "  ,
             " [ psi(3770) -> D*(2010)+ D+             ]cc "  ,
@@ -2017,7 +2017,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             ## combination cut : accept all
             CombinationCut = " AALL " ,
             ##      mother cut : accept all
-            MotherCut      = "  ALL " , 
+            MotherCut      = "  ALL " ,
             #
             )
 
@@ -2030,37 +2030,37 @@ class StrippingPromptCharmConf(LineBuilder) :
         aparts = ( 'D~0'        , 'D-'        , 'D_s-'       , 'D*(2010)-'       ,
                    'Lambda_c~-' , 'Sigma_c~0' , 'Sigma_c~--' , 'Lambda_c(2625)~-')
 
-        def _comb3 ( cnt ) :            
+        def _comb3 ( cnt ) :
             decs = set()
-            l = len(cnt) 
+            l = len(cnt)
             for i in range(l) :
                 ip = cnt[i]
-                for j in range(i,l) : 
+                for j in range(i,l) :
                     jp = cnt[j]
                     for k in range(j,l) :
                         kp = cnt[k]
-                        decs.add ( '[chi_c2(1P) -> %s %s %s]cc' % ( ip , jp , kp ) )            
+                        decs.add ( '[chi_c2(1P) -> %s %s %s]cc' % ( ip , jp , kp ) )
             return decs
 
         def _comb2 ( cnt1 , cnt2 ) :
-            
+
             decs = set()
-            l1 = len(cnt1) 
-            l2 = len(cnt2) 
+            l1 = len(cnt1)
+            l2 = len(cnt2)
             for i in range(l1) :
                 ip = cnt1[i]
-                for j in range(i,l1) : 
+                for j in range(i,l1) :
                     jp = cnt1[j]
                     for k in range(l2) :
                         kp = cnt2[k]
                         decs.add ( '[chi_c2(1P) -> %s %s %s]cc' % ( ip , jp , kp ) )
             return decs
 
-        _decs3 = _comb3 ( parts          ) ## 84 
+        _decs3 = _comb3 ( parts          ) ## 84
         _decs2 = _comb2 ( parts , aparts ) ## 196
         decs   = list(_decs2.union(_decs3))
-        decs.sort() 
-        
+        decs.sort()
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         return self.make_selection (
             'TriCharm'             ,
@@ -2074,9 +2074,9 @@ class StrippingPromptCharmConf(LineBuilder) :
             ## 2) combination cut : accept all
             CombinationCut   = " AALL " ,
             ## 3) mother cut : accept all
-            MotherCut        = "  ALL " , 
+            MotherCut        = "  ALL " ,
             #
-            )            
+            )
 
     ## get "dimuon+ DiCharm"-selection
     def DiMuonAndDiCharm ( self ) :
@@ -2087,20 +2087,20 @@ class StrippingPromptCharmConf(LineBuilder) :
         aparts = ( 'D~0'        , 'D-'        , 'D_s-'       , 'D*(2010)-'       ,
                    'Lambda_c~-' , 'Sigma_c~0' , 'Sigma_c~--' , 'Lambda_c(2625)~-')
 
-        def _comb_1 ( cnt ) :            
+        def _comb_1 ( cnt ) :
             decs = set()
-            l = len(cnt) 
+            l = len(cnt)
             for i in range(l) :
                 ip = cnt[i]
                 for j in range(i,l) :
                     jp = cnt[j]
-                    decs.add ( '[chi_c0(1P) -> J/psi(1S) %s %s]cc' % ( ip , jp ) )            
+                    decs.add ( '[chi_c0(1P) -> J/psi(1S) %s %s]cc' % ( ip , jp ) )
             return decs
 
-        def _comb_2 ( cnt1 , cnt2  ) :            
+        def _comb_2 ( cnt1 , cnt2  ) :
             decs = set()
-            l1 = len(cnt1) 
-            l2 = len(cnt2) 
+            l1 = len(cnt1)
+            l2 = len(cnt2)
             for i in range(l1) :
                 ip = cnt1[i]
                 for j in range(i,l2) :
@@ -2110,27 +2110,27 @@ class StrippingPromptCharmConf(LineBuilder) :
             return decs
 
 
-        _decs3 = _comb_1 ( parts          ) 
-        _decs2 = _comb_2 ( parts , aparts ) 
+        _decs3 = _comb_1 ( parts          )
+        _decs2 = _comb_2 ( parts , aparts )
         decs   = list(_decs2.union(_decs3))
         decs.sort()
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         return self.make_selection (
             'DiMuonDiCharm'            ,
             CombineParticles           ,
-            [ self.DiMuon() , self.PromptCharm() ] , 
+            [ self.DiMuon() , self.PromptCharm() ] ,
             #
             ## algorithm properties:
-            # 
+            #
             ## 1) the decays to be reconstructed
-            DecayDescriptors = decs     , 
+            DecayDescriptors = decs     ,
             ## 2) combination cut : accept all
             CombinationCut   = " AALL " ,
             ## 3) mother cut : accept all
-            MotherCut        = "  ALL " , 
+            MotherCut        = "  ALL " ,
             #
-            )            
+            )
 
 
     ## charm & W
@@ -2141,36 +2141,36 @@ class StrippingPromptCharmConf(LineBuilder) :
                    'Lambda_c+'  , 'Sigma_c0'  , 'Sigma_c++'  , 'Lambda_c(2625)+' )
         decs   = [ '[chi_b0(2P) -> %s  mu+]cc' % i for i in parts  ]
         decs  += [ '[chi_b0(2P) -> %s  mu-]cc' % i for i in parts  ]
-        ## 
-        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles 
+        ##
+        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
         return self.make_selection (
             'CharmW'        ,
             CombineParticles ,
-            [ self.W() , self.PromptCharm() ] , 
+            [ self.W() , self.PromptCharm() ] ,
             #
             ## algorithm properties
-            # 
+            #
             ## the decays to be reconstructed
             DecayDescriptors = decs ,
             ## combination cut : accept all
             CombinationCut   = " AALL " ,
             ##      mother cut : accept all
-            MotherCut        = "  ALL " , 
+            MotherCut        = "  ALL " ,
             #
             )
-    
+
     ## get the dimuons
     def DiMuon ( self ) :
         """Get the dimuons
         """
-        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
         return self.make_selection (
             'DiMuon'         ,
             CombineParticles ,
-            [ self.muons() ] , 
+            [ self.muons() ] ,
             #
             ## algorihtm properties
-            # 
+            #
             ## the decays to be reconstructed
             DecayDescriptor = 'J/psi(1S) -> mu+ mu-' ,
             ## combination cut
@@ -2178,47 +2178,47 @@ class StrippingPromptCharmConf(LineBuilder) :
             ##      mother cut
             MotherCut       = " chi2vx < 20 " ,
             )
-    
+
     ## get the 2xdimuons
     def DoubleDiMuon ( self ) :
         """Get the 2xdimuons
         """
-        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
         return self.make_selection (
             'DoubleDiMuon'         ,
             CombineParticles ,
-            [ self.DiMuon() ] , 
+            [ self.DiMuon() ] ,
             #
             ## algorihtm properties
-            # 
+            #
             ## the decays to be reconstructed
             DecayDescriptor = 'Upsilon(1S) -> J/psi(1S) J/psi(1S)' ,
             ## combination cut
             CombinationCut  = "AALL" ,
             ##      mother cut
-            MotherCut       = " ALL" 
+            MotherCut       = " ALL"
             )
 
     ## get the 3xdimuons
     def TripleDiMuon ( self ) :
         """Get the 3xdimuons
         """
-        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
         return self.make_selection (
             'TripleDiMuon'    ,
             CombineParticles  ,
-            [ self.DiMuon() ] , 
+            [ self.DiMuon() ] ,
             #
             ## algorihtm properties
-            # 
+            #
             ## 1) the decays to be reconstructed
             DecayDescriptor = 'Upsilon(2S) -> J/psi(1S) J/psi(1S) J/psi(1S)' ,
             ## 2) combination cut
             CombinationCut  = "AALL" ,
             ## 3) mother cut
-            MotherCut       = " ALL" 
+            MotherCut       = " ALL"
             )
-    
+
     ## get the dimuons & charn
     def DiMuonAndCharm ( self ) :
         """Get charm & dimuon :
@@ -2230,59 +2230,59 @@ class StrippingPromptCharmConf(LineBuilder) :
         parts  = ( 'D0'         , 'D+'        , 'D_s+'       , 'D*(2010)+'       ,
                    'Lambda_c+'  , 'Sigma_c0'  , 'Sigma_c++'  , 'Lambda_c(2625)+' )
         decs   = [ '[Upsilon(1S) -> J/psi(1S) %s]cc' % i for i in parts  ]
-        ## 
+        ##
         return self.make_selection (
             'DiMuonAndCharm' ,
             CombineParticles ,
-            [ self.DiMuon()  , self.PromptCharm() ] , 
+            [ self.DiMuon()  , self.PromptCharm() ] ,
             #
             ## algorithm properties
             #
             DecayDescriptors = decs ,
             CombinationCut   = " AALL " ,
-            MotherCut        = "  ALL " , 
+            MotherCut        = "  ALL " ,
             #
             )
-    
+
     ## get the 2xdimuons+charm
     def DoubleDiMuonAndCharm ( self ) :
-        """Get the 2xdimuons+charm 
+        """Get the 2xdimuons+charm
         """
         from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
-        
+
         parts  = ( 'D0'         , 'D+'        , 'D_s+'       , 'D*(2010)+'       ,
                    'Lambda_c+'  , 'Sigma_c0'  , 'Sigma_c++'  , 'Lambda_c(2625)+' )
         decs   = [ '[Upsilon(2S) -> J/psi(1S) J/psi(1S) %s]cc' % i for i in parts  ]
-        ## 
+        ##
         return self.make_selection (
             'DoubleDiMuonAndCharm' ,
             CombineParticles ,
-            [ self.DiMuon()  , self.PromptCharm() ] , 
+            [ self.DiMuon()  , self.PromptCharm() ] ,
             #
             ## algorithm properties
-            # 
+            #
             DecayDescriptors = decs ,
             CombinationCut   = " AALL " ,
-            MotherCut        = "  ALL " , 
+            MotherCut        = "  ALL " ,
             #
             )
-    
-        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles 
+
+        from GaudiConfUtils.ConfigurableGenerators      import CombineParticles
         return self.make_selection (
             'DoubleDiMuon'         ,
             CombineParticles ,
-            [ self.DiMuon() ] , 
+            [ self.DiMuon() ] ,
             #
             ## algorihtm properties
-            # 
+            #
             ## the decays to be reconstructed
             DecayDescriptor = 'Upsilon(1S) -> J/psi(1S) J/psi(1S)' ,
             ## combination cut
             CombinationCut  = "AALL" ,
             ##      mother cut
-            MotherCut       = " ALL" 
+            MotherCut       = " ALL"
             )
-    
+
     ## get the dimuons & charn
     def ChiAndCharm ( self ) :
         """Get charm & chi:
@@ -2290,7 +2290,7 @@ class StrippingPromptCharmConf(LineBuilder) :
         at least one chi
         """
         from GaudiConfUtils.ConfigurableGenerators       import DaVinci__N3BodyDecays
-        from StandardParticles import StdLooseAllPhotons as     inpts 
+        from StandardParticles import StdLooseAllPhotons as     inpts
         #
         pre_chi = self.make_selection (
             'PreChiAndCharm'      ,
@@ -2298,7 +2298,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             [ self.DiMuonAndCharm () , self.DiMuon() , self.PromptCharm() , inpts ] ,
             #
             ## algorithm proeprties
-            # 
+            #
             DecayDescriptors = [
             "[ Upsilon(1S) -> J/psi(1S) D0        gamma ]cc" ,
             "[ Upsilon(1S) -> J/psi(1S) D*(2010)+ gamma ]cc" ,
@@ -2314,32 +2314,32 @@ class StrippingPromptCharmConf(LineBuilder) :
             } ,
             ##
             Combination12Cut = """
-            ACHI2DOCA(1,2) < 100 
+            ACHI2DOCA(1,2) < 100
             """ ,
             ## require chi_(c,b)
             CombinationCut = """
             AM13 - AM1 < 1.01 * GeV
             """,
             ##
-            MotherCut      = "  ALL " , 
+            MotherCut      = "  ALL " ,
             )
-        
+
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-        ## 
+        ##
         return self.make_selection (
             'ChiAndCharm'                 ,
             Pi0Veto__Tagger               ,
             [ pre_chi ]                   ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25010     ## unique ! 
+            ExtraInfoIndex = 25010     ## unique !
             )
-    
+
     ## DiMuon & W
     def DiMuonAndW ( self ) :
         """Dimuon & W+-
         """
-        from GaudiConfUtils.ConfigurableGenerators   import CombineParticles 
+        from GaudiConfUtils.ConfigurableGenerators   import CombineParticles
         ##
         return self.make_selection (
             'DiMuonAndW'                 ,
@@ -2347,7 +2347,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             [ self.W() , self.DiMuon() ] ,
             #
             ## algorithm properties
-            # 
+            #
             ## the decays to be reconstructed
             DecayDescriptors = [
             " [ chi_b0(2P) -> J/psi(1S) mu+ ]cc " ,
@@ -2356,9 +2356,9 @@ class StrippingPromptCharmConf(LineBuilder) :
             ## combination cut : accept all
             CombinationCut = " AALL " ,
             ##      mother cut : accept all
-            MotherCut      = "  ALL " , 
+            MotherCut      = "  ALL " ,
             )
-    
+
     ## get the dimuons & charn
     def ChiAndW ( self ) :
         """Get chi & W :
@@ -2366,7 +2366,7 @@ class StrippingPromptCharmConf(LineBuilder) :
         at least one chi
         """
         from GaudiConfUtils.ConfigurableGenerators       import DaVinci__N3BodyDecays
-        from StandardParticles import StdLooseAllPhotons as     inpts 
+        from StandardParticles import StdLooseAllPhotons as     inpts
         #
         pre_chiw = self.make_selection (
             'PreChiAndW'          ,
@@ -2374,7 +2374,7 @@ class StrippingPromptCharmConf(LineBuilder) :
             [ self.DiMuonAndW () , self.W() , self.DiMuon() , inpts ] ,
             #
             ## algorihtm properties
-            # 
+            #
             ##
             DecayDescriptor = "[ chi_b1(2P) -> J/psi(1S) mu+ gamma ]cc" ,
             ##
@@ -2384,58 +2384,58 @@ class StrippingPromptCharmConf(LineBuilder) :
             },
             ##
             Combination12Cut = """
-            ACHI2DOCA(1,2) < 100 
-            """ , 
+            ACHI2DOCA(1,2) < 100
+            """ ,
             ## require chi_(c,b)
             CombinationCut = """
             AM13 - AM1 < 1.01 * GeV
             """,
             ##
-            MotherCut      = "  ALL " , 
+            MotherCut      = "  ALL " ,
             #
             )
         ##
         from GaudiConfUtils.ConfigurableGenerators import Pi0Veto__Tagger
-        ## 
+        ##
         return self.make_selection (
             'ChiAndW'                     ,
             Pi0Veto__Tagger               ,
             [ pre_chiw ]                  ,
             MassWindow     = 25 * MeV     ,
             MassChi2       = -1           ,
-            ExtraInfoIndex = 25015     ## unique ! 
+            ExtraInfoIndex = 25015     ## unique !
             )
-    
+
 # =============================================================================
 if '__main__' == __name__ :
 
-    logger.info ( 80*'*'  ) 
-    logger.info (  __doc__ ) 
-    logger.info ( ' Author :  %s' % __author__ ) 
+    logger.info ( 80*'*'  )
+    logger.info (  __doc__ )
+    logger.info ( ' Author :  %s' % __author__ )
     logger.info ( ' Date   :  %s' % __date__   )
-    logger.info ( 80 * '*' ) 
+    logger.info ( 80 * '*' )
     ##
-    clines = set() 
-    logger.info ( 70 * '-' ) 
+    clines = set()
+    logger.info ( 70 * '-' )
     logger.info ( ' %-15s | %-40s ' % ( 'STREAM' , 'LINE' ) )
-    logger.info ( 70 * '-' ) 
+    logger.info ( 70 * '-' )
     for stream in default_config['STREAMS'] :
         lines = default_config['STREAMS'][stream]
         for l in lines :
             logger.info ( ' %-15s | %-40s ' % ( stream , l ) )
             clines.add ( l )
-    logger.info ( 80 * '*' ) 
+    logger.info ( 80 * '*' )
     ##
     logger.info ( ' The output locations for the default configuration: ' )
     ##
-    _conf = StrippingPromptCharmConf ( 'PromptCharm' , 
+    _conf = StrippingPromptCharmConf ( 'PromptCharm' ,
                                        config = default_config['CONFIG']  )
     ##
     _ln   = ' ' + 61*'-' + '+' + 55*'-'
-    logger.info ( _ln ) 
+    logger.info ( _ln )
     logger.info ( '  %-60s| %-40s | %s ' % ( 'Output location'     ,
                                              'Stripping line name' ,
-                                             'MDST.DST'            ) ) 
+                                             'MDST.DST'            ) )
     logger.info ( _ln )
     for l in _conf.lines() :
         lout  = l.outputLocation()
@@ -2445,33 +2445,32 @@ if '__main__' == __name__ :
         if not lname in clines :
             raise AttributeError ('Unknown Line %s' % lname )
         clines.remove ( lname )
-        
-    logger.info ( _ln ) 
-    logger.info ( 80*'*'  ) 
+
+    logger.info ( _ln )
+    logger.info ( 80*'*'  )
     if clines :
         raise AttributeError('Undeclared lines: %s' % clines )
 
     keys = default_config['CONFIG'].keys()
     keys.sort()
     prescale = [ i for i in keys if 0 <= i.find('Prescale') ]
-    other    = [ i for i in keys if not i in prescale       ] 
-    logger.info ( 'Configuration keys are: %s' % other    ) 
-    logger.info ( 'Prescale      keys are: %s' % prescale ) 
-    logger.info ( 80*'*' ) 
-
-    ## make dot-graphs 
-    try:    
-        selections = _conf._selections_private() 
+    other    = [ i for i in keys if not i in prescale       ]
+    logger.info ( 'Configuration keys are: %s' % other    )
+    logger.info ( 'Prescale      keys are: %s' % prescale )
+    logger.info ( 80*'*' )
+
+    ## make dot-graphs
+    try:
+        selections = _conf._selections_private()
         for s in selections :
             from SelPy.graph import graph
             o = graph ( s , format = 'png' )
             if o : logger.info  ( "Generate DOT-graph: %s"          % o        )
             else : logger.error ( "Can't produce DOT=-graph for %s" % s.name() )
-            
+
     except : pass
-        
-        
+
+
 # =============================================================================
 # The END
 # =============================================================================
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py
index 5532893b58462726b840bec75692ae01d36ecee6..0cb9ec3f3fed21cd6b77dc29409bc53f349eca40 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py
@@ -40,94 +40,94 @@ from Configurables import TisTosParticleTagger
 
 default_config = {
     'NAME'        : 'BetacHHH',
-    "BUILDERTYPE": "StrippingXic2HHHConf", 
+    "BUILDERTYPE": "StrippingXic2HHHConf",
     "CONFIG": {
-        "Comb_ADOCAMAX_MAX": 0.3, 
-        "Comb_MASS_MAX": 2800.0, 
-        "Comb_MASS_MIN": 2200.0, 
-        "Daug_All_PT_MIN": 300.0, 
-        "Daug_P_MIN": 3000.0, 
-        "Daug_TRCHI2DOF_MAX": 3.0, 
-        "K_IPCHI2_MIN": 4.0, 
-        "PostscaleBetac2LcKS0": 1.0, 
-        "PostscaleBetac2pDs": 0.0, 
-        "PostscaleBetacLb1": 1.0, 
-        "PostscaleBetacLb2": 1.0, 
-        "PostscaleXic2PKK": 1.0, 
-        "PostscaleXic2PKPi": 0.0, 
-        "PrescaleBetac2LcKS0": 1.0, 
-        "PrescaleBetac2pDs": 0.0, 
-        "PrescaleBetacLb1": 1.0, 
-        "PrescaleBetacLb2": 1.0, 
-        "PrescaleXic2PKK": 1.0, 
-        "PrescaleXic2PKPi": 0.0, 
+        "Comb_ADOCAMAX_MAX": 0.3,
+        "Comb_MASS_MAX": 2800.0,
+        "Comb_MASS_MIN": 2200.0,
+        "Daug_All_PT_MIN": 300.0,
+        "Daug_P_MIN": 3000.0,
+        "Daug_TRCHI2DOF_MAX": 3.0,
+        "K_IPCHI2_MIN": 4.0,
+        "PostscaleBetac2LcKS0": 1.0,
+        "PostscaleBetac2pDs": 0.0,
+        "PostscaleBetacLb1": 1.0,
+        "PostscaleBetacLb2": 1.0,
+        "PostscaleXic2PKK": 1.0,
+        "PostscaleXic2PKPi": 0.0,
+        "PrescaleBetac2LcKS0": 1.0,
+        "PrescaleBetac2pDs": 0.0,
+        "PrescaleBetacLb1": 1.0,
+        "PrescaleBetacLb2": 1.0,
+        "PrescaleXic2PKK": 1.0,
+        "PrescaleXic2PKPi": 0.0,
         "RelatedInfoTools": [
             {
-                "ConeAngle": 1.5, 
-                "Location": "Cone1", 
-                "Type": "RelInfoConeVariables", 
+                "ConeAngle": 1.5,
+                "Location": "Cone1",
+                "Type": "RelInfoConeVariables",
                 "Variables": [
-                    "CONEANGLE", 
-                    "CONEMULT", 
+                    "CONEANGLE",
+                    "CONEMULT",
                     "CONEPTASYM"
                 ]
-            }, 
+            },
             {
-                "ConeAngle": 0.75, 
-                "Location": "Cone2", 
-                "Type": "RelInfoConeVariables", 
+                "ConeAngle": 0.75,
+                "Location": "Cone2",
+                "Type": "RelInfoConeVariables",
                 "Variables": [
-                    "CONEANGLE", 
-                    "CONEMULT", 
+                    "CONEANGLE",
+                    "CONEMULT",
                     "CONEPTASYM"
                 ]
-            }, 
+            },
             {
-                "ConeAngle": 0.5, 
-                "Location": "Cone3", 
-                "Type": "RelInfoConeVariables", 
+                "ConeAngle": 0.5,
+                "Location": "Cone3",
+                "Type": "RelInfoConeVariables",
                 "Variables": [
-                    "CONEANGLE", 
-                    "CONEMULT", 
+                    "CONEANGLE",
+                    "CONEMULT",
                     "CONEPTASYM"
                 ]
-            }, 
+            },
             {
-                "ConeAngle": 0.25, 
-                "Location": "Cone4", 
-                "Type": "RelInfoConeVariables", 
+                "ConeAngle": 0.25,
+                "Location": "Cone4",
+                "Type": "RelInfoConeVariables",
                 "Variables": [
-                    "CONEANGLE", 
-                    "CONEMULT", 
+                    "CONEANGLE",
+                    "CONEMULT",
                     "CONEPTASYM"
                 ]
-            }, 
+            },
             {
-                "ConeAngle": 0.1, 
-                "Location": "Cone5", 
-                "Type": "RelInfoConeVariables", 
+                "ConeAngle": 0.1,
+                "Location": "Cone5",
+                "Type": "RelInfoConeVariables",
                 "Variables": [
-                    "CONEANGLE", 
-                    "CONEMULT", 
+                    "CONEANGLE",
+                    "CONEMULT",
                     "CONEPTASYM"
                 ]
             }
-        ], 
-        "Xic_BPVDIRA_MIN": 0.999, 
-        "Xic_BPVIPCHI2_MAX": 12.0, 
-        "Xic_BPVLTIME_MAX": 0.003, 
-        "Xic_BPVLTIME_MIN": 0.0002, 
-        "Xic_BPVVDCHI2_MIN": 0.0, 
-        "Xic_PT_MIN": 2000.0, 
-        "Xic_VCHI2VDOF_MAX": 10.0, 
+        ],
+        "Xic_BPVDIRA_MIN": 0.999,
+        "Xic_BPVIPCHI2_MAX": 12.0,
+        "Xic_BPVLTIME_MAX": 0.003,
+        "Xic_BPVLTIME_MIN": 0.0002,
+        "Xic_BPVVDCHI2_MIN": 0.0,
+        "Xic_PT_MIN": 2000.0,
+        "Xic_VCHI2VDOF_MAX": 10.0,
         "pion_IPCHI2_MIN": 4.0
-    }, 
-    "STREAMS": [ "Charm" ], 
+    },
+    "STREAMS": [ "Charm" ],
     "WGs": ["Charm"] # Note, this should always be a list.
 }
 
 
-class StrippingXic2HHHConf(LineBuilder): 
+class StrippingXic2HHHConf(LineBuilder):
 
     __configuration_keys__ = default_config['CONFIG'].keys()
 
@@ -146,11 +146,11 @@ class StrippingXic2HHHConf(LineBuilder):
                           postscale = 1.0    ,   # postscale factor
                           MaxCandidates = "Override",   # Maximum number
                           MaxCombinations = "Override", # Maximum number
-                          HDRLocation = None, # other configuration parameter 
-                          RelatedInfoTools = None ) : # RelatedInfoTools to be included  
+                          HDRLocation = None, # other configuration parameter
+                          RelatedInfoTools = None ) : # RelatedInfoTools to be included
 
 
-        if (prescale > 0) and (postscale > 0) : 
+        if (prescale > 0) and (postscale > 0) :
             line = StrippingLine( name,
                                   prescale        = prescale,
                                   ODIN            = ODIN,
@@ -162,18 +162,18 @@ class StrippingXic2HHHConf(LineBuilder):
                                   postscale       = postscale,
                                   MaxCandidates   = MaxCandidates,
                                   MaxCombinations = MaxCombinations,
-                                  HDRLocation     = HDRLocation, 
+                                  HDRLocation     = HDRLocation,
                                   RelatedInfoTools  = RelatedInfoTools)
 
             self.registerLine(line)
             return line
 
-        else : 
+        else :
             return False
 
 
 
-    def __init__(self, name, config) : 
+    def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__= config
@@ -198,7 +198,7 @@ class StrippingXic2HHHConf(LineBuilder):
 
 
  ############### PIONS, Lambda0, KS0 and KAONS SELECTIONS ##################
-        
+
         self.inPions  = Selection( "Pionsfor" + name,
                                   Algorithm = self._pionFilter(),
                                   RequiredSelections = [StdNoPIDsPions])
@@ -206,7 +206,7 @@ class StrippingXic2HHHConf(LineBuilder):
         self.inKS0LL  = Selection( "KS0LLFor" + name,
                                   Algorithm = self._KS0LLFilter(),
                                   RequiredSelections = [self.KS0LL])
-        
+
         self.inKS0DD  = Selection( "KS0DDFor" + name,
                                   Algorithm = self._KS0DDFilter(),
                                   RequiredSelections = [self.KS0DD])
@@ -233,11 +233,11 @@ class StrippingXic2HHHConf(LineBuilder):
                , Xic_VCHI2VDOF_MAX = config['Xic_VCHI2VDOF_MAX']
                , Xic_BPVVDCHI2_MIN = config['Xic_BPVVDCHI2_MIN']
                , Xic_BPVDIRA_MIN = config['Xic_BPVDIRA_MIN']
-               , Xic_BPVIPCHI2_MAX = config['Xic_BPVIPCHI2_MAX'] 
+               , Xic_BPVIPCHI2_MAX = config['Xic_BPVIPCHI2_MAX']
                , Xic_BPVLTIME_MAX = config['Xic_BPVLTIME_MAX']
                , Xic_BPVLTIME_MIN = config['Xic_BPVLTIME_MIN']
              )
-                                      
+
         self.selXic2PKK = makeXic2PKPi( name = xic_pKK_name
                , inputSel = [self.inKaons, self.inProtons]
                , Daug_All_PT_MIN = config['Daug_All_PT_MIN']
@@ -247,12 +247,12 @@ class StrippingXic2HHHConf(LineBuilder):
                , Comb_MASS_MAX  = 2800. * MeV
                , Comb_ADOCAMAX_MAX = config['Comb_ADOCAMAX_MAX']
                , Xic_PT_MIN = config['Xic_PT_MIN']
-               , Xic_VCHI2VDOF_MAX = config['Xic_VCHI2VDOF_MAX']  
+               , Xic_VCHI2VDOF_MAX = config['Xic_VCHI2VDOF_MAX']
                , Xic_BPVVDCHI2_MIN = config['Xic_BPVVDCHI2_MIN']
                , Xic_BPVDIRA_MIN = config['Xic_BPVDIRA_MIN']
                , Xic_BPVIPCHI2_MAX = config['Xic_BPVIPCHI2_MAX']
                , Xic_BPVLTIME_MAX = config['Xic_BPVLTIME_MAX']
-               , Xic_BPVLTIME_MIN = config['Xic_BPVLTIME_MIN']  
+               , Xic_BPVLTIME_MIN = config['Xic_BPVLTIME_MIN']
                , decDescriptors = [ "[Lambda_c+ -> p+ K- K+]cc" ]
              )
 
@@ -261,8 +261,8 @@ class StrippingXic2HHHConf(LineBuilder):
                , Daug_All_PT_MIN =  config['Daug_All_PT_MIN']
                , Daug_P_MIN = config['Daug_P_MIN']
                , Daug_TRCHI2DOF_MAX = config['Daug_TRCHI2DOF_MAX']
-               , Comb_MASS_MIN  = 2770. * MeV            
-               , Comb_MASS_MAX  = 3600. * MeV            
+               , Comb_MASS_MIN  = 2770. * MeV
+               , Comb_MASS_MAX  = 3600. * MeV
                , Comb_ADOCAMAX_MAX = 1.0 * mm
                , Xic_PT_MIN = 3000. * MeV
                , Xic_BPVDIRA_MIN = -100.
@@ -305,8 +305,8 @@ class StrippingXic2HHHConf(LineBuilder):
                , Xic_BPVLTIME_MIN = config['Xic_BPVLTIME_MIN']
                , decDescriptors = [ "[Lambda_b0 -> p+ K- K+ KS0 pi-]cc" ]
              )
-                                         
-        self.selBetacLb2 = makeBetacLb2 ( name = betac_lb2_name  
+
+        self.selBetacLb2 = makeBetacLb2 ( name = betac_lb2_name
                , inputSel = [ self.inProtons, self.inKaons,  self.inPions, self.inKS0, self.inPions]
                , Daug_All_PT_MIN =  config['Daug_All_PT_MIN']
                , Daug_P_MIN = config['Daug_P_MIN']
@@ -315,7 +315,7 @@ class StrippingXic2HHHConf(LineBuilder):
                , Comb_MASS_MAX  = 6000. * MeV
                , Comb_ADOCAMAX_MAX = 1.0 * mm
                , Xic_PT_MIN = 2000. * MeV
-               , Xic_BPVDIRA_MIN = -100. 
+               , Xic_BPVDIRA_MIN = -100.
                , Xic_BPVIPCHI2_MAX = config['Xic_BPVIPCHI2_MAX']
                , Xic_BPVLTIME_MAX = config['Xic_BPVLTIME_MAX']
                , Xic_BPVLTIME_MIN = config['Xic_BPVLTIME_MIN']
@@ -358,11 +358,11 @@ class StrippingXic2HHHConf(LineBuilder):
                                          selection = self.selBetacLb1,
                                        )
 
-        self.line_BetacLb2= self._strippingLine( name = betac_lb2_name + 'Line', 
-                                         prescale  = config['PrescaleBetacLb2'], 
-                                         postscale = config['PostscaleBetacLb2'], 
+        self.line_BetacLb2= self._strippingLine( name = betac_lb2_name + 'Line',
+                                         prescale  = config['PrescaleBetacLb2'],
+                                         postscale = config['PostscaleBetacLb2'],
                                          RelatedInfoTools = config['RelatedInfoTools'],
-                                         selection = self.selBetacLb2, 
+                                         selection = self.selBetacLb2,
                                        )
 
 
@@ -379,7 +379,7 @@ class StrippingXic2HHHConf(LineBuilder):
 
 
     def _kaonFilter( self ):
-          _code = "(PROBNNk > 0.4) &(TRGHP < 0.4) & (MIPCHI2DV(PRIMARY) > %(K_IPCHI2_MIN)s) & (P>2000*MeV) & (PT>300*MeV) &(TRCHI2DOF < %(Daug_TRCHI2DOF_MAX)s)" % self.__confdict__          
+          _code = "(PROBNNk > 0.4) &(TRGHP < 0.4) & (MIPCHI2DV(PRIMARY) > %(K_IPCHI2_MIN)s) & (P>2000*MeV) & (PT>300*MeV) &(TRCHI2DOF < %(Daug_TRCHI2DOF_MAX)s)" % self.__confdict__
           _kaon = FilterDesktop( Code = _code )
           return _kaon
 
@@ -393,7 +393,7 @@ class StrippingXic2HHHConf(LineBuilder):
                                                 "& (BPVVDCHI2> 100)" % self.__confdict__
           _KS0LL = FilterDesktop( Code = _code )
           return _KS0LL
-                                  
+
     def _KS0DDFilter( self ):
           _code = "(P>3000.*MeV)&(PT>800.*MeV)&(BPVLTIME()>3.0*ps)&CHILDCUT((TRCHI2DOF<4.),1)&CHILDCUT((TRCHI2DOF<4.),2)" \
                                                 "& (BPVVDZ > -1000.0 * mm) " \
@@ -401,7 +401,7 @@ class StrippingXic2HHHConf(LineBuilder):
                                                 "& (BPVDIRA > 0.99995 ) " \
                                                 "& (ADMASS('KS0') < 15.0 *MeV) " \
                                                 "& (BPVVDCHI2> 100)" % self.__confdict__
-               
+
           _KS0DD = FilterDesktop( Code = _code )
           return _KS0DD
 
@@ -411,18 +411,18 @@ def makeXic2PKPi( name
                , Daug_All_PT_MIN
                , Daug_P_MIN
                , Daug_TRCHI2DOF_MAX
-               , Comb_MASS_MIN 
+               , Comb_MASS_MIN
                , Comb_MASS_MAX
                , Comb_ADOCAMAX_MAX
                , Xic_PT_MIN
                , Xic_VCHI2VDOF_MAX
                , Xic_BPVVDCHI2_MIN
                , Xic_BPVDIRA_MIN
-               , Xic_BPVIPCHI2_MAX 
+               , Xic_BPVIPCHI2_MAX
                , Xic_BPVLTIME_MAX
                , Xic_BPVLTIME_MIN
                , decDescriptors = [ "[Lambda_c -> p+ K- pi+]cc" ]
-             ) : 
+             ) :
 
 
     combCuts = "(AM > %(Comb_MASS_MIN)s)" \
@@ -445,7 +445,7 @@ def makeXic2PKPi( name
         DecayDescriptors = decDescriptors
 
         , CombinationCut = combCuts
-        , MotherCut = xicCuts 
+        , MotherCut = xicCuts
     )
 
     return Selection( name,
@@ -521,7 +521,7 @@ def makeBetac2pDs( name
     return Selection( name,
                       Algorithm = _Betac2pDs,
                       RequiredSelections = inputSel
-                    )    
+                    )
 
 
 def makeBetacLb1( name
@@ -531,7 +531,7 @@ def makeBetacLb1( name
                , Daug_TRCHI2DOF_MAX
                , Comb_MASS_MIN
                , Comb_MASS_MAX
-               , Comb_ADOCAMAX_MAX 
+               , Comb_ADOCAMAX_MAX
                , Xic_PT_MIN
                , Xic_BPVDIRA_MIN
                , Xic_BPVIPCHI2_MAX
@@ -539,26 +539,26 @@ def makeBetacLb1( name
                , Xic_BPVLTIME_MIN
                , decDescriptors = [ "[Lambda_b0 -> p+ K- K+ KS0 pi-]cc" ]
              ) :
-                     
+
     combCuts = "(AM > %(Comb_MASS_MIN)s)" \
                "& (AM <  %(Comb_MASS_MAX)s)" \
                "& (( ACHILD(MIPCHI2DV(), 1) + ACHILD(MIPCHI2DV(), 2) + ACHILD(MIPCHI2DV(), 3)+ ACHILD(MIPCHI2DV(), 6) )>25)" \
                "& (AMINCHILD(P)  > %(Daug_P_MIN)s)" \
                "& (AMINCHILD(PT) > %(Daug_All_PT_MIN)s)" % locals()
-                              
+
     betacCuts = "(PT > %(Xic_PT_MIN)s)" % locals()
-               
+
     _BetacLb1 = CombineParticles(
         DecayDescriptors = decDescriptors
         , CombinationCut = combCuts
-        , MotherCut = betacCuts 
+        , MotherCut = betacCuts
     )
-               
+
     return Selection( name,
                       Algorithm = _BetacLb1,
                       RequiredSelections = inputSel
                     )
-    
+
 def makeBetacLb2( name
                , inputSel
                , Daug_All_PT_MIN
@@ -566,7 +566,7 @@ def makeBetacLb2( name
                , Daug_TRCHI2DOF_MAX
                , Comb_MASS_MIN
                , Comb_MASS_MAX
-               , Comb_ADOCAMAX_MAX 
+               , Comb_ADOCAMAX_MAX
                , Xic_PT_MIN
                , Xic_BPVDIRA_MIN
                , Xic_BPVIPCHI2_MAX
@@ -574,24 +574,22 @@ def makeBetacLb2( name
                , Xic_BPVLTIME_MIN
                , decDescriptors = [ "[Lambda_b0 -> p+ K- pi+ KS0 KS0 pi-]cc" ]
              ) :
-    
+
     combCuts = "(AM > %(Comb_MASS_MIN)s)" \
                "& (AM <  %(Comb_MASS_MAX)s)" \
                "& ((ACHILD(MIPCHI2DV(), 1) + ACHILD(MIPCHI2DV(), 2) + ACHILD(MIPCHI2DV(), 3) + ACHILD(MIPCHI2DV(), 6) )>25)" \
                "& (AMINCHILD(P)  > %(Daug_P_MIN)s)" \
                "& (AMINCHILD(PT) > %(Daug_All_PT_MIN)s)" % locals()
-               
+
     betacCuts = "(PT > %(Xic_PT_MIN)s)" % locals()
-               
-    _BetacLb2 = CombineParticles( 
+
+    _BetacLb2 = CombineParticles(
         DecayDescriptors = decDescriptors
         , CombinationCut = combCuts
-        , MotherCut = betacCuts   
+        , MotherCut = betacCuts
     )
-               
+
     return Selection( name,
                       Algorithm = _BetacLb2,
                       RequiredSelections = inputSel
                     )
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py
index f1994c813e4229d8702fe98ded79cd8613d00a58..576ba1a8dd6906acb6b61ea0f13cd902add9f299 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py
@@ -48,7 +48,7 @@ __all__ = ( 'XiccBuilder'               ## LineBuilder class specialization
             , 'filterProtons'
             , 'filterDplus'
             , 'filterDsplus'
-            , 'filterD0' 
+            , 'filterD0'
             , 'filterLcForControl'
           )
 
@@ -215,7 +215,7 @@ class XiccBuilder(LineBuilder) :
             self.registerLine(line)
             return line
         # }
-        else : 
+        else :
             return False
 
     # }
@@ -748,4 +748,3 @@ def makeTisTos( name, selection, hltTisTosSpec = { } ) :  # {
 
     return outSel
 # }
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
index 6d2b809ecfbecb05f04df0f430d8bb8e21d5882e..e7c425e987455dbda78481cf40276551bf1a9c3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
@@ -236,7 +236,7 @@ default_config = {
             'MinPIDe' : -2.0,
             'MaxIPChi2' : 1000.0,
             'MaxPointing' : 1.0
-            }   
+            }
         }
     }
 
@@ -276,7 +276,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
             RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
             )
         self.registerLine(self.LLLine)
-        
+
         self.DDLine = StrippingLine(
             name = 'ConvPhotonDD',
             prescale = self.config['DD']['Prescale'],
@@ -309,7 +309,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
             ODIN = odin,
             RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
             )
-        self.registerLine(self.DDNoBremLine)            
+        self.registerLine(self.DDNoBremLine)
 
         #========================
         # Prescaled Low Pt lines
@@ -324,7 +324,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
             RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
             )
         self.registerLine(self.LowPtLLLine)
-        
+
         self.LowPtDDLine = StrippingLine(
             name = 'ConvPhotonLowPtDD',
             prescale = self.config['LowPtDD']['Prescale'],
@@ -357,7 +357,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
             ODIN = odin,
             RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
             )
-        self.registerLine(self.LowPtDDNoBremLine)            
+        self.registerLine(self.LowPtDDNoBremLine)
 
         #===============
         # High-pt lines
@@ -372,7 +372,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
             RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
             )
         self.registerLine(self.HighPtLLLine)
-        
+
         self.HighPtDDLine = StrippingLine(
             name = 'ConvPhotonHighPtDD',
             prescale = self.config['HighPtDD']['Prescale'],
@@ -405,7 +405,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
             ODIN = odin,
             RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
             )
-        self.registerLine(self.HighPtDDNoBremLine)            
+        self.registerLine(self.HighPtDDNoBremLine)
 
     #==============================
     # Make selections for each line
@@ -420,7 +420,7 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
         alg.DiElectronMassMax = config['MaxMass']
         alg.DiElectronPtMin = 200.0*MeV
         alg.AddBrem = config['AddBrem']
-        
+
         # Extra setup for DD pairs
         if config['TrackType'] == 'Downstream':
             alg.ParticleCombiners.update({"" : "LoKi::VertexFitter"})
@@ -440,5 +440,5 @@ class HeavyIonConvertedPhotonConf(LineBuilder):
         sel = Selection(name,
                         Algorithm=FilterDesktop(Code=code),
                         RequiredSelections=[preSel])
-        
+
         return sel
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 90e3ccf83a223126884d0e77079fc3837d25b590..5b579ea7063c7c256da0ea4ff8dbb217d516418e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -13,10 +13,10 @@ __date__ = '16/07/2014'
 __version__ = '$Revision: 1.6 $'
 
 '''
-Stripping selection for D0 -> K pi pi0 
+Stripping selection for D0 -> K pi pi0
 '''
 ####################################################################
-# Stripping selection for D0 -> K pi pi0 
+# Stripping selection for D0 -> K pi pi0
 #  2 lines : one for merged, one for resolved pi0
 ####################################################################
 
@@ -128,7 +128,7 @@ def makeD02KPiPi0R( name,
                   inputSel
                   ) :
 
-    _TrackCuts    = "(PT>%(TrackMinPT_R)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']    
+    _TrackCuts    = "(PT>%(TrackMinPT_R)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']
     _pi0Cuts      = "(PT>%(Pi0MinPT_R)s *MeV) & (CHILD(CL,1)>%(ResPi0MinGamCL)s) & (CHILD(CL,2)>%(ResPi0MinGamCL)s)" %locals()['config']
     _daughterCuts = { 'K-' : _TrackCuts, 'pi+' : _TrackCuts, 'pi0' : _pi0Cuts }
     _combCuts     = "(AM>%(D0MinM)s *MeV) & (AM<%(D0MaxM)s *MeV)" % locals()['config']
@@ -151,7 +151,7 @@ def makeD02KPiPi0M( name,
                   inputSel
                   ) :
 
-    _TrackCuts    = "(PT>%(TrackMinPT_M)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']    
+    _TrackCuts    = "(PT>%(TrackMinPT_M)s *MeV) & (TRPCHI2>%(TrackMinTrackProb)s) & (TRGHOSTPROB<%(TrackMaxGhostProb)s) & (MIPCHI2DV(PRIMARY)>%(TrackMinIPChi2)s)" %locals()['config']
     _pi0Cuts      = "(PT>%(Pi0MinPT_M)s *MeV)" %locals()['config']
     _daughterCuts = { 'K-' : _TrackCuts, 'pi+' : _TrackCuts, 'pi0' : _pi0Cuts }
     _combCuts     = "(AM>%(D0MinM)s *MeV) & (AM<%(D0MaxM)s *MeV)" % locals()['config']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py
index 48553de3c633a6201d93bd3b87ec33b410b15aee..e7e24da85dfba140664beecc4b65f9335b17a5b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -42,20 +42,20 @@ default_config =  {
         "AM_4000MeV"       : 4000,   # MeV
         "AM_8500MeV"       : 8500,   # MeV
         "AMDY"             : 2500,   # MeV
-        "ProbNNmu_min"     : 0.5, 
+        "ProbNNmu_min"     : 0.5,
         'PrescaleHighMass'            :  1.0,
-        'PostscaleHighMass'           : 1.0, 
+        'PostscaleHighMass'           : 1.0,
         'PrescaleLowMass'            :  1.0,
-        'PostscaleLowMass'           : 1.0, 
+        'PostscaleLowMass'           : 1.0,
         'PrescaleSameSign'            :  1.0,
-        'PostscaleSameSign'           : 1.0, 
+        'PostscaleSameSign'           : 1.0,
         'PrescaleDY'            :  1.0,
-        'PostscaleDY'           : 1.0, 
+        'PostscaleDY'           : 1.0,
         'Hlt1FilterHighMass'          : None,
         'Hlt2FilterHighMass'          : None,
-        'Hlt1FilterLowMass'           : None,     
+        'Hlt1FilterLowMass'           : None,
         'Hlt2FilterLowMass'           : None,
-        'Hlt1FilterSameSign'          : None, 
+        'Hlt1FilterSameSign'          : None,
         'Hlt2FilterSameSign'          : None,
         'Hlt1FilterDY'           : None,
         'Hlt2FilterDY1'          : None,
@@ -74,14 +74,14 @@ from StandardParticles import StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 class HeavyIonDiMuonConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
         self.inMuons = StdAllLooseMuons
 
@@ -91,7 +91,7 @@ class HeavyIonDiMuonConf(LineBuilder):
         # _dauCuts = {"mu+":("(PT>{0[PTmu_min]}) & (TRCHI2DOF<{0[Track_CHI2]}) & (PROBNNmu > {0[ProbNNmu_min]})").format(self.config)}
         _dauCuts = {"mu+":("(PT>{0[PTmu_min]}) & (TRCHI2DOF<{0[Track_CHI2]})").format(self.config)}
 
-        _comCutsHighMass = ( 
+        _comCutsHighMass = (
               "( AM > {0[AM]})"
               "&( (AM < {0[AM_4000MeV]}) | (AM > {0[AM_8500MeV]}))"
               # "&(ACUTDOCA({0[DOCA_max]}, ''))"
@@ -103,7 +103,7 @@ class HeavyIonDiMuonConf(LineBuilder):
               combCuts = _comCutsHighMass
               )
 
-        _comCutsHighMass_SameSign = ( 
+        _comCutsHighMass_SameSign = (
               "(ACUTDOCA({0[DOCA_max]}, ''))"
               ).format(self.config)
         self.makeDiMuonSameSign = self.makeDiMuonSameSign(
@@ -113,7 +113,7 @@ class HeavyIonDiMuonConf(LineBuilder):
               combCuts = _comCutsHighMass
               )
 
-        _comCutsLowMass = ( 
+        _comCutsLowMass = (
               "(AM < {0[AM]})"
               #              "&(PROBNNmu > {0[ProbNNmu_min]}, ''))"
               ).format(self.config)
@@ -125,7 +125,7 @@ class HeavyIonDiMuonConf(LineBuilder):
               )
 
 
-        _comCutsDY = ( 
+        _comCutsDY = (
             "(AM > {0[AMDY]})"
             ).format(self.config)
 
@@ -142,12 +142,12 @@ class HeavyIonDiMuonConf(LineBuilder):
             motherCuts = _monCuts,
             combCuts = _comCutsDY
             )
-        
+
         odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in self.config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
 
         self.JpsiLine = StrippingLine( name+'Jpsi2MuMuLine',
               prescale  = self.config['PrescaleHighMass'],
-              postscale  = self.config['PostscaleHighMass'],                                                                      
+              postscale  = self.config['PostscaleHighMass'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterHighMass'],
               HLT2       =self.config['Hlt2FilterHighMass'],
@@ -159,7 +159,7 @@ class HeavyIonDiMuonConf(LineBuilder):
 
         self.SameSignDiMuonLine = StrippingLine( name+'SameSignDiMuonLine',
               prescale  = self.config['PrescaleSameSign'],
-              postscale  = self.config['PostscaleSameSign'],                                                                      
+              postscale  = self.config['PostscaleSameSign'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterSameSign'],
               HLT2       =self.config['Hlt2FilterSameSign'],
@@ -171,19 +171,19 @@ class HeavyIonDiMuonConf(LineBuilder):
 
         self.LowDiMuonLine = StrippingLine( name+'LowDiMuonLine',
               prescale  = self.config['PrescaleLowMass'],
-              postscale  = self.config['PostscaleLowMass'],                                                                      
+              postscale  = self.config['PostscaleLowMass'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterLowMass'],
               HLT2       =self.config['Hlt2FilterLowMass'],
               algos     = [ self.makeDiMuonLow],
-              ODIN      = odin,           
+              ODIN      = odin,
               RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
               )
         self.registerLine( self.LowDiMuonLine )
 
         self.DY1Line = StrippingLine( name+'DY1Line',
               prescale  = self.config['PrescaleDY'],
-              postscale  = self.config['PostscaleDY'],                                                                      
+              postscale  = self.config['PostscaleDY'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterDY'],
               HLT2       =self.config['Hlt2FilterDY1'],
@@ -196,7 +196,7 @@ class HeavyIonDiMuonConf(LineBuilder):
 
         self.DY2Line = StrippingLine( name+'DY2Line',
               prescale  = self.config['PrescaleDY'],
-              postscale  = self.config['PostscaleDY'],                                                                      
+              postscale  = self.config['PostscaleDY'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterDY'],
               HLT2       =self.config['Hlt2FilterDY2'],
@@ -209,7 +209,7 @@ class HeavyIonDiMuonConf(LineBuilder):
 
         self.DY3Line = StrippingLine( name+'DY3Line',
               prescale  = self.config['PrescaleDY'],
-              postscale  = self.config['PostscaleDY'],                                                                      
+              postscale  = self.config['PostscaleDY'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterDY'],
               HLT2       =self.config['Hlt2FilterDY3'],
@@ -221,7 +221,7 @@ class HeavyIonDiMuonConf(LineBuilder):
 
         self.DY4Line = StrippingLine( name+'DY4Line',
               prescale  = self.config['PrescaleDY'],
-              postscale  = self.config['PostscaleDY'],                                                                      
+              postscale  = self.config['PostscaleDY'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterDY'],
               HLT2       =self.config['Hlt2FilterDY4'],
@@ -234,7 +234,7 @@ class HeavyIonDiMuonConf(LineBuilder):
 
         self.DYSSLine = StrippingLine( name+'DYSSLine',
               prescale  = self.config['PrescaleDY'],
-              postscale  = self.config['PostscaleDY'],                                                                      
+              postscale  = self.config['PostscaleDY'],
               checkPV   = self.config['CheckPV'],
               HLT1       =self.config['Hlt1FilterDY'],
               HLT2       =self.config['Hlt2FilterDYSS'],
@@ -265,13 +265,13 @@ class HeavyIonDiMuonConf(LineBuilder):
             DecayDescriptors   = ["J/psi(1S) -> mu+ mu+"],
             CombinationCut     = combCuts,
             MotherCut          = motherCuts,
-            DaughtersCuts       = daughterCuts    
+            DaughtersCuts       = daughterCuts
         )
         return Selection( name,
                           Algorithm = diMuonSS,
                           RequiredSelections = [ self.inMuons] )
-                          
-    
+
+
     def makeDYMuMu( self,name, daughterCuts, motherCuts, combCuts) :
         '''create a selection using a CombineParticles'''
         DYmumu = CombineParticles(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index bc7f7ac0e8668fbaca32673f1b381d1ba2c57d21..4174635a31e06cddeca53502f5e0483aa29b6d57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -45,7 +45,7 @@ default_config =  {
     'WGs'        : ['IFT'],
     'BUILDERTYPE': 'HeavyIonDst2D0KPiForPIDConf',
     'CONFIG'     :{
-    
+
       'DaugPt'           : 250 * MeV      ## GeV
     , 'DaugP'            : 2.0 * GeV      ## GeV
     , 'DaugIPChi2'       : 9             ## unitless
@@ -103,7 +103,7 @@ class HeavyIonDst2D0KPiForPIDConf(LineBuilder) :
              HLT1       =config['Hlt1Filter'],
              HLT2       =config['Hlt2Filter'],
              ODIN      = odin
-             )  
+             )
 
         self.registerLine(self.Dstar2D0Pi_line)
 
@@ -112,7 +112,7 @@ def D0 ( name, config) :
     """
     Selection for D0
     """
-    
+
     _D0 = CombineParticles()
     _D0.DecayDescriptor = "[D0 -> K- pi+]cc"
     dauCutStr = "(PT > %(DaugPt)s) & (P > %(DaugP)s) & (TRCHI2DOF < %(DaugTrkChi2)s) & (MIPCHI2DV(PRIMARY) > %(DaugIPChi2)s)" %locals()['config']
@@ -134,18 +134,18 @@ def D0 ( name, config) :
    # & ( ADWM( 'D0' , WM( 'pi-' , 'pi+') ) > %(PiPi_WrongMass)s)
    # """
     _D0.MotherCut = mothercut %locals()['config']
-    
+
     D0 = Selection("SelD02RSKPiFor"+name,
                    Algorithm = _D0,
                    RequiredSelections = [StdAllNoPIDsKaons,
                                          StdAllNoPIDsPions])
     return D0
-    
+
 def Dstar ( name, D0Sel, config) :
     """
     Selection for D*
     """
-    
+
     _DSt = CombineParticles()
     _DSt.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc"
     slowPiCuts = "(PT>%(SlowPiPt)s) & (TRCHI2DOF < %(SlowPiTrkChi2)s)" %locals()['config']
@@ -154,7 +154,7 @@ def Dstar ( name, D0Sel, config) :
     combcut = """
     (APT>%(DstarPt)s)
     & (ADAMASS('D*(2010)+')<75)
-    & (AM - AM1 < 165 * MeV) 
+    & (AM - AM1 < 165 * MeV)
     """
     _DSt.CombinationCut = combcut %locals()['config']
     mothercut = """
@@ -163,10 +163,10 @@ def Dstar ( name, D0Sel, config) :
     & (M-MAXTREE('D0'==ABSID,M)>%(DeltaM_Min)s)
     """
     _DSt.MotherCut =  mothercut %locals()['config']
-    
+
     DSt = Selection("SelDSt2D0PiFor"+name,
                     Algorithm = _DSt,
                     RequiredSelections = [StdAllNoPIDsPions,
                                           D0Sel])
-    
+
     return DSt
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonGammaHadron.py
index bda2e3c697da01c8b3666e813a646d61ca732584..243aa5c1fb1844dee63100658ae96f1ca19d761b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonGammaHadron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonGammaHadron.py
@@ -32,16 +32,16 @@ default_config =  {
         "odin": ["NoBeam","Beam1","Beam2","BeamCrossing"],
         'CheckPV'    :  True,
         'MicroBiasPrescale'            :  1.0,
-        'MicroBiasPostscale'           :  1.0, 
+        'MicroBiasPostscale'           :  1.0,
         "MicroBiasHlt1Filter"         : None, #"(HLT_PASS('Hlt1MBMicroBiasVeloDecision'))", #(HLT_PASS('Hlt1MB.*Decision')) #Hlt1MBMicroBiasVelo
         "MicroBiasHlt2Filter"         : None, #"(HLT_PASS('Hlt2PassThroughDecision'))|(HLT_PASS('Hlt2SMOGPhysicsDecision'))",
 
         'MicroBiasLowMultPrescale'            :  1.0,
-        'MicroBiasLowMultPostscale'           :  1.0, 
+        'MicroBiasLowMultPostscale'           :  1.0,
         "MicroBiasLowMultHlt1Filter"         : None, #"(HLT_PASS('Hlt1MBMicroBiasLowMultVeloDecision'))", #(HLT_PASS('Hlt1MB.*Decision')) #Hlt1MBMicroBiasVelo
         "MicroBiasLowMultHlt2Filter"         : None, #"(HLT_PASS('Hlt2PassThroughDecision'))",
         'NoBiasPrescale'            :  1.0, #0.2,
-        'NoBiasPostscale'           :  1.0, 
+        'NoBiasPostscale'           :  1.0,
         "NoBiasHlt1Filter"         : None, #"(HLT_PASS('Hlt1MBNoBiasLeadingCrossingDecision'))", #(HLT_PASS('Hlt1MB.*Decision')) #Hlt1MBMicroBiasVelo
         "NoBiasHlt2Filter"         : None, #"(HLT_PASS('Hlt2PassThroughDecision'))",
         'gammaPT1'              : 1000    # MeV/c
@@ -72,20 +72,20 @@ from Configurables import RelInfoConeVariables
 
 
 class HeavyIonGammaHadronConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, name, config ): 
-                
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
         print "inside GammaHadron",config
         odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
 
         fltrCode_LowPtLL = "(MAXTREE(ISBASIC,TRGHOSTPROB)<%(ConvGhostLL)s) & (M<%(gammaConvMLL)s*MeV) & (PT>(%(gammaConvPT1)s)*MeV) & (PT<(%(gammaConvPT2)s)*MeV) & (MAXTREE(ISBASIC,PPINFO( LHCb.ProtoParticle.ProbNNe,-1 ))>%(LLProbNNe)s) & INTREE('gamma'==ABSID)" % config
         self._trkFilter_LowPtLL = FilterDesktop(name = "LowPtLLFilterFor"+name, Code = fltrCode_LowPtLL )
-        
+
         fltrCode_LL = "(MAXTREE(ISBASIC,TRGHOSTPROB)<%(ConvGhostLL)s) & (M<%(gammaConvMLL)s*MeV) & (PT>(%(gammaConvPT2)s)*MeV) & (MAXTREE(ISBASIC,PPINFO( LHCb.ProtoParticle.ProbNNe,-1 ))>%(LLProbNNe)s) & INTREE('gamma'==ABSID)" % config
         self._trkFilter_LL = FilterDesktop(name = "LLFilterFor"+name, Code = fltrCode_LL )
 
@@ -104,7 +104,7 @@ class HeavyIonGammaHadronConf(LineBuilder):
         self.convPhotons_LL = DataOnDemand(Location='Phys/StdAllLooseGammaLL/Particles')
         self.convPhotons_DD = DataOnDemand(Location='Phys/StdAllLooseGammaDD/Particles')
         stdPhotons     = DataOnDemand(Location='Phys/StdLoosePhotons/Particles')
-        
+
         self.convPhotons_LowPtLL_clean = Selection( 'PhotonConvFilterLowPtLL' + name, Algorithm = self._trkFilter_LowPtLL, RequiredSelections = [self.convPhotons_LL])
         self.convPhotons_LowPtDD_clean = Selection( 'PhotonConvFilterLowPtDD' + name, Algorithm = self._trkFilter_LowPtDD, RequiredSelections = [self.convPhotons_DD])
         self.convPhotons_LL_clean = Selection( 'PhotonConvFilterLL' + name, Algorithm = self._trkFilter_LL, RequiredSelections = [self.convPhotons_LL])
@@ -116,7 +116,7 @@ class HeavyIonGammaHadronConf(LineBuilder):
         relinfo = [{"Type" : "RelInfoConeIsolation",
                     "ConeSize" : 0.5,
                     "Location"  : "Iso05"}]
-        
+
 #        isocut_NoConvLowPtGamma = FilterDesktop(name+"NoConvLowPtGammaIsoLine",
 #                                                Code="RELINFO('/Event/Phys/NoConvLowPtGamma/Iso05', 'NC_MULT', 1000) < 3",
 #                                                Inputs=['Phys/NoConvLowPtGamma/Particles'])
@@ -136,7 +136,7 @@ class HeavyIonGammaHadronConf(LineBuilder):
                                                 Code="(RELINFO('/Event/Phys/LowPtDDGamma/Iso05', 'CC_MULT', 1000)+RELINFO('/Event/Phys/LowPtDDGamma/Iso05', 'NC_MULT', 1000)) < 4",
                                                 Inputs=['Phys/LowPtDDGamma/Particles'])
 
-#        self.NoConvLowPtGammaLine = StrippingLine( 
+#        self.NoConvLowPtGammaLine = StrippingLine(
 #            name = 'NoConvLowPtGamma',
 #            prescale  = 1.0,
 #            postscale  = self.config['MicroBiasPostscale'],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py
index 53af0176dad696577e77b9e953da1fe918ff87b2..0888689305db38c4f7219a93f4b4b20a30ab6ebf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py
@@ -32,32 +32,32 @@ default_config =  {
         "odin": ["NoBeam","Beam1","Beam2","BeamCrossing"],
         "odinSMOG": ["Beam1","Beam2"],
         'CheckPV'    :  False,
-        
+
 
         'MicroBiasPrescale'            :  1.0,
-        'MicroBiasPostscale'           :  0.05, 
-        # Do PbPb or PbAr 
-        "MicroBiasHlt1Filter"         : "(HLT_PASS('Hlt1BBMicroBiasVeloDecision'))|(HLT_PASS('Hlt1BEMicroBiasVeloDecision'))", 
+        'MicroBiasPostscale'           :  0.05,
+        # Do PbPb or PbAr
+        "MicroBiasHlt1Filter"         : "(HLT_PASS('Hlt1BBMicroBiasVeloDecision'))|(HLT_PASS('Hlt1BEMicroBiasVeloDecision'))",
         "MicroBiasHlt2Filter"         : None,
 
 
         'NoMicroBiasPrescale'            :  1.0,
-        'NoMicroBiasPostscale'           :  1.0, 
-        "NoMicroBiasHlt1Filter"         : "(HLT_PASS('Hlt1BENoBiasDecision'))|(HLT_PASS('Hlt1MBNoBiasDecision'))", 
+        'NoMicroBiasPostscale'           :  1.0,
+        "NoMicroBiasHlt1Filter"         : "(HLT_PASS('Hlt1BENoBiasDecision'))|(HLT_PASS('Hlt1MBNoBiasDecision'))",
         "NoMicroBiasHlt2Filter"         : None,
-                                                                                                   
+
         #       "GEC_LowMult"       : "( recSummaryTrack(LHCb.RecSummary.nVeloTracks, TrVELO) < 10000) & ( recSummaryTrack(LHCb.RecSummary.nVeloTracks, TrVELO) > 1) ",
         "GEC_LowMult"       : "( recSummaryTrack(LHCb.RecSummary.nVeloTracks, TrVELO) > 1) ",
         "GEC_HighMult"       : "( recSummaryTrack(LHCb.RecSummary.nVeloTracks, TrVELO) >= 10000) ",
 
         #Only PbAr trigger available for LowMult MicroBias
         'MicroBiasLowMultPrescale'            :  1.0,
-        'MicroBiasLowMultPostscale'           :  1.0, 
+        'MicroBiasLowMultPostscale'           :  1.0,
         "MicroBiasLowMultHlt1Filter"         : "(HLT_PASS('Hlt1BEMicroBiasLowMultVeloDecision'))", #(HLT_PASS('Hlt1MB.*Decision')) #Hlt1MBMicroBiasVelo
         "MicroBiasLowMultHlt2Filter"         : None,
 
         'MicroBiasHighMultPrescale'            :  1.0,
-        'MicroBiasHighMultPostscale'           :  1.0, 
+        'MicroBiasHighMultPostscale'           :  1.0,
         "MicroBiasHighMultHlt1Filter"         : None,
         "MicroBiasHighMultHlt2Filter"         : None,
         }
@@ -68,17 +68,17 @@ from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 
 class HeavyIonMiniBiasConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
         #print "inside MiniBias",config
-        odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])      
+        odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
 
         _filter1 = {'Code': config['GEC_LowMult'], 'Preambulo' : ["from LoKiTracks.decorators import *" ,
                                                                   "from LoKiCore.functions    import * ",
@@ -87,12 +87,12 @@ class HeavyIonMiniBiasConf(LineBuilder):
         _filter2 = {'Code': config['GEC_HighMult'], 'Preambulo' : ["from LoKiTracks.decorators import *" ,
                                                                   "from LoKiCore.functions    import * ",
                                                                   "from GaudiKernel.SystemOfUnits import *"]}
-        
-        self.MicroBiasLine = StrippingLine( 
+
+        self.MicroBiasLine = StrippingLine(
 	      name = 'MBMicroBias',
               prescale  = self.config['MicroBiasPrescale'],
-              postscale  = self.config['MicroBiasPostscale'],                 
-              FILTER = _filter1,                   
+              postscale  = self.config['MicroBiasPostscale'],
+              FILTER = _filter1,
               HLT1       =self.config['MicroBiasHlt1Filter'],
               HLT2       =self.config['MicroBiasHlt2Filter'],
               checkPV   = self.config['CheckPV'],
@@ -102,10 +102,10 @@ class HeavyIonMiniBiasConf(LineBuilder):
         self.registerLine( self.MicroBiasLine )
 
 
-        self.NoMicroBiasLine = StrippingLine( 
+        self.NoMicroBiasLine = StrippingLine(
 	      name = 'MBNoMicroBias',
               prescale  = self.config['NoMicroBiasPrescale'],
-              postscale  = self.config['NoMicroBiasPostscale'],                 
+              postscale  = self.config['NoMicroBiasPostscale'],
               FILTER = None,
               HLT1       =self.config['NoMicroBiasHlt1Filter'],
               HLT2       =self.config['NoMicroBiasHlt2Filter'],
@@ -115,10 +115,10 @@ class HeavyIonMiniBiasConf(LineBuilder):
               )
         self.registerLine( self.NoMicroBiasLine )
 
-        self.MicroBiasLowMultLine = StrippingLine( 
+        self.MicroBiasLowMultLine = StrippingLine(
 	      name = 'MicroBiasLowMult',
               prescale  = self.config['MicroBiasLowMultPrescale'],
-              postscale  = self.config['MicroBiasLowMultPostscale'],          
+              postscale  = self.config['MicroBiasLowMultPostscale'],
               HLT1       =self.config['MicroBiasLowMultHlt1Filter'],
               HLT2       =self.config['MicroBiasLowMultHlt2Filter'],
               checkPV   = self.config['CheckPV'],
@@ -127,10 +127,10 @@ class HeavyIonMiniBiasConf(LineBuilder):
               )
         self.registerLine( self.MicroBiasLowMultLine )
 
-        self.MicroBiasHighMultLine = StrippingLine( 
+        self.MicroBiasHighMultLine = StrippingLine(
 	      name = 'MicroBiasHighMult',
               prescale  = self.config['MicroBiasHighMultPrescale'],
-              postscale  = self.config['MicroBiasHighMultPostscale'],                             
+              postscale  = self.config['MicroBiasHighMultPostscale'],
               HLT1       =self.config['MicroBiasHighMultHlt1Filter'],
               HLT2       =self.config['MicroBiasHighMultHlt2Filter'],
               checkPV   = self.config['CheckPV'],
@@ -139,4 +139,3 @@ class HeavyIonMiniBiasConf(LineBuilder):
               ODIN      = odin
               )
         self.registerLine( self.MicroBiasHighMultLine )
-        
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py
index 8fe92ca2c00c664e5e0b328d81bdd7375a5960f4..5078e7efc3593f2dc5e5459fbbdae139af79a1c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -49,7 +49,7 @@ default_config = {
     'BUILDERTYPE': 'HeavyIonOpenCharmConf',
     'STREAMS': ['IFT'],
     'CONFIG': {
-        "odin": ["NoBeam","Beam1","Beam2","BeamCrossing"], 
+        "odin": ["NoBeam","Beam1","Beam2","BeamCrossing"],
         #        'Track_CHI2'         : 3,         # Minimum track chi2
         'Track_CHI2'         : 5,         # Minimum track chi2
         #
@@ -66,7 +66,7 @@ default_config = {
         'D0_Pi_PIDK_MAX'             : 5.0,              # Maximum Dpm daughter pion DLLK,       'in trigger of pAr hlt2'
         'D0_Comb_ADOCAMAX_MAX'       : 2.,               # DOCA
         'D0_Daug_All_BPVIPCHI2_MIN'  : 4.0,               # Minimum best primary vertex IP chi^2 all D0 daughters must satisfy
-        'D0_VCHI2VDOF_MAX'           : 16.0,              # Maximum Dpm vertex chi^2 per vertex fit DoF 
+        'D0_VCHI2VDOF_MAX'           : 16.0,              # Maximum Dpm vertex chi^2 per vertex fit DoF
         'D0_acosBPVDIRA_MAX'         : 35.0*mrad,         # Maximum angle between D0 momentum and D0 direction of flight, '10 at HLT2 of pAr'
 
         #'D0_PVDispCut'               : '((BPVLTIME() > 0.500*picosecond))', # Primary vertex displacement requirement
@@ -75,7 +75,7 @@ default_config = {
         'D0_ADAMASS_WIN'             : 100.0*MeV,         # D0 mass window around the nominal D0 mass before the vertex fit, '90 MeV at HLT2 of pAr'
 
         'D0_Prescale':  1.0,
-        'D0_Postscale': 1.0, 
+        'D0_Postscale': 1.0,
 
         'D0_Hlt1Filter': None, #"HLT_PASS_RE('Hlt1SMOG.*Decision')",   #Hlt1SMOGD0KPiDecision ?
         'D0_Hlt2Filter': None, #"HLT_PASS_RE('Hlt2SMOGD02KPiDecision')",
@@ -87,7 +87,7 @@ default_config = {
         'Dst_AMDiff_MAX'        : 160.0*MeV,         # Maximum delta mass value m(D*{0,+}) - m(D0)
         'Dst_VCHI2VDOF_MAX'     : 10.0,              # Maximum D*+ vertex chi^2 per vertex DoF (_not_ applied to D*0)
 
-        'Dst_Prescale'     : 1.0, 
+        'Dst_Prescale'     : 1.0,
         'Dst_Postscale'    : 1.0,
 
         'Dst_Hlt1Filter': None, #"HLT_PASS_RE('Hlt1SMOG.*Decision')",   #Hlt1SMOGD0KPiDecision ?
@@ -127,16 +127,16 @@ default_config = {
         'Dp_ADAMASS_WIN'          : 100.0*MeV,         # D+ mass window around the nominal D+ mass before the vertex fit, '90 MeV at HLT2 of pAr'
 
         'Dp_Prescale': 1.0,
-        'Dp_Postscale': 1.0, 
+        'Dp_Postscale': 1.0,
 
         'Dp_Hlt1Filter': None, #"HLT_PASS_RE('Hlt1SMOG.*Decision')",   #Hlt1SMOGDpmKKPiDecision ?
         'Dp_Hlt2Filter': None, #"HLT_PASS_RE('Hlt2SMOGDpm2KPiPiDecision')",
-       
+
 
         'Ds_ADAMASS_WIN'          : 100.0*MeV,         # Ds+ mass window around the nominal Ds+ mass before the vertex fit, '90 MeV at HLT2 of pAr'
 
         'Ds_Prescale': 1.0,
-        'Ds_Postscale': 1.0, 
+        'Ds_Postscale': 1.0,
 
         # HLT filters, only process events firing triggers matching the RegEx
         'Ds_Hlt1Filter': None, #"HLT_PASS_RE('Hlt1SMOG.*Decision')",   #Hlt1SMOGDpmKPiDecision ?
@@ -145,12 +145,12 @@ default_config = {
         'Lc_ADAMASS_WIN'          : 300.0*MeV,         # Lc+ mass window around the nominal Lc+ mass before the vertex fit, '90 MeV at HLT2 of pAr'
 
         'Lc_Prescale': 1.0,
-        'Lc_Postscale': 1.0, 
+        'Lc_Postscale': 1.0,
 
         # HLT filters, only process events firing triggers matching the RegEx
         'Lc_Hlt1Filter': None, #"HLT_PASS_RE('Hlt1SMOG.*Decision')",   #Hlt1SMOGDpmKPiDecision ?
         'Lc_Hlt2Filter': None #"HLT_PASS_RE('Hlt2SMOGLc2KPPiDecision')",
-        
+
 
     }
 }
@@ -436,14 +436,14 @@ class HeavyIonOpenCharmConf(LineBuilder):
         kaonPIDCuts = (pidFiducialCuts +
                        '& (PIDK-PIDpi > {0[D0_K_PIDK_MIN]})'
                        ).format(self.config)
-        
+
         combCuts = "(ADAMASS('D0') < {0[D0_ADAMASS_WIN]}) & (AMINDOCA('')<{0[D0_Comb_ADOCAMAX_MAX]}) & (((APT1 > {0[D0_Daug_AllA_PT_MIN]}))|((APT2 > {0[D0_Daug_AllA_PT_MIN]})))".format(self.config)
 
         d0Cuts = ( '(VFASPF(VCHI2/VDOF) < {0[D0_VCHI2VDOF_MAX]})'
                    # '& ({0[D0_PVDispCut]})'
                    #                   '& (BPVDIRA > cos({0[D0_acosBPVDIRA_MAX]}))'
                    ).format(self.config)
-        
+
         _D0 = CombineParticles(
             DecayDescriptors=decDescriptors,
             Preambulo=lclPreambulo,
@@ -472,14 +472,14 @@ class HeavyIonOpenCharmConf(LineBuilder):
             pidFiducialCuts +
             '& (PIDK-PIDpi < {0[D0_Pi_PIDK_MAX]})'
         ).format(self.config)
-        
+
         combCuts = "(ADAMASS('D0') < {0[D0_ADAMASS_WIN]}) & (AMINDOCA('')<{0[D0_Comb_ADOCAMAX_MAX]}) & (((APT1 > {0[D0_Daug_AllA_PT_MIN]}))|((APT2 > {0[D0_Daug_AllA_PT_MIN]})))".format(self.config)
 
         d0Cuts = ( '(VFASPF(VCHI2/VDOF) < {0[D0_VCHI2VDOF_MAX]})'
                    # '& ({0[D0_PVDispCut]})'
                    #                   '& (BPVDIRA > cos({0[D0_acosBPVDIRA_MAX]}))'
                    ).format(self.config)
-        
+
         _D0 = CombineParticles(
             DecayDescriptors=decDescriptors,
             Preambulo=lclPreambulo,
@@ -489,9 +489,9 @@ class HeavyIonOpenCharmConf(LineBuilder):
             CombinationCut=combCuts,
             MotherCut=d0Cuts
             )
-        
+
         return Selection(name, Algorithm=_D0, RequiredSelections=inputSel)
-    
+
 
     def makeDst2D0Pi(self, name, inputSel, decDescriptors):
         """Return a Selection instance for a D*+ -> D0 pi+ decay.
@@ -515,7 +515,7 @@ class HeavyIonOpenCharmConf(LineBuilder):
         )
 
         return Selection(name, Algorithm=_Dst, RequiredSelections=inputSel)
-    
+
     def makeThreeProng(self, name, inputSel, decDescriptors,particle):
         """Return a Selection instance for a D+/Ds+/Lc+ -> h+ h+ h- decay.
 
@@ -579,7 +579,7 @@ class HeavyIonOpenCharmConf(LineBuilder):
                  "p+" : '{0} & {1}'.format(daugCuts, protonPIDCuts)
               }
         }
-       
+
 
         # Add 10 MeV either side of the ADAMASS checks to account for the
         # poorer mass resolution before the vertex fit
@@ -608,4 +608,3 @@ class HeavyIonOpenCharmConf(LineBuilder):
         )
 
         return Selection(name, Algorithm=_dplus, RequiredSelections=inputSel)
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py
index d53a20916fd593abcf47c52a9d0f7bb89fb055bf..4142759c35d122fba371bf674efe2d8d83281afd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -10,7 +10,7 @@
 ###############################################################################
 '''
 Module for selecting dielectron (J/psi, ...), pp (eta_c, ...)
-and W->MuNu 
+and W->MuNu
 '''
 
 __author__=['Emilie MAURICE']
@@ -31,8 +31,8 @@ default_config =  {
     'CONFIG'          : {
         "odin": ["NoBeam","Beam1","Beam2","BeamCrossing"],
         'CheckPV'    :  False,
-        
-              
+
+
         "VCHI2VDOF_max"    : 16,
         "Track_CHI2"       : 5,
         "DOCA_max"         : 10,
@@ -43,19 +43,19 @@ default_config =  {
         "Electron_PIDe"    : 1,
 
         'PrescaleDiElectron'            :  1.0,
-        'PostscaleDiElectron'           : 1.0, 
+        'PostscaleDiElectron'           : 1.0,
 
         'Hlt1FilterDiElectron'          : None, #"HLT_PASS_RE('Hlt1SingleElectronNoIP')",
         'Hlt2FilterDiElectron'          : None,
 
         # etac -> ppbar
-        'ProtonPIDppi'     :    20.  , # CombDLL(p-pi)                                                                                                                         
-        'ProtonPIDpK'      :    15.  , # CombDLL(p-K)                                                                                                                          
-        'CombMinMass'      :  2750.  , # MeV, before Vtx fit                                                                                                                   
-        'MaxMass'          :  4000.  , # MeV, after Vtx fit                                                                                                                    
+        'ProtonPIDppi'     :    20.  , # CombDLL(p-pi)
+        'ProtonPIDpK'      :    15.  , # CombDLL(p-K)
+        'CombMinMass'      :  2750.  , # MeV, before Vtx fit
+        'MaxMass'          :  4000.  , # MeV, after Vtx fit
 
         'PrescaleDiProton'            :  1.0,
-        'PostscaleDiProton'           : 1.0, 
+        'PostscaleDiProton'           : 1.0,
 
         'Hlt1FilterDiProton'          : None,
         'Hlt2FilterDiProton'          : None,
@@ -70,37 +70,37 @@ from StandardParticles import StdAllNoPIDsElectrons, StdAllLooseProtons, StdAllL
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 class HeavyIonOtherccConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
         self.inElectrons = StdAllNoPIDsElectrons
         self.inProtons = StdAllLooseProtons
         self.inMuons = StdAllLooseMuons
-        
+
         _monCuts = ( "(VFASPF(VCHI2/VDOF)<{0[VCHI2VDOF_max]})").format(self.config)
-        
+
         _dauCuts = {"e+":("(PT>{0[PT_min]}) & (TRCHI2DOF<{0[Track_CHI2]}) &  (PIDe >  {0[Electron_PIDe]})").format(self.config)}
-        
-        _comCutsHighMass = ( 
+
+        _comCutsHighMass = (
             "(AM > {0[AM]}) & (AM < {0[AMmax]} ) "
             #            "&(ACUTDOCA({0[DOCA_max]}, ''))"
             ).format(self.config)
-        
+
         self.makeJpsi = self.makeDiElectron(
             name = "Jpsi2ee",
             daughterCuts = _dauCuts,
             motherCuts = _monCuts,
             combCuts = _comCutsHighMass
             )
-        
+
         _dauCuts_proton = {"p+":("(TRCHI2DOF<{0[Track_CHI2]}) & ((PIDp-PIDpi) > {0[ProtonPIDppi]}) & ((PIDp-PIDK) > {0[ProtonPIDpK]})").format(self.config)}
-        
+
         _comCuts_pp = (
             "(AM > {0[CombMinMass]}) & (AM < {0[MaxMass]})"
 #            "&(ACUTDOCA({0[DOCA_max]}, ''))"
@@ -112,12 +112,12 @@ class HeavyIonOtherccConf(LineBuilder):
             combCuts = _comCuts_pp
             )
 
-        
+
         odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in self.config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
-        
+
         self.JpsiLine = StrippingLine( name+'Jpsi2eeLine',
                                        prescale  = self.config['PrescaleDiElectron'],
-                                       postscale  = self.config['PostscaleDiElectron'],                                                                      
+                                       postscale  = self.config['PostscaleDiElectron'],
                                        checkPV   = self.config['CheckPV'],
                                        HLT1       =self.config['Hlt1FilterDiElectron'],
                                        HLT2       =self.config['Hlt2FilterDiElectron'],
@@ -126,10 +126,10 @@ class HeavyIonOtherccConf(LineBuilder):
                                        RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
                                        )
         self.registerLine( self.JpsiLine )
-        
+
         self.EtacLine = StrippingLine( name+'Etac2ppLine',
                                        prescale  = self.config['PrescaleDiProton'],
-                                       postscale  = self.config['PostscaleDiProton'],                                                                      
+                                       postscale  = self.config['PostscaleDiProton'],
                                        checkPV   = self.config['CheckPV'],
                                        HLT1       =self.config['Hlt1FilterDiProton'],
                                        HLT2       =self.config['Hlt2FilterDiProton'],
@@ -138,10 +138,10 @@ class HeavyIonOtherccConf(LineBuilder):
                                        RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
                                        )
         self.registerLine( self.EtacLine )
-        
 
-        
-        
+
+
+
     def makeDiElectron( self,name, daughterCuts, motherCuts, combCuts) :
         diElectron = CombineParticles(
             #name               = 'Combine{0}'.format(name),
@@ -153,8 +153,8 @@ class HeavyIonOtherccConf(LineBuilder):
         return Selection( name,
                           Algorithm = diElectron,
                           RequiredSelections = [ self.inElectrons] )
-        
-        
+
+
 
     def makeDiProton( self,name, daughterCuts, motherCuts, combCuts) :
         '''create a selection using a CombineParticles'''
@@ -168,5 +168,3 @@ class HeavyIonOtherccConf(LineBuilder):
         return Selection( name,
                           Algorithm = diProton,
                           RequiredSelections = [ self.inProtons] )
-    
-        
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 53c13e173bdcc88f4a4bb74bad7ad8826830bead..725a7ba52202cbc96f4fd68049bf6b14d19d27bc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -55,8 +55,8 @@ default_config = {
         , 'CheckPV'     : False
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None # "HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None # "HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None # "HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None # "HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "J/psi(1S) -> mu+ mu-"
         , 'TagAndProbeIndices' : [ 1, 2 ]
@@ -75,8 +75,8 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None #"HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None #"HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None #"HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None #"HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "J/psi(1S) -> mu+ mu-"
         , 'TagAndProbeIndices' : [ 1, 2 ]
@@ -99,11 +99,11 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[Lambda0 -> p+ pi-]cc"
-        , 'InputTES'    : [ 'Phys/StdAllNoPIDsPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdAllNoPIDsPions/Particles',
                                    'Phys/StdAllNoPIDsProtons/Particles' ]
         , 'DaughtersCuts'       : {
             'p+'               : "( 2.0 * GeV < P ) &  ( TRCHI2DOF < 5 ) & ( MIPCHI2DV(PRIMARY) > 35 )",
@@ -112,10 +112,10 @@ default_config = {
         , 'CombinationCut'     :
             "(AM < 1.5 * GeV) & (ACHI2DOCA(1,2) < 20)"
         , 'MotherCut'          : (
-            "   ( ADMASS ( 'Lambda0') < 25 ) " + 
-            " & ( in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) )" + 
+            "   ( ADMASS ( 'Lambda0') < 25 ) " +
+            " & ( in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) )" +
             " & ( VFASPF ( VZ ) < 2200 ) "  +
-            " & ( in_range ( 0 , BPVLTFITCHI2() , 49 ) )" + 
+            " & ( in_range ( 0 , BPVLTFITCHI2() , 49 ) )" +
             " & ( BPVLTIME() * c_light > 5  ) " +
             " & ( ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > 20 )"
           )
@@ -151,21 +151,21 @@ default_config = {
       'L02ppiDD' : {
         'CloneLine' : "L02ppi"
         , 'Prescale'  : .14
-        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles',
                                    'Phys/StdNoPIDsDownProtons/Particles' ]
       },
 
       'L02ppiDDHighPT' : {
         'CloneLine' : "L02ppiHighPT"
         , 'Prescale'  : 1.0
-        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles',
                                    'Phys/StdNoPIDsDownProtons/Particles' ]
       },
 
       'L02ppiDDVeryHighPT' : {
         'CloneLine' : "L02ppiVeryHighPT"
         , 'Prescale'  : 1.0
-        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles', 
+        , 'InputTES'    : [ 'Phys/StdNoPIDsDownPions/Particles',
                                    'Phys/StdNoPIDsDownProtons/Particles' ]
       },
 
@@ -175,8 +175,8 @@ default_config = {
         , 'CheckPV'      : True
         , 'RawEvent'    : ['Calo']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'    : "[B+ -> J/psi(1S) K+]cc"
         , 'DecayDescriptorJpsi': "J/psi(1S) -> mu+ mu-"
@@ -204,8 +204,8 @@ default_config = {
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'DecayDescriptor'       : "KS0 -> pi+ pi-"
         , 'InputTES'              : ['Phys/StdNoPIDsPions/Particles']
@@ -215,50 +215,50 @@ default_config = {
         , 'CombinationCut'        : " ( ADAMASS('KS0') < 100 ) & (ACHI2DOCA(1,2) < 20 )"
         , 'MotherCut'             : (
             "( ADMASS ( 'KS0') < 50 ) & "+
-            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " + 
-            " ( VFASPF ( VZ ) < 2200 ) & " + 
+            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " +
+            " ( VFASPF ( VZ ) < 2200 ) & " +
             " (BPVVDCHI2 > 25) & " +
-            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 9 ) & " + 
+            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 9 ) & " +
             " ( ADWM( 'Lambda0' , WM( 'pi+' , 'p~-') ) > 9 )"
           )
       },
-    
+
       'Ks02pipiDD' : {
         'CloneLine'    : 'Ks02pipi'
         , 'Prescale'   : 0.024
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
         , 'InputTES'   : ['Phys/StdNoPIDsDownPions/Particles']
         , 'MotherCut'             : (
             "( ADMASS ( 'KS0') < 50 ) & "+
-            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " + 
-            " ( VFASPF ( VZ ) < 2200 ) & " + 
+            " in_range ( 0 , VFASPF ( VCHI2 ) , 16 ) & " +
+            " ( VFASPF ( VZ ) < 2200 ) & " +
             " (BPVVDCHI2 > 25) & " +
-            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 18 ) & " + 
+            " ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > 18 ) & " +
             " ( ADWM( 'Lambda0' , WM( 'pi+' , 'p~-') ) > 18 )"
         )
       },
-    
+
       'Lc2pKpi' : {
         'Prescale':   1.0
         , 'CheckPV'     : True
         , 'RawEvent'    : ['Muon']
         , 'MDST.DST'    : False
-        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')" 
-        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')" 
+        , 'Hlt1Filter'        : None#"HLT_PASS_RE('Hlt1.*Decision')"
+        , 'Hlt2Filter'        : None#"HLT_PASS_RE('Hlt2.*Decision')"
         , 'RefitPV'     : False
-        , 'InputTES' : [  'Phys/StdNoPIDsKaons/Particles' , 
-                          'Phys/StdNoPIDsPions/Particles' , 
-                          'Phys/StdNoPIDsProtons/Particles' 
+        , 'InputTES' : [  'Phys/StdNoPIDsKaons/Particles' ,
+                          'Phys/StdNoPIDsPions/Particles' ,
+                          'Phys/StdNoPIDsProtons/Particles'
                        ]
         , 'DecayDescriptor' : "[Lambda_c+ -> K- p+ pi+]cc"
         , 'DaughtersCuts' : {
-          'K+'    : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) ' 
-          , 'p+'  : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) ' 
+          'K+'    : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) '
+          , 'p+'  : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) '
           , 'pi+' : '( PT>250*MeV ) & ( P>2*GeV ) & ( TRPCHI2>0.0001 ) & ( MIPCHI2DV(PRIMARY)>8. ) '
           }
         , 'Combination12Cut' : "( ACHI2DOCA(1,2) < 25 )"
@@ -282,22 +282,22 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 #from Configurables import CombineParticles
-#from Configurables import DaVinci__N3BodyDecays 
+#from Configurables import DaVinci__N3BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays 
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 
 class HeavyIonPIDCalibConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
+
 ##==============================================================================
 ## PIDCalibLineBuilder constructor
 ##==============================================================================
-    def __init__(self, name, config ): 
-      
+    def __init__(self, name, config ):
+
       LineBuilder.__init__(self, name, config)
-      self.name = name 
+      self.name = name
       self.config = config
       self.odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
 
@@ -317,9 +317,9 @@ class HeavyIonPIDCalibConf(LineBuilder):
 
 
 ##==============================================================================
-## PIDCalibLineBuilder::_builderTagProbeCut 
-##    takes as input a cutPattern defining tag and probe requirements using 
-##    #tag and #probe key words which are replaced by tge indices of the 
+## PIDCalibLineBuilder::_builderTagProbeCut
+##    takes as input a cutPattern defining tag and probe requirements using
+##    #tag and #probe key words which are replaced by tge indices of the
 ##    tag and probe particles as defined in the configuration dictionary.
 ##    Tag and probe tracks are then swapped and the resulting cuts AND-ed.
 ##==============================================================================
@@ -334,8 +334,8 @@ class HeavyIonPIDCalibConf(LineBuilder):
 
 
 ##==============================================================================
-## PIDCalibLineBuilder::_resolveCloning 
-##    check if the config declares a "CloneLine" keyword, if yes it clones the 
+## PIDCalibLineBuilder::_resolveCloning
+##    check if the config declares a "CloneLine" keyword, if yes it clones the
 ##    pointed line, if the latter declares a "CloneLine" keyword imports from
 ##    that the missing keywords and so on.
 ##    Returns a _copy_ of the updated dictionary
@@ -347,7 +347,7 @@ class HeavyIonPIDCalibConf(LineBuilder):
       while 'CloneLine' in _config:
 ###        print "Cloning " + configRowId + " from " + _config['CloneLine']
         _newConfig = {}
-        _newConfig.update ( self.config[_config['CloneLine']] ) 
+        _newConfig.update ( self.config[_config['CloneLine']] )
         del _config['CloneLine']
         _newConfig.update ( _config )
         _config = _newConfig
@@ -356,7 +356,7 @@ class HeavyIonPIDCalibConf(LineBuilder):
 
 ##==============================================================================
 ## PIDCalibLineBuilder::buildPIDLine
-##   Parses the configuration dictionary to build the lines as defined in the 
+##   Parses the configuration dictionary to build the lines as defined in the
 ##   configuration dictionaries
 ##==============================================================================
     def buildPIDLine(self, configRowId, bodies):
@@ -364,7 +364,7 @@ class HeavyIonPIDCalibConf(LineBuilder):
 
       ## Resolves possible clone statements
       _config = self._resolveCloning(configRowId)
-      
+
       ## Selects the algorithm according to the number of bodies
       _algorithm = None
       if (bodies == 2)   :
@@ -389,7 +389,7 @@ class HeavyIonPIDCalibConf(LineBuilder):
       _algorithm.DaughtersCuts   = _config['DaughtersCuts']
       _algorithm.MotherCut       = _config['MotherCut']
       _algorithm.DecayDescriptor = _config['DecayDescriptor']
-      
+
       _requiredSelections = [DataOnDemand(x) for x in _config['InputTES']]
       _selection = Selection(self.name + configRowId + 'Selection'
                               , Algorithm = _algorithm
@@ -402,17 +402,17 @@ class HeavyIonPIDCalibConf(LineBuilder):
                               , EnableFlavourTagging   = False
                               , RequiredRawEvents      = _config['RawEvent']
                               #, MDSTFlag              = _config['MDST.DST']
-                              , HLT1             = _config['Hlt1Filter'] 
-                              , HLT2             = _config['Hlt2Filter'] 
+                              , HLT1             = _config['Hlt1Filter']
+                              , HLT2             = _config['Hlt2Filter']
                               , algos    = [ _selection ]
                               , ODIN     = self.odin
                            )
-      
+
       return _line
 
 ##==============================================================================
 ## PIDCalibLineBuilder::buildPIDLineWithJpsi
-##   Parses the configuration dictionary to build the lines as defined in the 
+##   Parses the configuration dictionary to build the lines as defined in the
 ##   configuration dictionaries, this function allows two subsequent fits,
 ##   and uses the output of the former as input of the latter
 ##==============================================================================
@@ -438,7 +438,7 @@ class HeavyIonPIDCalibConf(LineBuilder):
       _algorithmJpsi.DaughtersCuts   = _config['DaughtersCuts']
       _algorithmJpsi.MotherCut       = _config['JpsiMotherCut']
       _algorithmJpsi.DecayDescriptor = _config['DecayDescriptorJpsi']
-      
+
       _requiredSelections = [DataOnDemand(x) for x in _config['InputTESJpsi']]
       _selectionJpsi = Selection(self.name + configRowId + 'SelectionJpsi'
                                   , Algorithm = _algorithmJpsi
@@ -452,7 +452,7 @@ class HeavyIonPIDCalibConf(LineBuilder):
       _algorithm.DaughtersCuts   = _config['DaughtersCuts']
       _algorithm.MotherCut       = _config['MotherCut']
       _algorithm.DecayDescriptor = _config['DecayDescriptor']
-      
+
       _requiredSelections = [_selectionJpsi] + [DataOnDemand(x) for x in _config['InputTES']]
       _selection = Selection(self.name + configRowId + 'Selection'
                               , Algorithm = _algorithm
@@ -465,10 +465,10 @@ class HeavyIonPIDCalibConf(LineBuilder):
                               , EnableFlavourTagging = False
                               , RequiredRawEvents    = _config['RawEvent']
                               #, MDSTFlag             = _config['MDST.DST']
-                              , HLT1                 = _config['Hlt1Filter'] 
-                              , HLT2                 = _config['Hlt2Filter'] 
+                              , HLT1                 = _config['Hlt1Filter']
+                              , HLT2                 = _config['Hlt2Filter']
                               , algos    = [ _selection ]
                               , ODIN     = self.odin
                            )
-      
+
       return _line
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonSingleElectron.py
index 9c4aab391cb29692c121755ff0496e923448dfa2..0e9fbcfef86120f0a5e1d344349b110dccef4ba5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonSingleElectron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonSingleElectron.py
@@ -32,8 +32,8 @@ default_config =  {
     'CONFIG'          : {
         'odin': ["NoBeam","Beam1","Beam2","BeamCrossing"],
         'Prescale'            :  1.0,
-        'Postscale'           :  1.0, 
-        'Hlt1Filter'         : "(HLT_PASS('Hlt1BEMicroBiasLowMultVeloDecision'))", 
+        'Postscale'           :  1.0,
+        'Hlt1Filter'         : "(HLT_PASS('Hlt1BEMicroBiasLowMultVeloDecision'))",
         'Hlt2Filter'         : None,
         "MaxNvelo"           : 5,
         "MaxNTT"             : 3,
@@ -55,14 +55,14 @@ from StandardParticles import StdAllNoPIDsElectrons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 class HeavyIonSingleElectronConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
         print "inside SingleElectron",config
         odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
@@ -84,11 +84,11 @@ class HeavyIonSingleElectronConf(LineBuilder):
         self.EventFilter = {'Code' : myEvfilter,
                             'Preambulo' : ["from LoKiNumbers.functions import RECSUMMARY"]
                             }
-        
-        self.SingleElectronLine = StrippingLine( 
+
+        self.SingleElectronLine = StrippingLine(
 	      name = 'SingleElectron',
               prescale  = self.config['Prescale'],
-              postscale = self.config['Postscale'],                                                                      
+              postscale = self.config['Postscale'],
               HLT1      = self.config['Hlt1Filter'],
               HLT2      = self.config['Hlt2Filter'],
               checkPV   = False,
@@ -98,5 +98,3 @@ class HeavyIonSingleElectronConf(LineBuilder):
               FILTER= self.EventFilter
               )
         self.registerLine( self.SingleElectronLine )
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py
index 87919784bd0513df21667032e2153053b54f7a0c..bc76d1d587b60de4e7dbfe66e211706c89b88ceb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py
@@ -35,22 +35,22 @@ default_config =  {
         # For PbPb / PbAr
         #        "GEC"       : "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 20) & ( recSummary(LHCb.RecSummary.nSPDhits, 'Raw/Spd/Digits') < 2000) & ( recSummaryTrack(LHCb.RecSummary.nVeloTracks, TrVELO) < 11) & ( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG)  > 0) ",
         #        "GECGamma"       : "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 20) & ( recSummary(LHCb.RecSummary.nSPDhits, 'Raw/Spd/Digits') < 2000) & ( recSummaryTrack(LHCb.RecSummary.nVeloTracks, TrVELO) < 11)  ",
-        
+
         'CheckPVfalse'    :  False,
 
         'PrescaleLowMult'            :  1.0,
-        'PostscaleLowMult'           : 1.0, 
+        'PostscaleLowMult'           : 1.0,
 
         'PrescaleGammaLowMult'            :  1.0,
-        'PostscaleGammaLowMult'           : 1.0, 
+        'PostscaleGammaLowMult'           : 1.0,
 
         'PrescaleEE'            :  1.0,
-        'PostscaleEE'           : 1.0, 
+        'PostscaleEE'           : 1.0,
 
         'Hlt1FilterLowMult'          : None,
         'Hlt2FilterLowMult'          : None,
 
-        'Hlt1FilterE'          : None, 
+        'Hlt1FilterE'          : None,
         'Hlt2FilterE'          : None,
 
         'gammaPT' : 200
@@ -67,22 +67,22 @@ from Configurables               import FilterDesktop, CombineParticles
 
 
 class HeavyIonTopologyConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    
-    def __init__(self, name, config ): 
-        
+
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
 
         from PhysSelPython.Wrappers import Selection, DataOnDemand
 
-        self.name = name 
+        self.name = name
         self.config = config
 
 
         odin = "|".join( ["(ODIN_BXTYP == LHCb.ODIN.%s)"%(odin_type,) for odin_type in self.config['odin'] if odin_type in ["NoBeam","Beam1","Beam2","BeamCrossing"]])
-        
+
         _filterGEC = {'Code': config['GEC'], 'Preambulo' : ["from LoKiTracks.decorators import *" ,
                                                             "from LoKiCore.functions    import * ",
                                                             "from GaudiKernel.SystemOfUnits import *"]}
@@ -90,16 +90,16 @@ class HeavyIonTopologyConf(LineBuilder):
         _filterGECGamma = {'Code': config['GECGamma'], 'Preambulo' : ["from LoKiTracks.decorators import *" ,
                                                                       "from LoKiCore.functions    import * ",
                                                                       "from GaudiKernel.SystemOfUnits import *"]}
-        
-        
+
+
         _filterGamma = "(PT>%(gammaPT)s*MeV)" % config
         self._FilterGamma = FilterDesktop(name = "GammaFilterFor"+name, Code = _filterGamma )
 
         stdPhotons     = DataOnDemand(Location='Phys/StdLoosePhotons/Particles')
         self.stdPhotons_lowmult = Selection( 'PhotonFilter' + name, Algorithm = self._FilterGamma, RequiredSelections = [stdPhotons])
-        
-        
-        
+
+
+
         self.LowActivityLine = StrippingLine( name+'LowActivityLine',
                                               prescale  = self.config['PrescaleLowMult'],
                                               postscale  = self.config['PostscaleLowMult'],
@@ -122,11 +122,11 @@ class HeavyIonTopologyConf(LineBuilder):
         #                                           selection = self.stdPhotons_lowmult
         #                                           )
         #      self.registerLine( self.GammaLowActivityLine )
-   
-        
-        
+
+
+
         odinEE = "(ODIN_BXTYP == LHCb.ODIN.NoBeam)"
-   
+
         self.EmptyEmptyLine = StrippingLine( name+'EmptyEmptyLine',
                                              prescale  = self.config['PrescaleEE'],
                                              postscale  = self.config['PostscaleEE'],
@@ -135,5 +135,3 @@ class HeavyIonTopologyConf(LineBuilder):
                                              RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC"]
                                              )
         self.registerLine( self.EmptyEmptyLine )
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index d712ae2f0727cd6c5a1043ba377c06a0bdef1eb3..88d2bee05ddc6e683b70c82e56b8cf3e6bbb7072 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -17,10 +17,10 @@
 #
 # @authors P. Seyfert, A. Jaeger
 # @date 2011-Mar-17
-# 
+#
 # @author M. Kolpin
 # @date 2015-Mar-23
-# 
+#
 #######################################################################
 
 __author__ = [ 'Michael Kolpin']
@@ -44,14 +44,14 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
 from DAQSys.DecoderClass import Decoder
-from Configurables import GaudiSequencer 
+from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
 from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
 from MuonID import ConfiguredMuonIDs
-from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter 
+from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 
@@ -82,7 +82,7 @@ default_config = {
     'NAME'        : 'HeavyIonTrackEffDownMuon',
     'WGs'         : ['IFT'],
     'BUILDERTYPE' : 'StrippingHeavyIonTrackEffDownMuonConf',
-    'CONFIG'      : { 
+    'CONFIG'      : {
 				'MuMom':		2000.	# MeV
 			,	'MuTMom':		200.	# MeV
 			,	'ZMuMom':		0.	# MeV
@@ -102,14 +102,14 @@ default_config = {
 			,	'VertChi2':		25.	# adimensional
 			,	'SeedingMinP':		1500.	# MeV
                 	,       'DataType':             '2011'  # for ConfiguredMuonIDs configuration
-			,	'NominalLinePrescale':  1. # proposal: 0.2 to stay below 0.15% retention rate 
+			,	'NominalLinePrescale':  1. # proposal: 0.2 to stay below 0.15% retention rate
 			,	'NominalLinePostscale': 1.
 			,	'ValidationLinePrescale':0.0015 #0.5 in stripping15: 0.1 gives 1.42% retention rate , ValidationLine further prescaled
 			,	'ValidationLinePostscale': 1.
-			,	'ZLinePrescale':  1. # proposal: 0.2 to stay below 0.15% retention rate 
-			,	'ZLinePostscale':  1.  
-			,	'UpsilonLinePrescale':  1. # proposal: 0.2 to stay below 0.15% retention rate 
-			,	'UpsilonLinePostscale':  1. 
+			,	'ZLinePrescale':  1. # proposal: 0.2 to stay below 0.15% retention rate
+			,	'ZLinePostscale':  1.
+			,	'UpsilonLinePrescale':  1. # proposal: 0.2 to stay below 0.15% retention rate
+			,	'UpsilonLinePostscale':  1.
             ,   'JpsiHlt1Filter' : 'Hlt1.*Decision'
             ,   'JpsiHlt2Filter' : 'Hlt2.*Decision'
 			,	'HLT1TisTosSpecs': { "Hlt1SingleMuonHighPTDecision%TOS": 0 } #no reg. expression allowed(see selHlt1Jpsi )
@@ -125,8 +125,8 @@ default_config = {
                                ,'StrippingHeavyIonTrackEffDownMuonValidationLine'
                                ,'StrippingHeavyIonTrackEffDownMuonZLine'
                                ,'StrippingHeavyIonTrackEffDownMuonUpsilonLine']
-                  }    
-    
+                  }
+
 }
 
 
@@ -134,7 +134,7 @@ class StrippingHeavyIonTrackEffDownMuonConf(LineBuilder):
     """
     Definition of Downstream J/Psi stripping.
     """
-    
+
     __configuration_keys__ = (
 		        'MuMom',
 				'MuTMom',
@@ -174,47 +174,47 @@ class StrippingHeavyIonTrackEffDownMuonConf(LineBuilder):
 				'UpsilonHLT2TisTosSpecs',
 				'HLT2PassOnAll'
                               )
-				
+
 
     def __init__(self, name, config) :
 
           LineBuilder.__init__(self, name, config)
-          
+
           nominal_name = name + 'Nominal'
           valid_name = name + 'Validation'
           Z_name = name + 'Z'
           Upsilon_name = name + 'Upsilon'
-          
+
           self.TisTosPreFilter1Jpsi = selHlt1Jpsi('TisTosFilter1Jpsi'+name, HLT1TisTosSpecs = config['HLT1TisTosSpecs'], HLT1PassOnAll = config['HLT1PassOnAll'])
           self.TisTosPreFilter2Jpsi = selHlt2Jpsi('TisTosFilter2Jpsi'+name, hlt1Filter = self.TisTosPreFilter1Jpsi, HLT2TisTosSpecs = config['HLT2TisTosSpecs'], HLT2PassOnAll = config['HLT2PassOnAll'])
-          
+
           self.TisTosPreFilter1Z = selHlt1Jpsi('TisTosFilter1Z'+name, HLT1TisTosSpecs = config['ZHLT1TisTosSpecs'], HLT1PassOnAll = config['HLT1PassOnAll'])
           self.TisTosPreFilter2Z = selHlt2Jpsi('TisTosFilter2Z'+name, hlt1Filter = self.TisTosPreFilter1Z, HLT2TisTosSpecs = config['ZHLT2TisTosSpecs'], HLT2PassOnAll = config['HLT2PassOnAll'])
-          
+
           self.TisTosPreFilter1Upsilon = selHlt1Jpsi('TisTosFilter1Upsilon'+name, HLT1TisTosSpecs = config['UpsilonHLT1TisTosSpecs'], HLT1PassOnAll = config['HLT1PassOnAll'])
           self.TisTosPreFilter2Upsilon = selHlt2Jpsi('TisTosFilter2Upsilon'+name, hlt1Filter = self.TisTosPreFilter1Upsilon, HLT2TisTosSpecs = config['UpsilonHLT2TisTosSpecs'], HLT2PassOnAll = config['HLT2PassOnAll'])
-          
+
           self.TrackingPreFilter = trackingDownPreFilter(nominal_name, self.TisTosPreFilter2Jpsi, config['SeedingMinP'])
           self.DownMuProtoPFilter = selMuonPParts(nominal_name, config['DataType'], self.TrackingPreFilter)
           self.DownMuPFilter = makeMyMuons(nominal_name, self.DownMuProtoPFilter)
-          self.DownJpsiFilter = DownJPsi( 'DownJpsiSel'+nominal_name, self.DownMuPFilter, config['TrChi2'], 
-          		config['MuTMom'], config['MuMom'], config['MassPreComb'], config['Doca'], 
+          self.DownJpsiFilter = DownJPsi( 'DownJpsiSel'+nominal_name, self.DownMuPFilter, config['TrChi2'],
+          		config['MuTMom'], config['MuMom'], config['MassPreComb'], config['Doca'],
           		config['MassPostComb'], config['VertChi2'] )
-          
+
           self.ZTrackingPreFilter = trackingDownPreFilter( Z_name, self.TisTosPreFilter2Z, config['SeedingMinP'])
           self.ZDownMuProtoPFilter = selMuonPParts(Z_name, config['DataType'], self.ZTrackingPreFilter)
           self.ZDownMuPFilter = makeMyMuons(Z_name, self.ZDownMuProtoPFilter)
-          self.DownZFilter = DownZ( 'DownSel'+Z_name, self.ZDownMuPFilter,  
-          		config['ZMuMom'], config['ZMuTMom'], config['ZMuMinEta'], config['ZMuMaxEta'], 
+          self.DownZFilter = DownZ( 'DownSel'+Z_name, self.ZDownMuPFilter,
+          		config['ZMuMom'], config['ZMuTMom'], config['ZMuMinEta'], config['ZMuMaxEta'],
           		config['ZMassPreComb'], config['ZMassPostComb'], )
-          
+
           self.UpsilonTrackingPreFilter = trackingDownPreFilter( Upsilon_name, self.TisTosPreFilter2Upsilon, config['SeedingMinP'])
           self.UpsilonDownMuProtoPFilter = selMuonPParts(Upsilon_name, config['DataType'], self.UpsilonTrackingPreFilter)
           self.UpsilonDownMuPFilter = makeMyMuons(Upsilon_name, self.UpsilonDownMuProtoPFilter)
-          self.DownUpsilonFilter = DownUpsilon( 'DownSel'+Upsilon_name, self.UpsilonDownMuPFilter,  
-          		config['UpsilonMuMom'], config['UpsilonMuTMom'], 
+          self.DownUpsilonFilter = DownUpsilon( 'DownSel'+Upsilon_name, self.UpsilonDownMuPFilter,
+          		config['UpsilonMuMom'], config['UpsilonMuTMom'],
           		config['UpsilonMassPreComb'], config['UpsilonMassPostComb'], )
-          
+
           self.nominal_line =  StrippingLine(nominal_name + 'Line'
                                              , prescale = config['NominalLinePrescale']
                                              , postscale = config['NominalLinePostscale']
@@ -222,13 +222,13 @@ class StrippingHeavyIonTrackEffDownMuonConf(LineBuilder):
                                              , HLT1 = "HLT_PASS_RE('%(JpsiHlt1Filter)s')" % config
                                              , HLT2 = "HLT_PASS_RE('%(JpsiHlt2Filter)s')" % config
                                              )
-          
+
           self.valid_line = StrippingLine(valid_name + 'Line', prescale = config['ValidationLinePrescale'], postscale = config['ValidationLinePostscale'], algos=[self.TisTosPreFilter2Jpsi])
-          
+
           self.Z_line =  StrippingLine(Z_name + 'Line',  prescale = config['ZLinePrescale'], postscale = config['ZLinePostscale'], algos=[self.DownZFilter])
-          
+
           self.Upsilon_line =  StrippingLine(Upsilon_name + 'Line',  prescale = config['UpsilonLinePrescale'], postscale = config['UpsilonLinePostscale'], algos=[self.DownUpsilonFilter])
-          
+
           self.registerLine(self.nominal_line)
           self.registerLine(self.valid_line)
           self.registerLine(self.Z_line)
@@ -256,7 +256,7 @@ def selMuonPParts(name, DataType, downstreamSeq):
    downprotos.Inputs = ["Rec/"+name+"_Downstream/FittedTracks"]
    downprotos.Output = "Rec/ProtoP/"+name+"_ProtoPMaker/ProtoParticles"
    downprotos.addTool( DelegatingTrackSelector, name="TrackSelector" )
-   #tracktypes = [ "Long","Upstream","Downstream","Ttrack","Velo","VeloR" ] # only downstream needed 
+   #tracktypes = [ "Long","Upstream","Downstream","Ttrack","Velo","VeloR" ] # only downstream needed
    tracktypes = ["Downstream"]
    #if (trackcont == "Best") :
    #	tracktypes = [ "Long" ]
@@ -267,7 +267,7 @@ def selMuonPParts(name, DataType, downstreamSeq):
    	ts = getattr(selector,tsname)
    	# Set Cuts
    	ts.TrackTypes = [tsname]
-#	ts.MinNDoF = 1 
+#	ts.MinNDoF = 1
    	ts.MaxChi2Cut = 10
 
    addmuonpid = ChargedProtoParticleAddMuonInfo(name+"addmuoninfo")
@@ -281,7 +281,7 @@ def selMuonPParts(name, DataType, downstreamSeq):
    #TrackToDST(name+"TrackToDST").TracksInContainer = "Rec/Downstream/Tracks"
    #downprotoseq.Members += [ TrackToDST(name+"TrackToDST"), downprotos, addmuonpid, combinedll ]
    downprotoseq.Members += [ downprotos, addmuonpid, combinedll ]
-#        
+#
    DataOnDemandSvc().AlgMap.update( {
                 "/Event/Rec/"+name+"_Downstream/Tracks" : unpacker.getFullName(),
                 "/Event/Rec/"+name+"_Muon/DownstreamMuonPID" : idalg.getFullName(),
@@ -307,7 +307,7 @@ def makeMyMuons(name, protoParticlesMaker):
 
    DataOnDemandSvc().AlgMap.update( {
            "/Event/Phys/" + particleMaker.name() + '/Particles' : particleMaker.getFullName(),
-           "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName() 
+           "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
    } )
 
 
@@ -324,18 +324,18 @@ def DownJPsi( name,
 		MassPostComb,
 		VertChi2 ) :
    #self.makeMyMuons("DownMuonsForTrackEff", "Downstream")
-   
+
    _MuCuts =  "((TRCHI2DOF < %(TrChi2)s) & (PT > %(MuTMom)s*MeV) & (P > %(MuMom)s*MeV) )" % locals()
    _CombinationCuts = "((ADAMASS('J/psi(1S)') < %(MassPreComb)s * MeV) & (AMAXDOCA('') < %(Doca)s*mm) )" % locals()
    _MotherCuts = "((ADMASS('J/psi(1S)') < %(MassPostComb)s * MeV) & (VFASPF(VCHI2/VDOF) < %(VertChi2)s))" % locals()
-   
+
    _MyDownJpsis = CombineParticles( DecayDescriptor = "J/psi(1S) -> mu+ mu-" ,
    DaughtersCuts = { "mu+": _MuCuts,  "mu-": _MuCuts }, CombinationCut = _CombinationCuts, MotherCut = _MotherCuts)
 
    return Selection ( name,
                       Algorithm = _MyDownJpsis,
                       RequiredSelections = [protoPartSel])
- 
+
 #########################################################################################
 def DownZ( name,
 		protoPartSel,
@@ -346,18 +346,18 @@ def DownZ( name,
 		MassPreComb,
 		MassPostComb) :
    #self.makeMyMuons("DownMuonsForTrackEff", "Downstream")
-   
+
    _MuCuts =  "((ETA < %(MuMaxEta)s*MeV) & (ETA > %(MuMinEta)s*MeV) & (P > %(MuMom)s*MeV) & (PT > %(MuTMom)s*MeV) )" % locals()
    _CombinationCuts = "((ADAMASS('Z0') < %(MassPreComb)s * MeV))" % locals()
    _MotherCuts = "((ADMASS('Z0') < %(MassPostComb)s * MeV))" % locals()
-   
+
    _MyDownZ = CombineParticles( DecayDescriptor = "Z0 -> mu+ mu-" ,
    DaughtersCuts = { "mu+": _MuCuts,  "mu-": _MuCuts }, CombinationCut = _CombinationCuts, MotherCut = _MotherCuts)
 
    return Selection ( name,
                       Algorithm = _MyDownZ,
                       RequiredSelections = [protoPartSel])
- 
+
 #########################################################################################
 def DownUpsilon( name,
 		protoPartSel,
@@ -366,18 +366,18 @@ def DownUpsilon( name,
 		MassPreComb,
 		MassPostComb) :
    #self.makeMyMuons("DownMuonsForTrackEff", "Downstream")
-   
+
    _MuCuts =  "( (P > %(MuMom)s*MeV) & (PT > %(MuTMom)s*MeV) )" % locals()
    _CombinationCuts = "((ADAMASS('Z0') < %(MassPreComb)s * MeV))" % locals()
    _MotherCuts = "((ADMASS('Upsilon(1S)') < %(MassPostComb)s * MeV))" % locals()
-   
+
    _MyDownZ = CombineParticles( DecayDescriptor = "Upsilon(1S) -> mu+ mu-" ,
    DaughtersCuts = { "mu+": _MuCuts,  "mu-": _MuCuts }, CombinationCut = _CombinationCuts, MotherCut = _MotherCuts)
 
    return Selection ( name,
                       Algorithm = _MyDownZ,
                       RequiredSelections = [protoPartSel])
- 
+
 #########################################################################################
 """
 Define TisTos Prefilters
@@ -391,7 +391,7 @@ def selHlt1Jpsi(name, HLT1TisTosSpecs, HLT1PassOnAll):
    for J/psi selection
    """
    Hlt1Jpsi = TisTosParticleTagger(
-   TisTosSpecs = HLT1TisTosSpecs 
+   TisTosSpecs = HLT1TisTosSpecs
    ,ProjectTracksToCalo = False
    ,CaloClustForCharged = False
    ,CaloClustForNeutral = False
@@ -409,7 +409,7 @@ def selHlt2Jpsi(name, hlt1Filter, HLT2TisTosSpecs, HLT2PassOnAll):
    for J/psi selection
    """
    Hlt2Jpsi = TisTosParticleTagger(
-   TisTosSpecs =HLT2TisTosSpecs 
+   TisTosSpecs =HLT2TisTosSpecs
    ,ProjectTracksToCalo = False
    ,CaloClustForCharged = False
    ,CaloClustForNeutral = False
@@ -417,10 +417,10 @@ def selHlt2Jpsi(name, hlt1Filter, HLT2TisTosSpecs, HLT2PassOnAll):
    ,NoRegex = False
    )
    Hlt2Jpsi.PassOnAll = HLT2PassOnAll
-   
+
    return Selection(name+"_SelHlt2Jpsi", Algorithm = Hlt2Jpsi, RequiredSelections = [ hlt1Filter ])
 ##########################################################
-        
+
 
 def trackingDownPreFilter(name, prefilter, seedcut):
     #Test code for debugging
@@ -433,10 +433,10 @@ def trackingDownPreFilter(name, prefilter, seedcut):
     TrackToDST(name+"_DownTrackToDST").TracksInContainer = "Rec/"+name+"_Downstream/FittedTracks"
 
     jpsidotracking=GaudiSequencer("DownTrackingFor" + name)
-    
+
     #Add seed tracking
     DownSeeding = PatSeeding(name+"_DownSeeding")
-    DownSeeding.OutputTracksName = "Rec/"+name+"_DownSeeding/Tracks" 
+    DownSeeding.OutputTracksName = "Rec/"+name+"_DownSeeding/Tracks"
     PatAlgConf.SeedingConf().configureAlg( SeedAlg = DownSeeding )
     #DownSeeding.addTool(PatSeedingTool, name=name+"_PatSeedingTool")
     #DownSeeding.addTool(PatSeedingTool)
@@ -475,7 +475,7 @@ def trackingDownPreFilter(name, prefilter, seedcut):
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
@@ -483,6 +483,3 @@ class GSWrapper(UniquelyNamedObject,
                                algorithm = sequencer,
                                outputLocation = output,
                                requiredSelections = requiredSelections )
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 13b7c1d3e8f0c3800f1c855ac97379b4fd775818..6666daad7d352b9e862d074828905b00253c8ed1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -9,9 +9,9 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 ###'''
-###Module for construction of Jpsi -> mu mu /  Upsilon -> mu mu /  Z -> mu mu / B -> J/psi K to be used to measure tracking efficiency.  
+###Module for construction of Jpsi -> mu mu /  Upsilon -> mu mu /  Z -> mu mu / B -> J/psi K to be used to measure tracking efficiency.
 ###Provides functions to build a Jpsi / Upsilon / Z / B selection , with a long track and a muonTT track.
-###Provides class StrippingTrackEffMuonTTConf, which constructs the Selections and 
+###Provides class StrippingTrackEffMuonTTConf, which constructs the Selections and
 ###StrippingLines given a configuration dictionary.
 ###Original autor: Michel De Cian
 ###Exported symbols (use python help!):
@@ -33,7 +33,7 @@
 ###           - makeResonanceMuMuTrackEff
 ###           - makeBJpsiKTrackEff
 ###           - filterHLT2ForBJpsiK
-###      
+###
 ###'''
 
 __author__ = ['Michael Kolpin']
@@ -41,7 +41,7 @@ __date__ = '23/03/2015'
 __version__ = '$Revision: 1.1 $'
 
 
-__all__ = ('StrippingHeavyionTrackEffMuonTTConf', 
+__all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'default_config',
            'selFilterLongPartsMu',
            'selFilterLongPartsMuUpsilonZ',
@@ -67,16 +67,16 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticle
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons 
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
-from Configurables import (MuonCombRec, 
+from Configurables import (MuonCombRec,
                            MuonTTTrack,
 			   MuonHitDecode,
-                           PatAddTTCoord, 
-                           TrackMasterFitter, 
-                           TrackMasterExtrapolator, 
-                           TrackSelector, 
+                           PatAddTTCoord,
+                           TrackMasterFitter,
+                           TrackMasterExtrapolator,
+                           TrackSelector,
                            NoPIDsParticleMaker,
                            TisTosParticleTagger
                            )
@@ -88,7 +88,7 @@ default_config = {
     'NAME'        : 'HeavyIonTrackEffMuonTT',
     'WGs'         : ['IFT'],
     'BUILDERTYPE' : 'StrippingHeavyIonTrackEffMuonTTConf',
-    'CONFIG'      : { 
+    'CONFIG'      : {
 			'JpsiMassWin'                 : 500,
 			'UpsilonMassWin'              : 1500,
 			'ZMassWin'                    : 40000,
@@ -166,7 +166,7 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
 
     TrackEffMuonTT_UpsilonLine1    : Upsilon-> mu mu, long: minus, muonTT: plus
     TrackEffMuonTT_UpsilonLine2    : Upsilon-> mu mu, long: plus, muonTT: minus
-    
+
     TrackEffMuonTT_ZLine1          : Z-> mu mu, long: minus, muonTT: plus
     TrackEffMuonTT_ZLine2          : Z-> mu mu, long: plus, muonTT: minus
 
@@ -214,7 +214,7 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
                               'ZHlt1Triggers',
                               'JpsiHlt2Triggers',
                               'UpsilonHlt2Triggers',
-                              'Hlt1PassOnAll',  
+                              'Hlt1PassOnAll',
                               'Hlt2PassOnAll',
                               'ZHlt2Triggers',
                               'BJpsiKHlt2TriggersTUS',
@@ -227,19 +227,19 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
                               )
 
     def __init__(self, name, config = None):
-            
+
         LineBuilder.__init__(self, name, config)
 
-                
+
         # ########################################################################################
         # -->
         # --> INITIALIZING ALL THE OBJECTS NEEDED TO FORM THE LINES <--
         # -->
         # ########################################################################################
 
-        # initialize all the general things 
+        # initialize all the general things
         # idea: initialize the first object, that will be called, pass it to the second one, etc.
-                                
+
         # make the muonTT tracks (two instances, as the Z has a different seed station for the muon system than the rest)
         self.SelMakeMuonTTJpsi = selMakeMuonTT(name+'Jpsi', XTolParam = 25.0, MaxChi2TolParam = 7.0, MinAxProjParam = 5.5, MajAxProjParam = 25.0, seedStation = 2)
         self.SelMakeMuonTTZ = selMakeMuonTT(name+'Z', XTolParam = 25.0, MaxChi2TolParam = 7.0, MinAxProjParam = 5.5, MajAxProjParam = 25.0, seedStation = 4)
@@ -286,134 +286,134 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
         # ##########################################
         # B-> J/psi K
         # first for the J/psi object
-        self.SelHlt1BJpsiKMinus = selHlt1Jpsi(name+'BJpsiKMinus', longPartsFilter = self.SelFilterLongPartsMuJpsi, triggers = config['JpsiHlt1Triggers'],passonall = config['Hlt1PassOnAll']) 
+        self.SelHlt1BJpsiKMinus = selHlt1Jpsi(name+'BJpsiKMinus', longPartsFilter = self.SelFilterLongPartsMuJpsi, triggers = config['JpsiHlt1Triggers'],passonall = config['Hlt1PassOnAll'])
         self.SelHlt1BJpsiKPlus = selHlt1Jpsi(name+'BJpsiKPlus', longPartsFilter = self.SelFilterLongPartsMuJpsi, triggers = config['JpsiHlt1Triggers'],passonall = config['Hlt1PassOnAll'])
         self.SelHlt2BJpsiKMinus = selHlt2BJpsiKMu(name+'BJpsiKMinus', hlt1Filter = self.SelHlt1BJpsiKMinus, triggers = config['BJpsiKHlt2TriggersTUS'],passonall=config['Hlt2PassOnAll'])
         self.SelHlt2BJpsiKPlus = selHlt2BJpsiKMu(name+'BJpsiKPlus', hlt1Filter = self.SelHlt1BJpsiKPlus, triggers = config['BJpsiKHlt2TriggersTUS'],passonall=config['Hlt2PassOnAll'])
-        
+
         # and now for the K (no distinction for charged needed, will be done automatically be the decay descriptor)
         self.SelFilterLongPartsBJpsiKK = selFilterLongPartsK(name+'BJpsiK')
         self.SelHlt2BJpsiKK = selHlt2BJpsiKK( name+'BJpsiK',longPartsFilter = self.SelFilterLongPartsBJpsiKK, triggers = config['BJpsiKHlt2TriggersTUS'],passonall=config['Hlt2PassOnAll'])
-        
+
         self.muonTTPlusBJpsiK = chargeFilter(name+'MuonTTBJpsiKPlus', trackAlgo = 'MuonTT',  partSource = self.SelMuonTTPartsJpsi ,  charge = 1)
         self.muonTTMinusBJpsiK = chargeFilter(name+'MuonTTBJpsiKMinus', trackAlgo =  'MuonTT',   partSource =  self.SelMuonTTPartsJpsi , charge = -1)
         self.longPlusBJpsiK = chargeFilter( name+'LongBJpsiKPlus', trackAlgo =  'LongMu',   partSource = self.SelHlt2BJpsiKPlus  , charge = 1)
         self.longMinusBJpsiK = chargeFilter( name+'LongBJpsiKMinus', trackAlgo = 'LongMu',   partSource = self.SelHlt2BJpsiKMinus, charge = -1)
         # ##################################################################################################################1
-        # def makeResonanceMuMuTrackEff(name, resonanceName, decayDescriptor, plusCharge, minusCharge, 
+        # def makeResonanceMuMuTrackEff(name, resonanceName, decayDescriptor, plusCharge, minusCharge,
         # mode, massWin, vertexChi2, resonancePT, muonTTPT, longPT, longMuonPID, longMuonMinIPCHI2, longMuonTrackCHI2):
 
         # J/psi -> mu mu, tag-and-probe
-        self.makeJpsiMuMuTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuTrackEff1', 
+        self.makeJpsiMuMuTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuTrackEff1',
                                                                resonanceName = 'J/psi(1S)',
                                                                decayDescriptor = 'J/psi(1S) -> mu+ mu-',
-                                                               plusCharge = self.muonTTPlusJpsi, 
+                                                               plusCharge = self.muonTTPlusJpsi,
                                                                minusCharge = self.longMinusJpsi,
                                                                mode = 1,
-                                                               massWin = config['JpsiMassWin'], 
+                                                               massWin = config['JpsiMassWin'],
                                                                vertexChi2 = config['VertexChi2'],
                                                                resonancePT = config['JpsiPT'],
-                                                               muonTTPT = config['JpsiMuonTTPT'], 
-                                                               longPT = config['JpsiLongPT'], 
+                                                               muonTTPT = config['JpsiMuonTTPT'],
+                                                               longPT = config['JpsiLongPT'],
                                                                longMuonPID = config['LongMuonPID'],
                                                                longMuonMinIP = config['JpsiLongMuonMinIP'],
                                                                longMuonTrackCHI2 = config['JpsiLongMuonTrackCHI2'],
                                                                motherMinIP = config['JpsiMINIP'])
         # J/psi -> mu mu, probe-and-tag
-        self.makeJpsiMuMuTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuTrackEff2', 
+        self.makeJpsiMuMuTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuTrackEff2',
                                                                resonanceName = 'J/psi(1S)',
                                                                decayDescriptor = 'J/psi(1S) -> mu+ mu-',
                                                                minusCharge = self.muonTTMinusJpsi,
-                                                               plusCharge = self.longPlusJpsi, 
+                                                               plusCharge = self.longPlusJpsi,
                                                                mode = 2,
-                                                               massWin = config['JpsiMassWin'], 
+                                                               massWin = config['JpsiMassWin'],
                                                                vertexChi2 = config['VertexChi2'],
                                                                resonancePT = config['JpsiPT'],
-                                                               muonTTPT = config['JpsiMuonTTPT'], 
-                                                               longPT = config['JpsiLongPT'], 
+                                                               muonTTPT = config['JpsiMuonTTPT'],
+                                                               longPT = config['JpsiLongPT'],
                                                                longMuonPID = config['LongMuonPID'],
                                                                longMuonMinIP = config['JpsiLongMuonMinIP'],
                                                                longMuonTrackCHI2 = config['JpsiLongMuonTrackCHI2'],
                                                                motherMinIP = config['JpsiMINIP'])
         # ##################################################################################################################
         # # Upsilon -> mu mu, tag-and-probe
-        self.makeUpsilonMuMuTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeUpsilonMuMuTrackEff1', 
+        self.makeUpsilonMuMuTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeUpsilonMuMuTrackEff1',
                                                                   resonanceName = 'Upsilon(1S)',
                                                                   decayDescriptor = 'Upsilon(1S) -> mu+ mu-',
-                                                                  plusCharge = self.muonTTPlusUpsilon, 
+                                                                  plusCharge = self.muonTTPlusUpsilon,
                                                                   minusCharge = self.longMinusUpsilon,
                                                                   mode = 1,
-                                                                  massWin = config['UpsilonMassWin'], 
+                                                                  massWin = config['UpsilonMassWin'],
                                                                   vertexChi2 = config['VertexChi2'],
                                                                   resonancePT = config['UpsilonPT'],
-                                                                  muonTTPT = config['UpsilonMuonTTPT'], 
-                                                                  longPT = config['UpsilonLongPT'], 
+                                                                  muonTTPT = config['UpsilonMuonTTPT'],
+                                                                  longPT = config['UpsilonLongPT'],
                                                                   longMuonPID = config['LongMuonPID'],
                                                                   longMuonMinIP = config['UpsilonLongMuonMinIP'],
                                                                   longMuonTrackCHI2 = config['UpsilonLongMuonTrackCHI2'],
                                                                   motherMinIP = config['UpsilonMINIP'])
         # Upsilon -> mu mu, probe-and-tag
-        self.makeUpsilonMuMuTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeUpsilonMuMuTrackEff2', 
+        self.makeUpsilonMuMuTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeUpsilonMuMuTrackEff2',
                                                                   resonanceName = 'Upsilon(1S)',
                                                                   decayDescriptor = 'Upsilon(1S) -> mu+ mu-',
-                                                                  plusCharge = self.longPlusUpsilon, 
+                                                                  plusCharge = self.longPlusUpsilon,
                                                                   minusCharge = self.muonTTMinusUpsilon,
                                                                   mode = 2,
-                                                                  massWin = config['UpsilonMassWin'], 
+                                                                  massWin = config['UpsilonMassWin'],
                                                                   vertexChi2 = config['VertexChi2'],
                                                                   resonancePT = config['UpsilonPT'],
-                                                                  muonTTPT = config['UpsilonMuonTTPT'], 
-                                                                  longPT = config['UpsilonLongPT'], 
+                                                                  muonTTPT = config['UpsilonMuonTTPT'],
+                                                                  longPT = config['UpsilonLongPT'],
                                                                   longMuonPID = config['LongMuonPID'],
                                                                   longMuonMinIP = config['UpsilonLongMuonMinIP'],
                                                                   longMuonTrackCHI2 = config['UpsilonLongMuonTrackCHI2'],
                                                                   motherMinIP = config['UpsilonMINIP'])
         # ##################################################################################################################
         # Z -> mu mu, tag-and-probe
-        self.makeZMuMuTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeZMuMuTrackEff1', 
+        self.makeZMuMuTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeZMuMuTrackEff1',
                                                             resonanceName = 'Z0',
                                                             decayDescriptor = 'Z0 -> mu+ mu-',
-                                                            plusCharge = self.muonTTPlusZ, 
+                                                            plusCharge = self.muonTTPlusZ,
                                                             minusCharge = self.longMinusZ,
                                                             mode = 1,
-                                                            massWin = config['ZMassWin'], 
+                                                            massWin = config['ZMassWin'],
                                                             vertexChi2 = config['VertexChi2'],
                                                             resonancePT = config['ZPT'],
-                                                            muonTTPT = config['ZMuonTTPT'], 
-                                                            longPT = config['ZLongPT'], 
+                                                            muonTTPT = config['ZMuonTTPT'],
+                                                            longPT = config['ZLongPT'],
                                                             longMuonPID = config['LongMuonPID'],
                                                             longMuonMinIP = config['ZLongMuonMinIP'],
                                                             longMuonTrackCHI2 = config['ZLongMuonTrackCHI2'],
                                                             motherMinIP = config['ZMINIP'])
         # Z -> mu mu, probe-and-tag
-        self.makeZMuMuTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeZMuMuTrackEff2', 
+        self.makeZMuMuTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeZMuMuTrackEff2',
                                                             resonanceName = 'Z0',
                                                             decayDescriptor = 'Z0 -> mu+ mu-',
-                                                            plusCharge = self.longPlusZ, 
+                                                            plusCharge = self.longPlusZ,
                                                             minusCharge = self.muonTTMinusZ,
                                                             mode = 2,
-                                                            massWin = config['ZMassWin'], 
+                                                            massWin = config['ZMassWin'],
                                                             vertexChi2 = config['VertexChi2'],
                                                             resonancePT = config['ZPT'],
-                                                            muonTTPT = config['ZMuonTTPT'], 
-                                                            longPT = config['ZLongPT'], 
+                                                            muonTTPT = config['ZMuonTTPT'],
+                                                            longPT = config['ZLongPT'],
                                                             longMuonPID = config['LongMuonPID'],
                                                             longMuonMinIP = config['ZLongMuonMinIP'],
                                                             longMuonTrackCHI2 = config['ZLongMuonTrackCHI2'],
                                                             motherMinIP = config['ZMINIP'])
         # ##################################################################################################################
         # B -> J/psi K exclusive, tag-and-probe
-        self.makeJpsiMuMuForBJpsiKTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuForBJpsiKTrackEff1', 
+        self.makeJpsiMuMuForBJpsiKTrackEff1 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuForBJpsiKTrackEff1',
                                                                         resonanceName = 'J/psi(1S)',
                                                                         decayDescriptor = 'J/psi(1S) -> mu+ mu-',
-                                                                        plusCharge = self.muonTTPlusBJpsiK , 
+                                                                        plusCharge = self.muonTTPlusBJpsiK ,
                                                                         minusCharge = self.longMinusBJpsiK,
                                                                         mode = 1,
-                                                                        massWin = config['JpsiMassWin'], 
+                                                                        massWin = config['JpsiMassWin'],
                                                                         vertexChi2 = config['VertexChi2'],
                                                                         resonancePT = config['JpsiPT'],
-                                                                        muonTTPT = config['JpsiMuonTTPT'], 
-                                                                        longPT = config['JpsiLongPT'], 
+                                                                        muonTTPT = config['JpsiMuonTTPT'],
+                                                                        longPT = config['JpsiLongPT'],
                                                                         longMuonPID = config['LongMuonPID'],
                                                                         longMuonMinIP = config['JpsiLongMuonMinIP'],
                                                                         longMuonTrackCHI2 = config['JpsiLongMuonTrackCHI2'],
@@ -421,36 +421,36 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
         self.makeBJpsiKTrackEff1 = makeBJpsiKTrackEff(name+'_MakeBJpsiKTrackEff1',
                                                       JpsiSel = self.makeJpsiMuMuForBJpsiKTrackEff1,
                                                       KSel = self.SelHlt2BJpsiKK,
-                                                      massWin = config['BMassWin'], 
+                                                      massWin = config['BMassWin'],
                                                       vertexChi2 = config['VertexChi2'])
         self.BJpsiKHLT2Filter1 = filterHLT2ForBJpsiK( name+'_BJpsiKHLT2Filter1', BJpsiKSel = self.makeBJpsiKTrackEff1, triggers = config['BJpsiKHlt2TriggersTOS']) # Event must be filtered to be sure its TOS on the tag muon and the Kaon
-        
+
         # B -> J/psi K exclusive, probe-and-tag
-        self.makeJpsiMuMuForBJpsiKTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuForBJpsiKTrackEff2', 
+        self.makeJpsiMuMuForBJpsiKTrackEff2 = makeResonanceMuMuTrackEff(name+'_MakeJpsiMuMuForBJpsiKTrackEff2',
                                                                         resonanceName = 'J/psi(1S)',
                                                                         decayDescriptor = 'J/psi(1S) -> mu+ mu-',
-                                                                        plusCharge = self.longPlusBJpsiK , 
+                                                                        plusCharge = self.longPlusBJpsiK ,
                                                                         minusCharge = self.muonTTMinusBJpsiK,
                                                                         mode = 2,
-                                                                        massWin = config['JpsiMassWin'], 
+                                                                        massWin = config['JpsiMassWin'],
                                                                         vertexChi2 = config['VertexChi2'],
                                                                         resonancePT = config['JpsiPT'],
-                                                                        muonTTPT = config['JpsiMuonTTPT'], 
-                                                                        longPT = config['JpsiLongPT'], 
+                                                                        muonTTPT = config['JpsiMuonTTPT'],
+                                                                        longPT = config['JpsiLongPT'],
                                                                         longMuonPID = config['LongMuonPID'],
                                                                         longMuonMinIP = config['JpsiLongMuonMinIP'],
                                                                         longMuonTrackCHI2 = config['JpsiLongMuonTrackCHI2'],
                                                                         motherMinIP = config['BJpsiKMINIP'])
-        
+
         self.makeBJpsiKTrackEff2 = makeBJpsiKTrackEff(name+'_MakeBJpsiKTrackEff2',
                                                       JpsiSel = self.makeJpsiMuMuForBJpsiKTrackEff2,
                                                       KSel = self.SelHlt2BJpsiKK,
-                                                      massWin = config['BMassWin'], 
+                                                      massWin = config['BMassWin'],
                                                       vertexChi2 = config['VertexChi2'])
-        
+
         self.BJpsiKHLT2Filter2 = filterHLT2ForBJpsiK( name+'_BJpsiKHLT2Filter2', BJpsiKSel = self.makeBJpsiKTrackEff2, triggers = config['BJpsiKHlt2TriggersTOS'])  # Event must be filtered to be sure its TOS on the tag muon and the Kaon
         # # ##################################################################################################################
-    
+
 
 
         ################################################
@@ -462,7 +462,7 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
                                                       HLT1 = "HLT_PASS_RE('%(JpsiHlt1Filter)s')" % config,
                                                       HLT2 = "HLT_PASS_RE('%(JpsiHlt2Filter)s')" % config,
                                                       selection = self.makeJpsiMuMuTrackEff1)
-        
+
 
         self.TrackEffMuonTTJpsi_line2 = StrippingLine(name+'_JpsiLine2',
                                                       prescale = config['JpsiPrescale'],
@@ -471,7 +471,7 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
                                                       HLT2 = "HLT_PASS_RE('%(JpsiHlt2Filter)s')" % config,
                                                       selection = self.makeJpsiMuMuTrackEff2)
 
-    
+
         ################################################
         # Upsilon -> mu mu stripping lines (long + muonTT)
         ################################################
@@ -479,14 +479,14 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
                                                          prescale = config['UpsilonPrescale'],
                                                          postscale = config['Postscale'],
                                                          selection = self.makeUpsilonMuMuTrackEff1)
-                                                         
+
 
         self.TrackEffMuonTTUpsilon_line2 = StrippingLine(name+'_UpsilonLine2',
                                                          prescale = config['UpsilonPrescale'],
                                                          postscale = config['Postscale'],
                                                          selection = self.makeUpsilonMuMuTrackEff2)
-                                                         
-        
+
+
         ################################################
         # Z -> mu mu stripping lines (long + muonTT)
         ################################################
@@ -494,32 +494,32 @@ class StrippingHeavyIonTrackEffMuonTTConf(LineBuilder) :
                                                    prescale = config['ZPrescale'],
                                                    postscale = config['Postscale'],
                                                    selection = self.makeZMuMuTrackEff1)
-        
+
 
 
         self.TrackEffMuonTTZ_line2 = StrippingLine(name+'_ZLine2',
                                                    prescale = config['ZPrescale'],
                                                    postscale = config['Postscale'],
                                                    selection = self.makeZMuMuTrackEff2)
-        
+
         ################################################
         # B -> J/psi K stripping lines (long + muonTT + long)
-        ################################################                                        
+        ################################################
         self.TrackEffMuonTTBJpsiK_line1 = StrippingLine(name+'_BJpsiKLine1',
                                                         prescale = config['BJpsiKPrescale'],
                                                         postscale = config['Postscale'],
                                                         #HLT = "HLT_PASS('Hlt2MuTrackDecision')",
                                                         selection = self.BJpsiKHLT2Filter1
                                                         )
-        
+
         self.TrackEffMuonTTBJpsiK_line2 = StrippingLine(name+'_BJpsiKLine2',
                                                         prescale = config['BJpsiKPrescale'],
                                                         postscale = config['Postscale'],
                                                         #HLT = "HLT_PASS('Hlt2MuTrackDecision')",
                                                         selection = self.BJpsiKHLT2Filter2)
-                                                        
 
-        
+
+
         ################################################
         # register the lines
         ################################################
@@ -551,7 +551,7 @@ def selFilterLongPartsMu(name):
     """
     Filter = FilterDesktop()
     FilterLongPartsMu = Filter.configurable(name+"FilterLongPartsMu")
-    FilterLongPartsMu.Code = "(HASMUON) & (ISMUON) & (PIDmu > 2.0) & (P > 10000) & (PT > 1300*MeV) & (MIPDV(PRIMARY) > 0.5) & (TRCHI2DOF < 2.0) & (MIPCHI2DV(PRIMARY) > 200)" 
+    FilterLongPartsMu.Code = "(HASMUON) & (ISMUON) & (PIDmu > 2.0) & (P > 10000) & (PT > 1300*MeV) & (MIPDV(PRIMARY) > 0.5) & (TRCHI2DOF < 2.0) & (MIPCHI2DV(PRIMARY) > 200)"
     # These cuts are now tighter than the trigger that follows
 
     return Selection(name+"_SelFilterLongPartsMu", Algorithm = FilterLongPartsMu, RequiredSelections = [StdLooseMuons])
@@ -602,7 +602,7 @@ def selMakeMuonTT(name, XTolParam, MaxChi2TolParam, MinAxProjParam, MajAxProjPar
     MakeMuonTT.MuonCombRec.PhysicsTiming = True
     MakeMuonTT.MuonCombRec.AssumeCosmics = False
     MakeMuonTT.MuonCombRec.AssumePhysics = True
-    MakeMuonTT.MuonCombRec.StrongCloneKiller = False 
+    MakeMuonTT.MuonCombRec.StrongCloneKiller = False
     MakeMuonTT.MuonCombRec.SeedStation = seedStation # default seet station is M5
     MakeMuonTT.MuonCombRec.addTool( MuonHitDecode, ("MuonHitDecode") )
     MakeMuonTT.MuonCombRec.MuonHitDecode.SkipHWNumber = True
@@ -617,7 +617,7 @@ def selMakeMuonTT(name, XTolParam, MaxChi2TolParam, MinAxProjParam, MajAxProjPar
     # ################################################################
     MakeMuonTT.addTool( TrackMasterFitter)
     MakeMuonTT.TrackMasterFitter.MaterialLocator = "SimplifiedMaterialLocator"
-    MakeMuonTT.addTool( TrackMasterExtrapolator ) 
+    MakeMuonTT.addTool( TrackMasterExtrapolator )
     MakeMuonTT.TrackMasterExtrapolator.MaterialLocator = "SimplifiedMaterialLocator"
     # ################################################################
     MakeMuonTT.AddTTHits = True
@@ -681,7 +681,7 @@ def selHlt1Upsilon(name, longPartsFilter, triggers, passonall):
     Filter the long track muon to be TOS on a HLT1 single muon trigger, for Upsilon selection
     """
     Hlt1Upsilon = TisTosParticleTagger(name+"Hlt1Upsilon")
-    #Hlt1Upsilon.TisTosSpecs = { "Hlt1TrackMuonDecision%TOS" : 0, "Hlt1SingleMuonNoIPDecision%TOS" : 0, "Hlt1SingleMuonHighPTDecision%TOS" : 0} 
+    #Hlt1Upsilon.TisTosSpecs = { "Hlt1TrackMuonDecision%TOS" : 0, "Hlt1SingleMuonNoIPDecision%TOS" : 0, "Hlt1SingleMuonHighPTDecision%TOS" : 0}
     Hlt1Upsilon.TisTosSpecs = triggers
     Hlt1Upsilon.ProjectTracksToCalo = False
     Hlt1Upsilon.CaloClustForCharged = False
@@ -733,7 +733,7 @@ def selHlt2Upsilon(name, hlt1Filter, triggers, passonall):
     Filter the long track muon to be TOS on a HLT2 single muon trigger, for Upsilon selection
     """
     Hlt2Upsilon = TisTosParticleTagger(name+"Hlt2Upsilon")
-    #Hlt2Upsilon.TisTosSpecs = { "Hlt2SingleMuonLowPTDecision%TOS" : 0} 
+    #Hlt2Upsilon.TisTosSpecs = { "Hlt2SingleMuonLowPTDecision%TOS" : 0}
     Hlt2Upsilon.TisTosSpecs = triggers
     Hlt2Upsilon.ProjectTracksToCalo = False
     Hlt2Upsilon.CaloClustForCharged = False
@@ -792,7 +792,7 @@ def selHlt2BJpsiKK(name, longPartsFilter, triggers, passonall): # No HLT1 needed
     #
     return Selection(name+"_SelHlt2BJpsiKK", Algorithm = Hlt2BJpsiKK, RequiredSelections = [ longPartsFilter ])
 # ########################################################################################
-        
+
 # ########################################################################################
 # -->
 # --> FILTERS AND RESONANCE MAKERS <--
@@ -809,12 +809,12 @@ def chargeFilter(name, trackAlgo,  partSource, charge):
     """
     Filter = FilterDesktop() #there is maybe a change needed
     myFilter1 = Filter.configurable(name+"chargeFilter1")
-        
+
     if(charge == -1):
         myFilter1.Code = "(Q < 0)"
     if(charge == 1):
-        myFilter1.Code = "(Q > 0)"    
-        
+        myFilter1.Code = "(Q > 0)"
+
     if(trackAlgo == 'MuonTT'):
         return Selection( name+'_chargeFilter'+'MuonTT', Algorithm = myFilter1, RequiredSelections = [  partSource ] )
     if(trackAlgo == 'LongMu'):
@@ -824,9 +824,9 @@ def chargeFilter(name, trackAlgo,  partSource, charge):
 
 # ########################################################################################
 # Resonance maker, that fits two muons to a resonance (J/psi, Upsilon, Z)
-# ########################################################################################    
-def makeResonanceMuMuTrackEff(name, resonanceName, decayDescriptor, plusCharge, minusCharge, 
-                              mode, massWin, vertexChi2, resonancePT, muonTTPT, longPT, longMuonPID, longMuonMinIP, longMuonTrackCHI2, motherMinIP):    
+# ########################################################################################
+def makeResonanceMuMuTrackEff(name, resonanceName, decayDescriptor, plusCharge, minusCharge,
+                              mode, massWin, vertexChi2, resonancePT, muonTTPT, longPT, longMuonPID, longMuonMinIP, longMuonTrackCHI2, motherMinIP):
     """
     Create and return a Resonance -> mu mu Selection object, with one track a long track
     and the other a MuonTT track.
@@ -848,14 +848,14 @@ def makeResonanceMuMuTrackEff(name, resonanceName, decayDescriptor, plusCharge,
     longMuonMinIPCHI2    : MinIPCHI2 of long-track muon
     longMuonTrackCHI2    : Track-Chi2 of long-track muon
     """
-    
+
     massWinCombCut = 2 * massWin
-    
+
     Combine = CombineParticles()
     MuonTTResonance = Combine.configurable(name+"MuonTTResonance")
     MuonTTResonance.DecayDescriptor = decayDescriptor
 
-    MuonTTResonance.OutputLevel = 4 
+    MuonTTResonance.OutputLevel = 4
 
     if(mode == 1):
         MuonTTResonance.DaughtersCuts = {"mu+"	:	"PT > %(muonTTPT)s"  % locals(),
@@ -863,25 +863,25 @@ def makeResonanceMuMuTrackEff(name, resonanceName, decayDescriptor, plusCharge,
 
         MuonTTResonance.CombinationCut = "ADAMASS('%(resonanceName)s') < %(massWinCombCut)s" % locals()
         MuonTTResonance.MotherCut = "(ADMASS('%(resonanceName)s') < %(massWin)s) & (VFASPF(VCHI2/VDOF) < %(vertexChi2)s) & (MIPDV(PRIMARY) < %(motherMinIP)s)" % locals()
-    
+
         return Selection( name, Algorithm = MuonTTResonance, RequiredSelections = [minusCharge, plusCharge] )
-     
+
     if(mode == 2):
         MuonTTResonance.DaughtersCuts = {"mu-"	:	"PT > %(muonTTPT)s"  % locals(),
                                          "mu+"	:	"(PT > %(longPT)s) & (PIDmu > %(longMuonPID)s)"  % locals() }
 
         MuonTTResonance.CombinationCut = "ADAMASS('%(resonanceName)s') < %(massWinCombCut)s" % locals()
         MuonTTResonance.MotherCut = "(ADMASS('%(resonanceName)s') < %(massWin)s) & (VFASPF(VCHI2/VDOF) < %(vertexChi2)s) & (MIPDV(PRIMARY) < %(motherMinIP)s)" % locals()
-        
+
         return Selection( name, Algorithm = MuonTTResonance, RequiredSelections = [plusCharge, minusCharge] )
-    
-    
+
+
 # ################################################################
 
 # ########################################################################################
 # Make a B->J/psi K out of a J/psi and a K
 # ########################################################################################
-def makeBJpsiKTrackEff(name, JpsiSel, KSel, massWin, vertexChi2): 
+def makeBJpsiKTrackEff(name, JpsiSel, KSel, massWin, vertexChi2):
     """
     Create and return a B -> J/psi K Selection object, with a J/psi (long+muonTT) and a Kaon.
 
@@ -892,16 +892,16 @@ def makeBJpsiKTrackEff(name, JpsiSel, KSel, massWin, vertexChi2):
     """
 
     massWinCombCut = 2 * massWin
-    
+
     Combine = CombineParticles()
     MuonTTBJpsiK = Combine.configurable(name+"BJpsiK")
     MuonTTBJpsiK.DecayDescriptor = "[B+ -> J/psi(1S) K+]cc"
 
-    MuonTTBJpsiK.OutputLevel = 4 
-    
+    MuonTTBJpsiK.OutputLevel = 4
+
     MuonTTBJpsiK.DaughtersCuts = {"J/psi(1S)"	:	"DMASS('J/psi(1S)') < 500" ,
                                   "K+"          :	"ALL" }
-             
+
     MuonTTBJpsiK.CombinationCut = "ADAMASS('B+') < %(massWinCombCut)s" % locals()
     MuonTTBJpsiK.MotherCut = "(ADMASS('B+') < %(massWin)s) & (VFASPF(VCHI2/VDOF) < %(vertexChi2)s) & (BPVDIRA > 0.95)" % locals()
 
@@ -926,8 +926,3 @@ def filterHLT2ForBJpsiK(name, BJpsiKSel, triggers):
     #Hlt2BJpsiK.PassOnAll = True
     return Selection( name, Algorithm = Hlt2BJpsiK, RequiredSelections = [BJpsiKSel] )
 # ########################################################################################
-
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index bbeae0090dd562e0b169ee02ad2f083d79728f6e..f7383977dc2fc4cd7c1fcdd922465e160d5aaf76 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -17,10 +17,10 @@
 #
 # @authors P. Seyfert, A. Jaeger
 # @date 2011-Mar-17
-# 
+#
 # @author M. Kolpin
 # @date 2015-Mar-23
-# 
+#
 #######################################################################
 
 __author__ = ['Michael Kolpin']
@@ -43,12 +43,12 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
 
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles	
-#from Configurables import CombineParticles	
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+#from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
 from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
 from Configurables import FastVeloTracking
-  
+
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo,TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
 from Configurables import TrackCloneFinder
@@ -176,142 +176,142 @@ class HeavyIonTrackEffVeloMuonConf(LineBuilder):
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
-	
+
 	# CHECK TRIGGER
         self.TisTosPreFilter1Jpsi = selHlt1Jpsi('TisTosFilter1Jpsifor'+name, HLT1TisTosSpecs = config['HLT1TisTosSpecs'], HLT1PassOnAll = config['HLT1PassOnAll'])
         self.TisTosPreFilter2Jpsi = selHlt2Jpsi('TisTosFilter2Jpsifor'+name, hlt1Filter = self.TisTosPreFilter1Jpsi, HLT2TisTosSpecs = config['HLT2TisTosSpecs'], HLT2PassOnAll = config['HLT2PassOnAll'])
-        
+
         self.TisTosPreFilter1Z = selHlt1Jpsi('TisTosFilter1Zfor'+name, HLT1TisTosSpecs = config['ZHLT1TisTosSpecs'], HLT1PassOnAll = config['HLT1PassOnAll'])
         self.TisTosPreFilter2Z = selHlt2Jpsi('TisTosFilter2Zfor'+name, hlt1Filter = self.TisTosPreFilter1Z, HLT2TisTosSpecs = config['ZHLT2TisTosSpecs'], HLT2PassOnAll = config['HLT2PassOnAll'])
-        
+
         self.TisTosPreFilter1Upsilon = selHlt1Jpsi('TisTosFilter1Upsilonfor'+name, HLT1TisTosSpecs = config['UpsilonHLT1TisTosSpecs'], HLT1PassOnAll = config['HLT1PassOnAll'])
         self.TisTosPreFilter2Upsilon = selHlt2Jpsi('TisTosFilter2Upsilonfor'+name, hlt1Filter = self.TisTosPreFilter1Upsilon, HLT2TisTosSpecs = config['UpsilonHLT2TisTosSpecs'], HLT2PassOnAll = config['HLT2PassOnAll'])
-        
+
         # CHECK FOR TAG-TRACKS
         muCut = "((TRCHI2DOF < %(TrChi2LongMu)s)) & (PT > %(TrPt)s) & (P > %(LongP)s) & (PIDmu > %(MuDLL)s)" % config
         vmCut = "((TRCHI2DOF < %(TrChi2VeMu)s)) & (PT > %(TrPt)s) & (P > %(TrP)s)" % config
         ZmuCut = "((PT > %(ZTrPt)s) & (ETA > %(ZTrMinEta)s) & (ETA < %(ZTrMaxEta)s) & (P > %(ZTrP)s) )" % config
         UpsilonmuCut = "((PT > %(UpsilonTrPt)s) & (P > %(UpsilonTrP)s) )" % config
-        
+
         self.longbothJpsi = longtrackFilter( name+'LongJpsiBoth', trackAlgo = 'LongMu', partSource = StdAllLooseMuons, muCut = muCut)
         self.longMinusJpsi = chargeFilter( name+'LongJpsiMinus', trackAlgo = 'LongMu',   partSource = self.longbothJpsi, charge = -1, vmCut = vmCut, muCut = muCut)
         self.longPlusJpsi = chargeFilter( name+'LongJpsiPlus', trackAlgo =  'LongMu',   partSource = self.longbothJpsi, charge = 1, vmCut = vmCut, muCut = muCut)
-        
+
         self.longbothZ = longtrackFilter( name+'LongZBoth', trackAlgo = 'LongMu', partSource = StdAllLooseMuons, muCut = ZmuCut)
         self.longMinusZ = chargeFilter( name+'LongZMinus', trackAlgo = 'LongMu',   partSource = self.longbothZ, charge = -1, vmCut = ZmuCut, muCut = ZmuCut)
         self.longPlusZ = chargeFilter( name+'LongZPlus', trackAlgo =  'LongMu',   partSource = self.longbothZ, charge = 1, vmCut = ZmuCut, muCut = ZmuCut)
-        
+
         self.longbothUpsilon = longtrackFilter( name+'LongUpsilonBoth', trackAlgo = 'LongMu', partSource = StdAllLooseMuons, muCut = UpsilonmuCut)
         self.longMinusUpsilon = chargeFilter( name+'LongUpsilonMinus', trackAlgo = 'LongMu',   partSource = self.longbothUpsilon, charge = -1, vmCut = UpsilonmuCut, muCut = UpsilonmuCut)
         self.longPlusUpsilon = chargeFilter( name+'LongUpsilonPlus', trackAlgo =  'LongMu',   partSource = self.longbothUpsilon, charge = 1, vmCut = UpsilonmuCut, muCut = UpsilonmuCut)
-        
+
         # RECONSTRUCT PROBE-TRACKS
-        self.TrackingPreFilter = trackingPreFilter(name+"_Jpsi", [self.TisTosPreFilter2Jpsi,self.longbothJpsi]) 
+        self.TrackingPreFilter = trackingPreFilter(name+"_Jpsi", [self.TisTosPreFilter2Jpsi,self.longbothJpsi])
         self.VeloMuProtoPFilter = selMuonPParts(name+"_Jpsi", self.TrackingPreFilter)
         self.VeloMuPFilter = makeMyMuons(name+"_Jpsi", self.VeloMuProtoPFilter)
-        
-        self.ZTrackingPreFilter = trackingPreFilter(name+"_Z", [self.TisTosPreFilter2Z,self.longbothZ]) 
+
+        self.ZTrackingPreFilter = trackingPreFilter(name+"_Z", [self.TisTosPreFilter2Z,self.longbothZ])
         self.ZVeloMuProtoPFilter = selMuonPParts(name+"_Z", self.ZTrackingPreFilter)
         self.ZVeloMuPFilter = makeMyMuons(name+"_Z", self.ZVeloMuProtoPFilter)
-           
-        self.UpsilonTrackingPreFilter = trackingPreFilter(name+"_Upsilon", [self.TisTosPreFilter2Upsilon,self.longbothUpsilon]) 
+
+        self.UpsilonTrackingPreFilter = trackingPreFilter(name+"_Upsilon", [self.TisTosPreFilter2Upsilon,self.longbothUpsilon])
         self.UpsilonVeloMuProtoPFilter = selMuonPParts(name+"_Upsilon", self.UpsilonTrackingPreFilter)
         self.UpsilonVeloMuPFilter = makeMyMuons(name+"_Upsilon", self.UpsilonVeloMuProtoPFilter)
-           
+
         self.veloMuonMinusJpsi = chargeFilter(name+'MuonVeloJpsiMinus', trackAlgo =  'VeloMuon',   partSource =  self.VeloMuPFilter , charge = -1, vmCut = vmCut, muCut = muCut)
         self.veloMuonPlusJpsi = chargeFilter(name+'MuonVeloJpsiPlus', trackAlgo = 'VeloMuon',  partSource = self.VeloMuPFilter,  charge = 1, vmCut = vmCut, muCut = muCut)
-        
+
         self.veloMuonMinusZ = chargeFilter(name+'MuonVeloZMinus', trackAlgo =  'VeloMuon',   partSource =  self.ZVeloMuPFilter , charge = -1, vmCut = ZmuCut, muCut = ZmuCut)
         self.veloMuonPlusZ = chargeFilter(name+'MuonVeloZPlus', trackAlgo = 'VeloMuon',  partSource = self.ZVeloMuPFilter,  charge = 1, vmCut = ZmuCut, muCut = ZmuCut)
-        
+
         self.veloMuonMinusUpsilon = chargeFilter(name+'MuonVeloUpsilonMinus', trackAlgo =  'VeloMuon',   partSource =  self.UpsilonVeloMuPFilter , charge = -1, vmCut = UpsilonmuCut, muCut = UpsilonmuCut)
         self.veloMuonPlusUpsilon = chargeFilter(name+'MuonVeloUpsilonPlus', trackAlgo = 'VeloMuon',  partSource = self.UpsilonVeloMuPFilter,  charge = 1, vmCut = UpsilonmuCut, muCut = UpsilonmuCut)
-        
+
         # TAG-AND-PROBE
-        self.JpsiMuMuTrackEff1 = makeResonanceVeloMuTrackEff(name + "VeloMuJpsiSel1", 
-        						   resonanceName = 'J/psi(1S)', 
+        self.JpsiMuMuTrackEff1 = makeResonanceVeloMuTrackEff(name + "VeloMuJpsiSel1",
+        						   resonanceName = 'J/psi(1S)',
         						   decayDescriptor = 'J/psi(1S) -> mu+ mu-',
-        						   plusCharge = self.veloMuonPlusJpsi, 
+        						   plusCharge = self.veloMuonPlusJpsi,
         						   minusCharge = self.longMinusJpsi,
         						   mode = 1,
-        						   TrPt = config['TrPt'], 
+        						   TrPt = config['TrPt'],
         						   TrP = config['TrP'],
         						   MuDLL = config['MuDLL'],
-        						   MassPreComb = config['MassPreComb'], 
-        						   VertChi2 = config['VertChi2'], 
-        						   MassPostComb = config['MassPostComb'], 
-        						   JpsiPt = config['JpsiPt'])   
-        
-        self.JpsiMuMuTrackEff2 = makeResonanceVeloMuTrackEff(name + "VeloMuJpsiSel2", 
-        						   resonanceName = 'J/psi(1S)', 
+        						   MassPreComb = config['MassPreComb'],
+        						   VertChi2 = config['VertChi2'],
+        						   MassPostComb = config['MassPostComb'],
+        						   JpsiPt = config['JpsiPt'])
+
+        self.JpsiMuMuTrackEff2 = makeResonanceVeloMuTrackEff(name + "VeloMuJpsiSel2",
+        						   resonanceName = 'J/psi(1S)',
         						   decayDescriptor = 'J/psi(1S) -> mu+ mu-',
-        						   plusCharge = self.longPlusJpsi, 
+        						   plusCharge = self.longPlusJpsi,
         						   minusCharge = self.veloMuonMinusJpsi,
         						   mode = 2,
-        						   TrPt = config['TrPt'],  
+        						   TrPt = config['TrPt'],
         						   TrP = config['TrP'],
         						   MuDLL = config['MuDLL'],
-        						   MassPreComb = config['MassPreComb'], 
-        						   VertChi2 = config['VertChi2'], 
-        						   MassPostComb = config['MassPostComb'], 
-        						   JpsiPt = config['JpsiPt'])    
-        
-        self.ZMuMuTrackEff1 = makeResonanceVeloMuTrackEff(name + "VeloMuZSel1", 
-        						  resonanceName = 'Z0', 
+        						   MassPreComb = config['MassPreComb'],
+        						   VertChi2 = config['VertChi2'],
+        						   MassPostComb = config['MassPostComb'],
+        						   JpsiPt = config['JpsiPt'])
+
+        self.ZMuMuTrackEff1 = makeResonanceVeloMuTrackEff(name + "VeloMuZSel1",
+        						  resonanceName = 'Z0',
         						  decayDescriptor = 'Z0 -> mu+ mu-',
-        						  plusCharge = self.veloMuonPlusZ, 
+        						  plusCharge = self.veloMuonPlusZ,
         						  minusCharge = self.longMinusZ,
         						  mode = 1,
-        						  TrPt = config['ZTrPt'], 
+        						  TrPt = config['ZTrPt'],
         						  TrP = config['ZTrP'],
         						  MuDLL = config['MuDLL'],
-        						  MassPreComb = config['ZMassPreComb'], 
-        						  VertChi2 = config['ZVertChi2'], 
-        						  MassPostComb = config['ZMassPostComb'], 
-        						  JpsiPt = config['ZPt'])   
-        
-        self.ZMuMuTrackEff2 = makeResonanceVeloMuTrackEff(name + "VeloMuZSel2", 
-        						  resonanceName = 'Z0', 
+        						  MassPreComb = config['ZMassPreComb'],
+        						  VertChi2 = config['ZVertChi2'],
+        						  MassPostComb = config['ZMassPostComb'],
+        						  JpsiPt = config['ZPt'])
+
+        self.ZMuMuTrackEff2 = makeResonanceVeloMuTrackEff(name + "VeloMuZSel2",
+        						  resonanceName = 'Z0',
         						  decayDescriptor = 'Z0 -> mu+ mu-',
-        						  plusCharge = self.longPlusZ, 
+        						  plusCharge = self.longPlusZ,
         						  minusCharge = self.veloMuonMinusZ,
         						  mode = 2,
-        						  TrPt = config['ZTrPt'], 
+        						  TrPt = config['ZTrPt'],
         						  TrP = config['ZTrP'],
         						  MuDLL = config['MuDLL'],
-        						  MassPreComb = config['ZMassPreComb'], 
-        						  VertChi2 = config['ZVertChi2'], 
-        						  MassPostComb = config['ZMassPostComb'], 
-        						  JpsiPt = config['ZPt'])   
-        
-        self.UpsilonMuMuTrackEff1 = makeResonanceVeloMuTrackEff(name + "VeloMuUpsilonSel1", 
-        						  resonanceName = 'Upsilon(1S)', 
+        						  MassPreComb = config['ZMassPreComb'],
+        						  VertChi2 = config['ZVertChi2'],
+        						  MassPostComb = config['ZMassPostComb'],
+        						  JpsiPt = config['ZPt'])
+
+        self.UpsilonMuMuTrackEff1 = makeResonanceVeloMuTrackEff(name + "VeloMuUpsilonSel1",
+        						  resonanceName = 'Upsilon(1S)',
         						  decayDescriptor = 'Upsilon(1S) -> mu+ mu-',
-        						  plusCharge = self.veloMuonPlusUpsilon, 
+        						  plusCharge = self.veloMuonPlusUpsilon,
         						  minusCharge = self.longMinusUpsilon,
         						  mode = 1,
-        						  TrPt = config['UpsilonTrPt'], 
+        						  TrPt = config['UpsilonTrPt'],
         						  TrP = config['UpsilonTrP'],
         						  MuDLL = config['MuDLL'],
-        						  MassPreComb = config['UpsilonMassPreComb'], 
-        						  VertChi2 = config['UpsilonVertChi2'], 
-        						  MassPostComb = config['UpsilonMassPostComb'], 
-        						  JpsiPt = config['UpsilonPt'])   
-        
-        self.UpsilonMuMuTrackEff2 = makeResonanceVeloMuTrackEff(name + "VeloMuUpsilonSel2", 
-        						  resonanceName = 'Upsilon(1S)', 
+        						  MassPreComb = config['UpsilonMassPreComb'],
+        						  VertChi2 = config['UpsilonVertChi2'],
+        						  MassPostComb = config['UpsilonMassPostComb'],
+        						  JpsiPt = config['UpsilonPt'])
+
+        self.UpsilonMuMuTrackEff2 = makeResonanceVeloMuTrackEff(name + "VeloMuUpsilonSel2",
+        						  resonanceName = 'Upsilon(1S)',
         						  decayDescriptor = 'Upsilon(1S) -> mu+ mu-',
-        						  plusCharge = self.longPlusUpsilon, 
+        						  plusCharge = self.longPlusUpsilon,
         						  minusCharge = self.veloMuonMinusUpsilon,
         						  mode = 2,
-        						  TrPt = config['UpsilonTrPt'], 
+        						  TrPt = config['UpsilonTrPt'],
         						  TrP = config['UpsilonTrP'],
         						  MuDLL = config['MuDLL'],
-        						  MassPreComb = config['UpsilonMassPreComb'], 
-        						  VertChi2 = config['UpsilonVertChi2'], 
-        						  MassPostComb = config['UpsilonMassPostComb'], 
-        						  JpsiPt = config['UpsilonPt'])   
-        
+        						  MassPreComb = config['UpsilonMassPreComb'],
+        						  VertChi2 = config['UpsilonVertChi2'],
+        						  MassPostComb = config['UpsilonMassPostComb'],
+        						  JpsiPt = config['UpsilonPt'])
+
         self.nominal_line1 =  StrippingLine(name + 'Line1'
                                             , prescale = config['Prescale']
                                             , postscale = config['Postscale']
@@ -329,22 +329,22 @@ class HeavyIonTrackEffVeloMuonConf(LineBuilder):
                                             , HLT1 = "HLT_PASS_RE('%(JpsiHlt1Filter)s')" % config
                                             , HLT2 = "HLT_PASS_RE('%(JpsiHlt2Filter)s')" % config
                                             , MDSTFlag = True)
-        
+
         self.Z_line1 =  StrippingLine(name + 'ZLine1',  prescale = config['ZPrescale'], postscale = config['ZPostscale'], algos=[self.ZMuMuTrackEff1], RequiredRawEvents = ["Trigger","Muon","Velo","Tracker"], MDSTFlag = True)
         self.Z_line2 =  StrippingLine(name + 'ZLine2',  prescale = config['ZPrescale'], postscale = config['ZPostscale'], algos=[self.ZMuMuTrackEff2], RequiredRawEvents = ["Trigger","Muon","Velo","Tracker"], MDSTFlag = True)
-        
+
         self.Upsilon_line1 =  StrippingLine(name + 'UpsilonLine1',  prescale = config['UpsilonPrescale'], postscale = config['UpsilonPostscale'], algos=[self.UpsilonMuMuTrackEff1], RequiredRawEvents = ["Trigger","Muon","Velo","Tracker"], MDSTFlag = True)
         self.Upsilon_line2 =  StrippingLine(name + 'UpsilonLine2',  prescale = config['UpsilonPrescale'], postscale = config['UpsilonPostscale'], algos=[self.UpsilonMuMuTrackEff2], RequiredRawEvents = ["Trigger","Muon","Velo","Tracker"], MDSTFlag = True)
-        
+
         self.registerLine(self.nominal_line1)
         self.registerLine(self.nominal_line2)
-        
+
         self.registerLine(self.Z_line1)
         self.registerLine(self.Z_line2)
-        
+
         self.registerLine(self.Upsilon_line1)
         self.registerLine(self.Upsilon_line2)
-	
+
 # ########################################################################################
 # Make the protoparticles
 # ########################################################################################
@@ -384,14 +384,14 @@ def makeMyMuons(name, protoParticlesMaker):
 
    DataOnDemandSvc().AlgMap.update( {
            "/Event/Phys/" + particleMaker.name() + '/Particles' : particleMaker.getFullName(),
-           "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName() 
+           "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
    } )
 
 
    return Selection(name+"SelVeloMuonParts", Algorithm = particleMaker, RequiredSelections = [protoParticlesMaker], InputDataSetter=None)
 
-def makeResonanceVeloMuTrackEff(name, resonanceName, decayDescriptor, plusCharge, minusCharge, 
-                              mode, TrPt, TrP, MuDLL, MassPreComb, VertChi2, MassPostComb, JpsiPt):    
+def makeResonanceVeloMuTrackEff(name, resonanceName, decayDescriptor, plusCharge, minusCharge,
+                              mode, TrPt, TrP, MuDLL, MassPreComb, VertChi2, MassPostComb, JpsiPt):
    """
    Create and return a Resonance -> mu mu Selection object, with one track a long track
    and the other a MuonVelo track.
@@ -403,12 +403,12 @@ def makeResonanceVeloMuTrackEff(name, resonanceName, decayDescriptor, plusCharge
    minusCharge          : algorithm for selection negatively charged tracks
    mode                 : Tag(-)-and-Probe(+) (1) or  Tag(+)-and-Probe(-) (2)
    """
-    
-    
+
+
    MuonVeloResonance = CombineParticles()
    #MuonVeloResonance = CombineParticles('_'+name)
    MuonVeloResonance.DecayDescriptor = decayDescriptor
-   MuonVeloResonance.OutputLevel = 4 
+   MuonVeloResonance.OutputLevel = 4
 
 
    if(mode == 1):
@@ -417,16 +417,16 @@ def makeResonanceVeloMuTrackEff(name, resonanceName, decayDescriptor, plusCharge
 
        MuonVeloResonance.CombinationCut = "ADAMASS('%(resonanceName)s')<%(MassPreComb)s*MeV"% locals()
        MuonVeloResonance.MotherCut = "(VFASPF(VCHI2/VDOF)< %(VertChi2)s) & (ADMASS('%(resonanceName)s')<%(MassPostComb)s*MeV) & (PT > %(JpsiPt)s*GeV)"% locals()
-        
+
        return Selection( name, Algorithm = MuonVeloResonance, RequiredSelections = [minusCharge, plusCharge] )
-     
+
    if(mode == 2):
        #MuonVeloResonance.DaughtersCuts = {"mu-": muCut  % locals(),
        #                                   "mu+": vmCut  % locals() }
 
        MuonVeloResonance.CombinationCut = "ADAMASS('%(resonanceName)s')<%(MassPreComb)s*MeV"% locals()
        MuonVeloResonance.MotherCut = "(VFASPF(VCHI2/VDOF)< %(VertChi2)s) & (ADMASS('%(resonanceName)s')<%(MassPostComb)s*MeV) & (PT > %(JpsiPt)s*GeV)"% locals()
-            
+
        return Selection( name, Algorithm = MuonVeloResonance, RequiredSelections = [plusCharge, minusCharge] )
 
 # ########################################################################################
@@ -439,12 +439,12 @@ def chargeFilter(name, trackAlgo,  partSource, charge, vmCut, muCut):
     """
     Filter = FilterDesktop() #there is maybe a change needed
     myFilter1 = Filter.configurable("myFilter1")
-            
+
     if(charge == -1):
         myFilter1.Code = "(Q < 0) & "
     if(charge == 1):
-        myFilter1.Code = "(Q > 0) & "    
-            
+        myFilter1.Code = "(Q > 0) & "
+
     if(trackAlgo == 'VeloMuon'):
         myFilter1.Code += vmCut
     if(trackAlgo == "LongMu"):
@@ -464,7 +464,7 @@ def longtrackFilter(name, trackAlgo, partSource, muCut):
     """
     Filter = FilterDesktop() #there is maybe a change needed
     myFilter1 = Filter.configurable("mylongFilter1")
-            
+
     myFilter1.Code = muCut
     return Selection( name+'_longFilter'+'LongMu', Algorithm = myFilter1, RequiredSelections = [  partSource ] )
 # ################################################################
@@ -516,7 +516,7 @@ def selHlt2Jpsi(name, hlt1Filter, HLT2TisTosSpecs, HLT2PassOnAll):
    #
    return Selection(name+"_SelHlt2Jpsi", Algorithm = Hlt2Jpsi, RequiredSelections = [ hlt1Filter ])
 ##########################################################
-        
+
 
 def trackingPreFilter(name, prefilter):
 
@@ -537,7 +537,7 @@ def trackingPreFilter(name, prefilter):
    #TODO: apparently FastVelo is now (april 2012) run with fixes in the production which don't neccessarily apply to the stripping...
    alg = GaudiSequencer("VeloMuonTrackingFor"+name,
                          Members = [ FastVeloTracking(name+"FastVelo",OutputTracksName="Rec/"+name+"_Track/Velo"),
-				 preve, 
+				 preve,
 				 #StandaloneMuonRec(name+"MuonStandalone", OutputMuonTracksName = "Rec/Track/"+name+"MuonStandalone"), VeloMuonBuilder1])
 				 StandaloneMuonRec(name+"MuonStandalone",OutputMuonTracksName="Rec/Track/"+name+"MuonStandalone"), VeloMuonBuilder1])
 
@@ -551,7 +551,7 @@ def trackingPreFilter(name, prefilter):
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
@@ -559,7 +559,3 @@ class GSWrapper(UniquelyNamedObject,
                                algorithm = sequencer,
                                outputLocation = output,
                                requiredSelections = requiredSelections )
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonWMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonWMuNu.py
index a8c8808e5cdb7968cb4f6154de5316fccabe97c6..65e54264d4a343554231ba5aa25d1ba4e97d0769 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonWMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonWMuNu.py
@@ -37,7 +37,7 @@ default_config = {
   'BUILDERTYPE' : 'HeavyIonWMuNuConf',
   'WGs'         : [ 'IFT'],
   'STREAMS'     : [ 'IFT' ],
-  'CONFIG'      : { 
+  'CONFIG'      : {
     'WMu_Prescale'          : 1.0,
     #    'WMuLow_Prescale'       : 0.1,
     'WMuLow_Prescale'       : 1.0,
@@ -57,13 +57,13 @@ default_config = {
     'HLT2_Control10'        : None, #"HLT_PASS_RE('Hlt2(EW)?SingleMuon(V)?High.*')",
     'HLT2_Control4800'      : None, #"HLT_PASS_RE('Hlt2(EW)?SingleMuonLow.*')",
     #    'HLT1_SingleTrackNoBias': "HLT_PASS( 'Hlt1MBNoBiasDecision' )",
-    'HLT1_SingleTrackNoBias': ("HLT_PASS( 'Hlt1BBMicroBiasVeloDecision' )| HLT_PASS( 'Hlt1BBHighMultDecision' )"), 
+    'HLT1_SingleTrackNoBias': ("HLT_PASS( 'Hlt1BBMicroBiasVeloDecision' )| HLT_PASS( 'Hlt1BBHighMultDecision' )"),
 
 
     #
     'RawEvents' : ["Muon", "Calo", "Rich", "Velo", "Tracker", "HC"],
 
-    
+
     "ProbNNmu_min"     : 0.5,
 
   },
@@ -91,7 +91,7 @@ class HeavyIonWMuNuConf( LineBuilder ) :
       selection = sel,
     ))
 
-    #-----------------------------------------------------------------        
+    #-----------------------------------------------------------------
 
     sel = makeFilter(name+'Mu48', StdAllLooseMuons, config['SingMuon48_pT'])
 
@@ -166,7 +166,6 @@ def makeFilter(name, single_input, min_PT):
   Simple FilterDesktop selection having only min PT cut.
   """
   return SimpleSelection(name, FilterDesktop, [single_input],
-                         Preambulo = [ "from LoKiTracks.decorators import *" ],    
+                         Preambulo = [ "from LoKiTracks.decorators import *" ],
                          Code      = 'PT > {}'.format(min_PT)
                          )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingV0ForPID_ForIFT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingV0ForPID_ForIFT.py
index b625a7bc9e6a8358811fb4f0e937e29f323c8c19..3bc6cce62be981d3e2dea46ee092a796c05031af 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingV0ForPID_ForIFT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingV0ForPID_ForIFT.py
@@ -21,7 +21,7 @@
 # the periphery of phase-space, the selections are binned in terms of the
 # V0's rapidity and pT. Each bin is then assigned its own
 # pre-scale.
-# 
+#
 #
 # Acknowledgements:
 #
@@ -46,7 +46,7 @@ Usage:
  >>> from StrippingSelections.StrippingV0ForPID import default_config as config_v0
  >>> lb_v0  = builder_v0( name='noPIDV0', config=config_v0)
  >>> stream.appendLines( lb_v0.lines()  )
- 
+
 Results from running over:
 $STRIPPINGSELECTIONSROOT/tests/data/Reco13c_Run124134.py
 
@@ -59,7 +59,7 @@ StrippingReport                                                INFO Event 100000
 |!StrippingLam0DDLinenoPIDV0                        |  0.2920|       292|  1.051|   4.443|
 |!StrippingLam0LLIsMUONLine1noPIDV0                 |  0.1640|       164|  1.043|   0.117|
 |!StrippingLam0LLIsMUONLine2noPIDV0                 |  0.0080|         8|  1.000|   0.116|
-|!StrippingLam0DDIsMUONLinenoPIDV0                  |  0.1270|       127|  1.031|  39.297|                
+|!StrippingLam0DDIsMUONLinenoPIDV0                  |  0.1270|       127|  1.031|  39.297|
 """
 # =============================================================================
 __author__  = 'Andrew Powell a.powell1@physics.ox.ac.uk'
@@ -82,7 +82,7 @@ from GaudiKernel.SystemOfUnits import mm, cm , MeV, GeV
 # =============================================================================
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand        
+from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsDownPions, StdAllNoPIDsProtons, StdNoPIDsDownProtons, StdAllNoPIDsKaons
@@ -93,14 +93,14 @@ from StandardParticles import StdAllNoPIDsPions, StdNoPIDsDownPions, StdAllNoPID
 # =============================================================================
 ## Define the default configuration
 _default_configuration_ = {
-    'TrackChi2'            :  5       ,          ## Track Chi2/ndof quality 
+    'TrackChi2'            :  5       ,          ## Track Chi2/ndof quality
     'VertexChi2'           :  16      ,          ## Cut on Vertex chi2-quality
-    'DeltaMassK0S'         :  50 * MeV,          ## Mass-window (half)-width for K0S 
-    'DeltaMassPhi'         :  20 * MeV,          ##  Mass-window (half)-width for Phi (S??) 
-    'DeltaMassLambda'      :  25 * MeV,          ## Mass-window (half)-width for Lambda 
-    'MaxMassLambdastar'    :1560 * MeV,          ## Mass-window (half)-width for Lambda 
+    'DeltaMassK0S'         :  50 * MeV,          ## Mass-window (half)-width for K0S
+    'DeltaMassPhi'         :  20 * MeV,          ##  Mass-window (half)-width for Phi (S??)
+    'DeltaMassLambda'      :  25 * MeV,          ## Mass-window (half)-width for Lambda
+    'MaxMassLambdastar'    :1560 * MeV,          ## Mass-window (half)-width for Lambda
     'MaxZ'                 : 220 * cm ,          ## Maximal allowed vertex Z-position
-    'DaughtersIPChi2'      :  25      ,          ## minimal IP-chi2 for daughter particles  
+    'DaughtersIPChi2'      :  25      ,          ## minimal IP-chi2 for daughter particles
     'LTimeFitChi2'         :  49      ,          ## Chi2 from LifeTime Fitter
     ##
     'WrongMassK0S'         :   9 * MeV,          ## Mass-window (half)-width for ppi hypthesis
@@ -111,29 +111,29 @@ _default_configuration_ = {
     'WrongMassLambda'      :  20 * MeV,          ## Mass-window (half)-width for pipi hypthesis
     'WrongMassLambda_DD'   :  40 * MeV,          ## Mass-window (half)-width for pipi hypthesis (DD-case)
     ##
-    'CTauK0S'              :   1 * mm ,          ## Cut on c*tau for K0S 
+    'CTauK0S'              :   1 * mm ,          ## Cut on c*tau for K0S
     'CTauK0S_DD'           :  10 * mm ,          ## Cut on c*tau for K0S (DD-case)
     ##
     'CTauLambda0'          :   5 * mm ,          ## Cut on c*tau for Lambda0
     'CTauLambda0_DD'       :  20 * mm ,          ## Cut on c*tau for Lambda0 (DD-case)
     ##
-    'Proton_IsMUONCut'     :  "(INTREE( (ABSID=='p+') & ISMUON ) )" , 
-    ## 
-    'Phi_GhostProb_Tag'    : 0.025,               ##GhostProb threshold for the tag kaon in phi decay 
-    'Phi_HiPt_PIDK_Tag'    : 7,                   ##PIDK threshold for the tag kaon in the high pT phi decay 
-    'Phi_HiPt_PT_Tag'      : 1050 * MeV,          ##pT threshold for the tag kaon in the high pT phi decay 
-    'Phi_LoPt_ProbNNK_Tag' : 0.75 ,               ##ProbNNK threshold for the tag kaon in Low pT phi decay 
-    'phimaxDOCA'           : 10,                  ##Max K+K- DOCA in Phi decay 
+    'Proton_IsMUONCut'     :  "(INTREE( (ABSID=='p+') & ISMUON ) )" ,
+    ##
+    'Phi_GhostProb_Tag'    : 0.025,               ##GhostProb threshold for the tag kaon in phi decay
+    'Phi_HiPt_PIDK_Tag'    : 7,                   ##PIDK threshold for the tag kaon in the high pT phi decay
+    'Phi_HiPt_PT_Tag'      : 1050 * MeV,          ##pT threshold for the tag kaon in the high pT phi decay
+    'Phi_LoPt_ProbNNK_Tag' : 0.75 ,               ##ProbNNK threshold for the tag kaon in Low pT phi decay
+    'phimaxDOCA'           : 10,                  ##Max K+K- DOCA in Phi decay
 
     'K0s_HiPt_Pt_thre'     : 1250 * MeV,          ##Pt threshold for the high pT K0S line
     'Lambda_HiPt_Pt_thre'  : 750 * MeV,           ##Pt threshold for the high pT Lambda0 line
     'minimum_Pt'           : 380 * MeV,           ##minimum daughters Pt
 
     'ghostprob_Lambdastar' : 0.15,                 ## Ghost Prob thresholds for proton and kaon in the Lambda(1520) decay
-    'otherKcuts_Lambdastar': '(PIDK > 10) & ((PIDK - PIDp) > 0)',               ## Other cuts for the K selection in Lambda(1520) decay 
-    'PIDp_Lambdastar'      : 20 ,                 ## PIDp threshold for the proton selection in Lambda(1520) decay 
-    'PIDpPIDK_Lambdastar'  : 10 ,                 ## (PIDp - PIDK) threshold for the proton selection in Lambda(1520) decay 
-    'otherpcuts_Lambdastar': 'ALL',               ## Other cuts for the K selection in Lambda(1520) decay 
+    'otherKcuts_Lambdastar': '(PIDK > 10) & ((PIDK - PIDp) > 0)',               ## Other cuts for the K selection in Lambda(1520) decay
+    'PIDp_Lambdastar'      : 20 ,                 ## PIDp threshold for the proton selection in Lambda(1520) decay
+    'PIDpPIDK_Lambdastar'  : 10 ,                 ## (PIDp - PIDK) threshold for the proton selection in Lambda(1520) decay
+    'otherpcuts_Lambdastar': 'ALL',               ## Other cuts for the K selection in Lambda(1520) decay
 
     # Technicalities:
     ##
@@ -144,16 +144,16 @@ _default_configuration_ = {
     'Preambulo'       : [
     ## import c_light
     "from GaudiKernel.PhysicalConstants import c_light" ,
-    ## define DD-category of K0S 
+    ## define DD-category of K0S
     "DD =    CHILDCUT ( ISDOWN , 1 ) & CHILDCUT ( ISDOWN , 2 ) " ,
-    ## define LL-category of K0S 
+    ## define LL-category of K0S
     "LL =    CHILDCUT ( ISLONG , 1 ) & CHILDCUT ( ISLONG , 2 ) "
     ] ,
 
     #    'KS0LL_Prescale'                 : 0.160 ,
     'KS0LL_Prescale'                 : 1.0 ,
     'KS0LL_Prescale_HiPt'            : 1.0 ,
-    'KS0DD_Prescale'                 : 0.3 , 
+    'KS0DD_Prescale'                 : 0.3 ,
     'PhiLL_Prescale'                 : 0.1 ,
     #    'PhiLL_Prescale_KmProbe_LoPt'    : 0.170 ,
     'PhiLL_Prescale_KmProbe_LoPt'    : 1.0 ,
@@ -161,15 +161,15 @@ _default_configuration_ = {
     'PhiLL_Prescale_KpProbe_LoPt'    : 1.0 ,
     'PhiLL_Prescale_KmProbe_HiPt'    : 1.000 ,
     'PhiLL_Prescale_KpProbe_HiPt'    : 1.000 ,
-    #    'LamLL_Prescale_LoP'             : 0.680 , 
-    'LamLL_Prescale_LoP'             : 1.0 , 
+    #    'LamLL_Prescale_LoP'             : 0.680 ,
+    'LamLL_Prescale_LoP'             : 1.0 ,
     'LamLL_Prescale_HiP'             : 1.0 ,
     'LamLL_Prescale_HiPt'            : 1.000 ,
     'Lamstar_Prescale'               : 1.000 ,
-    'LamDD_Prescale'                 : 1.0 , 
+    'LamDD_Prescale'                 : 1.0 ,
     'LamLLIsMUON_Prescale_LoP'       : 1.0 ,
     'LamLLIsMUON_Prescale_HiP'       : 1.0 ,
-    'LamDDIsMUON_Prescale'           : 1.0   
+    'LamDDIsMUON_Prescale'           : 1.0
 
     }
 
@@ -178,35 +178,35 @@ _default_configuration_ = {
 default_config ={
     'NAME'        :   'VznoPID_ForIFT'       ,
     'WGs'         : [ 'IFT' ] ,
-    'CONFIG'      : _default_configuration_  , 
+    'CONFIG'      : _default_configuration_  ,
     'BUILDERTYPE' :   'StrippingV0ForPIDConf_ForIFT'            ,
     'STREAMS'     :  [ 'IFT']
-              }    
+              }
 
 
 
 # =============================================================================
-class StrippingV0ForPIDConf_ForIFT(LineBuilder) :    
+class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
     """
     Helper class to configure 'V0ForPID'-lines
     """
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    ## get the default configuration 
+    ## get the default configuration
     #@staticmethod
     def defaultConfiguration( key = None ) :
-        
+
         from copy import deepcopy
         _config = deepcopy ( _default_configuration_ )
         if key : return _config[ key ]
         return _config
-    
+
     ## constructor
     def __init__(self, name, config) :
         """
         Constructor
-        """        
-                
+        """
+
         self._name            = name
 
         self._trackChi2        = config[ 'TrackChi2' ]
@@ -223,14 +223,14 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         self.Phi_HiPt_PIDK_Tag      = config[ 'Phi_HiPt_PIDK_Tag' ]
         self.Phi_HiPt_PT_Tag        = config[ 'Phi_HiPt_PT_Tag' ]
         self.Phi_LoPt_ProbNNK_Tag   = config[ 'Phi_LoPt_ProbNNK_Tag' ]
-        
+
         self._wrongMassK0S       = config[ 'WrongMassK0S' ]
         self._wrongMassK0S_DD    = config[ 'WrongMassK0S_DD' ]
         self._wrongMassPhi       = config[ 'WrongMassPhi' ]
         self._wrongMassLambda    = config[ 'WrongMassLambda' ]
-        self._wrongMassLambda_DD = config[ 'WrongMassLambda_DD' ] 
-        
-        self.Lambda_HiPt_Pt_thre = config[ 'Lambda_HiPt_Pt_thre' ] 
+        self._wrongMassLambda_DD = config[ 'WrongMassLambda_DD' ]
+
+        self.Lambda_HiPt_Pt_thre = config[ 'Lambda_HiPt_Pt_thre' ]
         self.K0s_HiPt_Pt_thre    = config[ 'K0s_HiPt_Pt_thre' ]
 
         self._phimaxDOCA     = config[ 'phimaxDOCA' ]
@@ -243,18 +243,18 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
 
         self._ghostprob_Lambdastar   = config[ 'ghostprob_Lambdastar' ]
         self._otherKcuts_Lambdastar  = config[ 'otherKcuts_Lambdastar' ]
-        self._PIDp_Lambdastar        = config[ 'PIDp_Lambdastar' ] 
+        self._PIDp_Lambdastar        = config[ 'PIDp_Lambdastar' ]
         self._PIDpPIDK_Lambdastar    = config[ 'PIDpPIDK_Lambdastar' ]
         self._otherpcuts_Lambdastar  = config[ 'otherpcuts_Lambdastar' ]
-                            
+
         self._KS0LLPrescale                 = config[ 'KS0LL_Prescale' ]
         self._KS0LLPrescale_HiPt            = config[ 'KS0LL_Prescale_HiPt' ]
-        self._KS0DDPrescale                 = config[ 'KS0DD_Prescale' ] 
-        self._PhiLLPrescale                 = config[ 'PhiLL_Prescale' ] 
+        self._KS0DDPrescale                 = config[ 'KS0DD_Prescale' ]
+        self._PhiLLPrescale                 = config[ 'PhiLL_Prescale' ]
         self._PhiLLPrescale_KmProbe_LoPt    = config[ 'PhiLL_Prescale_KmProbe_LoPt' ]
         self._PhiLLPrescale_KpProbe_LoPt    = config[ 'PhiLL_Prescale_KpProbe_LoPt' ]
         self._PhiLLPrescale_KmProbe_HiPt    = config[ 'PhiLL_Prescale_KmProbe_HiPt' ]
-        self._PhiLLPrescale_KpProbe_HiPt    = config[ 'PhiLL_Prescale_KpProbe_HiPt' ] 
+        self._PhiLLPrescale_KpProbe_HiPt    = config[ 'PhiLL_Prescale_KpProbe_HiPt' ]
         self._LamLLPrescale_HiP             = config[ 'LamLL_Prescale_HiP' ]
         self._LamLLPrescale_HiPt            = config[ 'LamLL_Prescale_HiPt' ]
         self._LamLLPrescale_LoP             = config[ 'LamLL_Prescale_LoP' ]
@@ -268,10 +268,10 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         self._monitor      = config[ 'Monitor' ]
         self._hlt          = config[ 'HLT' ]
         self._Preambulo    = config[ 'Preambulo' ]
-        
-       
+
+
         LineBuilder.__init__( self , name , config )
-        
+
         for line in self._lines_inner() :
             self.registerLine(line)
 
@@ -285,10 +285,10 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             prescale   = self._KS0LLPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.K0S_LL_Bin1() ],
-            RequiredRawEvents = ["Muon"],    
-            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]  
+            RequiredRawEvents = ["Muon"],
+            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]
             ) ,
             ##
             StrippingLine (
@@ -296,21 +296,21 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             prescale   = self._KS0LLPrescale_HiPt ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.K0S_LL_Bin2() ],
-            RequiredRawEvents = ["Muon"],    
-            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]  
+            RequiredRawEvents = ["Muon"],
+            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "K0SDDLine" + self._name ,
             prescale   = self._KS0DDPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.K0S_DD_Bin1() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ] 
+            RelatedInfoTools = [ addRelInfoMuonIsolation("KS0 -> pi+ pi-")  ]
             ) ,
             ## (S)
             StrippingLine (
@@ -318,10 +318,10 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             prescale   = self._PhiLLPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Phi_LL_Bin1() ],
-            RequiredRawEvents = ["Muon"], #??   
-            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]  
+            RequiredRawEvents = ["Muon"], #??
+            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]
             ) ,
             ##
             StrippingLine (
@@ -329,40 +329,40 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             prescale   = self._PhiLLPrescale_KmProbe_LoPt ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Phi_LL_KmProbe_LoPt() ],
-            RequiredRawEvents = ["Muon"], #??   
-            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]  
+            RequiredRawEvents = ["Muon"], #??
+            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]
             ) ,
             StrippingLine (
             "PhiLLLine_KpProbe_LoPt" + self._name ,
             prescale   = self._PhiLLPrescale_KpProbe_LoPt ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Phi_LL_KpProbe_LoPt() ],
-            RequiredRawEvents = ["Muon"], #??   
-            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]  
+            RequiredRawEvents = ["Muon"], #??
+            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]
             ) ,
             StrippingLine (
             "PhiLLLine_KmProbe_HiPt" + self._name ,
             prescale   = self._PhiLLPrescale_KmProbe_HiPt ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Phi_LL_KmProbe_HiPt() ],
-            RequiredRawEvents = ["Muon"], #??   
-            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]  
+            RequiredRawEvents = ["Muon"], #??
+            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]
             ) ,
             StrippingLine (
             "PhiLLLine_KpProbe_HiPt" + self._name ,
             prescale   = self._PhiLLPrescale_KpProbe_HiPt ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Phi_LL_KpProbe_HiPt() ],
-            RequiredRawEvents = ["Muon"], #??   
-            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]  
+            RequiredRawEvents = ["Muon"], #??
+            RelatedInfoTools = [ addRelInfoMuonIsolation("phi(1020) -> K+ K-")  ]
             ) ,
             #
             StrippingLine (
@@ -370,78 +370,78 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             prescale   = self._LamLLPrescale_LoP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin1() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]  
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
                 ) ,
-            ## 
+            ##
             StrippingLine (
             "Lam0LLLine_HiP" + self._name ,
             prescale   = self._LamLLPrescale_HiP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin2() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "Lam0LLLine_HiPt" + self._name ,
             prescale   = self._LamLLPrescale_HiPt ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin3() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             ) ,
-            ## 
+            ##
             StrippingLine (
             "Lam0DDLine" + self._name ,
             prescale   = self._LamDDPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_DD_Bin1() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             ),
-            ## 
+            ##
             StrippingLine (
             "Lam0LLIsMUONLine1" + self._name ,
             prescale   = self._LamLLIsMUONPrescale_LoP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin1_IsMUON() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             )
             ,
-            ## 
+            ##
             StrippingLine (
             "Lam0LLIsMUONLine2" + self._name ,
             prescale   = self._LamLLIsMUONPrescale_HiP ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_LL_Bin2_IsMUON() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             )
             ,
-            ## 
+            ##
             StrippingLine (
             "Lam0DDIsMUONLine" + self._name ,
             prescale   = self._LamDDIsMUONPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lam0_DD_Bin1_IsMUON() ],
             RequiredRawEvents = ["Muon"],
-            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ] 
+            RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda0 -> p+ pi-]CC")  ]
             )
             ,
             ##
@@ -450,20 +450,20 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             prescale   = self._LamstarPrescale ,
             checkPV    = True , ## attention! PV is required!
             postscale  = 1 ,
-            #HLT        = self._hlt , 
+            #HLT        = self._hlt ,
             algos      = [ self.Lamstar0_LL_Bin1() ],
             #RequiredRawEvents = ["Muon"],
-            #RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda(1520)0 -> p+ K-]CC")] 
+            #RelatedInfoTools = [  addRelInfoMuonIsolation("[ Lambda(1520)0 -> p+ K-]CC")]
             )
-            
+
 
             ]
 
         return self._Lines
-    
+
     def K0S ( self ) :
         """
-        Selection for K0S 
+        Selection for K0S
         """
         if hasattr ( self , 'K0S_LL' ) :
             return self.K0S_LL
@@ -475,7 +475,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             DaughtersCuts   = {
             '' : self._k0s_daughtersCuts ()
             } ,
-            CombinationCut  = "AM < 1.0 * GeV " , 
+            CombinationCut  = "AM < 1.0 * GeV " ,
             MotherCut       = self._k0s_motherCut()
             )
 
@@ -495,20 +495,20 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             >> process ( p2LL )
             >> EMPTY
             """
-        
+
         self.K0S_LL = Selection("SelK0S2PiPi_LL_" + self._name,
                                 Algorithm = _K0S,
-                                RequiredSelections = [ StdAllNoPIDsPions ]) 
-            
+                                RequiredSelections = [ StdAllNoPIDsPions ])
+
         return self.K0S_LL
 
     def K0SDD ( self ) :
         """
-        Selection for K0S DD 
+        Selection for K0S DD
         """
         if hasattr ( self , 'K0S_DD' ) :
             return self.K0S_DD
-        
+
         _K0SDD = CombineParticles(
             #self.name + "StripK0S_DD" ,
             DecayDescriptor = "KS0 -> pi+ pi-" ,
@@ -536,16 +536,16 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             >> process ( p2DD )
             >> EMPTY
             """
-        
+
         self.K0S_DD = Selection("SelK0S2PiPi_DD_" + self._name,
                                 Algorithm = _K0SDD,
-                                RequiredSelections = [ StdNoPIDsDownPions ]) 
+                                RequiredSelections = [ StdNoPIDsDownPions ])
 
         return self.K0S_DD
 ####(S)
     def Phi ( self ) :
         """
-        Selection for Phi 
+        Selection for Phi
         """
         if hasattr ( self , 'Phi_LL' ) :
             return self.Phi_LL
@@ -557,7 +557,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             DaughtersCuts   = {
             '' : self._phi_daughtersCuts ()
             } ,
-            CombinationCut  = "(ADAMASS ('phi(1020)') < 40) & (ACUTDOCACHI2({},'') )".format(self._phimaxDOCA), #"AM < 1.5 * GeV " , 
+            CombinationCut  = "(ADAMASS ('phi(1020)') < 40) & (ACUTDOCACHI2({},'') )".format(self._phimaxDOCA), #"AM < 1.5 * GeV " ,
             MotherCut       = self._phi_motherCut()
             )
 
@@ -577,17 +577,17 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             >> process ( p2LL )
             >> EMPTY
             """
-        
+
         self.Phi_LL = Selection("SelPhi2KK_LL_" + self._name,
                                 Algorithm = _Phi,
-                                RequiredSelections = [ StdAllNoPIDsKaons ]) 
-            
+                                RequiredSelections = [ StdAllNoPIDsKaons ])
+
         return self.Phi_LL
 
 
     def Lam0 ( self ) :
         """
-        Selection for Lam0 
+        Selection for Lam0
         """
         if hasattr ( self , 'Lam0_LL' ) :
             return self.Lam0_LL
@@ -619,17 +619,17 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             >> process ( p2LL )
             >> EMPTY
             """
-        
+
 
         self.Lam0_LL = Selection("SelLam02PPi_LL" + self._name,
                                  Algorithm = _Lam0,
-                                 RequiredSelections = [ StdAllNoPIDsPions, StdAllNoPIDsProtons ]) 
+                                 RequiredSelections = [ StdAllNoPIDsPions, StdAllNoPIDsProtons ])
 
         return self.Lam0_LL
 
     def Lam0DD ( self ) :
         """
-        Selection for Lam0 DD 
+        Selection for Lam0 DD
         """
         if hasattr ( self , 'Lam0_DD' ) :
             return self.Lam0_DD
@@ -642,7 +642,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             '' : self._lam0_daughtersCuts (),
             } ,
             CombinationCut  = "AM < 1.5 * GeV " ,
-            MotherCut       = self._lam0_motherCut()        
+            MotherCut       = self._lam0_motherCut()
             )
 
         if  self._monitor == True :
@@ -663,14 +663,14 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             """
         self.Lam0_DD = Selection("SelLam02PiPi_DD" + self._name ,
                                  Algorithm = _Lam0DD,
-                                 RequiredSelections = [ StdNoPIDsDownPions , StdNoPIDsDownProtons]) 
-        
+                                 RequiredSelections = [ StdNoPIDsDownPions , StdNoPIDsDownProtons])
+
         return self.Lam0_DD
 
 
     def Lamstar0 ( self ) :
         """
-        Selection for Lamstar0 
+        Selection for Lamstar0
         """
         if hasattr ( self , 'Lamstar0_LL' ) :
             return self.Lamstar0_LL
@@ -702,11 +702,11 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             >> process ( p2LL )
             >> EMPTY
             """
-        
+
 
         self.Lamstar0_LL = Selection("SelLamstar02PK_LL" + self._name,
                                  Algorithm = _Lamstar0,
-                                 RequiredSelections = [ StdAllNoPIDsProtons, StdAllNoPIDsKaons ]) 
+                                 RequiredSelections = [ StdAllNoPIDsProtons, StdAllNoPIDsKaons ])
 
         return self.Lamstar0_LL
 
@@ -748,7 +748,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             RequiredSelections = [ K0S ]
             )
         return self.K0S_LL_Bin1_V0ForPID
-  
+
     ####(S)
     def K0S_LL_Bin2 ( self ) :
         """
@@ -1029,7 +1029,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             #self.name + 'Lam0_LL_Bin1_Filter' ,
             Code         = self._lam0_bin1Cut_LL()
             )
-        
+
         if self._monitor == True :
             _Lam0_LL_Bin1_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -1104,7 +1104,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             #self.name + 'Lam0_LL_Bin1_Filter' ,
             Code         = self._lam0_bin3Cut_LL()
             )
-        
+
         if self._monitor == True :
             _Lam0_LL_Bin3_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -1136,7 +1136,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         """
         if hasattr(self, 'Lam0_LL_Bin1_IsMUON_V0ForPID') :
             return self.Lam0_LL_Bin1_IsMUON_V0ForPID
-        
+
         Lam0 = self.Lam0()
         _Lam0_LL_Bin1_IsMUON_Filter = FilterDesktop (
             #self.name + 'Lam0_LL_Bin1_Filter' ,
@@ -1173,13 +1173,13 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         """
         if hasattr(self, 'Lam0_LL_Bin2_IsMUON_V0ForPID') :
             return self.Lam0_LL_Bin2_IsMUON_V0ForPID
-        
+
         Lam0 = self.Lam0()
         _Lam0_LL_Bin2_IsMUON_Filter = FilterDesktop (
             #self.name + 'Lam0_LL_Bin2_Filter' ,
             Code         = self._lam0_bin2Cut_LL_IsMUON()
             )
-        
+
         if self._monitor == True :
             _Lam0_LL_Bin2_IsMUON_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -1210,7 +1210,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         """
         if hasattr(self, 'Lam0_DD_Bin1_V0ForPID') :
             return self.Lam0_DD_Bin1_V0ForPID
-        
+
         Lam0DD = self.Lam0DD()
         _Lam0_DD_Bin1_Filter = FilterDesktop (
             ##
@@ -1218,7 +1218,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             ##
             Code         = self._lam0_bin1Cut_DD()
             )
-        
+
         if self._monitor == True :
             _Lam0_DD_Bin1_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -1249,7 +1249,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         """
         if hasattr(self, 'Lam0_DD_Bin1_IsMUON_V0ForPID') :
             return self.Lam0_DD_Bin1_IsMUON_V0ForPID
-        
+
         Lam0DD = self.Lam0DD()
         _Lam0_DD_Bin1_IsMUON_Filter = FilterDesktop (
             ##
@@ -1257,7 +1257,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             ##
             Code         = self._lam0_bin1Cut_LL_IsMUON()
             )
-        
+
         if self._monitor == True :
             _Lam0_DD_Bin1_IsMUON_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -1295,7 +1295,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
             #self.name + 'Lam0_LL_Bin1_Filter' ,
             Code         = self._lamstar0_bin1Cut_LL()
             )
-        
+
         if self._monitor == True :
             _Lamstar0_LL_Bin1_Filter.Preambulo    = [
                 ## define historam type (shortcut)
@@ -1323,8 +1323,8 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
 
     def trackChi2       ( self ) : return self._trackChi2
     def daughtersIPChi2 ( self ) : return self._daughtersIPChi2
-    
-    ## define daughter cuts for K0S 
+
+    ## define daughter cuts for K0S
     def _k0s_daughtersCuts ( self ) :
         """
         Define 'DaughtersCuts' for K0S
@@ -1336,7 +1336,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         & ( MIPCHI2DV(PRIMARY) > %g )
         """
         cuts = cuts %( self._trackChi2, self._daughtersIPChi2 )
-        return cuts.replace ( '\n' , ' ' ) 
+        return cuts.replace ( '\n' , ' ' )
 
     ## define daughter cuts for Phi0 (S)
     def _phi_daughtersCuts ( self ) :
@@ -1348,17 +1348,17 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         & ( TRCHI2DOF < %g )
         & ( PT > %g )
         """
-        cuts = cuts %( self._trackChi2, 
+        cuts = cuts %( self._trackChi2,
                        self._minimumPt)
-        return cuts.replace ( '\n' , ' ' ) 
+        return cuts.replace ( '\n' , ' ' )
+
 
-    
     ## define daughter cuts for Lambda0
     def _lam0_daughtersCuts ( self ) :
         """
         Define 'DaughtersCuts' for Lambda0
         """
-        return self._k0s_daughtersCuts () 
+        return self._k0s_daughtersCuts ()
 
     def _lamstar0_daughtersCuts ( self ) :
         """
@@ -1367,15 +1367,15 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         cuts = """
         ( 12 * GeV < P )
         & ( ISLONG | ISDOWN )
-        & ( TRCHI2DOF < %g ) 
+        & ( TRCHI2DOF < %g )
         & (PT > %g)
         """
-        cuts = cuts %( self._trackChi2, 
+        cuts = cuts %( self._trackChi2,
                        self._minimumPt)
-        return cuts.replace ( '\n' , ' ' ) 
+        return cuts.replace ( '\n' , ' ' )
 
 
-    ## define "MotherCut" for K0s 
+    ## define "MotherCut" for K0s
     def _k0s_motherCut      ( self ) :
         """
         Define 'MotherCut' for K0S
@@ -1400,8 +1400,8 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
                     self._wrongMassK0S_DD,
                     self._wrongMassK0S
                     )
-        
-        return cut.replace ( '\n' , ' ' )  
+
+        return cut.replace ( '\n' , ' ' )
 
     ## define "MotherCut" for K0s (S)
     def _phi_motherCut      ( self ) :
@@ -1412,14 +1412,14 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ( ADMASS ( 'phi(1020)') < %g  )
         & in_range ( 0 , VFASPF ( VCHI2 ) ,  %g   )
         & ( VFASPF ( VZ   ) < %g          )
-        """        
+        """
+        #
         #
-        #        
         #& in_range ( 0 , BPVLTFITCHI2()   ,  %g )
         #& ( BPVLTIME()*c_light > switch ( DD , %g , %g ) )
         #& ( ADWM( 'Lambda0' , WM( 'p+' , 'pi-') ) > switch( DD, %g , %g ) )
         #& ( ADWM( 'Lambda0' , WM( 'pi+' , 'p~-') ) > switch( DD, %g , %g ) )
-        
+
         cut = cut %(self._deltaMassPhi,
                     self._vertexChi2,
                     self._maxZ
@@ -1431,9 +1431,9 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
                     #self._wrongMassK0S_DD,
                     #self._wrongMassK0S
                     )
-        
-        return cut.replace ( '\n' , ' ' )  
-        
+
+        return cut.replace ( '\n' , ' ' )
+
     ## define "MotherCut" for Lambda0
     def _lam0_motherCut      ( self ) :
         """
@@ -1445,7 +1445,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         & ( VFASPF ( VZ       ) < %g            )
         & in_range ( 0 , BPVLTFITCHI2()   ,  %g )
         & ( BPVLTIME()*c_light > switch ( DD , %g , %g ) )
-        & ( ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > switch( DD, %g  , %g ) ) 
+        & ( ADWM( 'KS0' , WM( 'pi+' , 'pi-') ) > switch( DD, %g  , %g ) )
         """
         cut = cut %(self._deltaMassLambda,
                     self._vertexChi2,
@@ -1456,8 +1456,8 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
                     self._wrongMassLambda_DD,
                     self._wrongMassLambda
                     )
-        
-        return cut.replace ( '\n' , ' ' ) 
+
+        return cut.replace ( '\n' , ' ' )
 
     ## define "MotherCut" for Lambdastar0
     def _lamstar0_motherCut      ( self ) :
@@ -1481,9 +1481,9 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
                     self._ghostprob_Lambdastar,
                     self._otherpcuts_Lambdastar,
                     )
-        
-        return cut.replace ( '\n' , ' ' ) 
-        
+
+        return cut.replace ( '\n' , ' ' )
+
 
     ## define "Bin1 Cut" for K0S LL
     def _k0s_bin1Cut_LL ( self ) :
@@ -1494,7 +1494,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
     ## define "Bin1 Cut" for K0S LL
@@ -1503,10 +1503,10 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         Define 'Bin2 Cut' for K0S LL
         """
         cut       = """
-        PT > %g 
+        PT > %g
         """
         cut = cut %(self.K0s_HiPt_Pt_thre)
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
     #1250 MeV
 
     ##define "Bin1 Cut" for Phi LL (S)
@@ -1518,7 +1518,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ##define "KpProbe Cut" for Low pT Phi LL (S)
     def  _phi_KpProbe_LoPt_Cut_LL ( self ) :
@@ -1526,12 +1526,12 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         Define 'KpProbe Cut' for Phi LL
         """
         cut       = """
-        INTREE ( (ID == 'K-' ) & (PROBNNK > %g) & (TRGHP < %g) ) 
+        INTREE ( (ID == 'K-' ) & (PROBNNK > %g) & (TRGHP < %g) )
         """
         cut = cut % (self.Phi_LoPt_ProbNNK_Tag,
                      self.Phi_GhostProb_Tag,
                    )
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ##define "KmProbe Cut" for low pT Phi LL (S)
     def  _phi_KmProbe_LoPt_Cut_LL ( self ) :
@@ -1544,7 +1544,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         cut = cut % (self.Phi_LoPt_ProbNNK_Tag,
                      self.Phi_GhostProb_Tag,
                      )
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ##define "KpProbe Cut" for High pT Phi LL (S)
     def  _phi_KpProbe_HiPt_Cut_LL ( self ) :
@@ -1558,7 +1558,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
                      self.Phi_GhostProb_Tag,
                      self.Phi_HiPt_PT_Tag,
                    )
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ##define "KmProbe Cut" for high pT Phi LL (S)
     def  _phi_KmProbe_HiPt_Cut_LL ( self ) :
@@ -1572,7 +1572,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
                      self.Phi_GhostProb_Tag,
                      self.Phi_HiPt_PT_Tag
                      )
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ##define "Bin1 Cut" for Phi LL (S)
     def _phi_bin1Cut_LL ( self ) :
@@ -1583,7 +1583,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ## define "Bin1 Cut" for Lambda0 LL
     def _lam0_bin1Cut_LL ( self ) :
@@ -1594,7 +1594,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ## define "Bin2 Cut" for Lambda0 LL
     def _lam0_bin2Cut_LL ( self ) :
@@ -1605,7 +1605,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         (INTREE( (ABSID=='p+') & ( P > 40 * GeV ) ) )
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
     ## define "Bin3 Cut" for Lambda0 LL
@@ -1618,10 +1618,10 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         """
         cut = cut %( self.Lambda_HiPt_Pt_thre)
         #PT > 750 * MeV
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
-    ## define "Bin1 IsMUON Cut" for Lambda0 LL 
+    ## define "Bin1 IsMUON Cut" for Lambda0 LL
     def _lam0_bin1Cut_LL_IsMUON ( self ) :
         """
         Define 'Bin1 Cut' for Lambda0 LL
@@ -1630,9 +1630,9 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         (INTREE( (ABSID=='p+') & ISMUON ) )
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
-    ## define "Bin1 IsMUON Cut" for Lambda0 LL 
+    ## define "Bin1 IsMUON Cut" for Lambda0 LL
     def _lam0_bin2Cut_LL_IsMUON ( self ) :
         """
         Define 'Bin2 Cut' for Lambda0 LL
@@ -1641,7 +1641,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         (INTREE( (ABSID=='p+') & ( ISMUON & (P > 40 * GeV) ) ) )
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
     ## define "Bin1 Cut" for K0S DD
@@ -1653,9 +1653,9 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
+
 
- 
 
     ## define "Bin1 Cut" for Lambda0 DD
     def _lam0_bin1Cut_DD ( self ) :
@@ -1666,7 +1666,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
     ## define "Bin1 Cut" for Lambda0 LL
     def _lamstar0_bin1Cut_LL ( self ) :
@@ -1677,7 +1677,7 @@ class StrippingV0ForPIDConf_ForIFT(LineBuilder) :
         ALL
         """
         cut = cut % locals()
-        return cut.replace ( '\n' , ' ' ) 
+        return cut.replace ( '\n' , ' ' )
 
 
 if '__main__' == __name__ :
@@ -1688,25 +1688,25 @@ if '__main__' == __name__ :
     print __version__
 
     conf = StrippingV0ForPIDConf_ForIFT()
-    
+
     print conf
 
     props = [ 'DaughtersCuts'   ,
               'CombinationCut'  ,
               'MotherCut'       ,
               'DecayDescriptor' ,
-              'DecayDescriptors'] 
-                           
-    for l in conf.K0S     () : print __enroll__ ( l , lst = props ) 
+              'DecayDescriptors']
+
+    for l in conf.K0S     () : print __enroll__ ( l , lst = props )
     for l in conf.Lambda0 () : print __enroll__ ( l , lst = props )
     for l in conf.Phi     () : print __enroll__ ( l,  lst = props )  #(S)
-    
 
-def addRelInfoMuonIsolation( decdes ):    
+
+def addRelInfoMuonIsolation( decdes ):
     import re
     _DauLoc={}
     _daughters = re.match(r'(.*)->([ |\[]*)([^\]]+)(.*)', decdes)
-    if _daughters:    
+    if _daughters:
         _particles = _daughters.group(3).split()
         _ip=1
         _gp=1
@@ -1729,6 +1729,5 @@ def addRelInfoMuonIsolation( decdes ):
 
 
 # =============================================================================
-# The END 
+# The END
 # =============================================================================
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/Utils.py
index 3ab3a31cf747e3f4171062c3c489c722dd8a996a..ee1579b96239f77a19a4e31adf2df527ce311b14 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/Utils.py
@@ -245,7 +245,7 @@ def buildStreamsFromBuilder(conf, names ):
 
     >>> streams = buildStreamsFromBuilder(somelinebuilder, 'B2ppipiSigmacmm_Lcpi')
     """
-    
+
     from StrippingConf.StrippingStream import StrippingStream
     from StrippingSettings.Utils import strippingConfiguration
     from StrippingSelections import lineBuilders
@@ -254,14 +254,14 @@ def buildStreamsFromBuilder(conf, names ):
 
     if not isinstance(names, list):
       names = [names]
-    
+
     for name in names:
       _conf = {}
       if conf.has_key(name) :
         _conf[name] = conf[name]
       else:
-        log.error("The requested name %s is not present in the default_config of any LineBuilder" %name) 
-    
+        log.error("The requested name %s is not present in the default_config of any LineBuilder" %name)
+
       #_conf=lb.default_config
       #if isinstance(stripping, basestring) :
           #scdb = strippingConfiguration(stripping)
@@ -270,7 +270,7 @@ def buildStreamsFromBuilder(conf, names ):
 
       for k, v in _conf.iteritems() :
           if 'STREAMS' in v.keys():
-            
+
               try:
                   lb = lineBuilders()[v['BUILDERTYPE']](k,v['CONFIG'])
               except Exception, x:
@@ -363,4 +363,3 @@ def buildStreamsFromBuilder(conf, names ):
 ##         print 'Creating steam', stream, 'with lines', lines
 ##         strippingStreams.append(StrippingStream(stream, Lines = lines))
 ##     return strippingStreams
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py
index 86cb1849abab35ba707d79e7f14b53d54fe7bac6..9f160c1e4ed58498aaacc68bee9397cee26f0d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py
@@ -44,11 +44,11 @@ class BadEventsConf(LineBuilder) :
 
     def __init__(self, name, config):
       LineBuilder.__init__(self, name, config)
-      
+
       _filter={'Code': config['GEC'], 'Preambulo' : ["from LoKiTracks.decorators import *" ,
                                                      "from LoKiCore.functions    import * ",
                                                      "from GaudiKernel.SystemOfUnits import *"]}
-                                      
+
       line = StrippingLine(name
                            ,FILTER = _filter
                            ,prescale = config["prescale"]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py
index fa657dadd8ee86c856b8abab8843c380ff17d252..e19f3309cbe17623a3c985b8e49ee111e15e1fa7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py
@@ -54,7 +54,7 @@ class MiniBiasConf(LineBuilder) :
                                        config["NoBiasLine_Limiter"],
                                        config["NoBiasLine_Rate"],
                                        UseConditionDB=config["NoBiasLine_CondDB"] )
-      
+
       self.L0AnyLinePrescaled = StrippingLine("Hlt1L0AnyPrescaled"
                                               , HLT1 = config["L0AnyPSLine_RE"]
                                               , checkPV = False
@@ -63,10 +63,10 @@ class MiniBiasConf(LineBuilder) :
       self.registerLine( self.L0AnyLinePrescaled )
 
     def _makeLine(self,name,RE,limiter,rate,UseConditionDB=False):
-      from Configurables import OfflineRateLimiter  
+      from Configurables import OfflineRateLimiter
 
       orl = OfflineRateLimiter(name+"ORL",
-                               HltLimiter = limiter,  
+                               HltLimiter = limiter,
                                Rate = rate,
                                UseCondition = UseConditionDB,
                                FallBack = UseConditionDB)
@@ -74,9 +74,8 @@ class MiniBiasConf(LineBuilder) :
       line = StrippingLine(name
                            , HLT1 =  RE
                            , checkPV = False
-                           , algos = [ orl ] 
+                           , algos = [ orl ]
                            , RequiredRawEvents = ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker", "HC" ])
 
       self.registerLine( line )
       return line
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py
index a73f6713915c20b5d81f2bc6a862a173d5de96fc..fa7ca2c517226ef20cf7e96f24cb5d8418d0e071 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py
@@ -65,7 +65,7 @@ class A1MuMuConf(LineBuilder) :
     LineBuilder.__init__(self, name, config)
 
     ### A1 -> mu+ mu- line:
-    sel = filterDiMuon( name + '_SelMuMu', 
+    sel = filterDiMuon( name + '_SelMuMu',
       [StdLooseDiMuon],
       MuonPT        = config['PT_MUON_MIN'],
       MuonP         = config['P_MUON_MIN'],
@@ -94,7 +94,7 @@ class A1MuMuConf(LineBuilder) :
       MuMuVCHI2PDOF = config['VCHI2_DIMUON_MAX'],
       MuMuPT        = config['PT_DIMUON_MIN'],
     )
-            
+
     self.registerLine(StrippingLine(name + 'SameSign' + 'Line',
       prescale  = config['A1MuMu_LinePrescale'],
       postscale = config['A1MuMu_LinePrescale'],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py
index e2564afdde4158d936b015d17446299085119fbc..390876adc0124e61e4f667a47d8830ef4e6d0e98 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py
@@ -31,7 +31,7 @@ default_config = {
     'BUILDERTYPE' : 'A2MuMuConf',
     'WGs'         : [ 'QEE'],
     'STREAMS'     : [ 'EW' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'A2MuMu_Prescale'  : 1.0,
         'A2MuMu_Postscale' : 1.0,
         'pT'               : 2.5 * GeV,
@@ -71,12 +71,12 @@ class A2MuMuConf( LineBuilder ) :
                                            )
 
         self.registerLine( line_A2MuMu )
-      
+
 
 def makeCombination( name, _input, _daughters, _mother ) :
 
     _combination = CombineParticles( DecayDescriptor    = 'Z0 -> mu+ mu-',
-                                     DaughtersCuts      = { 'mu+' : _daughters, 
+                                     DaughtersCuts      = { 'mu+' : _daughters,
                                                             'mu-' : _daughters },
                                      MotherCut          = _mother,
                                      WriteP2PVRelations = False
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py
index 3cac5e327be0c1d90989f1064005152fc7772465..cca75039344569dbe8c32e7895f4f9e05939cc2d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -31,7 +31,7 @@ default_config = {
     'BUILDERTYPE' : 'A2MuMuSameSignConf',
     'WGs'         : [ 'QEE'],
     'STREAMS'     : [ 'EW' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'A2MuMuSameSign_Prescale'  : 1.0,
         'A2MuMuSameSign_Postscale' : 1.0,
         'pT'               : 2.5 * GeV,
@@ -71,12 +71,12 @@ class A2MuMuSameSignConf( LineBuilder ) :
                                            )
 
         self.registerLine( line_A2MuMuSameSign )
-      
+
 
 def makeCombination( name, _input, _daughters, _mother ) :
 
     _combination = CombineParticles( DecayDescriptor    = '[Z0 -> mu+ mu+]cc',
-                                     DaughtersCuts      = { 'mu+' : _daughters, 
+                                     DaughtersCuts      = { 'mu+' : _daughters,
                                                             'mu-' : _daughters },
                                      MotherCut          = _mother,
                                      WriteP2PVRelations = False
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py
index 119b6de362724abb5ee9bb43e7dc6cefb73ad4a1..7487d746b78059a8fc37cc40a8b6a7485ffe3953 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py
@@ -38,7 +38,7 @@ default_config = {
                   ,     'Multi_combChi2'        :  15.
                   ,     'Multi_motherChi2dv'    :  25.
                   ,     'Multi_motherChi2vx'    :  10.
-                  ,     'Multi_SUMPT'           :  "1000*MeV"   
+                  ,     'Multi_SUMPT'           :  "1000*MeV"
                   ,     'Multi_DELTAM'          :  "100*MeV"
                   ,     'Multi_VCHI2DOF'        :  25
                   ,     'Multi_FDCHI2'          :  50
@@ -76,11 +76,11 @@ class B2LLPV0_sConf(LineBuilder) :
                             ["El","PROBNNe","Multi_ProbNNe"],
                             ["P","PROBNNp","Multi_ProbNNp"],
                             ["K","PROBNNK","Multi_ProbNNK"]]:
-                       
+
             V02HHNOIP[nn] = CombineSelection( "V02HHNOIP"+nn + self.name,
                                               StdAllNoPIDsPions,
                                               DecayDescriptor = "KS0 -> pi+ pi-",
-                                              DaughtersCuts  = {"pi+" : "(P > %(Multi_daugsP)s) & (MIPCHI2DV(PRIMARY) > %(Multi_daugsChi2dv)s) & "% self.config + "("+pid+">"+str(self.config[cutn])+")", 
+                                              DaughtersCuts  = {"pi+" : "(P > %(Multi_daugsP)s) & (MIPCHI2DV(PRIMARY) > %(Multi_daugsChi2dv)s) & "% self.config + "("+pid+">"+str(self.config[cutn])+")",
                                                                 "pi-" : "(P > %(Multi_daugsP)s) & (MIPCHI2DV(PRIMARY) > %(Multi_daugsChi2dv)s) & "% self.config + "("+pid+">"+str(self.config[cutn])+")" },
                                               CombinationCut = "( ADOCACHI2CUT(%(Multi_combChi2)s, '') )" % self.config,
                                               MotherCut = "( CHI2VX < %(Multi_motherChi2vx)s )" % self.config
@@ -96,14 +96,14 @@ class B2LLPV0_sConf(LineBuilder) :
         for key in V02MixedLine: self.registerLine(V02MixedLine[key])
 
     def V0CombineSelection(self, name,inputs):
-        
+
         Preambulo = ["MS1 = ACHILD(M,1)",
                      "MS2 = ACHILD(M,2)"]
 
         ## Generic cuts for detached selection
         comboCuts = "(ASUM(PT)>%(Multi_SUMPT)s) " \
                     "& ( abs(MS1-MS2)<%(Multi_DELTAM)s )"%self.config
-        
+
         momCuts = "(VFASPF(VCHI2/VDOF)< %(Multi_VCHI2DOF)s)"\
                   "& (BPVVDCHI2> %(Multi_FDCHI2)s)" %self.config
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2SS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2SS.py
index fcfff39be19d663afcb041e15c239d94cad9998a..e5bc0fc5409500af29e387284b988b7e670cba08 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2SS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2SS.py
@@ -46,7 +46,7 @@ default_config = {
         'B2KstSSPionLinePostscale'   : 1,
         'B2KstSSPionDetLinePrescale'    : 1,
         'B2KstSSPionDetLinePostscale'   : 1,
-    
+
         'Bu2KSSPionLinePrescale'    : 1,
         'Bu2KSSPionLinePostscale'   : 1,
         'Bu2KSSPionDetLinePrescale'    : 1,
@@ -62,7 +62,7 @@ default_config = {
         'B2KstSSProtonLinePostscale'   : 1,
         'B2KstSSProtonDetLinePrescale'    : 1,
         'B2KstSSProtonDetLinePostscale'   : 1,
-    
+
         'Bu2KSSProtonLinePrescale'    : 1,
         'Bu2KSSProtonLinePostscale'   : 1,
         'Bu2KSSProtonDetLinePrescale'    : 1,
@@ -78,20 +78,20 @@ default_config = {
         'B2KstSSMuonLinePostscale'   : 1,
         'B2KstSSMuonDetLinePrescale'    : 1,
         'B2KstSSMuonDetLinePostscale'   : 1,
-    
+
         'Bu2KSSMuonLinePrescale'    : 1,
         'Bu2KSSMuonLinePostscale'   : 1,
         'Bu2KSSMuonDetLinePrescale'    : 1,
         'Bu2KSSMuonDetLinePostscale'   : 1,
 
         ## BS24Mu lines effectively already there in StrippingB2MuMuMuMuLines
- 
+
         ## Electron
         'B2KstSSElectronLinePrescale'    : 1 ,
         'B2KstSSElectronLinePostscale'   : 1,
         'B2KstSSElectronDetLinePrescale'    : 1,
         'B2KstSSElectronDetLinePostscale'   : 1,
-    
+
         'Bu2KSSElectronLinePrescale'    : 1,
         'Bu2KSSElectronLinePostscale'   : 1,
         'Bu2KSSElectronDetLinePrescale'    : 1,
@@ -113,7 +113,7 @@ default_config = {
         # LEPTONS
         "DAUGHLEPIPCHI2": 15,
         "DAUGHLEPPT": "25*MeV",
-        
+
         # KAON
         "DAUGHKAONPID": 0,
         "DAUGHPROTONPID": 0,
@@ -143,7 +143,7 @@ default_config = {
         'SPrompt_BPIMASS_MIN': '4900*MeV',
         'SPrompt_BPIMASS_MAX': '5800*MeV',
         'SPrompt_SDELTAMPI': '50*MeV',
-        
+
         # DETACHED PAIRS
         'SDet_PAIRMAXDOCA'  : '0.5*mm',
         'SDet_PAIRSUMPT'    : '1000*MeV',
@@ -175,7 +175,7 @@ default_config = {
         'SDet_BMASS_MAX'    : '6000*MeV',
         'SDet_SDELTAM'    : '100*MeV'
         },
-    
+
     'STREAMS' : ['EW'],
     }
 
@@ -199,27 +199,27 @@ class B2SSConf(LineBuilder) :
     """
     B2SS
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config):
         self.name = name
         self.__confdict__ = config
         self.config = config
-        
+
         LineBuilder.__init__(self, name, config)
 
         finalStates = ["Muon","Electron","Kaon",
                        "Pion","Proton"]
 
         Bids = ["B0","B+","B_s0"]
-        
+
         # Generaly used input particles
         self.inDaughters = {}
         for daugh in finalStates:
             self.inDaughters[daugh] = self.filterDaughters(daugh+"sFor"+name,daugh)
         self.inDaughters["Kstar"] = self.filterDaughters("KstarsFor"+name,"Kstar")
-        
+
         # Prompt selection
         self.B2Prompt = {}
         for bid in Bids:
@@ -234,7 +234,7 @@ class B2SSConf(LineBuilder) :
         for daugh in finalStates:
             self.inDetachedPairs[daugh] = self.makeDetachedPairs('Detached'+daugh+"PairFor"+name,
                                                                daugh)
-        
+
         ## build B combination
         self.B2Det = {}
         for bid in Bids:
@@ -242,14 +242,14 @@ class B2SSConf(LineBuilder) :
             for daugh in finalStates:
                 if daugh=="Muon" and bid=="B_s0": continue ## already covered at another module
                 self.B2Det[bid][daugh]=self.makeB2Det(bid+"2"+daugh+"DetFor"+name,bid,daugh)
-                
-        
+
+
         # Stripping lines
         StrippingLines = []
         for bid in Bids:
             if bid=="B0": line_name0 = "B2KstSS"
             if bid=="B+": line_name0 = "Bu2KSS"
-            if bid=="B_s0": line_name0 = "Bs2SS"            
+            if bid=="B_s0": line_name0 = "Bs2SS"
             for daugh in finalStates:
                 if daugh=="Muon" and bid=="B_s0": continue ## already covered at another module
                 line_name1 = line_name0+daugh
@@ -257,7 +257,7 @@ class B2SSConf(LineBuilder) :
                 for sel in [self.B2Prompt[bid][daugh],self.B2Det[bid][daugh]]:
                     if i1==2: line_name = line_name1+"DetLine"
                     else: line_name = line_name1+"Line"
-                    i1+=1                                        
+                    i1+=1
                     StrippingLines.append(StrippingLine(name+line_name,
                                                         prescale=config[line_name+'Prescale'],
                                                         postscale=config[line_name+'Postscale'],
@@ -276,12 +276,12 @@ class B2SSConf(LineBuilder) :
 
         elif daugh=="Proton":
             _code = "(PIDp > %(DAUGHPROTONPID)s) &" %self.config
-        
+
         else: _code = ""
 
 
         if daugh=="Muon" or daugh=="Electron":
-        ## apply first cuts to the daughters (faster)            
+        ## apply first cuts to the daughters (faster)
             _code += "( PT > %(DAUGHLEPPT)s)" \
                      "& ( MIPCHI2DV(PRIMARY)> %(DAUGHLEPIPCHI2)s)" %self.config
         elif daugh=="Pion":
@@ -292,7 +292,7 @@ class B2SSConf(LineBuilder) :
             ## apply first cuts to the daughters (faster)
             _code += "( PT > %(DAUGHHADPT)s)" \
                      "& ( MIPCHI2DV(PRIMARY)> %(DAUGHHADIPCHI2)s)" %self.config
-        
+
         if daugh=="Muon": mysel = StdAllLooseMuons
         if daugh=="Electron": mysel = StdAllLooseElectrons
         if daugh=="Kaon": mysel = StdAllLooseKaons
@@ -310,12 +310,12 @@ class B2SSConf(LineBuilder) :
             mysel = DataOnDemand(Location="Phys/StdLooseKstar2Kpi/Particles")
 
         _Filter = FilterDesktop(Code = _code)
-        
+
         return Selection(name,
                          Algorithm = _Filter,
                          RequiredSelections = [ mysel] )
-    
-    
+
+
     def makeB2Prompt(self,name,bid,daugh):
         """
         B --> 4 identical particles prompt selection
@@ -338,13 +338,13 @@ class B2SSConf(LineBuilder) :
                        "  (abs(MYAM13-MYAM24)< %(SPrompt_SDELTAMPI)s) | "\
                        "  (abs(MYAM14-MYAM23)< %(SPrompt_SDELTAMPI)s) )" %self.config
 
-            
+
             momCuts = "(VFASPF(VCHI2/VDOF)< %(SPrompt_BPIVCHI2DOF)s)"\
                       "& (BPVDIRA > %(SPrompt_BPIDIRA)s)"\
                       "& (BPVVDCHI2> %(SPrompt_BPIFDCHI2)s)"\
                       "& (BPVIPCHI2()< %(SPrompt_BPIIPCHI2)s)"%self.config
-            
-            
+
+
         else:
             ## Generic cuts for prompt selection
             comboDOCA = "(AMAXDOCA('')<%(SPrompt_BMAXDOCA)s) "%self.config
@@ -355,13 +355,13 @@ class B2SSConf(LineBuilder) :
             comboMass = "( (abs(MYAM12-MYAM34)< %(SPrompt_SDELTAM)s) | "\
                         "  (abs(MYAM13-MYAM24)< %(SPrompt_SDELTAM)s) | "\
                         "  (abs(MYAM14-MYAM23)< %(SPrompt_SDELTAM)s) )" %self.config
-            
+
             momCuts = "(VFASPF(VCHI2/VDOF)< %(SPrompt_BVCHI2DOF)s)"\
                       "& (BPVDIRA > %(SPrompt_BDIRA)s)"\
                       "& (BPVVDCHI2> %(SPrompt_BFDCHI2)s)"\
                       "& (BPVIPCHI2()< %(SPrompt_BIPCHI2)s)"%self.config
 
-        
+
         ## second half of decay depends on the mother
         if bid=="B0":
             decay2 = " K*(892)0"
@@ -373,7 +373,7 @@ class B2SSConf(LineBuilder) :
             decay2 = ""
             inputs = []
 
-        
+
         ## second half of decay depends on the daughters
         if daugh=="Muon": decay1 = bid+" -> mu+ mu- mu+ mu-"
         if daugh=="Electron": decay1 = bid+" -> e+ e- e+ e-"
@@ -442,7 +442,7 @@ class B2SSConf(LineBuilder) :
                       "& (BPVVDCHI2 > %(SDet_PAIRFDCHI2)s)"\
                       "& (BPVIPCHI2()> %(SDet_PAIRIPCHI2)s)" %self.config
 
-        
+
         KS2MuMu = CombineParticles("Combine"+name)
         inputs = [self.inDaughters[daugh]]
         if daugh=="Muon": KS2MuMu.DecayDescriptor = "KS0 ->  mu+ mu-"
@@ -452,13 +452,13 @@ class B2SSConf(LineBuilder) :
         if daugh=="Proton": KS2MuMu.DecayDescriptor = "KS0 ->  p+ p~-"
         KS2MuMu.CombinationCut=comboCuts
         KS2MuMu.MotherCut=momCuts
-        
+
         return Selection(
             name,
             Algorithm=KS2MuMu,
             RequiredSelections=inputs
             )
-    
+
 
     def makeB2Det(self,name,bid,daugh):
         """
@@ -475,7 +475,7 @@ class B2SSConf(LineBuilder) :
         comboCuts = "(ASUM(PT)>%(SDet_BSUMPT)s) " \
                     "& (AM>%(SDet_BMASS_MIN)s) & (AM<%(SDet_BMASS_MAX)s) "\
                     "& ( abs(MS1-MS2)<%(SDet_SDELTAM)s )"%self.config
-        
+
         momCuts = "(VFASPF(VCHI2/VDOF)< %(SDet_BVCHI2DOF)s)"\
                   "& (BPVDIRA > %(SDet_BDIRA)s)"\
                   "& (BPVVDCHI2> %(SDet_BFDCHI2)s)"\
@@ -491,7 +491,7 @@ class B2SSConf(LineBuilder) :
         if bid=="B_s0":
             decay = "B_s0 -> KS0 KS0"
             inputs = [self.inDetachedPairs[daugh]]
-            
+
 
         ## build B candidate
         B2DetS = CombineParticles("Combine"+name)
@@ -499,11 +499,9 @@ class B2SSConf(LineBuilder) :
         B2DetS.CombinationCut = comboCuts
         B2DetS.MotherCut = momCuts
         B2DetS.Preambulo = Preambulo
-        
+
         return Selection(
             name,
             Algorithm=B2DetS,
             RequiredSelections=inputs,
             )
-
-        
\ No newline at end of file
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py
index 873efc33695e96f2cedf6d4ff70c39604fb15244..ae437e092d54024ecda378bffb18a75c2c481cc7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py
@@ -40,12 +40,12 @@ default_config = {
     'BUILDERTYPE' : 'DY2MuMuConf',
     'WGs'         : [ 'QEE' ],
     'STREAMS'     : [ 'EW'  ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'DY2MuMu1LinePrescale'    : 0.05,
         'DY2MuMu1LineHltPrescale' : 0.1,
         'DY2MuMu2LinePrescale'    : 0.25,
         'DY2MuMu2LineHltPrescale' : 0.5,
-        'DY2MuMu3LinePrescale'    : 1.0,  
+        'DY2MuMu3LinePrescale'    : 1.0,
         'DY2MuMu4LinePrescale'    : 1.0,
         'DY2MuMuLinePostscale'    : 1.0,
         #
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py
index 611ae6b65e328d74505276e9be8e5c9d7d581d94..bb1312e75b9dfbbbe072a528cf6e0f6f686fac18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py
@@ -34,10 +34,10 @@ default_config = {
     'BUILDERTYPE' : 'DY2eeConf',
     'STREAMS'     : [ 'EW'  ],
     'WGs'         : [ 'QEE' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'DY2eeLine3Prescale' : 1.0,
-        'DY2eeLine4Prescale' : 1.0, 
-        'DY2eeLinePostscale' : 1.0,  
+        'DY2eeLine4Prescale' : 1.0,
+        'DY2eeLinePostscale' : 1.0,
         'DY3MinMass'  : 10. * GeV,
         'DY3MaxMass'  : 15. * GeV,
         'DY4MinMass'  : 15. * GeV,
@@ -56,7 +56,7 @@ default_config = {
 class DY2eeConf(LineBuilder) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__( self, name, config ) :
 
         LineBuilder.__init__( self, name, config )
@@ -73,12 +73,12 @@ class DY2eeConf(LineBuilder) :
 
         # DY2ee3
 
-        sel_DY2ee3 = makeCombination( name + 'DY2ee3', 
+        sel_DY2ee3 = makeCombination( name + 'DY2ee3',
                                            StdAllNoPIDsElectrons,
                                            _cut3,
                                            _DY3MassCut
                                            )
-     
+
         line_DY2ee3 = StrippingLine( name + 'Line3',
                                           prescale  = config[ 'DY2eeLine3Prescale' ],
                                           postscale = config[ 'DY2eeLinePostscale' ],
@@ -91,12 +91,12 @@ class DY2eeConf(LineBuilder) :
 
         # DY2ee4
 
-        sel_DY2ee4 = makeCombination( name + 'DY2ee4', 
+        sel_DY2ee4 = makeCombination( name + 'DY2ee4',
                                            StdAllNoPIDsElectrons,
                                            _cut4,
                                            _DY4MassCut
                                            )
-     
+
         line_DY2ee4 = StrippingLine( name + 'Line4',
                                           prescale  = config[ 'DY2eeLine4Prescale' ],
                                           postscale = config[ 'DY2eeLinePostscale' ],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py
index 5d9a6fbef1da530c611c5790e9a7591da5c89d55..9d3e26b2a159bf06eab37ee4f98d0c77947a6ef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py
@@ -28,7 +28,7 @@ default_config = {
   'STREAMS'     : [ 'BhadronCompleteEvent' ],
   'CONFIG': {
     'HLTCuts'                : "HLT_PASS('Hlt2JetsJetDisplacedSVDecision')|HLT_PASS('Hlt2JetsDiJetDisplacedSVSVLowPtDecision')",
-    'HltJetsLine_Prescale'   : 0.015, 
+    'HltJetsLine_Prescale'   : 0.015,
     'RequiredRawEvents'      : ['Calo', 'Trigger', 'Velo', 'Tracker']
   }
 }
@@ -41,9 +41,8 @@ class DisplJetsConf( LineBuilder ) :
   def __init__( self, name, config ) :
     LineBuilder.__init__( self, name, config )
     #_selHltJets = FilterSelection(name + "HltJetsFilteredList", [ StdHltJets ], Code = "(PT > %(min_jet_pT)s)" %config)
-    self.registerLine(StrippingLine( name + 'HltJetsLine', 
+    self.registerLine(StrippingLine( name + 'HltJetsLine',
                                      prescale  = config['HltJetsLine_Prescale'],
                                      checkPV   = False,
                                      HLT2      = config['HLTCuts'],
                                      RequiredRawEvents = config['RequiredRawEvents'] ))
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py
index c2ca2944a9f383a004c07f3143f07ece33322d64..4bb492fa9dab459da5ba17bc16a8593838c8e79c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py
@@ -23,7 +23,7 @@ __author__ = [
   "Pieter David <pieter.david@cern.ch>",
   "Victor Coco",
   "Veerle Heijne",
-  "Neal Gauvin" 
+  "Neal Gauvin"
 ]
 
 __date__ = "04/11/2015"
@@ -68,13 +68,13 @@ default_config = {
   'WGs'         : [ 'QEE' ],
   'CONFIG'      : {
     ## Velo GEC
-    "VeloGEC": { 
+    "VeloGEC": {
       "Apply"                : True,
       "MaxVeloRatio"         : 0.1,
       "MaxPhiVectorSize"     : 250.,
     },
     ## Velo tracks filter
-    "FilterVelo": { 
+    "FilterVelo": {
       "Apply"                : True,
       "MinNumTracks"         : 4,
       "PVLocation"           : "Rec/Vertex/Primary",
@@ -90,7 +90,7 @@ default_config = {
     #==========        SELECTION CUT VALUES         ==========#
 
     ## Velo reconstruction
-    "RV2PWithVelo": { 
+    "RV2PWithVelo": {
       "MinRho"               :  0.4*units.mm,
       "MinMass"              :  0.0*units.GeV,
       "MinSumPT"             :  0.0*units.GeV,
@@ -109,7 +109,7 @@ default_config = {
     },
 
     ## Single LLP line
-    "SinglePSSelection": { 
+    "SinglePSSelection": {
       "PreScale"             : 0.005,
       "RawEvents"            : [],
       "MinRho"               : 0.5*units.mm,
@@ -122,7 +122,7 @@ default_config = {
     },
 
     ## with the jet sequence
-    "JetSingleLowMassSelection": { 
+    "JetSingleLowMassSelection": {
       "PreScale"             : 0.5,
       "RawEvents"            : [],
       "MinRho"               : 0.4,
@@ -141,7 +141,7 @@ default_config = {
       "MinNJetTransvMass"    : None,
       "JetIDCut"             : "( JNWITHPVINFO >= 5 ) & ( JMPT > 1800. ) & ( (PT/M) > 2.5 )",
     },
-    "JetSingleHighMassSelection" : { 
+    "JetSingleHighMassSelection" : {
       "PreScale"             : 1.0,
       "RawEvents"            : [],
       "MinRho"               : 0.4,
@@ -160,9 +160,9 @@ default_config = {
       "MinNJetTransvMass"    : None,
       "JetIDCut"             : None,
     },
-    
+
     ## jet sequence on top of Hlt2 candidates
-    "JetHltSingleLowMassSelection": { 
+    "JetHltSingleLowMassSelection": {
       "PreScale"         :  0.1,
       "RawEvents"        : [],
       ## Jet-related cuts
@@ -174,7 +174,7 @@ default_config = {
       "MinNJetTransvMass": None,
       "JetIDCut"         : "( JNWITHPVINFO >= 5 ) & ( JMPT > 1800. ) & ( (PT/M) > 1.5 )",
     },
-    "JetHltSingleHighMassSelection": { 
+    "JetHltSingleHighMassSelection": {
       "PreScale"         :  0.1,
       "RawEvents"        : [],
       ## Jet-related cuts
@@ -188,7 +188,7 @@ default_config = {
     },
 
     ## Double LLP line
-    "DoubleSelection": { 
+    "DoubleSelection": {
       "PreScale"             : 1.0,
       "RawEvents"            : [],
       "MinRho"               : 0.4*units.mm,
@@ -204,7 +204,7 @@ default_config = {
     },
 
     ## Downstream reconstruction
-    "RV2PDown": { 
+    "RV2PDown": {
       "MinRho"               :  2.0*units.mm,
       "MinMass"              :  3.0*units.GeV,
       "MinSumPT"             :  0.0*units.GeV,
@@ -223,14 +223,14 @@ default_config = {
     },
 
     #========== Other lines for efficiency studies ==========#
-    "HLTPS": { 
+    "HLTPS": {
       "PreScale"  : 0.2,
       "RawEvents" : [],
     },
 
     #==========     HLT filters for all lines      ==========#
-    "HLT"                     : { 
-      "HLTPS"        : [ 
+    "HLT"                     : {
+      "HLTPS"        : [
         ( ("0x001c0028", "0x002f002c"), "HLT_PASS_RE('Hlt2DisplVerticesSinglePostScaledDecision')" ),
         ( ("0x00340032", "0x00730035"), "HLT_PASS_RE('Hlt2DisplVerticesSinglePostScaledDecision')" ),
         ( ("0x00750037", "0x007b0038"), "HLT_PASS_RE('Hlt2DisplVertices(Single|Double|SingleMV)PostScaledDecision')" ),
@@ -238,7 +238,7 @@ default_config = {
         ( ("0x00990042", "0x40000000"), "HLT_PASS_RE('Hlt2DisplVertices(Single|SingleLoose|Double)PSDecision')" ),
       ],
       ## For reviving Hlt2 candidates
-      "SignalLines": [ 
+      "SignalLines": [
         ( ("0x001c0028", "0x002f002c"), ["Hlt2DisplVerticesSingleDecision"] ),
         ( ("0x00340032", "0x00730035"), ["Hlt2DisplVerticesHighFDSingleDecision", "Hlt2DisplVerticesHighMassSingleDecision", "Hlt2DisplVerticesLowMassSingleDecision", "Hlt2DisplVerticesSingleDownDecision"] ),
         ( ("0x00750037", "0x007b0038"), ["Hlt2DisplVerticesSingleDecision", "Hlt2DisplVerticesSingleDownDecision", "Hlt2DisplVerticesSingleHighFDPostScaledDecision", "Hlt2DisplVerticesSingleHighMassPostScaledDecision"] ),
@@ -806,4 +806,3 @@ class DisplVerticesConf(LineBuilder):
                      )
 
             self.registerLine(line)
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py
index 3a7c4e542157adb8d4731dbc9f10aeed2a45c58a..b761acd5f1824792d9148ec2eb11f76a9c92db0a 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py
@@ -33,7 +33,7 @@ Tau decays with following branching ratio
 - 17.41 % : Muon              ( mu )
 - 17.83 % : Electron          ( e  )
 - 50.11 % : 1-Prong hadronic  ( h1 )
-- 14.57 % : 3-Prongs hadronic ( h3 ) 
+- 14.57 % : 3-Prongs hadronic ( h3 )
 - < 0.1 % : Others: 5-prongs, etc.
 
 Ditau decays in major channels are thus:
@@ -53,33 +53,33 @@ The selection is separated into 2 stages: Tau-candidates, and Ditau-candidates.
 
 At the first level, each 4 types of tau ( e / h1 / h3 / mu ) will have their
 own config dictionary. A selection cut will apply to this level before entering
-the second stage. It's design to made this way since each of these modes required 
+the second stage. It's design to made this way since each of these modes required
 their own condition on PT, isolation cone, etc.
 
-At the ditau level, each of the 10 possibilities of ditau will be made from the 
+At the ditau level, each of the 10 possibilities of ditau will be made from the
 tau-candidates made at previous level. Each of the 10 modes will also has it own
 config dictionary too, allowing maximum flexibility. Once these ditau are made,
 they will be groupped into 3 lines which should shared several overlapping events
 already, reducing the retention load.
 
-EXLine: ee  , eh1 , eh3 , emu 
-MXLine: emu , h1mu, h3mu, mumu 
-HHLine: h1h1, h1h3, h3h3 
+EXLine: ee  , eh1 , eh3 , emu
+MXLine: emu , h1mu, h3mu, mumu
+HHLine: h1h1, h1h3, h3h3
 
 (As well as the same-sign lines, auto-gen on-the-fly: EXss, MXss, HHss)
 
-The selection is based entirely on FilterDesktop + Combine particle. The config 
+The selection is based entirely on FilterDesktop + Combine particle. The config
 dictionary ( 14 of them in total ) is used to generate the cuts on-the-fly.
 This allow further flexibility for cutting (not to mention the usefulness during
-dev process) by omitting/adding key-val dynamically. 
+dev process) by omitting/adding key-val dynamically.
 
 For example, adding key:
 
-    { 'min_XXX' : 12345 } 
+    { 'min_XXX' : 12345 }
 
 will generate loki-ready cut:
 
-    '(XXX > 12345)' 
+    '(XXX > 12345)'
 
 dynamically to the `Code`
 
@@ -111,16 +111,16 @@ Version history
 - Deleagated more tuning to default_config. Make better use of pythonic-dict unpacking.
   - At tool level, e.g., PVReFitting in tau_h3
   - At Line's constructor. Easing the development of RelatedInfoTools
-- Restructure of control lines: 
+- Restructure of control lines:
   - Now there are 2 control Lines: 'XXnoiso', 'XXssnoiso'.
-  - Both are made like the signal lines, but with isolation removed, in exchange 
+  - Both are made like the signal lines, but with isolation removed, in exchange
     for prescale. This is planned to used for background such as QCD, V+jet
 - New `RelatedInfo::RelInfoConeVariables` in place, which can be used immediately
   in the offline analysis.
 
 ## 2.1 -- 150729 (S23 Tuning period summer 2015)
 - Properly expand SS lines (*explicit is better than implicit*)
-- Fixed duplication in decay descriptor of same particle 
+- Fixed duplication in decay descriptor of same particle
 - Separate prescale between os/ss lines
 - support for float/boolean value for autocut.
 - Option for TES source of particle
@@ -130,7 +130,7 @@ Version history
 
 ## 2.0
 - Optimized for Run-II Stripping 23.
-- Extends the code into 3 lines: EX, MX, HH. This covers all 10 possibilities of 
+- Extends the code into 3 lines: EX, MX, HH. This covers all 10 possibilities of
   ditau's decay modes.
 - Generate SS lines automatically
 - Generate cuts automatically + extra preambulo
@@ -199,7 +199,7 @@ config_tau_mu = {
   'max_ETA'       : 4.5,
   'max_TRCHI2DOF' : 5,
   'ISMUON'        : True,
-  'extracut'      : 'ALL',  
+  'extracut'      : 'ALL',
 }
 
 config_tau_h1 = {
@@ -210,7 +210,7 @@ config_tau_h1 = {
   'ISMUONLOOSE'   : False,
   'InAccHcal'     : True,
   'min_HCALFrac'  : 0.05,
-  'extracut'      : 'ALL'  
+  'extracut'      : 'ALL'
 }
 
 config_tau_h3 = {
@@ -227,7 +227,7 @@ config_tau_h3 = {
   'ccuts': {
     'min_AM'      : 700.  * MeV,
     'max_AM'      : 1500. * MeV,
-    'min_APTMAX'  : 2000. * MeV, 
+    'min_APTMAX'  : 2000. * MeV,
   },
   'mcuts': {
     'min_PT'        : 4 * GeV,
@@ -238,8 +238,8 @@ config_tau_h3 = {
 
 ## Isolation fraction for each tau type
 # Defined as pt(tau) / (p(tau)+p(cone))_T
-# i.e., relative amount in PT of tau candidate, over the vectorial-sum of 
-# momenta of candidate and cone. 
+# i.e., relative amount in PT of tau candidate, over the vectorial-sum of
+# momenta of candidate and cone.
 # Full isolated ~ 1
 # Anti isolated ~ 0
 config_tau_isolation = {
@@ -254,9 +254,9 @@ config_tau_isolation = {
 # DITAU #
 #-------#
 
-## Blank default fallback. 
+## Blank default fallback.
 # Remember the Zen: *Explicit is better than Implicit*
-pcuts0 = {'extracut': 'ALL'} 
+pcuts0 = {'extracut': 'ALL'}
 
 config_ditau_e_e = {
   'dcuts': { 'e':pcuts0 },
@@ -272,7 +272,7 @@ config_ditau_e_h1 = {
   'ccuts': {
     'min_APTMAX':   9 * GeV,
     'min_AM'    :  12 * GeV,
-    'extracut'  : 'ATRUE',  
+    'extracut'  : 'ATRUE',
   },
   'mcuts': pcuts0,
 }
@@ -355,7 +355,7 @@ config_ditau_mu_mu = {
 # Note that each decay have selection name, this is quite special.
 # - Each has to be unique!
 # - The first half before '_' is used to pick the appropriate ditau-level config
-# - 
+# -
 lines_decays = {
   'EX': {
     'ee_os' : '  Z0 ->  e-    e+   ',
@@ -373,7 +373,7 @@ lines_decays = {
     'ee_ss_noiso' : '[ Z0 ->  e-    e-   ]cc',
     'eh1_ss_noiso': '[ Z0 ->  e-    pi-  ]cc',
     'eh3_ss_noiso': '[ Z0 ->  e-    tau- ]cc',
-    'emu_ss_noiso': '[ Z0 ->  e-    mu-  ]cc',  
+    'emu_ss_noiso': '[ Z0 ->  e-    mu-  ]cc',
   },
   'MX': {
     'emu_os'  : '[ Z0 ->  e-    mu+  ]cc',
@@ -432,7 +432,7 @@ default_config = {
   'CONFIG'      : {
 
     ## Particle identification, full path to ./Particles please
-    'TES_mu': 'Phys/StdAllLooseMuons/Particles', 
+    'TES_mu': 'Phys/StdAllLooseMuons/Particles',
     'TES_e' : 'Phys/StdAllNoPIDsElectrons/Particles',
     'TES_pi': 'Phys/StdAllNoPIDsPions/Particles',
 
@@ -464,53 +464,53 @@ default_config = {
       'EX': {
         'prescale'        : 1.,
         'checkPV'         : True,
-        'RelatedInfoTools': config_rit_default, 
+        'RelatedInfoTools': config_rit_default,
       },
       'EXnoiso': {
         'prescale'        : 0.02,
         'checkPV'         : True,
-        'RelatedInfoTools': config_rit_default, 
+        'RelatedInfoTools': config_rit_default,
       },
       'EXssnoiso': {
         'prescale'        : 0.02,
         'checkPV'         : True,
-        # 'RelatedInfoTools': config_rit_default, 
+        # 'RelatedInfoTools': config_rit_default,
       },
       'HH': {
         'prescale'        : 1.,
         'checkPV'         : True,
-        'RelatedInfoTools': config_rit_default, 
+        'RelatedInfoTools': config_rit_default,
       },
       'HHnoiso': {
         'prescale'        : 0.02,
         'checkPV'         : True,
-        'RelatedInfoTools': config_rit_default, 
+        'RelatedInfoTools': config_rit_default,
       },
       'HHssnoiso': {
         'prescale'        : 0.02,
         'checkPV'         : True,
-        # 'RelatedInfoTools': config_rit_default, 
+        # 'RelatedInfoTools': config_rit_default,
       },
       'MX': {
         'prescale'        : 1.,
         'checkPV'         : True,
-        'RelatedInfoTools': config_rit_default, 
+        'RelatedInfoTools': config_rit_default,
       },
       'MXnoiso': {
         'prescale'        : 0.05,
         'checkPV'         : True,
-        'RelatedInfoTools': config_rit_default, 
+        'RelatedInfoTools': config_rit_default,
       },
       'MXssnoiso': {
         'prescale'        : 0.05,
         'checkPV'         : True,
-        # 'RelatedInfoTools': config_rit_default, 
+        # 'RelatedInfoTools': config_rit_default,
       },
     },
 
     ## For advance usage
     ## Extra preambulo, give me barestring with proper linebreak.
-    'preambulo'   : '\n', 
+    'preambulo'   : '\n',
     ## Choice of ParticleCombiner for ditau
     'ditau_pcomb' : {'': 'MomentumCombiner:PUBLIC'},
     ## Fine-tuning the BPV threshold for PVRefit.
@@ -544,12 +544,12 @@ def _MakeTrio(f1, f2, f3):
   trioguard = lambda f: switch(NDAUGHTERS==3, f, -1)
   return trioguard(fmin), trioguard(fmid), trioguard(fmax)
 
-def _MakeChildrenDR(i1, i2):                           
-  from LoKiPhys.decorators import CHILD,ETA,PHI  
+def _MakeChildrenDR(i1, i2):
+  from LoKiPhys.decorators import CHILD,ETA,PHI
   from LoKiCore.math import cos,acos
   DETA = abs(CHILD(ETA,i1)-CHILD(ETA,i2))
   DPHI = abs(CHILD(PHI,i1)-CHILD(PHI,i2))
-  DPHI = acos(cos(DPHI))  # mod pi       
+  DPHI = acos(cos(DPHI))  # mod pi
   return (DPHI**2 + DETA**2)**0.5
 
 DRTRIOMIN, DRTRIOMID, DRTRIOMAX = _MakeTrio( _MakeChildrenDR(1,2), _MakeChildrenDR(2,3), _MakeChildrenDR(3,1) )
@@ -576,9 +576,9 @@ InAccEcal = PPFUN(PP_InAccEcal, -1)==1
 
 def parse_single_cut( key, val ):
   """
-  Auto-generate the cut string from config key-val. 
+  Auto-generate the cut string from config key-val.
   Designed for on-demand cut.
-  
+
   >>> parse_single_cut( 'min_PT', 500 )
   'PT > 500'
   >>> parse_single_cut( 'ISMUON', False )  # Boolean
@@ -614,7 +614,7 @@ def join(cuts):
 
 def parse_cuts_auto(config):
   """
-  Given the custom-formatted config-dict, return LoKi-ready string cut generated 
+  Given the custom-formatted config-dict, return LoKi-ready string cut generated
   on-the-fly for each key-val in config (see `parse_single_cut`).
 
   Note: Since the content inside config may vary, the optional argument
@@ -639,14 +639,14 @@ def doubling_sign_dict(d):
 #   Make on-demand functor that cut on isolation var calculated by RelInfoConeVar.
 #   This is the former `PTFrac05C` functor.
 #   More bump since the PT-fraction needs to be calculated manually.
-  
+
 #   ** ACTS ON MOTHER, BUT GET INFO OF CHILD***
 
-#   Remark that, due to the (weird) design of relatedInfo, even when I want to 
+#   Remark that, due to the (weird) design of relatedInfo, even when I want to
 #   retrieve the isolation info of a child, I need to use its mother as a pointer,
 #   and select the appropriate location where the child's info is stored.
-#   As such, the isolation info is outside the CHILDCUT functor, but act on 
-#   mother directly.  
+#   As such, the isolation info is outside the CHILDCUT functor, but act on
+#   mother directly.
 
 #   """
 #   PT = 'CHILD(PT,%i)'%index
@@ -698,7 +698,7 @@ def cut_iso_tau( infoloc, tau_e, tau_mu, tau_h1, tau_h3, **kwargs ):
 
 def selection_filt( config, preambulo, sel, newname ):
   """
-  Given a selection, apply FilterDesktop on top of it, 
+  Given a selection, apply FilterDesktop on top of it,
   with cuts from config to be parsed.
   """
   return SimpleSelection( newname, FilterDesktop, sel,
@@ -797,7 +797,7 @@ def selection_ditau( config, preambulo, pcomb, dcname, decay, inputs ):
 # NAME    : Formal name of stripping line, by default, 'Ditau'
 # dtype   : Decay type of ditau (no sign), e.g., eh1, mumu
 # dcname  : Decay name of ditau (with sign), e.g., eh1_ss, mumu_os
-# linename: Short line name, e.g., EX, MXss 
+# linename: Short line name, e.g., EX, MXss
 #           (note that opposite-sign os is dropped)
 
 
@@ -832,14 +832,14 @@ class DitauConf(LineBuilder):
 
     ## Prepare selection of ditau
     # Selections, indexed by dcname (for emu sharing). Think of it as caching.
-    sels_ditau = {}  
+    sels_ditau = {}
 
     ## Loop over all lines, make groupping
     for linename, condict in CONFIG['CONSTRUCTORS'].iteritems():
       ## Make the fullname: e.g., 'Ditau' + 'EXss' + 'Line'
       fullname = NAME + linename + 'Line'
-      ## Get list of decay, indexed by Line's name      
-      dcdict = lines_decays[linename]  
+      ## Get list of decay, indexed by Line's name
+      dcdict = lines_decays[linename]
       ## Make list of selections to be put in single line
       sels = []
       for dcname, decay in dcdict.iteritems():
@@ -856,7 +856,7 @@ class DitauConf(LineBuilder):
       selection = MergedSelection( 'Sel'+linename, sels )
 
       # ## Adding isolation cut on the ditau level.
-      # filt = None 
+      # filt = None
       # if 'noiso' not in linename:
       #   filt = rif_isolation( fullname, CONFIG['tau_isolation'] )
 
@@ -871,7 +871,7 @@ class DitauConf(LineBuilder):
 
 def Tuples():
   """
-  Simple class-like method to return DecayTreeTuple which can be used to 
+  Simple class-like method to return DecayTreeTuple which can be used to
   do quick-check on the output DST.
 
   Usage:
@@ -892,8 +892,8 @@ def Tuples():
       desc = desc.replace('cc', 'CC') # different between CombineP & DTT
       #
       ## Extra complication for cand with RIF, such that the input location
-      # after isolation filter is not at default line location, but on the 
-      # last algo's location. Otherwise the tuple will pick up candidates 
+      # after isolation filter is not at default line location, but on the
+      # last algo's location. Otherwise the tuple will pick up candidates
       # before isolation filtering.
       root = 'Phys/Ditau%sLine'%lname
       # if 'noiso' not in root:
@@ -919,4 +919,3 @@ def Tuples():
       }
       seq.Members.append(tup)
   return [seq]
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py
index fbb9f10c7694bfe3001eac95e48000b54034bb63..9167c64ab369675b48eed432800aee3492209304 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py
@@ -30,7 +30,7 @@ default_config = {
   'WGs'         : [ 'QEE' ],
   'STREAMS'     : [ 'EW' ],
   'CONFIG': {
-    'FullDiJetsLine_Prescale'   : 0.013, 
+    'FullDiJetsLine_Prescale'   : 0.013,
     'FullDiJetsLine_Postscale'  : 1.0,
     'RequiredRawEvents'         : [],
     'min_jet_pT'                : 20. * GeV,
@@ -46,9 +46,9 @@ class FullDiJetsConf( LineBuilder ) :
   def __init__( self, name, config ) :
 
     LineBuilder.__init__( self, name, config )
-        
+
     sel_FullDiJets  = self.makeJetGroup(name + 'FullDiJets', config )
-        
+
     self.registerLine(StrippingLine( name + 'Line',
       prescale  = config[ 'FullDiJetsLine_Prescale' ],
       postscale = config[ 'FullDiJetsLine_Postscale' ],
@@ -60,25 +60,24 @@ class FullDiJetsConf( LineBuilder ) :
   def makeJetGroup(self, name, config):
 
     JetGroup = CombineParticles("Combine"+name)
-    JetGroup.DecayDescriptor = "H_10 -> CELLjet CELLjet"    
-      
+    JetGroup.DecayDescriptor = "H_10 -> CELLjet CELLjet"
+
     JetGroup.ParticleCombiners = {"" : "LoKi::VertexFitter"}
     JetGroup.addTool( LoKi__VertexFitter, name="LoKi::VertexFitter" )
     vfitter = getattr ( JetGroup , "LoKi::VertexFitter" )
     vfitter.Jets = ""
-      
-    JetGroup.DaughtersCuts = { "CELLjet" :" (PT > %(min_jet_pT)s ) " %config }   
+
+    JetGroup.DaughtersCuts = { "CELLjet" :" (PT > %(min_jet_pT)s ) " %config }
     JetGroup.CombinationCut = "AALL"
     JetGroup.MotherCut = "ALL"
-    
+
     ## TOS_HLT2 on-demand
     hlt = config['TOS_HLT2']
     if hlt:
       JetGroup.MotherCut += '& (TOS("%s", "Hlt2TriggerTisTos"))'%hlt
 
     requiredSelections = [DataOnDemand(Location = "Phys/StdJets/Particles")]
-      
+
     return Selection ("Sel"+name,
                       Algorithm = JetGroup,
                       RequiredSelections = requiredSelections)
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py
index 10e148db08dba1aa8dc90b4850181ba5972f76f3..6120f66398381bff3ed8e49d34ff2d3efa2f1a62 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py
@@ -27,20 +27,20 @@ default_config = {
     'NAME'              : 'GluinosJets',
     'WGs'               : ['QEE'],
     'BUILDERTYPE'       : 'GluinosJetsConf',
-    'CONFIG'            : { 'JET_PT'                   : 20*GeV 
+    'CONFIG'            : { 'JET_PT'                   : 20*GeV
                           , 'MIN_IPCHI2'               : 25
                           , 'DG_NDISPLONG'             : 1
-                          , 'HF_NDISPLONG'             : 3 
+                          , 'HF_NDISPLONG'             : 3
                           , 'HF_GDAUGS'                : 5
                           , 'DisplacedGluinoPrescale'  : 1.
                           , 'SixLightPrescale'         : 1.
                           , 'TwoLightOneHFPrescale'    : 1.
                           , 'RawBanks'                 : ['Calo', 'Trigger', 'Velo', 'Tracker']
                           },
-    'STREAMS'             : [ 'BhadronCompleteEvent' ]             
+    'STREAMS'             : [ 'BhadronCompleteEvent' ]
     }
 
-### Lines stored in this file:  
+### Lines stored in this file:
 # StrippingGluinosJetsSixJetsLine
 # StrippingGluinosJetsDisplacedGluinoLine
 # StrippingGluinosJetsThreeJetsOneHFLine
@@ -64,7 +64,7 @@ class GluinosJetsConf(LineBuilder) :
 
         ## Add daughter vertices to jets:
 
-        jetVertexAlg  = JetVertexAlg( self.name + "jetVertexAlg", 
+        jetVertexAlg  = JetVertexAlg( self.name + "jetVertexAlg",
                                       Input=StdJets.outputLocation(), Output="Phys/StdJetsVtxAlgGluinos/Particles" )
         _StdJetVtxAlg = updateDoD( jetVertexAlg, name="StdJetsVtxAlgGluinos" )
 
@@ -116,4 +116,4 @@ class GluinosJetsConf(LineBuilder) :
         from GaudiConfUtils.ConfigurableGenerators import LoKi__VoidFilter as _VFilter_
         return PassThroughSelection (name,
                                      Algorithm         = _VFilter_(Code = _Code , Preambulo = _Preambulo) ,
-                                     RequiredSelection = input )
\ No newline at end of file
+                                     RequiredSelection = input )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingH24Mu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingH24Mu.py
index 1d75796119f3268fefc0de5fcf7a08217628aa1d..06b2d9cb37d705494e252b2c9ef0380e1d6a450d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingH24Mu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingH24Mu.py
@@ -49,7 +49,7 @@ default_config={
 
     'RequiredRawEvents'      : ['Muon'],
     'MDSTFlag'               : False,
-              
+
     'MuTrackChi2DoF'         : 3,
     'MupTprompt'             : 500 * MeV,  # 375 MeV
     'MupTdetached'           : 250 * MeV,
@@ -58,7 +58,7 @@ default_config={
     'MuMinIPchi2'            : 1,
     'MuPIDdll'               : -3, # muon combDLL
     'MuNShared'              : 3, # muon NShared
-              
+
     'A1maxMass'              : 2000 * MeV,
     'A1Doca'                 : 0.2 * mm,
     'A1DocaTight'            : 0.1 * mm,
@@ -67,13 +67,13 @@ default_config={
     'A1Dira'                 : 0,
     'A1maxIPchi2'            : 25,
     'A1FDChi2'               : 4,
-              
+
     'HmaxDOCA'               : 0.75 * mm,
     'HmaxDOCATight'          : 0.25 * mm,
     'HVchi2'                 : 10,
     'HVchi2Tight'            : 2,
     'HpT'                    : 1200 * MeV,
-              
+
     'MuTrackChi2DoF_loose'   : 10,
     'MupT_loose'             : 0 * MeV,
     'MuMaxIPchi2_loose'      : 1000000,
@@ -82,7 +82,7 @@ default_config={
     'A1Vchi2_loose'          : 20,
     'HmaxDOCA_loose'         : 1000000 * mm,
     'HpT_loose'              : 300 * MeV,
-    'HVchi2_loose'           : 50,          
+    'HVchi2_loose'           : 50,
   },
 }
 
@@ -111,16 +111,16 @@ class H24MuConf(LineBuilder) :
     detachedLine  : Stripping line made from selDetached
     looseLine     : Stripping line made from selLoose
     lines         : list of lines:  [ promptLine, simpleLine, detachedLine, looseLine ]
-    
+
     """
- 
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, 
+    def __init__(self,
                  name = default_name,
                  config = None,
                  debug_cuts = 0):
-                 
+
 
         LineBuilder.__init__(self, name, config)
 
@@ -141,9 +141,9 @@ class H24MuConf(LineBuilder) :
                            'ConeAngle' : 1.0,
                            'Variables' : ['angle', 'mult','p','pt',
                                           'ptasy','pasy']},
-                          {'Type' : 'ConeVariables', 
-                           'ConeNumber' : 2, 
-                           'ConeAngle' : 1.5, 
+                          {'Type' : 'ConeVariables',
+                           'ConeNumber' : 2,
+                           'ConeAngle' : 1.5,
                            'Variables' : ['angle', 'mult','p','pt',
                                           'ptasy','pasy']},
                           {'Type' : 'ConeVariables',
@@ -151,14 +151,14 @@ class H24MuConf(LineBuilder) :
                            'ConeAngle' : 2.0,
                            'Variables' : ['angle', 'mult','p','pt',
                                           'ptasy','pasy']},
-                          
+
                           {'Type' : 'VertexIsolation'}]
 
         ExtraInfoDaughters = {"prompt"  : [getattr(self,"A1"+prompt_name)],
                               "simple"  : [getattr(self,"A1"+simple_name)],
                               "detached": [getattr(self,"A1"+detached_name)],
                               "loose"   : [getattr(self,"A1"+loose_name)]}
-        
+
         self.promptLine = StrippingLine(prompt_name+"Line",
                                         prescale = config['PromptLinePrescale'],
                                         postscale = config['DefaultPostscale'],
@@ -189,7 +189,7 @@ class H24MuConf(LineBuilder) :
                                           MDSTFlag = config['MDSTFlag'],
                                           RequiredRawEvents = config['RequiredRawEvents'],
                                           )
-        
+
 ## 2015-11-10 ckhurewa: Instantiated but unused Line raises warning...
 #         ## no need for mdst or raw data in the loose line...
 #         self.looseLine = StrippingLine(loose_name+"Line",
@@ -224,10 +224,10 @@ class H24MuConf(LineBuilder) :
                                  "& ( TRGHOSTPROB < %(MuGhostProb)s ) " \
                                  "& (PT > %(MupTprompt)s ) "\
                                  "& (MIPCHI2DV(PRIMARY)< %(MuMaxIPchi2)s )" %self.config_dict }
-            
+
             A1.CombinationCut = "(AM < %(A1maxMass)s ) "\
                                  "& (AMAXDOCA('')<%(A1Doca)s )" %self.config_dict
-            
+
             A1.MotherCut = "(VFASPF(VCHI2)< %(A1Vchi2)s ) "\
                            "& (MM < %(A1maxMass)s )" %self.config_dict
 
@@ -239,7 +239,7 @@ class H24MuConf(LineBuilder) :
                                          "& (PPINFO(LHCb.ProtoParticle.MuonNShared,99999)<= %(MuNShared)s ) " %self.config_dict }
             A1.CombinationCut = "(AM < %(A1maxMass)s  ) "\
                                  "& (AMAXDOCA('')<%(A1DocaTight)s )" %self.config_dict
-            
+
             A1.MotherCut = "(VFASPF(VCHI2)< %(A1Vchi2Tight)s ) "\
                            "& (MM < %(A1maxMass)s )" %self.config_dict
 
@@ -255,10 +255,10 @@ class H24MuConf(LineBuilder) :
                                  "& (PT > %(MupTdetached)s ) "\
                                  "& ( TRGHOSTPROB < %(MuGhostProb)s ) " \
                                  "& (MIPCHI2DV(PRIMARY)> %(MuMinIPchi2)s )" %self.config_dict }
-            
+
             A1.CombinationCut = "(AM < %(A1maxMass)s  ) "\
                                  "& (AMAXDOCA('')<%(A1Doca)s )" %self.config_dict
-            
+
             A1.MotherCut = "(VFASPF(VCHI2)< %(A1Vchi2)s ) "\
                            "& (MM < %(A1maxMass)s )" \
                            "& (BPVDIRA > %(A1Dira)s )" \
@@ -267,19 +267,19 @@ class H24MuConf(LineBuilder) :
 
         #loose
         else:
-            
+
             A1.DaughtersCuts = { "mu+" : "(TRCHI2DOF < %(MuTrackChi2DoF_loose)s ) "\
                                  "& (PT > %(MupT_loose)s  ) "\
                                  "& (MIPCHI2DV(PRIMARY)< %(MuMaxIPchi2_loose)s )" %self.config_dict }
 
             A1.CombinationCut = "(AM < %(A1maxMass_loose)s  ) "\
                                  "& (AMAXDOCA('')<%(A1Doca_loose)s )" %self.config_dict
-            
+
             A1.MotherCut = "(VFASPF(VCHI2)< %(A1Vchi2_loose)s ) "\
                            "& (MM < %(A1maxMass_loose)s )" %self.config_dict
 
-            
-            
+
+
         _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
 
         if self.debug_cuts:
@@ -289,7 +289,7 @@ class H24MuConf(LineBuilder) :
             print A1.CombinationCut
 
 
-        
+
         return Selection ("Sel"+name,
                           Algorithm = A1,
                           RequiredSelections = [ _stdAllLooseMuons ])
@@ -304,11 +304,11 @@ class H24MuConf(LineBuilder) :
         name        : name of the Selection.
         type        : 0 (prompt), 1 (simple), 2 (detached), 3 (loose)
         """
-        
-        
+
+
         SelA1 = self.makeA1("A1"+name,type)
         setattr(self,"A1"+name,SelA1)
-        
+
         H25 = CombineParticles("Combine_H25"+name)
         H25.DecayDescriptor = "H_10 -> KS0 KS0"
         H25.DaughtersCuts = {}
@@ -317,7 +317,7 @@ class H24MuConf(LineBuilder) :
         if type==1:
             H25.CombinationCut = "(AMAXDOCA('')< %(HmaxDOCATight)s )" %self.config_dict
             H25.MotherCut = "(VFASPF(VCHI2)< %(HVchi2Tight)s )" %self.config_dict
-        
+
         # loose: loosen all cuts
         elif type==3:
             H25.CombinationCut = "(AMAXDOCA('')< %(HmaxDOCA_loose)s )" %self.config_dict
@@ -334,11 +334,7 @@ class H24MuConf(LineBuilder) :
             print "DEBUG - H cuts for type", type
             print H25.MotherCut
             print H25.CombinationCut
-        
+
         return Selection( "SelH4mu"+name,
                           Algorithm = H25,
                           RequiredSelections=[SelA1] )
-    
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHighPtMuons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHighPtMuons.py
index e24302811e712d272d92e7158a2c90faf4e19ed2..96f47b4587c73413b7f4dae7e5907f204be0de41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHighPtMuons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHighPtMuons.py
@@ -35,7 +35,7 @@ default_config = {
   'WGs'                : ['QEE'],
   'STREAMS'            : {'EW': ['StrippingHighPtMuonsZ02MuMuNoPIDsLine'],
                           'Leptonic': ['StrippingHighPtMuonsY2MuMuNoPIDsLine'] },
-  'CONFIG'             : { 
+  'CONFIG'             : {
     'Prescale'         : 1.0,
     'Postscale'        : 1.0,
     'pT'               : 3.   * GeV,
@@ -44,7 +44,7 @@ default_config = {
     'MmaxY'            : 11   * GeV,
     'TrackChi2Mu'      : 5,
     'VtxChi2MuMu'      : 12,
-    'YPIDcut'          : 0.5, 
+    'YPIDcut'          : 0.5,
     'RawEvents'        : ["Muon", "Calo", "Rich", "Velo", "Tracker", "HC"],
   },
 }
@@ -73,7 +73,7 @@ class HighPtMuonsConf( LineBuilder ) :
 def makeCombinationZ0( name, config ):
   dcut = '(PT>%(pT)s)'%config
   mcut = '(MM>%(MZ0)s)'%config
-  
+
   return SimpleSelection(name, CombineParticles, [StdAllNoPIDsMuons],
     DecayDescriptor    = 'Z0 -> mu+ mu-',
     DaughtersCuts      = { 'mu+' : dcut, 'mu-' : dcut },
@@ -95,5 +95,3 @@ def makeCombinationY( name, config ):
     MotherCut          = mcut + ' & ((CHILDCUT('+pidcut+',1))|(CHILDCUT('+pidcut+',2)))',
     WriteP2PVRelations = False
   )
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHltQEE.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHltQEE.py
index 4821b9d653027efb4bf80347325adbd20ad5b008..5d0497467101a7a6c83b23d203588f13afbae388 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHltQEE.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingHltQEE.py
@@ -143,4 +143,3 @@ class HltQEEConf(LineBuilder):
       conf = dict(conf_common)
       conf.update(conf_override)
       self.registerLine(StrippingLine( name+linename+'Line', **conf ))
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py
index 462d6574e65e40a5b70f84fab10edf8002533c85..67584fd68a41ef96c5cfa82a919956c7c0b9409b 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py
@@ -51,7 +51,7 @@ default_config = {
               'Prescale_SS'   : 0.5,
               'Postscale_SS'  : 1.0,
               'Prompt_PT' : 500*MeV,
-              'Prompt_P' : 10000*MeV,                                                  
+              'Prompt_P' : 10000*MeV,
               'Prompt_ProbNNmu' : 0.5,
               'Prompt_ProbNNe' : 0.25,
               'Prompt_GhostProb': 0.3,
@@ -67,7 +67,7 @@ default_config = {
               'Prescale_SS'   : 1.0,
               'Postscale_SS'  : 1.0,
               'Detached_PT' : 500*MeV,
-              'Detached_P' : 10000*MeV,                                                  
+              'Detached_P' : 10000*MeV,
               'Detached_ProbNNmu' : 0.5,
               'Detached_ProbNNe' : 0.,
               'Detached_GhostProb': 0.3,
@@ -85,16 +85,16 @@ default_config = {
               'Postscale_SS'  : 1.0,
               'max_TRCHI2DV'     : 3.0,
               'Detached_PT' : 1600*MeV,
-              'Detached_P' : 10000*MeV,                                                  
+              'Detached_P' : 10000*MeV,
               'Detached_ProbNNmu' : 0.5,
               'Detached_GhostProb': 0.20,
-              'Detached_IPChi2' : 25,                                                 
+              'Detached_IPChi2' : 25,
               'Detached_ProbNNe' : 0.,
               'Detached_VChi2' : 8,
               'Detached_M' : 0,
               'Detached_TAU' : 0.5*picosecond,
               'Detached_FDChi2' : 225,
-              },        
+              },
      'StrippingLFVExoticaW2EN2EMuXDetachedLine': {
               'Prescale'   : 1.0,
               'Postscale'  : 1.0,
@@ -102,17 +102,17 @@ default_config = {
               'Postscale_SS'  : 1.0,
               'max_TRCHI2DV'     : 3.0,
               'Detached_PT' : 500*MeV,
-              'Detached_P' : 10000*MeV,                                                  
+              'Detached_P' : 10000*MeV,
               'Detached_ProbNNmu' : 0.5,
               'Detached_GhostProb': 0.20,
-              'Detached_IPChi2' : 16,                                                 
+              'Detached_IPChi2' : 16,
               'Detached_ProbNNe' : 0.,
               'Detached_VChi2' : 8,
               'Detached_M' : 0,
               'Detached_TAU' : 0.5*picosecond,
               'Detached_FDChi2' : 225,
               'Prompt_PT' : 2000*MeV,
-              'Prompt_P' : 10000*MeV,                                                                                           
+              'Prompt_P' : 10000*MeV,
               'Prompt_ProbNN' : 0.0,
               'W_M': 0*MeV,
               'Prompt_IPChi2' : 5,
@@ -125,17 +125,17 @@ default_config = {
               'Postscale_SS'  : 1.0,
               'max_TRCHI2DV'     : 3.0,
               'Detached_PT' : 500*MeV,
-              'Detached_P' : 10000*MeV,                                                  
+              'Detached_P' : 10000*MeV,
               'Detached_ProbNNmu' : 0.5,
               'Detached_GhostProb': 0.20,
-              'Detached_IPChi2' : 16,                                                 
+              'Detached_IPChi2' : 16,
               'Detached_ProbNNe' : 0.,
               'Detached_VChi2' : 8,
               'Detached_M' : 0,
               'Detached_TAU' : 0.5*picosecond,
               'Detached_FDChi2' : 225,
               'Prompt_PT' : 1000*MeV,
-              'Prompt_P' : 10000*MeV,                                                                                           
+              'Prompt_P' : 10000*MeV,
               'Prompt_ProbNN' : 0.5,
               'W_M': 0*MeV,
               'Prompt_IPChi2' : 5,
@@ -155,30 +155,30 @@ StdJetsNoJetIDNoBan = JetMakerConf(stdjets_name_noban,
                                    PtMin = 500.,
                                    JetIDCut = False).algorithms[0]
 
-## configure Data-On-Demand service                                                        
+## configure Data-On-Demand service
 locations = updateDoD ( StdJetsNoJetIDNoBan )
 
 
 # the daughters banning is line dependent (need to provide the location of the daughters!)
 def create_stdjets(strob,line_location,stdjets_name_ban):
-    
+
     myconf1 = JetMakerConf(stdjets_name_ban,
                            R = 0.7 ,
                            PtMin = 500.,
                            listOfParticlesToBan = [line_location],
                            JetIDCut = False).algorithms[0]
-    
+
     if "StdJetsNoJetIDBan" in dir(strob): strob.StdJetsNoJetIDBan.append(myconf1)
     else: strob.StdJetsNoJetIDBan= [myconf1]
-                                      
-    ## configure Data-On-Demand service                                            
+
+    ## configure Data-On-Demand service
     locations = updateDoD ( myconf1 )
 
 
 relInfoJetsVars = ["JETNOMU1PX","JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY", "JETNOMU3PZ", "JETNOMU3PT", "JETNOMU3JETWIDTH", "JETNOMU3NNTAG", "JETNOMU3MNF", "JETMU1PX", "JETMU1PY", "JETMU1PZ", "JETMU1PT", "JETMU1JETWIDTH", "JETMU1NNTAG", "JETMU1MNF", "JETMU2PX", "JETMU2PY", "JETMU2PZ", "JETMU2PT", "JETMU2JETWIDTH", "JETMU2NNTAG", "JETMU2MNF"]
 
 def JetsRelInfo(stdjets_name_ban):
-  
+
     ret = { 'Type' : 'RelInfoJetsVariables',
             'Location': 'RelatedInfoJets',
             'Variables': relInfoJetsVars,
@@ -186,75 +186,75 @@ def JetsRelInfo(stdjets_name_ban):
             'LocationJetsNoMu' : "Phys/"+stdjets_name_ban+"/Particles",
             'LocationJetsNoRemove' : "Phys/"+stdjets_name_noban+"/Particles"
           }
-        
+
     return ret
 
 relInfoConeVars = ["CONEANGLE","CONEMULT","CONEP","CONEPT","CONEPASYM","CONEPTASYM","CONEDELTAETA","CONEDELTAPHI"]
 
 def IsoConeRelInfo(angle, location, *args):
-  
+
     ret = {'Type' : 'RelInfoConeVariables', 'Variables':relInfoConeVars, 'ConeAngle' : angle, 'Location': location}
     dl = {}
     for a in args:
       dl[a["part"]] = a["loc"]
     ret['DaughterLocations'] = dl
-    
+
     return ret
 
 relInfoPFVars = ["PFCHARGEDMASS","PFALLMASS","PFCHARGEDMISSPT","PFALLMISSPT","PFCHARGEDMISSPX","PFALLMISSPX","PFCHARGEDMISSPY","PFALLMISSPY"]
-    
+
 class LFVExoticaConf(LineBuilder) :
   __configuration_keys__ = default_config['CONFIG'].keys()
 
   def __init__(self, name, config):
     LineBuilder.__init__(self, name, config)
-    
-    
+
+
     stdjets_name_ban_prompt = "StdJetsNoJetIDBanDaughtersPrompt"
     stdjets_name_ban_ssprompt = "StdJetsNoJetIDBanDaughtersSameSignPrompt"
     stdjets_name_ban_detached = "StdJetsNoJetIDBanDaughtersDetached"
     stdjets_name_ban_ssdetached = "StdJetsNoJetIDBanDaughtersSameSignDetached"
-    
+
     RelatedInfoToolsPrompt = [JetsRelInfo(stdjets_name_ban_prompt)]
     RelatedInfoToolsSSPrompt = [JetsRelInfo(stdjets_name_ban_ssprompt)]
     RelatedInfoToolsDetached = [JetsRelInfo(stdjets_name_ban_detached)]
     RelatedInfoToolsSSDetached = [JetsRelInfo(stdjets_name_ban_ssdetached)]
-              
-                                    
+
+
     PFrelatedinfos = {'Type' : 'RelInfoPFVariables', 'Variables':relInfoPFVars, 'Location': 'PFVariables'}
     VertexIso = {'Type': 'RelInfoVertexIsolation', 'Location':'RelInfoVtxIso' }
-                                    
+
     ## cone related infos
-                                    
-    RelatedInfoToolsPrompt +=    [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo05'}, 
+
+    RelatedInfoToolsPrompt +=    [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo05'},
                                                                          {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo05'}),
                                   IsoConeRelInfo(1.0, 'ConeVariables1',  {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo1'},
                                                                          {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo1'}),
                                   IsoConeRelInfo(2.0, 'ConeVariables2',  {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo2'},
-                                                                         {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo2'})] 
-                                  
-    RelatedInfoToolsSSPrompt +=  [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo05'}, 
+                                                                         {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo2'})]
+
+    RelatedInfoToolsSSPrompt +=  [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo05'},
                                                                          {"part": '[H_30 -> mu+ ^e+]CC', 'loc': 'ElectronConeInfo05'}),
                                   IsoConeRelInfo(1.0, 'ConeVariables1',  {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo1'},
                                                                          {"part": '[H_30 -> mu+ ^e+]CC', 'loc': 'ElectronConeInfo1'}),
                                   IsoConeRelInfo(2.0, 'ConeVariables2',  {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo2'},
                                                                          {"part": '[H_30 -> mu+ ^e+]CC', 'loc': 'ElectronConeInfo2'})]
-                                  
-    RelatedInfoToolsDetached +=  [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo05'}, 
+
+    RelatedInfoToolsDetached +=  [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo05'},
                                                                          {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo05'}),
                                   IsoConeRelInfo(1.0, 'ConeVariables1',  {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo1'},
                                                                          {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo1'}),
                                   IsoConeRelInfo(2.0, 'ConeVariables2',  {"part": '[H_30 -> ^mu+ e-]CC', 'loc': 'MuonConeInfo2'},
-                                                                         {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo2'})] 
-                                  
-    RelatedInfoToolsSSDetached += [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo05'}, 
+                                                                         {"part": '[H_30 -> mu+ ^e-]CC', 'loc': 'ElectronConeInfo2'})]
+
+    RelatedInfoToolsSSDetached += [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo05'},
                                                                          {"part": '[H_30 -> mu+ ^e+]CC', 'loc': 'ElectronConeInfo05'}),
                                   IsoConeRelInfo(1.0, 'ConeVariables1',  {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo1'},
                                                                          {"part": '[H_30 -> mu+ ^e+]CC', 'loc': 'ElectronConeInfo1'}),
                                   IsoConeRelInfo(2.0, 'ConeVariables2',  {"part": '[H_30 -> ^mu+ e+]CC', 'loc': 'MuonConeInfo2'},
                                                                          {"part": '[H_30 -> mu+ ^e+]CC', 'loc': 'ElectronConeInfo2'})]
 
-  
+
     W2EN_RelatedInfos = [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e-)]CC e+ ]CC', 'loc': 'MuonConeInfo05'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e-)]CC e+ ]CC', 'loc': 'ElectronConeInfo05'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e-)]CC e+ ]CC', 'loc': 'HNLConeInfo05'},
@@ -266,8 +266,8 @@ class LFVExoticaConf(LineBuilder) :
                          IsoConeRelInfo(2.0, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e-)]CC e+ ]CC', 'loc': 'MuonConeInfo2'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e-)]CC e+ ]CC', 'loc': 'ElectronConeInfo2'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e-)]CC e+ ]CC', 'loc': 'HNLConeInfo2'},
-                                                                {"part": '[W+ -> [(H_30 -> mu+ e-)]CC ^e+ ]CC', 'loc': 'PromptElectronConeInfo2'})]  
-                                                                
+                                                                {"part": '[W+ -> [(H_30 -> mu+ e-)]CC ^e+ ]CC', 'loc': 'PromptElectronConeInfo2'})]
+
     W2MuN_RelatedInfos = [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e-)]CC mu+ ]CC', 'loc': 'MuonConeInfo05'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e-)]CC mu+ ]CC', 'loc': 'ElectronConeInfo05'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e-)]CC mu+ ]CC', 'loc': 'HNLConeInfo05'},
@@ -279,8 +279,8 @@ class LFVExoticaConf(LineBuilder) :
                          IsoConeRelInfo(2.0, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e-)]CC mu+ ]CC', 'loc': 'MuonConeInfo2'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e-)]CC mu+ ]CC', 'loc': 'ElectronConeInfo2'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e-)]CC mu+ ]CC', 'loc': 'HNLConeInfo2'},
-                                                                {"part": '[W+ -> [(H_30 -> mu+ e-)]CC ^mu+ ]CC', 'loc': 'PromptMuonConeInfo2'})]                                                             
-                                                                
+                                                                {"part": '[W+ -> [(H_30 -> mu+ e-)]CC ^mu+ ]CC', 'loc': 'PromptMuonConeInfo2'})]
+
     W2ENSS_RelatedInfos = [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e+)]CC e+ ]CC', 'loc': 'MuonConeInfo05'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e+)]CC e+ ]CC', 'loc': 'ElectronConeInfo05'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e+)]CC e+ ]CC', 'loc': 'HNLConeInfo05'},
@@ -292,8 +292,8 @@ class LFVExoticaConf(LineBuilder) :
                          IsoConeRelInfo(2.0, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e+)]CC e+ ]CC', 'loc': 'MuonConeInfo2'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e+)]CC e+ ]CC', 'loc': 'ElectronConeInfo2'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e+)]CC e+ ]CC', 'loc': 'HNLConeInfo2'},
-                                                                {"part": '[W+ -> [(H_30 -> mu+ e+)]CC ^e+ ]CC', 'loc': 'PromptElectronConeInfo2'})]  
-                                                                
+                                                                {"part": '[W+ -> [(H_30 -> mu+ e+)]CC ^e+ ]CC', 'loc': 'PromptElectronConeInfo2'})]
+
     W2MuNSS_RelatedInfos = [IsoConeRelInfo(0.5, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e+)]CC mu+ ]CC', 'loc': 'MuonConeInfo05'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e+)]CC mu+ ]CC', 'loc': 'ElectronConeInfo05'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e+)]CC mu+ ]CC', 'loc': 'HNLConeInfo05'},
@@ -305,9 +305,9 @@ class LFVExoticaConf(LineBuilder) :
                          IsoConeRelInfo(2.0, 'ConeVariables05', {"part": '[W+ -> [(H_30 -> ^mu+ e+)]CC mu+ ]CC', 'loc': 'MuonConeInfo2'},
                                                                 {"part": '[W+ -> [(H_30 -> mu+ ^e+)]CC mu+ ]CC', 'loc': 'ElectronConeInfo2'},
                                                                 {"part": '[W+ -> ^[(H_30 -> mu+ e+)]CC mu+ ]CC', 'loc': 'HNLConeInfo2'},
-                                                                {"part": '[W+ -> [(H_30 -> mu+ e+)]CC ^mu+ ]CC', 'loc': 'PromptMuonConeInfo2'})]                                                                
-                                                                        
-    
+                                                                {"part": '[W+ -> [(H_30 -> mu+ e+)]CC ^mu+ ]CC', 'loc': 'PromptMuonConeInfo2'})]
+
+
     RelatedInfoToolsPrompt += [PFrelatedinfos, VertexIso]
     RelatedInfoToolsSSPrompt += [PFrelatedinfos, VertexIso]
     RelatedInfoToolsDetached += [PFrelatedinfos, VertexIso]
@@ -317,7 +317,7 @@ class LFVExoticaConf(LineBuilder) :
 
     ## [A1 -> mu+ e-]cc prompt line:
     sel_prompt = combinePrompt(name,config['StrippingLFVExoticaPromptLine'])
-    
+
     promptline = StrippingLine(name + 'PromptLine',
                                prescale  = config['StrippingLFVExoticaPromptLine']['Prescale'],
                                postscale = config['StrippingLFVExoticaPromptLine']['Postscale'],
@@ -325,10 +325,10 @@ class LFVExoticaConf(LineBuilder) :
                                selection = sel_prompt,
                                RelatedInfoTools = RelatedInfoToolsPrompt)
     self.registerLine(promptline)
-    
+
     ### [A1 -> mu- e-]cc prompt line:
     sel_prompt_ss = combinePrompt(name,config['StrippingLFVExoticaPromptLine'],ss=True)
-            
+
     sspromptline = StrippingLine(name + 'SameSignPromptLine',
                                 prescale  = config['StrippingLFVExoticaPromptLine']['Prescale_SS'],
                                 postscale = config['StrippingLFVExoticaPromptLine']['Postscale_SS'],
@@ -336,7 +336,7 @@ class LFVExoticaConf(LineBuilder) :
                                 selection = sel_prompt_ss,
                                 RelatedInfoTools = RelatedInfoToolsSSPrompt)
     self.registerLine(sspromptline)
-    
+
     ### [A1 -> mu+ e-]cc detached line:
     sel_detached = combineDetached(name,config['StrippingLFVExoticaDetachedLine'])
 
@@ -358,7 +358,7 @@ class LFVExoticaConf(LineBuilder) :
                                 selection = sel_detached_ss,
                                 RelatedInfoTools = RelatedInfoToolsSSDetached)
     self.registerLine(ssdetachedline)
-    
+
     ### [A1 -> mu+ e- X]cc detached line:
     sel_detached_emux = combineDetached_EMuX(name,config['StrippingLFVExoticaEMuXDetachedLine'])
 
@@ -380,8 +380,8 @@ class LFVExoticaConf(LineBuilder) :
                         selection = sel_detached_ss_emux,
                         RelatedInfoTools = RelatedInfoToolsSSDetached)
     self.registerLine(ssdetachedline_emux)
-    
-    
+
+
     ### [W+ -> e+ (HNL -> mu- e+ X)]cc detached line:
     sel_detached_N_e_emux = makeW2LeptonN2EMuX(name, config['StrippingLFVExoticaW2EN2EMuXDetachedLine'],  lepton="e", ss=False)
 
@@ -392,7 +392,7 @@ class LFVExoticaConf(LineBuilder) :
               selection = sel_detached_N_e_emux,
               RelatedInfoTools = W2EN_RelatedInfos)
     self.registerLine(N_e_detachedline_emux)
-    
+
     ### [W+ -> mu+ (HNL -> mu- e+ X)]cc detached line:
     sel_detached_N_mu_emux = makeW2LeptonN2EMuX(name, config['StrippingLFVExoticaW2MuN2EMuXDetachedLine'], lepton="mu", ss=False)
 
@@ -403,8 +403,8 @@ class LFVExoticaConf(LineBuilder) :
               selection = sel_detached_N_mu_emux,
               RelatedInfoTools = W2MuN_RelatedInfos)
     self.registerLine(N_mu_detachedline_emux)
-    
-    
+
+
     ### [W+ -> e+ (HNL -> mu+ e+ X)]cc detached line:
     sel_detached_N_e_emux_SS = makeW2LeptonN2EMuX(name, config['StrippingLFVExoticaW2EN2EMuXDetachedLine'],  lepton="e", ss=True)
 
@@ -415,7 +415,7 @@ class LFVExoticaConf(LineBuilder) :
               selection = sel_detached_N_e_emux_SS,
               RelatedInfoTools = W2ENSS_RelatedInfos)
     self.registerLine(N_e_detachedline_emux_SS)
-    
+
     ### [W+ -> mu+ (HNL -> mu+ e+ X)]cc detached line:
     sel_detached_N_mu_emux_SS = makeW2LeptonN2EMuX(name, config['StrippingLFVExoticaW2MuN2EMuXDetachedLine'], lepton="mu", ss=True)
 
@@ -431,38 +431,38 @@ class LFVExoticaConf(LineBuilder) :
     create_stdjets(self,sspromptline.outputLocation(),stdjets_name_ban_ssprompt)
     create_stdjets(self,detachedline.outputLocation(),stdjets_name_ban_detached)
     create_stdjets(self,ssdetachedline.outputLocation(),stdjets_name_ban_ssdetached)
-    
+
 
 def combinePrompt(name,config,ss=False):
-    
-  daugh_cut={'mu': ("(PT > {Prompt_PT}) " 
-                    "& (P > {Prompt_P}) " 
-                    "& (BPVIPCHI2() < {Prompt_IPChi2}) " 
-                    "& (TRGHOSTPROB < {Prompt_GhostProb}) " 
+
+  daugh_cut={'mu': ("(PT > {Prompt_PT}) "
+                    "& (P > {Prompt_P}) "
+                    "& (BPVIPCHI2() < {Prompt_IPChi2}) "
+                    "& (TRGHOSTPROB < {Prompt_GhostProb}) "
                     "& (PROBNNmu > {Prompt_ProbNNmu}) ").format(**config),
-            'e': ("(PT > {Prompt_PT}) " 
-                    "& (P > {Prompt_P}) " 
-                    "& (PROBNNe > {Prompt_ProbNNe}) " 
-                    "& (BPVIPCHI2() < {Prompt_IPChi2}) " 
+            'e': ("(PT > {Prompt_PT}) "
+                    "& (P > {Prompt_P}) "
+                    "& (PROBNNe > {Prompt_ProbNNe}) "
+                    "& (BPVIPCHI2() < {Prompt_IPChi2}) "
                     "& (TRGHOSTPROB < {Prompt_GhostProb}) ").format(**config)}
-    
-  comb_cut = ("(APT > 2.0*{Prompt_PT}) &  (AM > {Prompt_M}) &" 
+
+  comb_cut = ("(APT > 2.0*{Prompt_PT}) &  (AM > {Prompt_M}) &"
               "(ACUTDOCACHI2({Prompt_VChi2},''))").format(**config)
-  
-  mother_cut = ("(PT > 2*{Prompt_PT})" 
-                "& (HASVERTEX)" 
-                "& (VFASPF(VCHI2PDOF) < {Prompt_VChi2}) " 
-                "& (BPVIPCHI2() < {Prompt_XIPChi2})" 
+
+  mother_cut = ("(PT > 2*{Prompt_PT})"
+                "& (HASVERTEX)"
+                "& (VFASPF(VCHI2PDOF) < {Prompt_VChi2}) "
+                "& (BPVIPCHI2() < {Prompt_XIPChi2})"
                 "& (BPVVDCHI2 < {Prompt_FDChi2})" ).format(**config)
-    
+
   decay = "[H_30 -> mu+ e-]cc"
   ename = "e-"
   namesel = name+"PromptSel"
   if ss:
     decay = "[H_30 -> mu+ e+]cc"
-    ename = "e+" 
+    ename = "e+"
     namesel = name+"SSPromptSel"
-  
+
   _combination = CombineParticles( DecayDescriptor    = decay,
                                    CombinationCut     = comb_cut,
                                    DaughtersCuts      = { 'mu+' : daugh_cut["mu"],
@@ -477,35 +477,35 @@ def combinePrompt(name,config,ss=False):
 
 
 def combineDetached(name,config,ss=False):
-  
-  
-  daugh_cut={'mu': ("(PT > {Detached_PT}) " 
-                    "& (P > {Detached_P}) " 
-                    "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) " 
-                    "& (TRGHOSTPROB < {Detached_GhostProb}) " 
+
+
+  daugh_cut={'mu': ("(PT > {Detached_PT}) "
+                    "& (P > {Detached_P}) "
+                    "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) "
+                    "& (TRGHOSTPROB < {Detached_GhostProb}) "
                     "& (PROBNNmu > {Detached_ProbNNmu}) ").format(**config),
-            'e': ("(PT > {Detached_PT}) " 
-                    "& (P > {Detached_P}) " 
-                    "& (PROBNNe > {Detached_ProbNNe}) " 
-                    "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) " 
+            'e': ("(PT > {Detached_PT}) "
+                    "& (P > {Detached_P}) "
+                    "& (PROBNNe > {Detached_ProbNNe}) "
+                    "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) "
                     "& (TRGHOSTPROB < {Detached_GhostProb}) ").format(**config)}
-    
-  comb_cut = ("(APT > 2.0*{Detached_PT}) &  (AM > {Detached_M}) &" 
+
+  comb_cut = ("(APT > 2.0*{Detached_PT}) &  (AM > {Detached_M}) &"
               "(ACUTDOCACHI2({Detached_VChi2},''))").format(**config)
-  
-  mother_cut = ("(PT > 2*{Detached_PT})" 
-                "& (HASVERTEX)" 
-                "& (VFASPF(VCHI2PDOF) < {Detached_VChi2}) " 
-                "& (BPVIPCHI2() < {Detached_XIPChi2})" 
-                "& (BPVVDCHI2 > {Detached_FDChi2})" 
+
+  mother_cut = ("(PT > 2*{Detached_PT})"
+                "& (HASVERTEX)"
+                "& (VFASPF(VCHI2PDOF) < {Detached_VChi2}) "
+                "& (BPVIPCHI2() < {Detached_XIPChi2})"
+                "& (BPVVDCHI2 > {Detached_FDChi2})"
                 "& (BPVLTIME() > {Detached_TAU})").format(**config)
-            
+
   decay = "[H_30 -> mu+ e-]cc"
   ename = "e-"
   namesel = name+"DetachedSel"
   if ss:
     decay = "[H_30 -> mu+ e+]cc"
-    ename = "e+" 
+    ename = "e+"
     namesel = name+"SSDetachedSel"
 
   _combination = CombineParticles( DecayDescriptor    = decay,
@@ -519,37 +519,37 @@ def combineDetached(name,config,ss=False):
                      Algorithm          = _combination,
                      RequiredSelections = [ StdAllLooseMuons, StdAllLooseElectrons]
                      )
-                    
+
 def combineDetached_EMuX(name,config,ss=False):
-  
-    daugh_cut={'mu': ("(PT > {Detached_PT}) " 
-                      "& (P > {Detached_P}) " 
-                      "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) " 
-                      "& (TRGHOSTPROB < {Detached_GhostProb}) " 
+
+    daugh_cut={'mu': ("(PT > {Detached_PT}) "
+                      "& (P > {Detached_P}) "
+                      "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) "
+                      "& (TRGHOSTPROB < {Detached_GhostProb}) "
                       "& (PROBNNmu > {Detached_ProbNNmu}) "
                       "& (TRCHI2DOF < {max_TRCHI2DV})").format(**config),
-              'e': ("(PT > {Detached_PT}) " 
-                      "& (P > {Detached_P}) " 
-                      "& (PROBNNe > {Detached_ProbNNe}) " 
-                      "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) " 
+              'e': ("(PT > {Detached_PT}) "
+                      "& (P > {Detached_P}) "
+                      "& (PROBNNe > {Detached_ProbNNe}) "
+                      "& (MIPCHI2DV(PRIMARY) > {Detached_IPChi2}) "
                       "& (TRGHOSTPROB < {Detached_GhostProb}) "
                       "& (TRCHI2DOF < {max_TRCHI2DV})").format(**config)}
-      
-    comb_cut = ("(APT > 2.*{Detached_PT}) &  (AM > {Detached_M}) &" 
+
+    comb_cut = ("(APT > 2.*{Detached_PT}) &  (AM > {Detached_M}) &"
                 "(ACUTDOCACHI2({Detached_VChi2},''))").format(**config)
 
-    mother_cut = ("(PT > 2.*{Detached_PT})" 
-                  "& (HASVERTEX)" 
-                  "& (VFASPF(VCHI2PDOF) < {Detached_VChi2}) " 
-                  "& (BPVVDCHI2 > {Detached_FDChi2})" 
+    mother_cut = ("(PT > 2.*{Detached_PT})"
+                  "& (HASVERTEX)"
+                  "& (VFASPF(VCHI2PDOF) < {Detached_VChi2}) "
+                  "& (BPVVDCHI2 > {Detached_FDChi2})"
                   "& (BPVLTIME() > {Detached_TAU})").format(**config)
-              
+
     decay = "[H_30 -> mu+ e-]cc"
     ename = "e-"
     namesel = name+"DetachedSel_EMuX"
     if ss:
       decay = "[H_30 -> mu+ e+]cc"
-      ename = "e+" 
+      ename = "e+"
       namesel = name+"SSDetachedSel_EMuX"
 
     _combination = CombineParticles( DecayDescriptor    = decay,
@@ -565,44 +565,40 @@ def combineDetached_EMuX(name,config,ss=False):
                         )
 
 def makeW2LeptonN2EMuX(name, config, lepton, ss=False):
-  
+
     #lepton = e, mu
 
     EMuX = combineDetached_EMuX("{0}N{1}".format(lepton, name), config, ss)
-    
+
     decay = "[W+ -> H_30 {0}+]cc".format(lepton)
-    
+
     daugh_cut={
-          "{0}+".format(lepton): ("(PT > {Prompt_PT}) " 
+          "{0}+".format(lepton): ("(PT > {Prompt_PT}) "
           "& (P > {Prompt_P}) "
-          "& (PROBNN{0} > {Prompt_ProbNN}) " 
+          "& (PROBNN{0} > {Prompt_ProbNN}) "
           "& (TRGHOSTPROB < {Prompt_GhostProb}) "
           "& (MIPCHI2DV(PRIMARY) < {Prompt_IPChi2}) "
           ).format(lepton, **config)}
-                    
+
     comb_cut = ("AM > {W_M}").format(**config)
-                    
+
     mother_cut = ("M > {W_M}").format(**config)
 
     _combination = CombineParticles(DecayDescriptor = decay,
                     CombinationCut = comb_cut,
                     DaughtersCuts  = daugh_cut,
                     MotherCut = mother_cut)
-                                    
+
     namesel = name+"W2{0}N".format(lepton)
-    
+
     if ss:
       namesel += "SS"
-      
+
     if lepton == "e":
         lepton_loc = StdAllLooseElectrons
     elif lepton == "mu":
         lepton_loc = StdAllLooseMuons
-                                    
+
     return Selection( namesel,
             Algorithm = _combination,
             RequiredSelections=[EMuX, lepton_loc] )
-
-    
-    
-  
\ No newline at end of file
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py
index 30ac15a295cfb3d0cb7a26c480ab46cc0e50095c..4b1a5d9b7a4147031bd740d63460f11615990b8d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py
@@ -180,4 +180,4 @@ class LLPV0_sConf(LineBuilder) :
         return PassThroughSelection   (
             name,
             Algorithm         = _VFilter_(Code = code , Preambulo = preamb),
-            RequiredSelection = input )
\ No newline at end of file
+            RequiredSelection = input )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py
index 651f9dfbae100dcb76d5d31358f35bcbe26a5095..b15f0af9168c44ac59463626d72d50533bd471fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py
@@ -128,4 +128,4 @@ class LLP2Jets_sConf(LineBuilder) :
         self.registerLine(SingleLine)
         self.registerLine(DoubleLine)
         self.registerLine(SingleHighMassLine)
-        self.registerLine(SingleLowMassLine)
\ No newline at end of file
+        self.registerLine(SingleLowMassLine)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py
index 36cd65c3eb35c5c0910aa7f3f95a78758aa22b22..7cc3530c79d5e2ddb736bf72546a4492aa520325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py
@@ -29,7 +29,7 @@ default_config= {
     'BUILDERTYPE' : 'LLP2MuXConf',
     'STREAMS'     : [ 'EW'  ],
     'WGs'         : [ 'QEE' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         "MinPT"     : 12.00*units.GeV,
         "MinIP"     :  0.25*units.mm,
         "L0DU"      : "L0_CHANNEL('Muon')",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py
index de7eb31e22210e0fc594390be2ed1efbf940a670..3a1d41a377eea60452b38fbfe80e2a230475a9e7 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Stripping selection of Lb -> d p (pi pi) 
+Stripping selection of Lb -> d p (pi pi)
    Lb -> dp
    Lb -> dppipi
 '''
@@ -39,7 +39,7 @@ default_config = {
     'WGs'         : ['QEE'],
     'STREAMS'     : ['BhadronCompleteEvent'],
     'CONFIG'      : {
-        'Prescale'             : 1.0 ,      
+        'Prescale'             : 1.0 ,
         'Prescale_pipi'        : 1.0 ,
 
         'TrackChi2Ndof'        : 4.0,
@@ -51,7 +51,7 @@ default_config = {
         'PionP'                : 1500,
         'PionPIDKpi'           : 2,
         # 'PionProbNNpi'         : 0.05,
-        
+
         'ProtonPT'             : 500,
         'ProtonP'              : 15000,
         'ProtonPIDppi'         : 10,
@@ -60,7 +60,7 @@ default_config = {
         'KaonPT'               : 500,
         'KaonP'                : 20000,
         'KaonP_pipi'           : 30000,
-        
+
         'SumPT'                : 1000,
 
         'LbMassMin'            : 5000. ,
@@ -96,7 +96,7 @@ class Lb2dpConf(LineBuilder) :
         _protonCuts += " & ((PIDp-PIDpi)> %(ProtonPIDppi)s) & ((PIDp-PIDK)> %(ProtonPIDpK)s) & (P> %(ProtonP)s *MeV)) & (PT> %(ProtonPT)s *MeV)"%self.config
 
 
-        self.PionForLb2Dp = SimpleSelection( "PionFor" + self.name, FilterDesktop, 
+        self.PionForLb2Dp = SimpleSelection( "PionFor" + self.name, FilterDesktop,
           [ DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles') ],
           Code  = _pionCuts,
         )
@@ -106,22 +106,22 @@ class Lb2dpConf(LineBuilder) :
           Code  = _protonCuts,
         )
 
-        self.DeuteronForLb2Dp = SimpleSelection( "KaonFor" + self.name, FilterDesktop, 
+        self.DeuteronForLb2Dp = SimpleSelection( "KaonFor" + self.name, FilterDesktop,
           [ DataOnDemand(Location = 'Phys/StdAllNoPIDsKaons/Particles') ],
           Code  = _kaonCuts,
         )
-        
+
         self.makeLb2Dp()
         self.makeLb2Dppipi()
 
-    ## Note: This functionality is already available in SimpleSelection     
+    ## Note: This functionality is already available in SimpleSelection
     # def createSubSel( self, OutputList, InputList, Cuts ) :
     #     '''create a selection using a FilterDesktop'''
     #     filter = FilterDesktop(Code = Cuts)
     #     return Selection( OutputList,
     #                       Algorithm = filter,
     #                       RequiredSelections = [ InputList ] )
-    
+
 
     def makeLb2Dp(self):
 
@@ -149,12 +149,12 @@ class Lb2dpConf(LineBuilder) :
                        "P2_Lb = Px_Lb*Px_Lb + Py_Lb*Py_Lb + Pz_Lb*Pz_Lb",
                        "E_Lb = E_deut + MINTREE(ABSID=='p+',E)",
                        "M_Lb = sqrt(E_Lb*E_Lb - P2_Lb)"]
-        
+
         _Lb2Dp = CombineParticles( DecayDescriptors = _decayDescriptors,
                                    # DaughtersCuts = _daughtersCuts,
                                    CombinationCut = _combinationCut,
                                    Preambulo = _preambulo,
-                                   MotherCut = _motherCut)                            
+                                   MotherCut = _motherCut)
 
 
         _Lb2Dp_sel = Selection( self.name,
@@ -165,11 +165,11 @@ class Lb2dpConf(LineBuilder) :
                                    prescale = self.config['Prescale'],
                                    selection =  _Lb2Dp_sel)
                                    #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"])
-        
+
         self.registerLine(Lb2DpLine)
 
 
-        
+
     def makeLb2Dppipi(self):
 
         _decayDescriptors = ["[Lambda_b0 -> K+ p~- pi+ pi-]cc"]
@@ -179,7 +179,7 @@ class Lb2dpConf(LineBuilder) :
                             ,"pi+" : "(MIPCHI2DV(PRIMARY)> %(TrackIPChi2_pipi)s)" % self.config }
 
         _combinationCut = "((ACHILD(PT,1)+ACHILD(PT,2)+ACHILD(PT,3) + ACHILD(PT,4)) > %(SumPT)s *MeV)"% self.config
-        
+
         _motherCut = "(BPVDIRA > %(LbDIRA)s) & (VFASPF(VCHI2/VDOF) < %(LbVtxChi2_pipi)s)"\
                      " & (M_Lb > %(LbMassMin)s *MeV)  & (M_Lb< %(LbMassMax)s)"\
                      " & (BPVVDCHI2> %(LbFDChi2_pipi)s) & (PT> %(LbPT)s)"\
@@ -200,7 +200,7 @@ class Lb2dpConf(LineBuilder) :
                                    DaughtersCuts = _daughtersCuts,
                                    CombinationCut = _combinationCut,
                                    Preambulo = _preambulo,
-                                   MotherCut = _motherCut)                            
+                                   MotherCut = _motherCut)
 
 
         _Lb2Dp_sel = Selection( self.name+"pipi",
@@ -212,10 +212,5 @@ class Lb2dpConf(LineBuilder) :
                                    selection =  _Lb2Dp_sel)
                                    #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"])
 
-        
-        self.registerLine(Lb2DpLine)
 
-       
-       
-       
-       
+        self.registerLine(Lb2DpLine)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLowMultINC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLowMultINC.py
index b5f66eff1ee9e715a7b6096a4996aac7cdf79fd7..816b8d202a9c61cb696136b68e7e05a5678a5563 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLowMultINC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLowMultINC.py
@@ -34,12 +34,12 @@ from StrippingUtils.Utils        import LineBuilder
 
 #######################
 # L0 Lines
-#["DiEM,lowMult"]     
-#["Photon,lowMult"]  
+#["DiEM,lowMult"]
+#["Photon,lowMult"]
 #["DiHadron,lowMult"]
-#["DiMuon,lowMult"]  
+#["DiMuon,lowMult"]
 #["Electron,lowMult"]
-#["Muon,lowMult"]    
+#["Muon,lowMult"]
 #fltrs = LoKi_Filters (
 #        ODIN_Code  = ' in_range ( 5000 , ODIN_RUNNUM , 9000 ) '          ,
 #              L0DU _Code  = ' L0_CHANNEL  ( ... )  '                           ,
@@ -48,7 +48,7 @@ from StrippingUtils.Utils        import LineBuilder
 #              VOID_Code  = ' CONTAINS    ('Rec/Vertex/Primary') == 1 '         ,
 #              MC_Code    = ' count ( 'D0' == MCABSID ) > 0.5 '                 ,
 #              GEN_Code   = ' count ( 'D0' ==  GABSID ) > 0.5 '                 ,
-#             )                 
+#             )
 #"HLT_PASS_RE('Hlt1.*Decision')"
 ######################
 
@@ -60,9 +60,9 @@ default_config = {
     'WGs'         : ['QEE'],
     'CONFIG'      : {
     #
-    # PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE 
+    # PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE
     # Stripping Liason please inform Paolo Gandini when putting in these settings
-    # PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE      
+    # PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE PLEASE
     #
         #
         #'LowMultRequiredRawEvents' : ["Velo","Calo","HC","Trigger","Muon","Rich","Tracker"],  #Please add this!
@@ -164,8 +164,8 @@ default_config = {
 
 class LowMultINCLines( LineBuilder ) :
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__( self,name,config ) :            
+
+    def __init__( self,name,config ) :
 
         LineBuilder.__init__(self, name, config)
 
@@ -175,10 +175,10 @@ class LowMultINCLines( LineBuilder ) :
                                              prescale  = config['PrescaleL0DiHadron'],
                                              checkPV   = False,
                                              EnableFlavourTagging = False,
-                                             L0DU      = config['DecisionL0DiHadron']) 
+                                             L0DU      = config['DecisionL0DiHadron'])
                                              #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineL0DiHadron)
-        
+
 
         self.lineL0DiEM = StrippingLine( "L0DiEM"+"Line",
                                          prescale  = config['PrescaleL0DiEM'],
@@ -188,7 +188,7 @@ class LowMultINCLines( LineBuilder ) :
                                          #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineL0DiEM)
 
-                
+
         self.lineL0Photon = StrippingLine( "L0Photon"+"Line",
                                            prescale  = config['PrescaleL0Photon'],
                                            checkPV   = False,
@@ -215,7 +215,7 @@ class LowMultINCLines( LineBuilder ) :
                                            #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineL0Muon)
 
-                
+
         self.lineL0Electron = StrippingLine( "L0Electron"+"Line",
                                          prescale  = config['PrescaleL0Electron'],
                                          checkPV   = False,
@@ -231,7 +231,7 @@ class LowMultINCLines( LineBuilder ) :
 
 
 
-                
+
 #################################################
         self.lineLowMultL2pPi = StrippingLine( "LowMultL2pPi"+"Line",
                                                prescale  = config['PrescaleLowMultL2pPi'],
@@ -262,7 +262,7 @@ class LowMultINCLines( LineBuilder ) :
                                                RequiredRawEvents = ['HC','Velo'])
                                                #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultD2KPiPi)
-                
+
         self.lineLowMultD2KKPi = StrippingLine( "LowMultD2KKPi"+"Line",
                                                  prescale  = config['PrescaleLowMultD2KKPi'],
                                                  checkPV   = False,
@@ -324,7 +324,7 @@ class LowMultINCLines( LineBuilder ) :
                                                  RequiredRawEvents = ['HC','Velo'])
                                                  #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultLMR2HH)
-        
+
         self.lineLowMultLMR2HHHH = StrippingLine( "LowMultLMR2HHHH"+"Line",
                                                   prescale  = config['PrescaleLowMultLMR2HHHH'],
                                                   checkPV   = False,
@@ -346,7 +346,7 @@ class LowMultINCLines( LineBuilder ) :
                                                 RequiredRawEvents = ['HC','Velo'])
                                                 #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultLMR2HH_mediumPS)
-        
+
         self.lineLowMultLMR2HH_mediumPSHH = StrippingLine( "LowMultLMR2HHHH_mediumPS"+"Line",
                                                   prescale  = config['PrescaleLowMultLMR2HHHH_mediumPS'],
                                                   checkPV   = False,
@@ -358,7 +358,7 @@ class LowMultINCLines( LineBuilder ) :
         self.registerLine(self.lineLowMultLMR2HH_mediumPSHH)
 
 #
-        
+
         self.lineLowMultLMR2HH_heavyPS = StrippingLine( "LowMultLMR2HH_heavyPS"+"Line",
                                                          prescale  = config['PrescaleLowMultLMR2HH_heavyPS'],
                                                          checkPV   = False,
@@ -368,7 +368,7 @@ class LowMultINCLines( LineBuilder ) :
                                                          RequiredRawEvents = ['HC','Velo'])
                                                          #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultLMR2HH_heavyPS)
-        
+
         self.lineLowMultLMR2HH_heavyPSHH = StrippingLine( "LowMultLMR2HHHH_heavyPS"+"Line",
                                                            prescale  = config['PrescaleLowMultLMR2HHHH_heavyPS'],
                                                            checkPV   = False,
@@ -380,7 +380,7 @@ class LowMultINCLines( LineBuilder ) :
         self.registerLine(self.lineLowMultLMR2HH_heavyPSHH)
 
 #################################################
-                        
+
         self.lineLowMultHadron_noTrFilt = StrippingLine( "LowMultHadron_noTrFilt"+"Line",
                                                  prescale  = config['PrescaleLowMultHadron_noTrFilt'],
                                                  checkPV   = False,
@@ -429,7 +429,7 @@ class LowMultINCLines( LineBuilder ) :
                                                    RequiredRawEvents = ['HC','Velo','Rich','Calo'])
                                                    #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultMuon)
-                                
+
 #################################################
 
         self.lineLowMultDiElectron = StrippingLine( "LowMultDiElectron"+"Line",
@@ -441,7 +441,7 @@ class LowMultINCLines( LineBuilder ) :
                                               RequiredRawEvents = ['HC','Velo','Rich','Calo'])
                                               #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultDiElectron)
-                        
+
         self.lineLowMultDiElectron_noTrFilt = StrippingLine( "LowMultDiElectron_noTrFilt"+"Line",
                                                     prescale  = config['PrescaleLowMultDiElectron_noTrFilt'],
                                                     checkPV   = False,
@@ -485,7 +485,7 @@ class LowMultINCLines( LineBuilder ) :
                                                            RequiredRawEvents = ['HC','Velo','Rich','Calo'])
                                                            #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultPi0)
-        
+
 
 #####
 #####
@@ -498,7 +498,7 @@ class LowMultINCLines( LineBuilder ) :
                                                    RequiredRawEvents = ['HC','Velo','Calo'])
                                                    #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultNonBeamBeamNoBias)
-                        
+
 
         self.lineLowMultTechnical = StrippingLine( "LowMultTechnical"+"Line",
                                              prescale  = config['PrescaleLowMultTechnical'],
@@ -509,7 +509,7 @@ class LowMultINCLines( LineBuilder ) :
                                              RequiredRawEvents = ['HC','Velo'])
                                              #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultTechnical)
-        
+
 #####
         self.lineHlt1NoBiasNonBeamBeam = StrippingLine( "Hlt1NoBiasNonBeamBeam"+"Line",
                                                         prescale  = config['PrescaleHlt1NoBiasNonBeamBeam'],
@@ -530,8 +530,8 @@ class LowMultINCLines( LineBuilder ) :
                                                   RequiredRawEvents = ['HC','Velo','Calo'])
         self.registerLine(self.lineHlt2PassThrough)
 
-        
-#####    
+
+#####
         self.lineLowMultTMP1 = StrippingLine( "LowMultTMP1"+"Line",
                                               prescale  = config['PrescaleLowMultTMP1'],
                                               checkPV   = False,
@@ -542,7 +542,7 @@ class LowMultINCLines( LineBuilder ) :
                                               #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultTMP1)
 
-        
+
         self.lineLowMultTMP2 = StrippingLine( "LowMultTMP2"+"Line",
                                               prescale  = config['PrescaleLowMultTMP2'],
                                               checkPV   = False,
@@ -567,5 +567,3 @@ class LowMultINCLines( LineBuilder ) :
                                               #RequiredRawEvents = config["LowMultRequiredRawEvents"])
         self.registerLine(self.lineLowMultBXTYPE)
 ####################################################################################################
-        
-        
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py
index 43865bd9bb35251d761977030a3d3f94d5d20f2e..8f9158d65cb6872d2d1c43e42f7cefd72c79c049 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py
@@ -87,7 +87,3 @@ class MicroDiJetsConf( LineBuilder ) :
       JetGroup.MotherCut += '& (TOS("%s", "Hlt2TriggerTisTos"))'%hlt
 
     return Selection("Sel"+ name, Algorithm = JetGroup, RequiredSelections = [DataOnDemand(self.emptySelLoc)])
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py
index a395026bec1e537b387e1c7be7d6a697356f82c7..614505162903b5e4555cd05e4cf9bf082745d7fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py
@@ -60,7 +60,7 @@ default_config = {
 class MuMuSSConf( LineBuilder ) :
 
   __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
   def __init__( self, name, config ) :
 
     LineBuilder.__init__( self, name, config )
@@ -98,12 +98,12 @@ class MuMuSSConf( LineBuilder ) :
     ))
 
     ## MuMuSS4
-    sel = makeSSCombination( name + 'MuMuSS4', cut2, MuMuSS4MassCut )     
+    sel = makeSSCombination( name + 'MuMuSS4', cut2, MuMuSS4MassCut )
     self.registerLine(StrippingLine( name + 'Line4',
       prescale  = config[ 'MuMuSSLine4Prescale' ],
       selection = sel,
     ))
-      
+
 
 def makeSSCombination( name, dcut, mcut ) :
   return SimpleSelection( name, CombineParticles, [StdAllLooseMuons],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py
index ef9c384a385cca135c9c44173de71fc118614a8e..fd8d069545cf1d49843808ff2ddfd22901126c93 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py
@@ -38,7 +38,7 @@ default_config = {
   'BUILDERTYPE' : 'SbarSCorrelationsConf',
   'STREAMS'     : [ 'EW'  ],
   'WGs'         : [ 'QEE' ],
-  'CONFIG'      : { 
+  'CONFIG'      : {
       'HLT'               : "HLT_PASS_RE('Hlt1.*NoBias.*Decision')|HLT_PASS_RE('Hlt1.*MB.*Bias.*Decision')|HLT_PASS_RE('Hlt1.*MicroBias.*Decision')",
       'LongTrackGEC'      : 1000,     # 150 or 500 might be a better choice
       'Trk_P_MIN'         : 5 * GeV,  # to limit material interactions for Kaons
@@ -56,17 +56,17 @@ default_config = {
       'Lambda_V_Chi2_Max' : 9,
       'Lambda_Adamass'    : 50 * MeV,
       'Lambda_ipChi2_MAX' : 49,
-#                   
+#
       'Phiprescale'       : 0.05,
       'F2prescale'        : 1.0,
-      'LambdaCprescale'   : 1.0,                  
+      'LambdaCprescale'   : 1.0,
       'postscale'         : 1.0,
     },
 }
 
 
 class SbarSCorrelationsConf(LineBuilder):
-    __configuration_keys__ = default_config['CONFIG'].keys() 
+    __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config) :
         LineBuilder.__init__(self, name, config)
@@ -85,27 +85,27 @@ class SbarSCorrelationsConf(LineBuilder):
                                           config['KAON_PIDKp_MIN'],
                                           config['KAON_ipChi2_MAX'])
 
-        
+
         self.selPion = filterPions('PiFor'+name, 'Phys/StdAllNoPIDsPions/Particles',
                                           config['isLong'],
                                           config['PION_ipChi2_MIN'],
-                                          config['PION_P_MIN']                                   
+                                          config['PION_P_MIN']
                                           )
 
         #using the same function/method to select Protons as Pions
         self.selProton = filterPions('ProtonFor'+name, 'Phys/StdAllNoPIDsProtons/Particles',
                                           config['isLong'],
                                           config['PROTON_ipChi2_MIN'],
-                                          config['PROTON_P_MIN']                                        
-                                          )        
+                                          config['PROTON_P_MIN']
+                                          )
 
         self.selPPi = [self.selPion, self.selProton]
         self.selKK = [self.selKaon]
 
-        
+
         # Now make the various decays e.g. Lambda/Lambda-bar decays which are real
         # and the dummy decays "f_2(2300) -> Lambda0 Lambda~0", - not real decay but dummy
-        #                      "phi(1020) -> K+ K-" - not real but dummy  
+        #                      "phi(1020) -> K+ K-" - not real but dummy
         #                      "Lambda_c+ -> Lambda0 K+" - not real but dummy
         #                      "Lambda_c- -> Lambda~0 K-" - not real but dummy
         #
@@ -117,17 +117,17 @@ class SbarSCorrelationsConf(LineBuilder):
         strDecaysPhi = ["phi(1020) -> K+ K-"]
         strDecaysLambdaCplus   = ["Lambda_c+ -> Lambda0 K+"]
         strDecaysLambdaCminus =  ["Lambda_c~- -> Lambda~0 K-"]
-        
-        # make real decays 
+
+        # make real decays
         self.selLambda         = makeLambda('Lambda'        + name, strDecaysLambda,         self.selPPi, config['Fisher'], config['Lambda_V_Chi2_Max'], config['Lambda_Adamass'] , config['Lambda_ipChi2_MAX'])
         self.selLambdabar      = makeLambda('Lambdabar'        + name, strDecaysLambdabar,         self.selPPi, config['Fisher'],config['Lambda_V_Chi2_Max'], config['Lambda_Adamass'] , config['Lambda_ipChi2_MAX'])
 
-#        print  self.selKK       
+#        print  self.selKK
         # make a dummy Phi
         self.selPhi      = makePhi('Phi'        + name, strDecaysPhi,    self.selKK  )
 
-        
-        # Now make the dummy decays with at least a Lambda 
+
+        # Now make the dummy decays with at least a Lambda
 #        print [self.selLambda] + [self.selLambdabar]
 #        print [self.selLambda] + self.selKK
 #        print [self.selLambdabar] +  self.selKK
@@ -181,7 +181,7 @@ class SbarSCorrelationsConf(LineBuilder):
         self.registerLine(self.lineLambdaCplus)
         self.registerLine(self.lineLambdaCminus)
 
-        
+
 def filterPions(name, inputName, isLong, PION_BPV_IPCHI2, PION_P_MIN):
     """
     Apply cuts to daughters of Lambdas
@@ -190,7 +190,7 @@ def filterPions(name, inputName, isLong, PION_BPV_IPCHI2, PION_P_MIN):
     _strCutBPVIPCHI2 = "(BPVIPCHI2() > %(PION_BPV_IPCHI2)s)" % locals()
     _strCutPMIN = "(P  > %(PION_P_MIN)s)"                    % locals()
     _strCuts = '(' + _strCutISLONG + '&' + _strCutBPVIPCHI2 \
-                   + '&' + _strCutPMIN  + ')'               
+                   + '&' + _strCutPMIN  + ')'
     _trackFilter = FilterDesktop(Code = _strCuts)
     inputTracks = DataOnDemand(Location = inputName)
     return Selection(name,
@@ -199,7 +199,7 @@ def filterPions(name, inputName, isLong, PION_BPV_IPCHI2, PION_P_MIN):
 
 
 
-                     
+
 def filterKaons(name, inputName,isLong, Trk_P_MIN, KAON_PIDK_MIN, KAON_PIDKp_MIN, KAON_IPCHI2_MAX):
     """
     Apply cuts to daughters of D0
@@ -208,10 +208,10 @@ def filterKaons(name, inputName,isLong, Trk_P_MIN, KAON_PIDK_MIN, KAON_PIDKp_MIN
     _strCutP      = "(P  > %(Trk_P_MIN)s)"                        % locals()
     _strCutPID    = "(PIDK  > %(KAON_PIDK_MIN)s)"                 % locals()
     _strCutPID2    = "( (PIDK-PIDp) > %(KAON_PIDKp_MIN)s)"         % locals()
-    
+
 
     _strCutIPChi2 = "(BPVIPCHI2() < %(KAON_IPCHI2_MAX)s)" % locals()
-    
+
     _strCuts = '(' + _strCutLONG + '&' + _strCutP \
                    + '&' + _strCutPID \
                    + '&' + _strCutPID2 + '&' + _strCutIPChi2 + ')'
@@ -237,22 +237,22 @@ def makeLambda(name, inputDecayDescriptors, inputDaughters, FISHER_D, LAMBDA_V_C
 #    "p+"  : "(P>2*GeV) & (MIPCHI2DV(PRIMARY)>9)"
 #    X.CombinationCut = "(ADAMASS('Lambda0')<50*MeV) & (ADOCACHI2CUT(30, ''))"
 #    X.MotherCut      =  "(ADMASS('Lambda0')<35*MeV) & (VFASPF(VCHI2)<30) & (BPVVDCHI2 > 4.)"
-    
+
     _combCutMass = "(ADAMASS('Lambda0')<%(LAMBDA_ADAMASS)s)"  % locals()
-    
+
 # not needed because pion and proton are originating in Lambda (long-lived) decay vertex    _combCutsPV   = "(AALLSAMEBPV)"
 
-    
+
     _combCuts = '(' + _combCutMass + ')'
-    
+
     _motherCutFisher   = '( (CHILD(MIPDV(PRIMARY),1)*CHILD(MIPDV(PRIMARY),2)/MIPDV(PRIMARY))>%(FISHER_D)s)'  % locals()
     _motherCutVtx      = '(VFASPF(VCHI2PDOF) < %(LAMBDA_V_CHI2)s)' % locals()
     _motherCutIPCHI2_MAX = '( BPVIPCHI2() < %(LAMBDA_IPCHI2_MAX)s)' % locals()
-    
+
     _motherCuts = '(' + _motherCutFisher   + '&' + _motherCutVtx + '&' + _motherCutIPCHI2_MAX + ')'
-    
+
 #    print 'inputDecayDescriptors', inputDecayDescriptors
-#    print '_combCuts:MakeLambda', _combCuts 
+#    print '_combCuts:MakeLambda', _combCuts
 #    print '_motherCuts:MakeLambda', _motherCuts
 
     _Lambda = CombineParticles(DecayDescriptors = inputDecayDescriptors,
@@ -273,8 +273,8 @@ def makePhi(name, inputDecayDescriptors, inputDaughters):
     Given lists of K+/K- daughter tracks  reconstruct a dummy phi without applying cuts on combination and with PZ>0 dummy cut on Mother.
     """
 
-    _combCuts =  '(AALLSAMEBPV(0.5,25,0.7))'  #'(ATRUE)' 
-    _motherCuts =  'PZ>0' 
+    _combCuts =  '(AALLSAMEBPV(0.5,25,0.7))'  #'(ATRUE)'
+    _motherCuts =  'PZ>0'
 
 
 #    print '_combCuts:MakePhi', _combCuts
@@ -299,7 +299,7 @@ Make dummy  f_2 candidates - for now not needed as not needed the makeLambdaCplu
     Given lists of Lambda/Lambdabar daughter particles reconstruct a dummy f_2 without applying cuts on combination and with PZ>0 dummy cut on Mother.
 '''
 #    _combCuts = '(AALLSAMEBPV)' #'(ATRUE)' is nor enough, we need Lambdas comming from the same PV in High PileUp
-#    _motherCuts =  'PZ>0' 
+#    _motherCuts =  'PZ>0'
 #
 #    _f2 = CombineParticles(DecayDescriptors = inputDecayDescriptors,
 #                            CombinationCut   = _combCuts,
@@ -307,8 +307,3 @@ Make dummy  f_2 candidates - for now not needed as not needed the makeLambdaCplu
 #    return Selection(name,
 #                     Algorithm = _f2,
 #                     RequiredSelections = inputDaughters)
-
-                     
-
-    
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSingleTrackTIS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSingleTrackTIS.py
index 8fa46a51bac45cb5ed01dc5af1b7b164db97d27c..f83713ba1c383069f24a4e480e32a86f1d29c9ed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSingleTrackTIS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSingleTrackTIS.py
@@ -36,7 +36,7 @@ default_config = {
     'BUILDERTYPE' : 'SingleTrackTISConf',
     'WGs'         : [ 'QEE'],
     'STREAMS'     : [ 'EW' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'SingleTrackTIS_Prescale'    : 0.1,
         'SingleTrackTISLow_Prescale' : 0.01,
         'SingleTrackTIS_Postscale'   : 1.00,
@@ -48,7 +48,7 @@ default_config = {
 class SingleTrackTISConf( LineBuilder ) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__( self, name, config ) :
 
         LineBuilder.__init__( self, name, config )
@@ -58,7 +58,7 @@ class SingleTrackTISConf( LineBuilder ) :
 
         _cut    = "(PT>%(pT)s)    & (HASTRACK & TRCUT(0<TrIDC('isTT')))"%config
         _cutlow = "(PT>%(pTlow)s) & (HASTRACK & TRCUT(0<TrIDC('isTT')))"%config
-        
+
 
         # SingleTrackTIS
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py
index a8df8a03bdbfeaaef5a256fe0550209552bad186..ef2bc021900f86924fd2edfef7c37ef6e96d6b19 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Stripping line for Strange Baryon  studies 
+Stripping line for Strange Baryon  studies
 Author: MS&IB&BP
 
 The Xi, Omega strange baryons are selected from the decays
@@ -38,14 +38,14 @@ default_config = {
     'BUILDERTYPE' : 'StrippingStrangeBaryonsConf',
     'STREAMS'     : [ 'EW'  ],
     'WGs'         : [ 'QEE' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'PreScale'    : 1,
         'checkPV'     : True,
         'HLT1'        : "HLT_PASS_RE('Hlt1.*NoBias.*Decision')|HLT_PASS_RE('Hlt1.*MB.*Bias.*Decision')|HLT_PASS_RE('Hlt1.*MicroBias.*Decision')",
         #'RawEvents'   : [ "Muon", "Calo", "Rich" ],
 
         #PID cuts
-        'ProtonPIDppi'  : -5.,  #(PIDp-PIDpi) > -5                   
+        'ProtonPIDppi'  : -5.,  #(PIDp-PIDpi) > -5
         'PionPIDpiK'    : 0.,   #(PIDp-PIDK) > 0
 
         # Lambda Decay
@@ -91,12 +91,12 @@ default_config = {
 #-------------------------------------------------------------------------------------------------------------
 class StrippingStrangeBaryonsConf(LineBuilder) :
        __configuration_keys__ = default_config['CONFIG'].keys()
-       
+
        def __init__(self, name, config) :
            LineBuilder.__init__(self, name, config)
            self.name = name
            self.config = config
-       
+
 
            #### LLL case ####
            PionsForLambdaLList = createSubSel( OutputList = "PionsForLambda" + self.name,
@@ -115,9 +115,9 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                               InputList = DataOnDemand("Phys/StdAllLooseKaons/Particles"),
                                               Cuts = "(ISLONG) & (TRCHI2DOF < %(TRCHI2DOF)s ) & "\
                                               "(BPVIPCHI2() > %(minCHI2IPPV_K_Bachelor_L)s)" % self.config )
-           
 
-           
+
+
            #### DDL ####
            PionsForLambdaDList = createSubSel( OutputList = "PionsForLambdaD" + self.name,
                                                InputList = DataOnDemand("Phys/StdNoPIDsDownPions/Particles"),
@@ -132,9 +132,9 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                             InputList = DataOnDemand("Phys/StdAllLoosePions/Particles"),
                                             Cuts = "(ISLONG) & (TRCHI2DOF < %(TRCHI2DOF)s ) & "\
                                             "(BPVIPCHI2() > %(minCHI2IPPV_Bachelor)s)" % self.config )
-           
 
-           
+
+
            #### DDD ####de adaugat conditiile pentru protoni
            PionsForXiDDList = createSubSel( OutputList = "PionsForXiDD" + self.name,
                                             InputList = DataOnDemand("Phys/StdNoPIDsDownPions/Particles"),
@@ -144,21 +144,21 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                               InputList = DataOnDemand("Phys/StdLooseDownKaons/Particles"),
                                               Cuts = "(TRCHI2DOF < %(TRCHI2DOF)s ) & "\
                                               "(BPVIPCHI2() > %(minCHI2IPPV_K_Bachelor_D)s)" % self.config )
-           
-           
-           
-           
+
+
+
+
            #print "Lambda0MassWindow: %(Lambda0MassWindow)s*MeV " % self.config
       	   #print "Lambda0MassWindowPost: %(Lambda0MassWindowPost)s*MeV" % self.config
            #print "this stripping Line is used, signed Florin"
-           
+
            #Create Lambdas
            Lambda2pPiL = createCombinationSel(OutputList = "Lambda2pPiL"+ self.name,
                                               DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
                                               DaughterLists   = [PionsForLambdaLList, ProtonsForLambdaLList],
                                               DaughterCuts    = {},
                                               PreVertexCuts   = "(ADAMASS('Lambda0') < %(Lambda0MassWindow)s*MeV)"% self.config,
-  
+
                                               PostVertexCuts  = "(BPVIPCHI2() > %(minCHI2IPPV_L_LL)s) & (VFASPF(VCHI2) < %(CHI2VTX_L)s) &"\
                                               "(BPVVDCHI2 > %(L_FDCHI2_OWNPV_LL)s) & (ADMASS('Lambda0') < %(Lambda0MassWindowPost)s*MeV)" %self.config
                                               #PostVertexCuts  = "(BPVIPCHI2() > %(minCHI2IPPV_L_Loose)s) & (VFASPF(VCHI2) < %(CHI2VTX_L)s)" %self.config
@@ -175,9 +175,9 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                               "(BPVVDCHI2 > %(L_FDCHI2_OWNPV_LL_Omega)s) & (ADMASS('Lambda0') < %(Lambda0MassWindowPost)s*MeV)" %self.config
                                               #PostVertexCuts  = "(BPVIPCHI2() > %(minCHI2IPPV_L_Loose)s) & (VFASPF(VCHI2) < %(CHI2VTX_L)s)" %self.config
                                               )
-           
-           
-           
+
+
+
            Lambda2pPiD = createCombinationSel(OutputList = "Lambda2pPiD"+ self.name,
                                               DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
                                               DaughterLists   = [PionsForLambdaDList, ProtonsForLambdaDList],
@@ -198,25 +198,25 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                               "(BPVVDCHI2 > %(L_FDCHI2_OWNPV_Omega)s) & (ADMASS('Lambda0') < %(Lambda0MassWindowPost)s*MeV)" %self.config
                                               #PostVertexCuts  = "(BPVIPCHI2() > %(minCHI2IPPV_L)s) & (VFASPF(VCHI2) < %(CHI2VTX_L)s)" %self.config
                                               )
-           
-             
-           
+
+
+
            self.makeXiminus("XiminusLLL",  [Lambda2pPiL, PionsForXiLList], 'Xi_FDCHI2_OWNPV_LLL')
 #           self.makeXiminus("XiminusDDL",  [Lambda2pPiD, PionsForXiDLList], 'Xi_FDCHI2_OWNPV_DDL')
            self.makeXiminus("XiminusDDD",  [Lambda2pPiD, PionsForXiDDList], 'Xi_FDCHI2_OWNPV')
            self.makeXiminus("XiminusDDL",  [Lambda2pPiD, PionsForXiDLList], 'Xi_FDCHI2_OWNPV_DDL')
 
-           
+
            self.makeOmegaminus("OmegaminusLLL",  [Lambda2pPiLOmega, KaonsForOmegaLList], 'Omega_FDCHI2_OWNPV')
 #           self.makeOmegaminus("OmegaminusDDL",  [Lambda2pPiD, KaonsForOmegaLList], 'Omega_FDCHI2_OWNPV')
            self.makeOmegaminus("OmegaminusDDD",  [Lambda2pPiDOmega, KaonsForOmegaDList], 'Omega_FDCHI2_OWNPV')
            self.makeOmegaminus("OmegaminusDDL",  [Lambda2pPiDOmega, KaonsForOmegaLList], 'Omega_FDCHI2_OWNPV')
 
-           
+
 
 #------------------------------------------------------------------------------------------
 
-       def makeXiminus(self, OutputList, DaughterLists, FDCHI2 ):            
+       def makeXiminus(self, OutputList, DaughterLists, FDCHI2 ):
               ''' Make a Xi minus candidate '''
               myPostVertexCuts  = "(VFASPF(VCHI2)< %%(CHI2VTX_Xi)s) & (BPVVDCHI2 > %%(%s)s) & "\
                                                       "((CHILD(PX,1)*CHILD(PX,0)+CHILD(PY,1)*CHILD(PY,0)+CHILD(PZ,1)*CHILD(PZ,0))/(CHILD(P,1)*CHILD(P,0)) > %%(COS_L_Xi)s)" % (FDCHI2)
@@ -225,7 +225,7 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
               #PostVertexCuts = "(VFASPF(VCHI2)< %(CHI2VTX_Xi)s) " %self.config
               #PostVertexCuts += "(BPVVDCHI2 > %s)" %self.config[FDCHI2]
               myPostVertexCuts += " & (BPVIPCHI2()<1000)" # new cut
-              
+
               Ximinus2LambdaPi = createCombinationSel(OutputList = OutputList,
                                                       DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
                                                       DaughterLists   = DaughterLists,
@@ -235,11 +235,11 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                                       #PostVertexCuts  = "(VFASPF(VCHI2)< %(CHI2VTX_Xi)s) & (BPVVDCHI2 > %(L_FDCHI2_OWNPV)s)" %self.config
                                                       # PostVertexCuts  = "(VFASPF(VCHI2)< %(CHI2VTX_Xi)s)" %self.config
                                                       )
-              
+
               #print "1st HLT = ", "%(HLT1)s" %self.config
-              Ximinus2LambdaPiLine = StrippingLine(OutputList+self.name, 
-                  prescale  = self.config['PreScale'], 
-                  HLT1      = self.config['HLT1'], 
+              Ximinus2LambdaPiLine = StrippingLine(OutputList+self.name,
+                  prescale  = self.config['PreScale'],
+                  HLT1      = self.config['HLT1'],
                   algos     = [Ximinus2LambdaPi],
                   #RequiredRawEvents = self.config['RawEvents'],
               )
@@ -247,13 +247,13 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
 
 
 
-              
-       def makeOmegaminus(self, OutputList, DaughterLists, FDCHI2 ): 
+
+       def makeOmegaminus(self, OutputList, DaughterLists, FDCHI2 ):
               ''' Make an Omega minus candidate '''
               #print "Make %s"%OutputList
               myPostVertexCuts = "(VFASPF(VCHI2)< %%(CHI2VTX_Omega)s) & (BPVVDCHI2 > %%(%s)s) & "\
                                                         "((CHILD(PX,1)*CHILD(PX,0)+CHILD(PY,1)*CHILD(PY,0)+CHILD(PZ,1)*CHILD(PZ,0))/(CHILD(P,1)*CHILD(P,0)) > %%(COS_L_Xi)s)" % (FDCHI2)
-              myPostVertexCuts += " & (BPVIPCHI2()<1000)" # new cut 
+              myPostVertexCuts += " & (BPVIPCHI2()<1000)" # new cut
               Omegaminus2LambdaK = createCombinationSel(OutputList = OutputList,
                                                         DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
                                                         DaughterLists = DaughterLists,
@@ -266,16 +266,16 @@ class StrippingStrangeBaryonsConf(LineBuilder) :
                                                         #"(LV01 > %(COS_L_Xi)s) " %self.config
                                                         )
        	      # print "2nd HLT = ", "%(HLT1)s" %self.config
-              Omegaminus2LambdaKLine = StrippingLine(OutputList+self.name, 
-                  prescale  = self.config['PreScale'], 
-                  HLT1      = self.config['HLT1'], 
+              Omegaminus2LambdaKLine = StrippingLine(OutputList+self.name,
+                  prescale  = self.config['PreScale'],
+                  HLT1      = self.config['HLT1'],
                   algos     = [Omegaminus2LambdaK],
                   #RequiredRawEvents = self.config['RawEvents'],
               )
-              self.registerLine (Omegaminus2LambdaKLine)             
+              self.registerLine (Omegaminus2LambdaKLine)
+
 
 
-              
 
 
 def createSubSel(OutputList, InputList, Cuts ) :
@@ -307,4 +307,3 @@ def createCombinationSel( OutputList,
        return Selection ( OutputList,
                           Algorithm = combiner,
                           RequiredSelections = DaughterLists)
-       
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 1edb739adb17168b7ce4d3cfb7a65ed6a1aff754..6dfd54bb56be7e4eeab12111611553fc9b6dde65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 '''
-Stripping line for Strange Baryon  studies 
+Stripping line for Strange Baryon  studies
 Author: MF
 
 The Xi, Omega strange baryons are selected from the decays
@@ -41,9 +41,9 @@ default_config = {
         'checkPV'     : False,
         'HLT1'        : "HLT_PASS_RE('Hlt1.*NoBias.*Decision')|HLT_PASS_RE('Hlt1.*MB.*Bias.*Decision')|HLT_PASS_RE('Hlt1.*MicroBias.*Decision')",
         #'RawEvents'   : [ "Muon", "Calo", "Rich" ],
-        'ProtonPIDppi':       -5.,  #(PIDp-PIDpi) > -5                   
+        'ProtonPIDppi':       -5.,  #(PIDp-PIDpi) > -5
         'PionPIDpiK'  :       0.,   #(PIDp-PIDK) > 0
-       
+
         # Lambda Decay
         'TRCHI2DOF'               :       4., # < 4 for all 6 cases
         'minCHI2IPPV_pPi_LL'      :      20., # > 20
@@ -64,7 +64,7 @@ default_config = {
         'minCHI2IPPV_Bachelor'        :       3., # > 3 for the other 3 cases: Tight DDL & DDD + Loose DDL
         'minCHI2IPPV_K_Bachelor_D'    :      3., # > 6
         'minCHI2IPPV_K_Bachelor_L'    :      3., # should have been 10 but use it for DDL case too , reduced to 3
-       
+
         # Xi Decay
         'CHI2VTX_Xi'          :      25., # < 25 for all 6 cases
         'Xi_FDCHI2_OWNPV_LLL' :      30., # > 30
@@ -80,7 +80,7 @@ default_config = {
         'OmegaMassWindow'     :      50., #?????????
     },
 }
-    
+
 
 
 
@@ -88,12 +88,12 @@ default_config = {
 class StrippingStrangeBaryonsNoPIDConf(LineBuilder) :
 
        __configuration_keys__ = default_config['CONFIG'].keys()
-       
+
        def __init__(self, name, config) :
            LineBuilder.__init__(self, name, config)
            self.name = name
            self.config = config
-       
+
 
            #### LLL case ####
            PionsForLambdaLList = createSubSel( OutputList = "PionsForLambda" + self.name,
@@ -112,15 +112,15 @@ class StrippingStrangeBaryonsNoPIDConf(LineBuilder) :
                                               InputList = DataOnDemand("Phys/StdAllNoPIDsKaons/Particles"),
                                               Cuts = "(ISLONG) & (TRCHI2DOF < %(TRCHI2DOF)s ) & "\
                                               "(BPVIPCHI2() > %(minCHI2IPPV_K_Bachelor_L)s)" % self.config )
-           
-           
+
+
            #Create Lambdas
            Lambda2pPiL = createCombinationSel(OutputList = "Lambda2pPiL"+ self.name,
                                               DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
                                               DaughterLists   = [PionsForLambdaLList, ProtonsForLambdaLList],
                                               DaughterCuts    = {},
                                               PreVertexCuts   = "(ADAMASS('Lambda0') < %(Lambda0MassWindow)s*MeV)"% self.config,
-  
+
                                               PostVertexCuts  = "(BPVIPCHI2() > %(minCHI2IPPV_L_LL)s) & (VFASPF(VCHI2) < %(CHI2VTX_L)s) &"\
                                               "(BPVVDCHI2 > %(L_FDCHI2_OWNPV_LL)s) & (ADMASS('Lambda0') < %(Lambda0MassWindowPost)s*MeV)" %self.config
                                              )
@@ -134,33 +134,33 @@ class StrippingStrangeBaryonsNoPIDConf(LineBuilder) :
                                               PostVertexCuts  = "(BPVIPCHI2() > %(minCHI2IPPV_L_LL)s) & (VFASPF(VCHI2) < %(CHI2VTX_L)s) &"\
                                               "(BPVVDCHI2 > %(L_FDCHI2_OWNPV_LL_Omega)s) & (ADMASS('Lambda0') < %(Lambda0MassWindowPost)s*MeV)" %self.config
                                               )
-           
-           
-           
+
+
+
            self.makeXiminus("XiminusLLLNoPID",  [Lambda2pPiL, PionsForXiLList], 'Xi_FDCHI2_OWNPV_LLL')
 
            self.makeOmegaminus("OmegaminusLLLNoPID",  [Lambda2pPiLOmega, KaonsForOmegaLList], 'Omega_FDCHI2_OWNPV')
 
-           
+
 
 #------------------------------------------------------------------------------------------
 
-       def makeXiminus(self, OutputList, DaughterLists, FDCHI2 ):            
+       def makeXiminus(self, OutputList, DaughterLists, FDCHI2 ):
               ''' Make a Xi minus candidate '''
               myPostVertexCuts  = "(VFASPF(VCHI2)< %%(CHI2VTX_Xi)s) & (BPVVDCHI2 > %%(%s)s) & "\
                                                       "((CHILD(PX,1)*CHILD(PX,0)+CHILD(PY,1)*CHILD(PY,0)+CHILD(PZ,1)*CHILD(PZ,0))/(CHILD(P,1)*CHILD(P,0)) > %%(COS_L_Xi)s)" % (FDCHI2)
               myPostVertexCuts += " & (BPVIPCHI2()<1000)" # new cut
-              
+
               Ximinus2LambdaPi = createCombinationSel(OutputList = OutputList,
                                                       DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
                                                       DaughterLists   = DaughterLists,
                                                       PreVertexCuts   = "(ADAMASS('Xi-') < %(XiMassWindow)s*MeV)"% self.config,
                                                       PostVertexCuts = myPostVertexCuts % self.config
                                                       )
-              
-              Ximinus2LambdaPiLine = StrippingLine(OutputList+self.name, 
-                  prescale  = self.config['PreScale'], 
-                  HLT1      = self.config['HLT1'], 
+
+              Ximinus2LambdaPiLine = StrippingLine(OutputList+self.name,
+                  prescale  = self.config['PreScale'],
+                  HLT1      = self.config['HLT1'],
                   algos     = [Ximinus2LambdaPi],
                   #RequiredRawEvents = self.config['RawEvents'],
               )
@@ -168,28 +168,28 @@ class StrippingStrangeBaryonsNoPIDConf(LineBuilder) :
 
 
 
-              
-       def makeOmegaminus(self, OutputList, DaughterLists, FDCHI2 ): 
+
+       def makeOmegaminus(self, OutputList, DaughterLists, FDCHI2 ):
               ''' Make an Omega minus candidate '''
               myPostVertexCuts = "(VFASPF(VCHI2)< %%(CHI2VTX_Omega)s) & (BPVVDCHI2 > %%(%s)s) & "\
                                                         "((CHILD(PX,1)*CHILD(PX,0)+CHILD(PY,1)*CHILD(PY,0)+CHILD(PZ,1)*CHILD(PZ,0))/(CHILD(P,1)*CHILD(P,0)) > %%(COS_L_Xi)s)" % (FDCHI2)
-              myPostVertexCuts += " & (BPVIPCHI2()<1000)" # new cut 
+              myPostVertexCuts += " & (BPVIPCHI2()<1000)" # new cut
               Omegaminus2LambdaK = createCombinationSel(OutputList = OutputList,
                                                         DecayDescriptor = "[Omega- -> Lambda0 K-]cc",
                                                         DaughterLists = DaughterLists,
                                                         PreVertexCuts = "(ADAMASS('Omega-') < %(OmegaMassWindow)s*MeV)" % self.config,
                                                         PostVertexCuts = myPostVertexCuts % self.config
                                                         )
-              Omegaminus2LambdaKLine = StrippingLine(OutputList+self.name, 
-                  prescale  = self.config['PreScale'], 
-                  HLT1      = self.config['HLT1'], 
+              Omegaminus2LambdaKLine = StrippingLine(OutputList+self.name,
+                  prescale  = self.config['PreScale'],
+                  HLT1      = self.config['HLT1'],
                   algos     = [Omegaminus2LambdaK],
                   #RequiredRawEvents = self.config['RawEvents'],
               )
-              self.registerLine (Omegaminus2LambdaKLine)             
+              self.registerLine (Omegaminus2LambdaKLine)
+
 
 
-              
 
 
 def createSubSel(OutputList, InputList, Cuts ) :
@@ -215,4 +215,3 @@ def createCombinationSel( OutputList,
        return Selection ( OutputList,
                           Algorithm = combiner,
                           RequiredSelections = DaughterLists)
-       
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py
index 006cf3abf1382e45acdb7a325405c699e3338d88..2a746faf96b7dc8a734d248a08ce4f8b8876f6bb 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py
@@ -60,12 +60,12 @@ class TaggedJetsConf( LineBuilder ) :
     taggedJetsLocation = updateDoD ( filterJet )
     self.__taggedJets = DataOnDemand(Location = taggedJetsLocation.keys()[0])
 
-    ## Making selections        
+    ## Making selections
     self.sel_DiJet  = self.makeJetGroup (name + 'DiJet', ptcut=1)
     self.sel_DiJet_ExclusiveDiJet  = self.makeJetGroup (name + 'DiJetExclusiveDiJet',ptcut=2)
-    self.sel_DiJet_noPT  = self.makeJetGroup (name + 'DiJetNoPT')  
+    self.sel_DiJet_noPT  = self.makeJetGroup (name + 'DiJetNoPT')
     self.sel_DiJetPair  = self.makeDiJetPair (name + 'DiJetPair')
-        
+
     ## Filter events with more than two jets
     filterJets = " ( CONTAINS('Phys/StdJets/Particles') == 2 ) "
 
@@ -85,7 +85,7 @@ class TaggedJetsConf( LineBuilder ) :
      selection  = self.sel_DiJet_ExclusiveDiJet,
     ))
 
-        
+
     self.registerLine(StrippingLine( name + 'DiJetPairLine',
       prescale  = config[ 'DiTaggedJetsPair_Prescale' ],
       postscale = config[ 'DiTaggedJetsPair_Postscale' ],
@@ -102,14 +102,14 @@ class TaggedJetsConf( LineBuilder ) :
     JetGroup.addTool( LoKi__VertexFitter, name="LoKi::VertexFitter" )
     vfitter = getattr ( JetGroup , "LoKi::VertexFitter" )
     vfitter.Jets = ""
-    
+
     if ptcut==1: JetGroup.DaughtersCuts = { "CELLjet" :" (PT > %(min_jet_pT)s ) " %self._config }
-    elif ptcut==2: JetGroup.DaughtersCuts = { "CELLjet" :" (PT > %(min_jet_pT_ExclusiveDiJet)s ) " %self._config }    
-    
+    elif ptcut==2: JetGroup.DaughtersCuts = { "CELLjet" :" (PT > %(min_jet_pT_ExclusiveDiJet)s ) " %self._config }
+
     JetGroup.MotherCut = "ALL"
-    
+
     requiredSelections = [self.__taggedJets]
-    
+
     return Selection ("Sel"+_name,
                       Algorithm = JetGroup,
                       RequiredSelections = requiredSelections)
@@ -122,9 +122,9 @@ class TaggedJetsConf( LineBuilder ) :
     DiJetPair.DecayDescriptor = "H_20 -> H_10 H_10"
     DiJetPair.ParticleCombiners = {"" : "LoKi::VertexFitter"}
     DiJetPair.addTool( LoKi__VertexFitter, name="LoKi::VertexFitter" )
-    
+
     DiJetPair.MotherCut = "ALL"
-    
+
     requiredSelections = [self.sel_DiJet_noPT]
 
     return Selection ("Sel"+_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py
index dbe997369154d5a0cb62480bd947fdadfe44fa96..8dd859177d67108389dd912511c79c54503c1f26 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py
@@ -34,7 +34,7 @@ default_config = {
     'BUILDERTYPE' : 'W2nHConf',
     'WGs'         : [ 'QEE'],
     'STREAMS'     : [ 'EW' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'W2nH_Prescale'  : 1.0,
         'W2nH_Postscale' : 1.0,
         'pT'        : 3. * GeV,
@@ -106,4 +106,3 @@ def make_line(name, config, decay):
     checkPV   = False,
     selection = make_combination(name, config, decay)
   )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py
index cfd308f081ac109fc83ebeeb90d16a23debcb9f4..246940dc5c8a1cdfcff31e787318f25699410e6b 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py
@@ -77,7 +77,7 @@ default_config = {
         'max_e_pT'  : 200000. * GeV,
         'PrsCalMin' : 50. * MeV,
         'ECalMin'   : 0.10,
-        'HCalMax'   : 0.05,      
+        'HCalMax'   : 0.05,
       },
       'min_jet_pT'    : 15. * GeV,
       'dr_lepton_jet' : 0.5,
@@ -102,7 +102,7 @@ phi_3 = ACHILDFUN(3,PHI)
 deta_13 = eta_1 - eta_3
 deta_23 = eta_2 - eta_3
 
-dphi_13 = phi_1 - phi_3 
+dphi_13 = phi_1 - phi_3
 dphi_23 = phi_2 - phi_3
 
 dphi_13 = switch ( dphi_13 >  180 * degree ,  dphi_13 - 180 * degree , dphi_13 )
@@ -118,8 +118,8 @@ dr_23 = sqrt(deta_23**2 + dphi_23**2)
 #===============================================================================
 
 def SelWmu( name, conf, TOS_HLT2=None ):
-  """ 
-  Define the W->mu selection 
+  """
+  Define the W->mu selection
   """
   ## Apply cuts, with TOS optionally
   code = '(PT>%(min_mu_pT)s) & (PT<%(max_mu_pT)s)'%conf
@@ -129,8 +129,8 @@ def SelWmu( name, conf, TOS_HLT2=None ):
 
 
 def SelWe( name, conf, TOS_HLT2=None ):
-  """ 
-  Define the W->e selection 
+  """
+  Define the W->e selection
   """
   ## Quality cut.
   code = '(PT>%(min_e_pT)s) & (PT<%(max_e_pT)s)'\
@@ -142,7 +142,7 @@ def SelWe( name, conf, TOS_HLT2=None ):
   if TOS_HLT2:
     code += "& (TOS('%s','Hlt2TriggerTisTos'))"%TOS_HLT2
   preambulo = ["from LoKiTracks.decorators import *"]
-  return SimpleSelection( name, FilterDesktop, [StdAllNoPIDsElectrons], 
+  return SimpleSelection( name, FilterDesktop, [StdAllNoPIDsElectrons],
     Code=code, Preambulo=preambulo)
 
 
@@ -162,7 +162,7 @@ def SelWDiJets( name, conf, desc, sel_W, TOS_HLT2=None ):
 #  ccut = "AALLSAMEBPV(-1,-1,-1) "\ # This functor should NOT be used unoptimised with the default arguments! Buggy!
 #         "& ( dr_13 > %(dr_lepton_jet)s )"\
 #         "& ( dr_23 > %(dr_lepton_jet)s )" %conf
-  
+
   ccut = " ( dr_13 > %(dr_lepton_jet)s )"\
           "& ( dr_23 > %(dr_lepton_jet)s )" %conf
   if TOS_HLT2:
@@ -191,9 +191,9 @@ class WJetsConf( LineBuilder ) :
     ## Switch the W selection, depends on the name given.
     if name == 'WmuJets':
       SelW = SelWmu
-      desc = "[H+ -> CELLjet CELLjet mu+]cc" 
+      desc = "[H+ -> CELLjet CELLjet mu+]cc"
     elif name == 'WeJets':
-      SelW = SelWe 
+      SelW = SelWe
       desc = "[H+ -> CELLjet CELLjet e+]cc"
     else:
       raise ValueError('Unknown W to make: %s'%name)
@@ -221,4 +221,3 @@ class WJetsConf( LineBuilder ) :
       checkPV           = False,
       selection         = WJets_tosjet,
     ))
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWMu.py
index 143231a2c0173822e5d0d2e83bc143c3a0aa6d5d..6f1c336ccd9eb934ec447562f0cf43f30ace4cca 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWMu.py
@@ -38,7 +38,7 @@ default_config = {
   'BUILDERTYPE' : 'WMuConf',
   'WGs'         : [ 'QEE'],
   'STREAMS'     : [ 'EW' ],
-  'CONFIG'      : { 
+  'CONFIG'      : {
     'WMu_Prescale'          : 1.0,
     'WMuLow_Prescale'       : 0.1,
     'WMuHighIP_Prescale'    : 1.0,
@@ -92,7 +92,7 @@ class WMuConf( LineBuilder ) :
       selection = sel,
     ))
 
-    #-----------------------------------------------------------------        
+    #-----------------------------------------------------------------
 
     sel = makeFilter(name+'Mu48', StdAllLooseMuons, min_PT = config['SingMuon48_pT'])
 
@@ -160,7 +160,7 @@ class WMuConf( LineBuilder ) :
       checkPV   = False,
       selection = sel,
     ))
-    
+
     #-----------------#
     # WMu No muons ID #
     #-----------------#
@@ -175,13 +175,13 @@ class WMuConf( LineBuilder ) :
       checkPV   = False,
       selection = sel,
     ))
-    
+
     #-------------#
     # WMu IP Line #
     #-------------#
-    
+
     sel = makeFilter(name+'_HighIP', StdAllLooseMuons, min_PT = config['MinpT_HighIP'], min_IP = config['MinIP'], max_PT = config['pT'])
-    
+
     self.registerLine(StrippingLine( name + 'HighIPLine',
       RequiredRawEvents = config['RawEvents'],
       prescale  = config[ 'WMuHighIP_Prescale' ],
@@ -193,17 +193,17 @@ class WMuConf( LineBuilder ) :
     #--------------#
     # WMu Iso Line #
     #--------------#
-    
+
     # WMu Isolation variables
     relinfo = [{"Type" : "RelInfoConeVariables",
           "ConeAngle" : 0.5,
           "Variables" : ['CONEPT', 'CONEANGLE','CONEMULT','CONEPTASYM'],
           "Location"  : "Iso"}
          ]
-    
+
     sel = makeFilter(name+'_Iso', StdAllLooseMuons, min_PT = config['MinpTiso'], max_PT = config['pT'])
     relinfofilter = Filter(name+"IsoFilter", Code="RELINFO('/Event/Phys/"+name+"IsoLine/Iso', 'CONEPT', 100000.) < "+str(config["IsoMax"]), Inputs=['Phys/'+name+'IsoLine/Particles'])
-    
+
     self.registerLine(StrippingLine( name + 'IsoLine',
       RequiredRawEvents = config['RawEvents'],
       prescale  = config[ 'WMuIso_Prescale' ],
@@ -219,31 +219,28 @@ def makeFilter(name, single_input, min_PT = None , max_PT = None, min_IP = None
   """
   Simple FilterDesktop selection having min_PT/max_PT/min_IP cuts.
   """
-  
+
   cuts = []
-  
+
   if min_PT:
     cuts.append("PT > {}".format(min_PT))
-  
+
   if max_PT:
     cuts.append("PT < {}".format(max_PT))
-    
+
   if min_IP:
     cuts.append("MIPDV(PRIMARY) > {}".format(min_IP))
-  
+
   cut_str = ""
   for i,c in enumerate(cuts):
     if i == 0:
       cut_str += "({})".format(c)
     else:
       cut_str += " & ({})".format(c)
-      
+
   selection = SimpleSelection(name, FilterDesktop, [single_input],
-    Preambulo = [ "from LoKiTracks.decorators import *" ],    
+    Preambulo = [ "from LoKiTracks.decorators import *" ],
     Code      = cut_str
   )
-  
-  return selection
-  
-
 
+  return selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py
index 85e9fe546aef4c972cdfc58c1e15b8c3e397667c..59f44b660e30176505125049b262d20c3d5133e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py
@@ -20,7 +20,7 @@ __author__  = ['Hang Yin', 'Qundong Han']
 __date__    = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
 
-__all__ = 'default_config', 'WRareDecayConf' 
+__all__ = 'default_config', 'WRareDecayConf'
 
 from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
@@ -39,7 +39,7 @@ default_config = {
     'TrChi2'        : 5.    ,   # dimensionless
     'TrIPChi2'      : 9.    ,   # dimensionless
     'TrGhost'       : 0.4   ,   # dimensionless
-          
+
     'RhoMassWin'    : 150. * MeV,
     'KSMassWin'     : 40.  * MeV,
     'KstMassWin'    : 120. * MeV,
@@ -54,7 +54,7 @@ default_config = {
     'pion0PT'       : 800.  * MeV,
     'kaonPT'        : 400.  * MeV,
     'MesonPT'       : 13000.* MeV,
-          
+
     'WMassWin'      : 50000. * MeV,
 
     # Pre- and postscales
@@ -79,7 +79,7 @@ default_config = {
 
 class WRareDecayConf(LineBuilder):
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
@@ -89,7 +89,7 @@ class WRareDecayConf(LineBuilder):
                                     config['photonPT'])
         selPhotonHi = makePhoton('PhotonHighPTSel' + name,
                                       config['photonHighPT'])
-        # make pions 
+        # make pions
         selPions = makePions('PionsSel' + name,
                                   config['TrChi2'],
                                   config['TrIPChi2'],
@@ -102,7 +102,7 @@ class WRareDecayConf(LineBuilder):
                                     config['MesonPT'])
         selPion0 = makePion0('Pion0Sel' + name,
                                   config['pion0PT'])
-        # make Kaons 
+        # make Kaons
         selKaons = makeKaons('KaonsSel' + name,
                                   config['TrChi2'],
                                   config['TrIPChi2'],
@@ -116,15 +116,15 @@ class WRareDecayConf(LineBuilder):
         selKS = makeKS('KSSel' + name,
                             config['KSLTIME'],
                             config['KSMassWin'])
-        # make K*+ -> KS pi+, K+, pi0 
+        # make K*+ -> KS pi+, K+, pi0
         selKstP1 = makeKstar('KstPSel1' + name,
                                   selKS,
-                                  selPions,  
+                                  selPions,
                                   config['KstMassWin'],
                                   config['MesonPT'])
         selKstP2 = makeKstar('KstPSel2' + name,
                                   selKaons,
-                                  selPion0,  
+                                  selPion0,
                                   config['KstMassWin'],
                                   config['MesonPT'])
         selKstP = MergedSelection('KstPSel' + name, RequiredSelections=[selKstP1, selKstP2])
@@ -190,7 +190,7 @@ class WRareDecayConf(LineBuilder):
                                           config['WMassWin'])
 
         ##
-        ## Stripping lines  
+        ## Stripping lines
         ##
 
         # W-> pi gamma line
@@ -201,7 +201,7 @@ class WRareDecayConf(LineBuilder):
                                              RelatedInfoTools = [{'Type' : 'RelInfoVertexIsolation', 'Location': "VertexIsoInfo"  }],
                                              selection=selW2PionGamma)
         self.registerLine(W2PionGammaLine)
-        
+
         # W-> K gamma line
         W2KaonGammaLine = StrippingLine(name + 'W2KaonGammaLine',
                                              prescale=config['W2KaonGammaPreScale'],
@@ -210,7 +210,7 @@ class WRareDecayConf(LineBuilder):
                                              RelatedInfoTools = [{'Type' : 'RelInfoVertexIsolation', 'Location': "VertexIsoInfo"  }],
                                              selection=selW2KaonGamma)
         self.registerLine(W2KaonGammaLine)
-        
+
         # W-> K* gamma line
         W2KstPGammaLine = StrippingLine(name + 'W2KstPGammaLine',
                                              prescale=config['W2KstPGammaPreScale'],
@@ -244,7 +244,7 @@ class WRareDecayConf(LineBuilder):
                                            RelatedInfoTools = [{'Type' : 'RelInfoVertexIsolation', 'Location': "VertexIsoInfo"  }],
                                            selection=selW2DsGamma)
         self.registerLine(W2DsGammaLine)
-        
+
         # W-> B+ gamma line
         W2BuGammaLine = StrippingLine(name + 'W2BuGammaLine',
                                            prescale=config['W2BuGammaPreScale'],
@@ -260,9 +260,9 @@ def makePhoton(name, photonPT):
 
     @arg name: name of the Selection.
     @arg photonPT: PT of the photon
-    
+
     @return: Selection object
-    
+
     """
     code = "(PT > %(photonPT)s)" % locals()
     gammaFilter = FilterDesktop(Code=code)
@@ -273,13 +273,13 @@ def makePions(name, TrChi2, TrIPChi2, TrGhost, MesonPT):
     """Create pi+ Selection object starting from DataOnDemand 'Phys/StdLoosePions'.
 
     @arg name: name of the Selection.
-    @arg TrChi2: track chi2/dof of the pions 
-    @arg TrIPChi2: trakc IP chi2/dof of the pions 
-    @arg TrGhost: trakc ghost probability of the pions 
-    @arg MesonPT: PT of the pions 
-    
+    @arg TrChi2: track chi2/dof of the pions
+    @arg TrIPChi2: trakc IP chi2/dof of the pions
+    @arg TrGhost: trakc ghost probability of the pions
+    @arg MesonPT: PT of the pions
+
     @return: Selection object
-    
+
     """
     code = "(PT > %(MesonPT)s) & (TRGHOSTPROB < %(TrGhost)s) & (TRCHI2DOF<%(TrChi2)s) & ISBASIC & (MIPCHI2DV(PRIMARY) > %(TrIPChi2)s)" % locals()
     pionFilter = FilterDesktop(Code=code)
@@ -290,13 +290,13 @@ def makeKaons(name, TrChi2, TrIPChi2, TrGhost, MesonPT):
     """Create pi+ Selection object starting from DataOnDemand 'Phys/StdLooseKaons'.
 
     @arg name: name of the Selection.
-    @arg TrChi2: track chi2/dof of the kaons 
-    @arg TrIPChi2: trakc IP chi2/dof of the kaons 
-    @arg TrGhost: trakc ghost probability of the kaons 
+    @arg TrChi2: track chi2/dof of the kaons
+    @arg TrIPChi2: trakc IP chi2/dof of the kaons
+    @arg TrGhost: trakc ghost probability of the kaons
     @arg MesonPT: PT of the kaons
-    
+
     @return: Selection object
-    
+
     """
     code = "(PT > %(MesonPT)s) & (TRGHOSTPROB < %(TrGhost)s) & (TRCHI2DOF<%(TrChi2)s) & ISBASIC & (MIPCHI2DV(PRIMARY) > %(TrIPChi2)s)" % locals()
     kaonFilter = FilterDesktop(Code=code)
@@ -318,7 +318,7 @@ def makePion0(name, pion0PT):
     filter_pi0resolved = FilterDesktop(Code = code1)
     selpi0resolved = Selection("Selection_"+name+"_pi0resolved", RequiredSelections=[pi0resolved], Algorithm=filter_pi0resolved)
     code2 = "(PT > %(pion0PT)s)" % locals()
-    filter_pi0merged = FilterDesktop(Code = code2) 
+    filter_pi0merged = FilterDesktop(Code = code2)
     selpi0merged = Selection("Selection_"+name+"_pi0merged", RequiredSelections=[pi0merged], Algorithm=filter_pi0merged)
     return MergedSelection(name, RequiredSelections=[selpi0resolved,selpi0merged])
 
@@ -340,14 +340,14 @@ def makeKS(name, KSLTIME, KSMassWin):
 def makeRho2PiPi(name, TrChi2, RhoMassWin, MesonPT):
     """
     Create and return a Rho+ -> Pi+ Pi0 Selection object, starting from DataOnDemand 'Phys/StdLoosePions'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+ Pi+ tracks
     @arg RhoMassWin: selected Ds mass window
-    @arg MesonPT: selected rho pT cut 
-    
+    @arg MesonPT: selected rho pT cut
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodPion = (TRCHI2DOF < %(TrChi2)s)" % locals(),
                   "goodRho = ((ADMASS('rho(770)+') < %(RhoMassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -370,14 +370,14 @@ def makeKstar(name, Kaons, Pions, KstMassWin, MesonPT):
 def makeDp2KPiPi(name, TrChi2, DpMassWin, MesonPT):
     """
     Create and return a D+->KPiPi Selection object, starting from DataOnDemand 'Phys/StdLooseDplus2KKPi'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+ Pi+ tracks
     @arg DpMassWin: selected D+ mass window
-    @arg MesonPT: selected Dp pT cut 
-    
+    @arg MesonPT: selected Dp pT cut
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodKaon = (TRCHI2DOF < %(TrChi2)s)" % locals(),
                   "goodDp = ((ADMASS('D+') < %(DpMassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -389,14 +389,14 @@ def makeDp2KPiPi(name, TrChi2, DpMassWin, MesonPT):
 def makeDs2KKPi(name, TrChi2, DsMassWin, MesonPT):
     """
     Create and return a Ds->KKPi Selection object, starting from DataOnDemand 'Phys/StdLooseDplus2KKPi'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+ Pi+ tracks
     @arg DsMassWin: selected Ds mass window
-    @arg MesonPT: selected Ds pT cut 
-    
+    @arg MesonPT: selected Ds pT cut
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodKaon = (TRCHI2DOF < %(TrChi2)s)" % locals(),
                   "goodDs = ((ADMASS('D_s+') < %(DsMassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -408,14 +408,14 @@ def makeDs2KKPi(name, TrChi2, DsMassWin, MesonPT):
 def makeBu2JpsiK(name, TrChi2, BuMassWin, MesonPT, BPVLTIME):
     """
     Create and return a Ds->KKPi Selection object, starting from DataOnDemand 'Phys/StdLooseDplus2KKPi'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+ Pi+ tracks
     @arg DsMassWin: selected Ds mass window
-    @arg MesonPT: selected Ds pT cut 
-    
+    @arg MesonPT: selected Ds pT cut
+
     @return: Selection object
-    
+
     """
     stdJpsiMuMu = DataOnDemand(Location="Phys/StdLooseJpsi2MuMu/Particles")
     stdKaon = DataOnDemand(Location="Phys/StdAllNoPIDsKaons/Particles")
@@ -435,15 +435,15 @@ def makeBu2JpsiK(name, TrChi2, BuMassWin, MesonPT, BPVLTIME):
 def makeW2PionGamma(name, pionSel, gammaSel, WMassWin):
     """
     Create and return a W+ -> pi+ Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg pionSel: pion selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> pi+ gamma]cc",
                            MotherCut=motherCut,
@@ -454,15 +454,15 @@ def makeW2PionGamma(name, pionSel, gammaSel, WMassWin):
 def makeW2KaonGamma(name, kaonSel, gammaSel, WMassWin):
     """
     Create and return a W+ -> K+ Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg kaonSel: kaon selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> K+ gamma]cc",
                            MotherCut=motherCut,
@@ -473,15 +473,15 @@ def makeW2KaonGamma(name, kaonSel, gammaSel, WMassWin):
 def makeW2KstPGamma(name, kstpSel, gammaSel, WMassWin):
     """
     Create and return a W+ -> K+ Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg kaonSel: kaon selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> K*(892)+ gamma]cc",
                            MotherCut=motherCut,
@@ -492,15 +492,15 @@ def makeW2KstPGamma(name, kstpSel, gammaSel, WMassWin):
 def makeW2RhoGamma(name, rhoSel, gammaSel, WMassWin):
     """
     Create and return a W+ -> rho+ Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg rhoSel: rho+ -> pi+ pi0 selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> rho(770)+ gamma]cc",
                            MotherCut=motherCut,
@@ -511,15 +511,15 @@ def makeW2RhoGamma(name, rhoSel, gammaSel, WMassWin):
 def makeW2DpGamma(name, DpSel, gammaSel, WMassWin):
     """
     Create and return a W -> D+ Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg DpSel: D+ -> Pi+ K- Pi+ selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> D+ gamma]cc",
                            MotherCut=motherCut,
@@ -529,15 +529,15 @@ def makeW2DpGamma(name, DpSel, gammaSel, WMassWin):
 def makeW2DsGamma(name, DsSel, gammaSel, WMassWin):
     """
     Create and return a W -> Ds Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg DsSel: D_s+ -> K+ K- Pi+ selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> D+ gamma]cc",
                            MotherCut=motherCut,
@@ -547,18 +547,17 @@ def makeW2DsGamma(name, DsSel, gammaSel, WMassWin):
 def makeW2BuGamma(name, BuSel, gammaSel, WMassWin):
     """
     Create and return a W -> B+ Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg BuSel: B+ -> Jpsi K+ selection
     @arg gammaSel: photon selection
-    @arg WMassWin: W mass window 
-    
+    @arg WMassWin: W mass window
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('W+') < %(WMassWin)s)" % locals()
     Wp = CombineParticles(DecayDescriptor="[W+ -> B+ gamma]cc",
                            MotherCut=motherCut,
                            ReFitPVs=False)#True)
     return Selection(name, Algorithm=Wp, RequiredSelections=[gammaSel, BuSel])
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py
index 57859a3727ae9cc167da799a003d10d50ed61938..ebc1113ab6ff5c86ea025fef98e4258d7fda94bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py
@@ -35,7 +35,7 @@ default_config = {
   'BUILDERTYPE' : 'WeConf',
   'STREAMS'     : [ 'EW'  ],
   'WGs'         : [ 'QEE' ],
-  'CONFIG'      : { 
+  'CONFIG'      : {
     'We_Prescale'   : 1.0,
     'WeLow_Prescale': 0.1,
     'We_Postscale'  : 1.0,
@@ -51,7 +51,7 @@ default_config = {
 class WeConf( LineBuilder ) :
 
   __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
   def __init__( self, name, config ) :
 
     LineBuilder.__init__( self, name, config )
@@ -79,5 +79,5 @@ class WeConf( LineBuilder ) :
 
 def makeFilter( name, code ):
   preambulo = ["from LoKiTracks.decorators import *"]
-  return SimpleSelection(name, FilterDesktop, [StdAllNoPIDsElectrons], 
+  return SimpleSelection(name, FilterDesktop, [StdAllNoPIDsElectrons],
     Preambulo=preambulo, Code=code)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02MuMu.py
index 2f6d8e18ef97871446102baff6ea0dec9a633c0a..1aea991ba4f29ddb396670f7e9e43498080b4296 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02MuMu.py
@@ -34,7 +34,7 @@ default_config = {
   'BUILDERTYPE'      : 'Z02MuMuConf',
   'WGs'              : [ 'QEE'],
   'STREAMS'          : [ 'EW' ],
-  'CONFIG'           : { 
+  'CONFIG'           : {
     'Prescale'       : 1.0,
     'Postscale'      : 1.0,
     'pT'             : 3.  * GeV,
@@ -70,4 +70,3 @@ def makeCombination( name, config ):
     MotherCut          = mcut,
     WriteP2PVRelations = False
   )
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py
index 9e514ac3f8af1acf35379ca3e091dcb8d91074ce..8add20419c3530f890ca369597fbc17aba8315cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py
@@ -37,7 +37,7 @@ default_config = {
   'BUILDERTYPE' : 'Z02eeConf',
   'STREAMS'     : [ 'EW'  ],
   'WGs'         : [ 'QEE' ],
-  'CONFIG'      : { 
+  'CONFIG'      : {
     'Prescale'  : 1.0,
     'Postscale' : 1.0,
     'ECalMin'   : 0.1,
@@ -52,10 +52,10 @@ default_config = {
 class Z02eeConf( LineBuilder ) :
 
   __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
   def __init__( self, name, config ) :
 
-    LineBuilder.__init__( self, name, config )        
+    LineBuilder.__init__( self, name, config )
 
     # Z02ee signal
     desc  = 'Z0 -> e+ e-'
@@ -79,11 +79,11 @@ class Z02eeConf( LineBuilder ) :
 
 
 def make_combination(name, config, desc):
-  # Define the cuts  
+  # Define the cuts
   dcut = '((PT>%(pT)s) & (PPINFO(LHCb.ProtoParticle.CaloPrsE,0)>%(PrsCalMin)s) & (PPINFO(LHCb.ProtoParticle.CaloEcalE,0)>P*%(ECalMin)s) & (PPINFO(LHCb.ProtoParticle.CaloHcalE,99999)<P*%(HCalMax)s))'%config
   mcut = '(MM>%(MMmin)s)'%config
 
-  return SimpleSelection(name, CombineParticles, [StdAllNoPIDsElectrons], 
+  return SimpleSelection(name, CombineParticles, [StdAllNoPIDsElectrons],
     DecayDescriptor    = desc,
     DaughtersCuts      = { 'e+' : dcut, 'e-' : dcut },
     MotherCut          = mcut,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py
index a03ceb492454c8e6821fab02658b04f131cc6d14..08043e8e7e467d81148dbd7db9436ec2720bc1e9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py
@@ -34,7 +34,7 @@ default_config = {
     'BUILDERTYPE' : 'Z02nHConf',
     'WGs'         : [ 'QEE'],
     'STREAMS'     : [ 'EW' ],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         'Z02nH_Prescale'  : 1.0,
         'Z02nH_Postscale' : 1.0,
         'pT'        : 3. * GeV,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py
index 185512a6a6d86b092566e4d92802805129521d2c..f9c6499d28e5d87743f1e30d20318153849420eb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py
@@ -20,7 +20,7 @@ __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
 
-__all__ = 'default_config', 'Z0RareDecayConf' 
+__all__ = 'default_config', 'Z0RareDecayConf'
 
 from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
@@ -38,7 +38,7 @@ default_config = {
   'CONFIG'      : {
     'TrChi2'          : 5.,        # dimensionless, useless (default is 4)
     'VtxChi2'         : 20.,       # dimensionless, useless (default is 4)
-          
+
     'RhoMassWin'      : 230.  * MeV,
     'OmegaMassWin'    : 230.  * MeV,
     'KstMassWin'      : 120.  * MeV,
@@ -83,12 +83,12 @@ default_config = {
 
 class Z0RareDecayConf(LineBuilder):
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         ##
-        ## Selection of Z daughters: photon, pion0, rho, omega, 
-        ##   kstar, phi, Jpsi and Upsilon 
+        ## Selection of Z daughters: photon, pion0, rho, omega,
+        ##   kstar, phi, Jpsi and Upsilon
         ##
 
         # make photon
@@ -119,7 +119,7 @@ class Z0RareDecayConf(LineBuilder):
                                     config['TrChi2'],
                                     config['MesonPT'],
                                     config['PhiMassWin'])
-        # make D0 
+        # make D0
         selD02KPi = makeD02KPi('D0Sel' + name,
                                     config['TrChi2'],
                                     config['MesonPT'],
@@ -136,7 +136,7 @@ class Z0RareDecayConf(LineBuilder):
                               config['UpsilonMassMin'])
 
         ##
-        ## make event selections 
+        ## make event selections
         ##
 
         # Z -> Gamma Gamma selections
@@ -243,7 +243,7 @@ class Z0RareDecayConf(LineBuilder):
                                             RelatedInfoTools = [{'Type' : 'RelInfoVertexIsolation', 'Location': "VertexIsoInfo"  }],
                                             selection=selZ2KstGamma)
         self.registerLine(Z2KstGammaLine)
-        
+
         # Z-> phi gamma line
         Z2PhiGammaLine = StrippingLine(name + 'Z2PhiGammaLine',
                                             prescale=config['Z2PhiGammaPreScale'],
@@ -278,9 +278,9 @@ def makePhoton(name, photonPT):
 
     @arg name: name of the Selection.
     @arg photonPT: PT of the photon
-    
+
     @return: Selection object
-    
+
     """
     code = "(PT> %(photonPT)s)" % locals()
     gammaFilter = FilterDesktop(Code=code)
@@ -302,21 +302,21 @@ def makePion0(name, pion0PT):
     filter_pi0resolved = FilterDesktop(Code = code1)
     selpi0resolved = Selection("Selection_"+name+"_pi0resolved", RequiredSelections=[_pi0resolved], Algorithm=filter_pi0resolved)
     code2 = "(PT > %(pion0PT)s)" % locals()
-    filter_pi0merged = FilterDesktop(Code = code2) 
+    filter_pi0merged = FilterDesktop(Code = code2)
     selpi0merged = Selection("Selection_"+name+"_pi0merged", RequiredSelections=[_pi0merged], Algorithm=filter_pi0merged)
     return MergedSelection(name, RequiredSelections=[selpi0resolved,selpi0merged])
 
 def makeRho(name, TrChi2, MesonPT, RhoMassWin) :
     """
     Create and return a rho -> pi+ pi- Selection object, starting from DataOnDemand 'Phys/StdLooseRho0'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: tracks chi2
     @arg MesonPT: PT of combined particle
     @arg RhoMassWin: rho(770)0 mass window
-    
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodTrack = ((TRCHI2DOF < %(TrChi2)s))" % locals(),
                   "goodRho = ((ADMASS('rho(770)0') < %(RhoMassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -328,14 +328,14 @@ def makeRho(name, TrChi2, MesonPT, RhoMassWin) :
 def makeOmega(name, MesonPT, OmegaMassWin, selPion0) :
     """
     Create and return a omega -> pi+ pi- pi0 Selection object, starting from DataOnDemand 'Phys/StdLoosePions'.
-    
+
     @arg name: name of the Selection.
     @arg MesonPT: PT of combined particle
     @arg OmegaMassWin: omega(782) mass window
     @arg selPion0: selected pion0 candidates
-    
+
     @return: Selection object
-    
+
     """
     stdPions = DataOnDemand(Location="Phys/StdLoosePions/Particles")
     omega2pipipizero = CombineParticles()
@@ -349,13 +349,13 @@ def makeOmega(name, MesonPT, OmegaMassWin, selPion0) :
 def makeKstar(name, TrChi2, MesonPT, KstMassWin) :
     """
     Create and return a K*->Kpi Selection object, starting from DataOnDemand 'Phys/StdVeryLooseDetachedKst2Kpi'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: tracks chi2
     @arg KstMassWin: K* mass window
-    
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodTrack = ((TRCHI2DOF < %(TrChi2)s))" % locals(),
                   "goodKstar = ((ADMASS('K*(892)0') < %(KstMassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -367,14 +367,14 @@ def makeKstar(name, TrChi2, MesonPT, KstMassWin) :
 def makePhi2KK(name, TrChi2, MesonPT, PhiMassWin) :
     """
     Create and return a Phi->KK Selection object, starting from DataOnDemand 'Phys/StdLoosePhi2KK'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+ tracks
-    @arg MesonPT: selected Phi PT 
+    @arg MesonPT: selected Phi PT
     @arg PhiMassWin: selected Phi mass window
-    
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodKaon = ((TRCHI2DOF < %(TrChi2)s))" % locals(),
                   "goodPhi = ((ADMASS('phi(1020)') < %(PhiMassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -386,14 +386,14 @@ def makePhi2KK(name, TrChi2, MesonPT, PhiMassWin) :
 def makeD02KPi(name, TrChi2, MesonPT, D0MassWin) :
     """
     Create and return a D0->KPi Selection object, starting from DataOnDemand 'Phys/StdLooseD02KPi'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+, pi tracks
-    @arg MesonPT: selected D0 PT 
+    @arg MesonPT: selected D0 PT
     @arg D0MassWin: selected D0 mass window
-    
+
     @return: Selection object
-    
+
     """
     preambulo = ["goodKaon = ((TRCHI2DOF < %(TrChi2)s))" % locals(),
                   "goodD0 = ((ADMASS('D0') < %(D0MassWin)s) & (PT > %(MesonPT)s))" % locals()]
@@ -405,19 +405,19 @@ def makeD02KPi(name, TrChi2, MesonPT, D0MassWin) :
 def makeQON(name, VtxChi2, TrChi2, MesonPT, MuonPT, MuonP, JpsiMassMin, JpsiMassMax, UpsilonMassMin) :
     """
     Create and return a Jpsi-> mu mu and Upsilon -> mu mu Selection object, starting from DataOnDemand 'Phys/StdLooseDiMuon'.
-    
+
     @arg name: name of the Selection.
     @arg VtxChi2: vertex/dof chi2
     @arg TrChi2: tracks chi2
     @arg MesonPT: PT of combined particle
-    @arg MuonPT: PT of Muon 
-    @arg MuonP: P of Muon 
+    @arg MuonPT: PT of Muon
+    @arg MuonP: P of Muon
     @arg JpsiMassMin: Jpsi mass lower cut
     @arg JpsiMassMax: Jpsi mass higher cut
     @arg UpsilonMassMin: Upsilon mass lower cut
-    
+
     @return: Selection object
-    
+
     """
     MuonCut = "(MINTREE('mu+'==ABSID,PT) > %(MuonPT)s ) & (MINTREE('mu+'==ABSID,P) > %(MuonP)s ) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(TrChi2)s)" % locals()
     MuMuCut = "(((MM > %(JpsiMassMin)s ) & (MM < %(JpsiMassMax)s )) | (MM > %(UpsilonMassMin)s )) & (VFASPF(VCHI2PDOF)< %(VtxChi2)s) & (PT > %(MesonPT)s )"%locals()
@@ -431,22 +431,22 @@ def makeQON(name, VtxChi2, TrChi2, MesonPT, MuonPT, MuonP, JpsiMassMin, JpsiMass
 def makeZ2GammaGamma(name, gammaSel, Pi0Pi0PT, ZMassWin):
     """
     Create and return a Z -> Gamma Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg gammaSel: photon selection
     @arg Pi0Pi0PT: PT of photon
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     strCutdau = "PT > %(Pi0Pi0PT)s" % locals()
     daughtersCuts = {'gamma' : strCutdau}
     Z0 = CombineParticles(DecayDescriptor="Z0 -> gamma gamma",
                            MotherCut=motherCut,
                            DaughtersCuts = daughtersCuts,
-                           ParticleCombiners = {"" : "MomentumCombiner:PUBLIC"}, 
+                           ParticleCombiners = {"" : "MomentumCombiner:PUBLIC"},
                            ReFitPVs=False)#True)
 
 
@@ -455,60 +455,60 @@ def makeZ2GammaGamma(name, gammaSel, Pi0Pi0PT, ZMassWin):
 def makeZ2Pi0Gamma(name, Pion0Sel, gammaSel, Pi0Pi0PT, ZMassWin):
     """
     Create and return a Z -> pi0 Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg Pion0Sel: pi0 selection
     @arg gammaSel: photon selection
     @arg Pi0Pi0PT: PT of pi0 and photon
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     strCutdau = "PT > %(Pi0Pi0PT)s" % locals()
     daughtersCuts = {'pi0' : strCutdau, 'gamma' : strCutdau}
     Z0 = CombineParticles(DecayDescriptor="Z0 -> pi0 gamma",
                            MotherCut=motherCut,
                            DaughtersCuts = daughtersCuts,
-                           ParticleCombiners = {"" : "MomentumCombiner:PUBLIC"}, 
+                           ParticleCombiners = {"" : "MomentumCombiner:PUBLIC"},
                            ReFitPVs=False)#True)
     return Selection(name, Algorithm=Z0, RequiredSelections=[gammaSel, Pion0Sel])
 
 def makeZ2Pi0Pi0(name, Pion0Sel, Pi0Pi0PT, ZMassWin):
     """
     Create and return a Z -> pi0 pi0 Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg Pion0Sel: pi0 selection
     @arg Pi0Pi0PT: PT of pi0
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     strCutdau = "PT > %(Pi0Pi0PT)s" % locals()
-    daughtersCuts = {'pi0' : strCutdau } 
+    daughtersCuts = {'pi0' : strCutdau }
     Z0 = CombineParticles(DecayDescriptor="Z0 -> pi0 pi0",
                            MotherCut=motherCut,
                            DaughtersCuts = daughtersCuts,
-                           ParticleCombiners = {"" : "MomentumCombiner:PUBLIC"}, 
+                           ParticleCombiners = {"" : "MomentumCombiner:PUBLIC"},
                            ReFitPVs=False)#True)
     return Selection(name, Algorithm=Z0, RequiredSelections=[Pion0Sel])
 
 def makeZ2RhoGamma(name, RhoSel, gammaSel, ZMassWin):
     """
     Create and return a Z -> Rho(770)0 Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg Rho: Rho -> pi+ pi- selection
     @arg gammaSel: photon selection
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     Z0 = CombineParticles(DecayDescriptor="Z0 -> rho(770)0 gamma",
                            MotherCut=motherCut,
@@ -518,15 +518,15 @@ def makeZ2RhoGamma(name, RhoSel, gammaSel, ZMassWin):
 def makeZ2OmegaGamma(name, OmegaSel, gammaSel, ZMassWin):
     """
     Create and return a Z -> Omega(782)0 Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg Omega: Omega -> pi+ pi- pi0 selection
     @arg gammaSel: photon selection
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     Z0 = CombineParticles(DecayDescriptor="Z0 -> omega(782) gamma",
                            MotherCut=motherCut,
@@ -536,15 +536,15 @@ def makeZ2OmegaGamma(name, OmegaSel, gammaSel, ZMassWin):
 def makeZ2KstGamma(name, KstSel, gammaSel, ZMassWin):
     """
     Create and return a Z -> K* Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg KstSel: K* -> K+ pi- selection
     @arg gammaSel: photon selection
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     Z0 = CombineParticles(DecayDescriptor="[Z0 -> K*(892)0 gamma]cc",
                            MotherCut=motherCut,
@@ -554,15 +554,15 @@ def makeZ2KstGamma(name, KstSel, gammaSel, ZMassWin):
 def makeZ2PhiGamma(name, phiSel, gammaSel, ZMassWin):
     """
     Create and return a Z -> Phi Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg phiSel: Phi -> K+ K+ selection
     @arg gammaSel: photon selection
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     Z0 = CombineParticles(DecayDescriptor="Z0 -> phi(1020) gamma",
                            MotherCut=motherCut,
@@ -572,15 +572,15 @@ def makeZ2PhiGamma(name, phiSel, gammaSel, ZMassWin):
 def makeZ2D0Gamma(name, D0Sel, gammaSel, ZMassWin):
     """
     Create and return a Z -> D0 Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg D0Sel: D0 -> K+ pi- selection
     @arg gammaSel: photon selection
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     Z0 = CombineParticles(DecayDescriptor="Z0 -> D0 gamma",
                            MotherCut=motherCut,
@@ -590,18 +590,17 @@ def makeZ2D0Gamma(name, D0Sel, gammaSel, ZMassWin):
 def makeZ2QONGamma(name, QONSel, gammaSel, ZMassWin):
     """
     Create and return a Z -> Jpsi/Upsilon Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg QONSel: Jpsi/Upsilon -> mu mu selection
     @arg gammaSel: photon selection
     @arg ZMassWin: Z0 mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     motherCut = "(ADMASS('Z0') < %(ZMassWin)s)" % locals()
     Z0 = CombineParticles(DecayDescriptor="Z0 -> J/psi(1S) gamma",
                            MotherCut=motherCut,
                            ReFitPVs=False)#True)
     return Selection(name, Algorithm=Z0, RequiredSelections=[gammaSel, QONSel])
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py
index e3b143b0db21d1e48bb94cecacc753dd832e58fb..2636174f73b4590bef8d83914f9a29bd513d2a16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py
@@ -34,7 +34,7 @@ default_config = {
     'BUILDERTYPE' : 'DijetsConf',
     'STREAMS'     : ['EW'],
     'WGs'         : ['QEE'],
-    'CONFIG'      : { 
+    'CONFIG'      : {
         # Prescale for the calibration line.
         "PRESCALE" : 0.03,
         # HLT properties.
@@ -76,7 +76,7 @@ class DijetsConf(LineBuilder):
 
     # Configuration keys.
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     # Initializer.
     def __init__(self, name, config) :
 
@@ -99,7 +99,7 @@ class DijetsConf(LineBuilder):
                   else StdJets)
         disvrs = self._create_disvrs([svrs])
         dijets = self._create_dijets([disvrs, jets])
-        
+
         # The di-jet line.
         line_dijets = StrippingLine(
             name + "Line",
@@ -186,13 +186,13 @@ class DijetsConf(LineBuilder):
                           'Phys/StdAllNoPIDsPions/Particles']
                 )
             jets.addTool(LoKi__FastJetMaker)
-            jets.LoKi__FastJetMaker.Type = 2                             
+            jets.LoKi__FastJetMaker.Type = 2
             jets.LoKi__FastJetMaker.RParameter = self._config["JET"]["R"]
             jets.LoKi__FastJetMaker.PtMin = self._config["JET"]["MIN_PT"]
-            jets.LoKi__FastJetMaker.Recombination = 0                    
+            jets.LoKi__FastJetMaker.Recombination = 0
             return Selection(self._name + "JetsSelection" ,
                              Algorithm = jets,
-                             RequiredSelections = [StdAllNoPIDsPions, 
+                             RequiredSelections = [StdAllNoPIDsPions,
                                                    StdLoosePhotons])
 
     # Create the di-svrs.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 60cfe9cc158839f24ce498a65b5e5d6ba9873ef1..2a7c8406b759b3c8a2a35b78538747acd94bc8d3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -36,12 +36,12 @@ default_config = {
   'BUILDERTYPE' : 'HighPtTopoJetsConf',
   'WGs'         : [ 'QEE' ],
   'STREAMS'     : [ 'EW'  ],
-  'CONFIG'      : { 
-    'HighPtTopo40000_Prescale'        : 1.0, 
-    'HighPtTopo20000_Prescale'        : 1.0, 
+  'CONFIG'      : {
+    'HighPtTopo40000_Prescale'        : 1.0,
+    'HighPtTopo20000_Prescale'        : 1.0,
     'HighPtTopo10000_Prescale'        : 0.0014,
     'HighPtTopo1000_Prescale'         : 0.00017,
-    'HighPtTopo20000_Cone55_Prescale' : 0.1, 
+    'HighPtTopo20000_Cone55_Prescale' : 0.1,
     'HighPtTopo_Postscale'            : 1.0,
     'pT'        : 40 * GeV,
     'pT20'      : 20 * GeV,
@@ -59,7 +59,7 @@ def config_split_HLT(tool):
     tool.addTool(TriggerTisTos, "TriggerTisTosTool")
     tool.TriggerTisTosTool.HltDecReportsLocation = DecoderDB["HltDecReportsDecoder/Hlt2DecReportsDecoder"].listOutputs()[0]
     tool.TriggerTisTosTool.HltSelReportsLocation = DecoderDB["HltSelReportsDecoder/Hlt2SelReportsDecoder"].listOutputs()[0]
-    
+
 
 class HighPtTopoJetsConf( LineBuilder ) :
 
@@ -79,11 +79,11 @@ class HighPtTopoJetsConf( LineBuilder ) :
         ## Available after Phys/TopologicalTools v1r1+
         ## Conditional can be removed afterward (hasattr doesn't work here)
         if 'hltdecision' in dir(dt):
-          dt.hltdecision = config['HLT2']  
+          dt.hltdecision = config['HLT2']
 
         # Split HLT configuration
         config_split_HLT(dt)
-        
+
         sline = StrippingLine(name+'%(pT)i'%config,
                               prescale  = config[ 'HighPtTopo40000_Prescale' ],
                               postscale = config[ 'HighPtTopo_Postscale' ],
@@ -101,7 +101,7 @@ class HighPtTopoJetsConf( LineBuilder ) :
         ## Available after Phys/TopologicalTools v1r1+
         ## Conditional can be removed afterward (hasattr doesn't work here)
         if 'hltdecision' in dir(dt):
-          dt.hltdecision = config['HLT2']  
+          dt.hltdecision = config['HLT2']
 
         # Split HLT configuration
         config_split_HLT(dt)
@@ -123,7 +123,7 @@ class HighPtTopoJetsConf( LineBuilder ) :
         ## Available after Phys/TopologicalTools v1r1+
         ## Conditional can be removed afterward (hasattr doesn't work here)
         if 'hltdecision' in dir(dt):
-          dt.hltdecision = config['HLT2']  
+          dt.hltdecision = config['HLT2']
 
         # Split HLT configuration
         config_split_HLT(dt)
@@ -145,7 +145,7 @@ class HighPtTopoJetsConf( LineBuilder ) :
         ## Available after Phys/TopologicalTools v1r1+
         ## Conditional can be removed afterward (hasattr doesn't work here)
         if 'hltdecision' in dir(dt):
-          dt.hltdecision = config['HLT2']  
+          dt.hltdecision = config['HLT2']
 
         # Split HLT configuration
         config_split_HLT(dt)
@@ -168,7 +168,7 @@ class HighPtTopoJetsConf( LineBuilder ) :
         ## Available after Phys/TopologicalTools v1r1+
         ## Conditional can be removed afterward (hasattr doesn't work here)
         if 'hltdecision' in dir(dt):
-          dt.hltdecision = config['HLT2']  
+          dt.hltdecision = config['HLT2']
 
 
         # Split HLT configuration
@@ -181,6 +181,6 @@ class HighPtTopoJetsConf( LineBuilder ) :
                               HLT2="HLT_PASS_RE('%s')"%config['HLT2'])
         self.registerLine(sline)
 
-    
+
 
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py
index 39efe61ed4619e808cfb35c1f12c4d2f2dfc76b2..906c2b10f564bff05f1fad27744b4c36cefe377d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py
@@ -54,7 +54,7 @@ default_config = {
         "HLT"   : {
             "LINETOPO"  : "Hlt2Topo.*Decision", # Line to use for TOPO
             "LINEMB"    : "Hlt1MBNoBiasDecision",  # Line to use for MB
-        }, 
+        },
         # Track properties.
         "TRK"   : {
             "MAX_MULT"       : 2500,      # Multiplicity.
@@ -365,4 +365,3 @@ def config_split_HLT(tool):
     tool.addTool(TriggerTisTos, "TriggerTisTos")
     tool.TriggerTisTos.HltDecReportsLocation = DecoderDB["HltDecReportsDecoder/Hlt2DecReportsDecoder"].listOutputs()[0]
     tool.TriggerTisTos.HltSelReportsLocation = DecoderDB["HltSelReportsDecoder/Hlt2SelReportsDecoder"].listOutputs()[0]
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py
index 40399a89c71788ebc8f8b1a56fdd7587eb5ce929..92fb1627e73c6b0c120cc3af41e8763f41508e81 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -38,14 +38,14 @@ class LoKiCuts(object):
     full functor is used (not the key) and that cuts are ignored if the key
     is not supplied to LoKiCuts.
     '''
-    
+
     functors = {'TRCHI2DOF' : 'TRCHI2DOF',
                 'P'         : 'P',
                 'PT'        : 'PT',
                 'MIPCHI2DV' : 'MIPCHI2DV(PRIMARY)',
                 'ASUMPT'    : 'ASUM(PT)',
                 'AMAXDOCA'  : "ACUTDOCA(%s,'LoKi::DistanceCalculator')",
-                #'AMAXDOCA' : "AMAXDOCA('LoKi::DistanceCalculator')" 
+                #'AMAXDOCA' : "AMAXDOCA('LoKi::DistanceCalculator')"
                 'VCHI2DOF'  : "VFASPF(VCHI2/VDOF)",
                 'BPVVDCHI2' : 'BPVVDCHI2',
                 'BPVDIRA'   : 'BPVDIRA',
@@ -63,7 +63,7 @@ class LoKiCuts(object):
                 'BPVVDZ'    : 'BPVVDZ',
                 'DOCAMAX'   : 'DOCAMAX',
                 'AM'        : 'AM',
-                'CL'        : 'CL', 
+                'CL'        : 'CL',
                 'TRGHP'     : 'TRGHP',
                 'DZ1'       : ' (CHILD(VFASPF(VZ), 1) - VFASPF(VZ))',
                 'DZ2'       : ' (CHILD(VFASPF(VZ), 2) - VFASPF(VZ))',
@@ -71,9 +71,9 @@ class LoKiCuts(object):
                 'PROBNNpi'  : 'PROBNNpi',
                 'PIDmu'     : 'PIDmu',
                 'HASVERTEX' : 'HASVERTEX',
-                'BPVCORRM'  : 'BPVCORRM', 
+                'BPVCORRM'  : 'BPVCORRM',
                 }
-    
+
     def __init__(self,cuts,config):
         self.cuts = cuts
         self.config = config
@@ -82,7 +82,7 @@ class LoKiCuts(object):
         cuts = []
         for cut in self.cuts: cuts += self._getCut(cut)
         return LoKiCuts.combine(cuts)
-        
+
     def _getCut(self,cut):
         cuts = []
         fun = self.functors[cut]
@@ -95,7 +95,7 @@ class LoKiCuts(object):
                         cuts.append(key.replace('_MAX','')+'<'+str(val))
                 return cuts
         for key,val in self.config.iteritems():
-            if key.startswith(cut+'_'):                
+            if key.startswith(cut+'_'):
                 if key.endswith('MIN'): cuts.append(fun+'>'+str(val))
                 else: cuts.append(fun+'<'+str(val))
         return cuts
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py
index a13fa02a9a53c270090314d9bd9d47a04cfc4824..c7ff86be40d0d0d8024b2dabf0bf49979467f026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -45,7 +45,7 @@ default_config = {
 
 class B02Lcmu_pKpiConf(LineBuilder):
 
-    __configuration_keys__ = default_config['CONFIG'].keys() 
+    __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config ):
 
@@ -63,7 +63,7 @@ class B02Lcmu_pKpiConf(LineBuilder):
                                            InputList =  DataOnDemand(Location = 'Phys/StdLooseKaons/Particles' ),
                                            Cuts = config['KaonCuts']
                                            )
-        
+
         self.SelPions = self.createSubSel( OutputList = name + 'SelPions',
                                            InputList =  DataOnDemand(Location = 'Phys/StdLoosePions/Particles' ),
                                            Cuts = config['PionCuts']
@@ -86,7 +86,7 @@ class B02Lcmu_pKpiConf(LineBuilder):
                                                     DecayDescriptor = '[B0 -> Lambda_c+ mu-]cc',
                                                     DaughterLists = [self.SelMuons, self.SelLc2pKpi],
                                                     PreVertexCuts  = config['B0MotheCut'],
-                                                    PostVertexCuts = config['B0VxCut'] 
+                                                    PostVertexCuts = config['B0VxCut']
                                                     )
         self.B02Lcmu_pKpiBDTLine = StrippingLine( self.name + 'Line',
                                                 prescale  = config['Prescale'],
@@ -117,5 +117,3 @@ class B02Lcmu_pKpiConf(LineBuilder):
         return Selection ( OutputList,
                        Algorithm = combiner,
                        RequiredSelections = DaughterLists)
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py
index 36646d83a5b098aafcbe18533e1d4dbf1d483513..1eb87be24ed4552f757196f181a1b334b3a8b5d8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py
@@ -21,7 +21,7 @@ StrippingReport                                                INFO Event 100000
  |!StrippingB23MuB23MuLine_TIMING                              |  0.0001|         1|  1.000|   0.068|
  |!StrippingB23MuB2MueeLine_TIMING                             |  0.0005|         5|  1.000|   0.079|
  |!StrippingB23MuB23PiLine_TIMING                              |  0.0103|       103|  1.097|   0.151|
-       
+
 MC: B23Pi (12103002)
 ####################
 StrippingReport                                                INFO Event 100000, Good event 100000
@@ -39,7 +39,7 @@ MC: B23K (12103012)
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
  |!StrippingB23MuB23PiLine                                     |  0.1140|       114|  1.026|   1.742|
- 
+
 Exported symbols (use python help!):
 
 """
@@ -86,7 +86,7 @@ default_config = {
     "MaxVtxChi2Dof"        : 9,
     "MinDira"              : 0.0,
     "MinTau"               : 0.0, # (ps)
-    # scalings    
+    # scalings
     "Postscale"            : 1,
     "B23MuPrescale"        : 1,
     "B2MueePrescale"       : 1,
@@ -105,11 +105,11 @@ default_config = {
 class B23MuLinesConf(LineBuilder) :
     """
     Builder
-    
+
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name = "B23Mu", config = default_config) :
 
         LineBuilder.__init__(self, name, config)
@@ -129,13 +129,13 @@ class B23MuLinesConf(LineBuilder) :
                                     & (ADOCA(1,3) < %(MaxDoca)s*mm)
                                     & (ADOCA(2,3) < %(MaxDoca)s*mm)
                                     """ %config
-        
+
         self.CombinationCutsTight = """
                                     (ADAMASS('B+') < %(mDiffBuTight)s*MeV)
                                     & (ADOCA(1,3) < %(MaxDoca)s*mm)
                                     & (ADOCA(2,3) < %(MaxDoca)s*mm)
                                     """ %config
-        
+
         self.MotherCuts = """
                           (BPVIPCHI2() < %(MaxIPChi2)s )
                           & (BPVVDCHI2 > %(MinVDChi2)s )
@@ -145,7 +145,7 @@ class B23MuLinesConf(LineBuilder) :
                           """ %config
 
 #############################################################################
-        
+
         B23Mu_name  = name+"B23Mu"
         B2Muee_name = name+"B2Muee"
         B23Pi_name  = name+"B23Pi"
@@ -153,7 +153,7 @@ class B23MuLinesConf(LineBuilder) :
         self.selB23Mu  = self.makeB23Mu(B23Mu_name)
         self.selB2Muee = self.makeB2Muee(B2Muee_name)
         self.selB23Pi  = self.makeB23Pi(B23Pi_name)
-        
+
 #############################################################################
 
         self.B23Mu_Line = StrippingLine(B23Mu_name+"Line",
@@ -161,7 +161,7 @@ class B23MuLinesConf(LineBuilder) :
                                         postscale = config["Postscale"],
                                         MDSTFlag = config["MDSTflag"],
                                         selection = self.selB23Mu,
-                                        RelatedInfoTools = [ 
+                                        RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -204,7 +204,7 @@ class B23MuLinesConf(LineBuilder) :
                                              "[B+ ->  mu+ ^mu+  l]CC"  : "BsMuMuTrackIsomu2",
                                              "[B+ ->  mu+  mu+ ^l]CC"  : "BsMuMuTrackIsomu3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                         )# closes Strippingline
 
         self.B2Muee_Line = StrippingLine(B2Muee_name+"Line",
@@ -212,7 +212,7 @@ class B23MuLinesConf(LineBuilder) :
                                          postscale = config["Postscale"],
                                          MDSTFlag = config["MDSTflag"],
                                          selection = self.selB2Muee,
-                                         RelatedInfoTools = [ 
+                                         RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -255,7 +255,7 @@ class B23MuLinesConf(LineBuilder) :
                                              "[B+ ->  l ^l  l]CC"  : "BsMuMuTrackIsomu2",
                                              "[B+ ->  l  l ^l]CC"  : "BsMuMuTrackIsomu3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                          ) # closes Strippingline
 
         self.B23Pi_Line = StrippingLine(B23Pi_name+"Line",
@@ -263,7 +263,7 @@ class B23MuLinesConf(LineBuilder) :
                                         postscale = config["Postscale"],
                                         MDSTFlag = config["MDSTflag"],
                                         selection = self.selB23Pi,
-                                        RelatedInfoTools = [ 
+                                        RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -306,9 +306,9 @@ class B23MuLinesConf(LineBuilder) :
                                              "[B+ ->  pi+ ^pi+  pi-]CC"  : "TrackIsoBDTpi2",
                                              "[B+ ->  pi+  pi+ ^pi-]CC"  : "TrackIsoBDTpi3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        ) # closes Strippingline 
-                                                             
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        ) # closes Strippingline
+
 #############################################################################
 
         self.registerLine(self.B23Mu_Line)
@@ -318,51 +318,51 @@ class B23MuLinesConf(LineBuilder) :
 #############################################################################
 
     def makeB23Mu(self,name):
-    
+
         B23Mu = DaVinci__N3BodyDecays("Combine"+name)
-        
+
         B23Mu.DecayDescriptors = [ "[B+ -> mu+ mu+ mu-]cc","[B+ -> mu+ mu+ mu+]cc" ]
         B23Mu.DaughtersCuts = { "mu+" : self.TrackCuts }
-            
+
         B23Mu.Combination12Cut = self.Combination12Cuts
-        B23Mu.CombinationCut   = self.CombinationCutsLoose    
+        B23Mu.CombinationCut   = self.CombinationCutsLoose
         B23Mu.MotherCut        = self.MotherCuts
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
         return Selection (name, Algorithm = B23Mu, RequiredSelections = [ _myMuons ])
 
 #############################################################################
 
     def makeB2Muee(self,name):
-    
+
         B2Muee = DaVinci__N3BodyDecays("Combine"+name)
         B2Muee.DecayDescriptors = [ "[B+ -> mu+ e+ e-]cc","[B+ -> mu- e+ e+]cc","[B+ -> mu+ e+ e+]cc" ]
         B2Muee.DaughtersCuts = { "mu+" : self.TrackCuts, "e+" : self.TrackCuts }
-        
+
         B2Muee.Combination12Cut = self.Combination12Cuts
-        B2Muee.CombinationCut   = self.CombinationCutsLoose     
+        B2Muee.CombinationCut   = self.CombinationCutsLoose
         B2Muee.MotherCut        = self.MotherCuts
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
         _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
-        
+
         return Selection (name, Algorithm = B2Muee, RequiredSelections = [ _myMuons, _myElectrons ])
 
 #############################################################################
 
     def makeB23Pi(self,name):
-    
+
         B23Pi = DaVinci__N3BodyDecays("Combine"+name)
         B23Pi.DecayDescriptors = [ "[B+ -> pi+ pi+ pi-]cc" ]
         B23Pi.DaughtersCuts = { "pi+" : self.TrackCuts }
-        
+
         B23Pi.Combination12Cut = self.Combination12Cuts
         B23Pi.CombinationCut   = self.CombinationCutsTight
         B23Pi.MotherCut        = self.MotherCuts
-        
+
         _myPions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-    
+
         return Selection (name, Algorithm = B23Pi, RequiredSelections = [ _myPions ])
 
 #############################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py
index 087c0518b9a3afe9f6236f66766054695a493058..5ff7ee6b86989213902223aa1afde1fff176c295 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py
@@ -51,7 +51,7 @@ default_config = {
                       'MuonPID': -3.0,
 
                       # Dimuon cuts
-                      'EMMDimuon_MaxMass': 6100., 
+                      'EMMDimuon_MaxMass': 6100.,
 
                       # B cuts
                       'EMMBMinPT'       : 2500.,
@@ -175,7 +175,7 @@ def makeLightResList( name,
                            CombinationCut = _diTrackPreVertexCuts,
                            MotherCut = _diTrackPostVertexCuts
                            )
-    
+
     PiPiPi0 = SimpleSelection(name+"_pi0", CombineParticles,
                            [ trkList, pi0List ],
                            DecayDescriptors=["rho(770)0 -> pi+ pi- pi0"],
@@ -267,5 +267,3 @@ def tisTosSelection(sel):
     '''Filters Selection sel to be TOS OR TIS.'''
     tisTosFilter = makeTISTOSFilter(sel.name())
     return Selection(sel.name()+'TISTOS', Algorithm=tisTosFilter, RequiredSelections=[sel])
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py
index b66be6b501d5063ce2e25e7bbedb4f7a45556dc2..068536ee94894950a4307663035eab1f5a99a3dd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py
@@ -53,7 +53,7 @@ default_config = {
     'CORRM_MAX'       : 15000.0, # MeV
     # Track cuts
     'Track_CHI2nDOF'      :    3.0,
-    'Track_GhostProb'     :    0.5,  
+    'Track_GhostProb'     :    0.5,
 
     # Muon cuts
     'Muon_MinIPCHI2'   :    16.0,
@@ -95,14 +95,14 @@ defaultName = "B2KLLXInclusive"
 class B2KLLXInclusiveConf(LineBuilder) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config) :
 
 
         LineBuilder.__init__(self, name, config)
 
         self.name = name
-        
+
 
         self.InclDiMuCombCut = "(AM > %(LOWERMASS)s *MeV) & " \
                                      "(AM < %(UPPERMASS)s *MeV)" %config
@@ -118,7 +118,7 @@ class B2KLLXInclusiveConf(LineBuilder) :
 
         self.TrackCuts = "(TRCHI2DOF < %(Track_CHI2nDOF)s) & (TRGHP < %(Track_GhostProb)s)" %config
         #self.TrackCuts = "(TRCHI2DOF < %(Track_CHI2nDOF)s)" %config
-        
+
         self.MuonCut = self.TrackCuts + " & (MIPCHI2DV(PRIMARY) > %(Muon_MinIPCHI2)s) & " \
                                              " (PIDmu> %(Muon_PIDmu)s) & " \
                                              " (PIDmu-PIDK> %(Muon_PIDmuK)s) & "\
@@ -164,7 +164,7 @@ class B2KLLXInclusiveConf(LineBuilder) :
         self.InclKLLNoLeptonPID = self.__InclKLL__(config,NoMuonPID=True)
         self.InclKLLNoHadronPID = self.__InclKLL__(config,NoHadronPID=True)
 
-        
+
 
 
         # inclusive dimuon line
@@ -215,12 +215,12 @@ class B2KLLXInclusiveConf(LineBuilder) :
     def __Muons__(self, conf,NoPID = False):
         """
         Filter muons from StdLooseMuons
-        """ 
+        """
         _code = self.MuonCut
         _muons = DataOnDemand(Location = 'Phys/StdLooseMuons/Particles')
         _name = "Selection_"+self.name+"_Muons"
         if NoPID:
-          _code = self.MuonCutNoPID 
+          _code = self.MuonCutNoPID
           _muons = DataOnDemand(Location = 'Phys/StdNoPIDsMuons/Particles')
           _name+="NoPID"
         _filter = FilterDesktop(Code = _code)
@@ -232,12 +232,12 @@ class B2KLLXInclusiveConf(LineBuilder) :
     def __Electrons__(self, conf,NoPID = False):
         """
         Filter electrons from StdLooseElectrons
-        """  
+        """
         _code = self.ElectronCut
         _electrons = DataOnDemand(Location = 'Phys/StdLooseElectrons/Particles')
         _name = "Selection_"+self.name+"_Electrons"
         if NoPID:
-          _code = self.ElectronCutNoPID 
+          _code = self.ElectronCutNoPID
           _electrons = DataOnDemand(Location = 'Phys/StdNoPIDsElectrons/Particles')
           _name+="NoPID"
         _filter = FilterDesktop(Code = _code)
@@ -249,18 +249,18 @@ class B2KLLXInclusiveConf(LineBuilder) :
     def __DiLeptons__(self, conf,NoPID = False):
         """
         Merge electrons and muons
-        """ 
+        """
         electrons = self.InclDielectron
         muons = self.InclDimu
         _name = "Selection_"+self.name+"_Leptons"
         if NoPID:
-          electrons = self.InclDielectronNoPID 
-          muons = self.InclDimuNoPID 
+          electrons = self.InclDielectronNoPID
+          muons = self.InclDimuNoPID
           _name+="NoPID"
         _sel = MergedSelection(_name,
                          RequiredSelections = [ muons,electrons ])
         return _sel
- 
+
 
     def __Kaons__(self, conf,NoPID = False):
         """
@@ -268,7 +268,7 @@ class B2KLLXInclusiveConf(LineBuilder) :
         """
         _code = self.KaonCut
         _name = "Selection_"+self.name+"_Kaons"
-        if NoPID: 
+        if NoPID:
           _code = self.KaonCutNoPID
           _name = "Selection_"+self.name+"_KaonsNoPID"
 
@@ -278,14 +278,14 @@ class B2KLLXInclusiveConf(LineBuilder) :
                          RequiredSelections = [ _kaons ] ,
                          Algorithm = _filter)
         return _sel
-        
+
     def __InclDielectron__(self, conf,NoPID=False, doWS=False):
         '''
         Create a new dimuon for high q2 inclusive B->Xmumu
         '''
         from StandardParticles import StdDiElectronFromTracks as DiElectrons
         #from StandardParticles import StdLooseDiElectron as DiElectrons
-        
+
         _name = "Sel_"+self.name+"_electronfilter"
         _Code = self.DiElectronCut
         if NoPID:
@@ -302,13 +302,13 @@ class B2KLLXInclusiveConf(LineBuilder) :
         '''
         Create a new dimuon for high q2 inclusive B->Xmumu
         '''
-        
+
         from  GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["J/psi(1S) -> mu- mu+","[J/psi(1S) -> mu- e+]cc"]
         CombineDiMuon.MotherCut     = self.InclDiMuCut
         if NoPID:
-          CombineDiMuon.MotherCut = self.InclDiMuCutNoPID 
+          CombineDiMuon.MotherCut = self.InclDiMuCutNoPID
         # choose
         if doWS == True:
             CombineDiMuon.DecayDescriptors = ["J/psi(1S) -> mu- mu+", "J/psi(1S) -> mu- mu-", "J/psi(1S) -> mu+ mu+","J/psi(1S) -> e+ e-","J/psi(1S) -> e+ e+","J/psi(1S) -> e- e-"]
@@ -326,7 +326,7 @@ class B2KLLXInclusiveConf(LineBuilder) :
         SelDiMuon = Selection(_name, Algorithm = CombineDiMuon,
                               RequiredSelections = [_sel ] )
         return SelDiMuon
-   
+
 
 
     def __InclKLL__(self, conf,NoMuonPID = False,NoHadronPID=False):
@@ -352,4 +352,3 @@ class B2KLLXInclusiveConf(LineBuilder) :
         SelDiMuon = Selection(_name, Algorithm = CombineDiMuon,
                               RequiredSelections = [ leptons,kaons ] )
         return SelDiMuon
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py
index 67f109c6207eadaa78429d512b3d4e7e9c4192e1..81606291fe90ae8fc45014feebc9937f3f391571 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py
@@ -41,7 +41,7 @@ default_config =  {
   'VCHI2_B_Mu'                    : '150', # dimensionless
   'FDCHI2_B'                      : '80',
   'FD_B_Mu'                       : '3',
-  'MASS_LOW_B'                    : 2000 * MeV,  
+  'MASS_LOW_B'                    : 2000 * MeV,
   'MASS_HIGH_B'                   : 10000 * MeV,
   #
   'MASS_LOW_Kst'                  : '700', # MeV
@@ -68,7 +68,7 @@ default_config =  {
   #
   'MINIPCHI2_K_KMM'	          : '4', #'16',
   'MINIPCHI2_PI_KMM'	          : '4', #'16',
-  'DOCAMAX_KST_KMM'	          : '0.15', #'0.15',	
+  'DOCAMAX_KST_KMM'	          : '0.15', #'0.15',
   'MINIPCHI2_KST_KMM'	          : '3', #'9',
   'FDCHI2OWNPV_KST_KMM'	          : '120',
   'MINIPCHI2_MU_KMM'	          : '4', #'16',
@@ -76,8 +76,8 @@ default_config =  {
   'VCHI2_B_Mu_KMM'                : '100', # dimensionless
   'FD_B_Mu_KMM'                   : '3',
   'FD_Kst_Mu_KMM'                 : '3',
-  'MASS_LOW_B_KMM'                : 1500 * MeV,  
-  'MASS_HIGH_B_KMM'               : 10000 * MeV,  
+  'MASS_LOW_B_KMM'                : 1500 * MeV,
+  'MASS_HIGH_B_KMM'               : 10000 * MeV,
   'PT_B_KMM'                      : 2000 * MeV,
   'PT_MU_KMM'                     : '800', #MeV,
   #
@@ -107,17 +107,17 @@ default_config =  {
     , "Variables" : [
        'BKSTTAUTAUMUONISOBDTFIRSTVALUETAUP', 'BKSTTAUTAUMUONISOBDTSECONDVALUETAUP','BKSTTAUTAUMUONISOBDTTHIRDVALUETAUP',
        'BKSTTAUTAUMUONISOBDTFIRSTVALUETAUM', 'BKSTTAUTAUMUONISOBDTSECONDVALUETAUM','BKSTTAUTAUMUONISOBDTTHIRDVALUETAUM']
-    , "Location"  : "B2KstTauTau_MuonIsolationBDT"  
+    , "Location"  : "B2KstTauTau_MuonIsolationBDT"
     },
   { "Type" : "RelInfoBKsttautauTauIsolationBDT"
     , "Variables" : [
      'BKSTTAUTAUTAUISOBDTFIRSTVALUETAUP', 'BKSTTAUTAUTAUISOBDTSECONDVALUETAUP','BKSTTAUTAUTAUISOBDTTHIRDVALUETAUP',
      'BKSTTAUTAUTAUISOBDTFIRSTVALUETAUM', 'BKSTTAUTAUTAUISOBDTSECONDVALUETAUM','BKSTTAUTAUTAUISOBDTTHIRDVALUETAUM',
      'BKSTTAUTAUTAUISOBDTFIRSTVALUEKST', 'BKSTTAUTAUTAUISOBDTSECONDVALUEKST','BKSTTAUTAUTAUISOBDTTHIRDVALUEKST']
-    , "Location"  : "B2KstTauTau_TauIsolationBDT"  
+    , "Location"  : "B2KstTauTau_TauIsolationBDT"
     },
-    
-  { "Type" : "RelInfoBKsttautauTrackIsolationBDT" 
+
+  { "Type" : "RelInfoBKsttautauTrackIsolationBDT"
     , "Variables" : [
       'BKSTTAUTAUTRKISOBDTFIRSTVALUETAUPPIM','BKSTTAUTAUTRKISOBDTSECONDVALUETAUPPIM','BKSTTAUTAUTRKISOBDTTHIRDVALUETAUPPIM',
       'BKSTTAUTAUTRKISOBDTFIRSTVALUETAUPPIP1','BKSTTAUTAUTRKISOBDTSECONDVALUETAUPPIP1','BKSTTAUTAUTRKISOBDTTHIRDVALUETAUPPIP1',
@@ -127,24 +127,24 @@ default_config =  {
       'BKSTTAUTAUTRKISOBDTFIRSTVALUETAUMPIM2','BKSTTAUTAUTRKISOBDTSECONDVALUETAUMPIM2','BKSTTAUTAUTRKISOBDTTHIRDVALUETAUMPIM2',
       'BKSTTAUTAUTRKISOBDTFIRSTVALUEKSTK','BKSTTAUTAUTRKISOBDTSECONDVALUEKSTK','BKSTTAUTAUTRKISOBDTTHIRDVALUEKSTK',
       'BKSTTAUTAUTRKISOBDTFIRSTVALUEKSTPI','BKSTTAUTAUTRKISOBDTSECONDVALUEKSTPI','BKSTTAUTAUTRKISOBDTTHIRDVALUEKSTPI']
-    , "Location"  : "B2KstTauTau_TrackIsolationBDT"  
-    },  
-  { "Type" : "RelInfoBstautauCDFIso" 
+    , "Location"  : "B2KstTauTau_TrackIsolationBDT"
+    },
+  { "Type" : "RelInfoBstautauCDFIso"
     #    , "Variables" : ['BKSTTAUTAUCDFISO']
-    , "Location"  : "B2KstTauTau_CDFIso"  
+    , "Location"  : "B2KstTauTau_CDFIso"
     }
-  
+
 #  ,{"Type" : "RelInfoConeIsolation"
 #      , "Variables" : [
 #        'CC_ANGLE', 'CC_MULT','CC_PX', 'CC_PY', 'CC_PZ', 'CC_VPT', 'CC_SPT', 'CC_PASYM ', 'CC_PTASYM', 'CC_PXASYM', 'CC_PYASYM', 'CC_PZASYM', 'CC_DELTAETA', 'CC_DELTAPHI', 'CC_IT', 'NC_ANGLE', 'NC_MULT', 'NC_PX', 'NC_PY', 'NC_PZ', 'NC_VPT', 'NC_SPT', 'NC_PASYM', 'NC_PTASYM', 'NC_PXASYM', 'NC_PYASYM', 'NC_PZASYM', 'NC_DELTAETA', 'NC_DELTAPHI', 'NC_IT']
 #    , "Location"  : "ConeIsolation" }
-  
+
   ]
   },
   'STREAMS'     : ['Bhadron']
   }
-  
-  
+
+
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
@@ -158,7 +158,7 @@ from StandardParticles import StdNoPIDsKaons
 
 
 class B2KstTauXConf(LineBuilder) :
-  
+
   """
     Builder for B->K*TauTau, B->K*TauMu
     """
@@ -172,9 +172,9 @@ class B2KstTauXConf(LineBuilder) :
   MuMu_SS_Line  = None
 
 
-  __configuration_keys__ = default_config['CONFIG'].keys()  
+  __configuration_keys__ = default_config['CONFIG'].keys()
+
 
-  
   def __init__(self, name, config):
 
     LineBuilder.__init__(self, name, config)
@@ -183,19 +183,19 @@ class B2KstTauXConf(LineBuilder) :
                                       config  = config)
     selKstar_KMM    = self._makeKstar_KMM(      name    = "Kstar_KMM"+name,
                                       config  = config)
-    
+
     self.FilterSPD = {
                 'Code' : " ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(SpdMult)s )" %config ,
                 'Preambulo' : [
                 "from LoKiNumbers.decorators import *", "from LoKiCore.basic import LHCb"
                 ]
                 }
-    
+
     rawTau          = DataOnDemand("Phys/StdTightDetachedTau3pi/Particles")
 
-    selPionsForD        = self._makePionsForD(      name    = "PionsDFor"+name, 
+    selPionsForD        = self._makePionsForD(      name    = "PionsDFor"+name,
                                       config  = config)
-    selKaonsForD        = self._makeKaonsForD(      name    = "KaonsDFor"+name, 
+    selKaonsForD        = self._makeKaonsForD(      name    = "KaonsDFor"+name,
                                       config  = config)
 
     selD            = self._makeD(name       = "DFor"+name,
@@ -207,44 +207,44 @@ class B2KstTauXConf(LineBuilder) :
                                             config  = config)
     selMuons_KMM    = self._makeMuons_KMM(      name    = "MuonsKMMFor"+name,
                                             config  = config)
-    
+
     selB2KstTauTau     = self._makeB2XX(   name    = name,
                                            tauSel  = rawTau,
-                                           KstarSel  = selKstar, 
+                                           KstarSel  = selKstar,
                                            config  = config)
     selB2KstTauTauSS = self._makeB2XXSS( name    = name,
                                          tauSel  = rawTau,
-                                         KstarSel  = selKstar, 
+                                         KstarSel  = selKstar,
                                          config  = config)
 
     selB2KstTauMu    = self._makeB2XMu(  name    = name,
                                          tauSel  = rawTau,
                                          muonSel = selMuons,
-                                         KstarSel  = selKstar, 
+                                         KstarSel  = selKstar,
                                          config  = config)
-    
+
     selB2KstTauMuSS = self._makeB2XMuSS(name    = name,
                                         tauSel  = rawTau,
                                         muonSel = selMuons,
-                                        KstarSel  = selKstar, 
+                                        KstarSel  = selKstar,
                                         config  = config)
 
     selB2KstMuMu    = self._makeB2XMuMu(  name    = name+"twoMuons",
                                          muonSel_KMM = selMuons_KMM,
-                                         KstarSel_KMM  = selKstar_KMM, 
+                                         KstarSel_KMM  = selKstar_KMM,
                                          config  = config)
-    
+
     selB2KstMuMuSS = self._makeB2XMuMuSS(name    = name+"twoMuons_SS",
                                         muonSel_KMM = selMuons_KMM,
-                                        KstarSel_KMM  = selKstar_KMM, 
+                                        KstarSel_KMM  = selKstar_KMM,
                                         config  = config)
 
     selB2DDSL    = self._makeB2DXMu(  name    = name,
                                          DSel  = selD,
                                          muonSel = selMuons,
-                                         KstarSel  = selKstar, 
+                                         KstarSel  = selKstar,
                                          config  = config)
-    
+
     self.TauTau_Line    = StrippingLine(name+"_TauTau_Line",
                                            #HLT         = " HLT_PASS_RE('"+HLT_DECISIONS+"') ",
                                         prescale    = config['B2KstTauTau_LinePrescale'],
@@ -254,7 +254,7 @@ class B2KstTauXConf(LineBuilder) :
                                         #RelatedInfoTools = config['RelatedInfoTools'],
                                         RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT" ,  "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso" ,             "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
@@ -274,7 +274,7 @@ class B2KstTauXConf(LineBuilder) :
                                                   }
                                                   ],
                                         selection = selB2KstTauTau,
-                                        MaxCandidates = 50 
+                                        MaxCandidates = 50
                                         )
 
     self.TauTau_SS_Line = StrippingLine(name+"_TauTau_SameSign_Line",
@@ -286,7 +286,7 @@ class B2KstTauXConf(LineBuilder) :
                                         #RelatedInfoTools = config['RelatedInfoTools'],
                                         RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT",   "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso",              "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
@@ -295,7 +295,7 @@ class B2KstTauXConf(LineBuilder) :
                                                                     "[Beauty ->  X0  tau+ ^tau+]CC" : "TauVars_VertexIsoInfo_1"
                                                                 }
                                                   },
-                                                  { "Type" : "RelInfoConeIsolation",               
+                                                  { "Type" : "RelInfoConeIsolation",
                                                                 "ConeSize" : 0.5,
                                                                 "Location" : "BVars_ConeIsoInfo",
                                                                 "DaughterLocations" : {
@@ -305,7 +305,7 @@ class B2KstTauXConf(LineBuilder) :
                                                   }
                                                   ],
                                         selection   = selB2KstTauTauSS,
-                                        MaxCandidates = 50 
+                                        MaxCandidates = 50
                                         )
 
     self.TauMu_Line     = StrippingLine(name+"_TauMu_Line",
@@ -318,7 +318,7 @@ class B2KstTauXConf(LineBuilder) :
                                         RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauMuonIsolationBDT",  "Location" : "B2KstTauTau_MuonIsolationBDT" },
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT",   "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso",              "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
@@ -326,7 +326,7 @@ class B2KstTauXConf(LineBuilder) :
                                                                     "[Beauty ->  X0 ^tau+ mu-]CC" : "TauVars_VertexIsoInfo_0"
                                                                 }
                                                   },
-                                                  { "Type" : "RelInfoConeIsolation",               
+                                                  { "Type" : "RelInfoConeIsolation",
                                                                 "ConeSize" : 0.5,
                                                                 "Location" : "BVars_ConeIsoInfo",
                                                                 "DaughterLocations" : {
@@ -415,12 +415,12 @@ class B2KstTauXConf(LineBuilder) :
                                      'Location'          : 'ConeIsoInfo20'
                                     },
 
-                                                  
+
                                                   ],
                                         selection   = selB2KstTauMu,
-                                        MaxCandidates = 30 
+                                        MaxCandidates = 30
                                         )
-   
+
     self.TauMu_SS_Line  = StrippingLine(name+"_TauMu_SameSign_Line",
                                         #HLT         = " HLT_PASS_RE('"+HLT_DECISIONS+"') ",
                                         prescale    = config['B2KstTauMu_SameSign_LinePrescale'],
@@ -431,7 +431,7 @@ class B2KstTauXConf(LineBuilder) :
                                         RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauMuonIsolationBDT",  "Location" : "B2KstTauTau_MuonIsolationBDT" },
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT",   "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso",              "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
@@ -439,7 +439,7 @@ class B2KstTauXConf(LineBuilder) :
                                                                     "[Beauty ->  X0 ^tau+ mu+]CC" : "TauVars_VertexIsoInfo_0"
                                                                 }
                                                   },
-                                                  { "Type" : "RelInfoConeIsolation",               
+                                                  { "Type" : "RelInfoConeIsolation",
                                                                 "ConeSize" : 0.5,
                                                                 "Location" : "BVars_ConeIsoInfo",
                                                                 "DaughterLocations" : {
@@ -453,7 +453,7 @@ class B2KstTauXConf(LineBuilder) :
                                                                     "[Beauty -> [(X0 -> K+ ^pi-)]CC  tau+ mu+]CC" : "PiVars_ConeIsoInfo_0",
                                                                 }
                                                   },
-                                          
+
                                                     {'Type'             : 'RelInfoVertexIsolationBDT',
                                                      'Location'         : 'VertexIsoBDTInfo',
                                                      'DaughterLocations'   : {
@@ -529,7 +529,7 @@ class B2KstTauXConf(LineBuilder) :
 
                                                   ],
                                         selection   = selB2KstTauMuSS,
-                                        MaxCandidates = 30 
+                                        MaxCandidates = 30
                                         )
 
 
@@ -543,14 +543,14 @@ class B2KstTauXConf(LineBuilder) :
                                         RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauMuonIsolationBDT",  "Location" : "B2KstTauTau_MuonIsolationBDT" },
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT",   "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso",              "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
                                                                     "[B0 -> ^K*(892)0 mu+ mu-]CC" : "KstarVars_VertexIsoInfo"
                                                                 }
                                                   },
-                                                  { "Type" : "RelInfoConeIsolation",               
+                                                  { "Type" : "RelInfoConeIsolation",
                                                                 "ConeSize" : 0.5,
                                                                 "Location" : "BVars_ConeIsoInfo",
                                                                 "DaughterLocations" : {
@@ -560,9 +560,9 @@ class B2KstTauXConf(LineBuilder) :
                                                   }
                                                   ],
                                         selection   = selB2KstMuMu,
-                                        MaxCandidates = 30 
+                                        MaxCandidates = 30
                                         )
-   
+
     self.MuMu_SS_Line  = StrippingLine(name+"_MuMu_SameSign_Line",
                                         #HLT         = " HLT_PASS_RE('"+HLT_DECISIONS+"') ",
                                         prescale    = config['B2KstMuMu_SameSign_LinePrescale'],
@@ -573,14 +573,14 @@ class B2KstTauXConf(LineBuilder) :
                                         RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauMuonIsolationBDT",  "Location" : "B2KstTauTau_MuonIsolationBDT" },
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT",   "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso",              "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
                                                                     "[Beauty -> ^X0 mu+ mu+]CC" : "KstarVars_VertexIsoInfo"
                                                                 }
                                                   },
-                                                  { "Type" : "RelInfoConeIsolation",               
+                                                  { "Type" : "RelInfoConeIsolation",
                                                                 "ConeSize" : 0.5,
                                                                 "Location" : "BVars_ConeIsoInfo",
                                                                 "DaughterLocations" : {
@@ -590,9 +590,9 @@ class B2KstTauXConf(LineBuilder) :
                                                   }
                                                   ],
                                         selection   = selB2KstMuMuSS,
-                                        MaxCandidates = 30 
+                                        MaxCandidates = 30
                                         )
-    
+
     self.DDSL_Line    = StrippingLine(name+"_DDSL_Line",
                                       #HLT         = " HLT_PASS_RE('"+HLT_DECISIONS+"') ",
                                       prescale    = config['B2DDSL_LinePrescale'],
@@ -603,7 +603,7 @@ class B2KstTauXConf(LineBuilder) :
                                       RelatedInfoTools      = [
                                                   { "Type" : "RelInfoBKsttautauMuonIsolationBDT",  "Location" : "B2KstTauTau_MuonIsolationBDT" },
                                                   { "Type" : "RelInfoBKsttautauTauIsolationBDT",   "Location" : "B2KstTauTau_TauIsolationBDT" },
-                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },  
+                                                  { "Type" : "RelInfoBKsttautauTrackIsolationBDT", "Location" : "B2KstTauTau_TrackIsolationBDT" },
                                                   { "Type" : "RelInfoBstautauCDFIso",              "Location" : "B2KstTauTau_CDFIso" },
                                                   { "Type" : "RelInfoVertexIsolation",             "Location" : "BVars_VertexIsoInfo",
                                                                 "DaughterLocations" : {
@@ -611,7 +611,7 @@ class B2KstTauXConf(LineBuilder) :
                                                                     "[B0 ->  K*(892)0 ^D+ mu-]CC" : "DVars_VertexIsoInfo"
                                                                 }
                                                   },
-                                                  { "Type" : "RelInfoConeIsolation",               
+                                                  { "Type" : "RelInfoConeIsolation",
                                                                 "ConeSize" : 0.5,
                                                                 "Location" : "BVars_ConeIsoInfo",
                                                                 "DaughterLocations" : {
@@ -624,7 +624,7 @@ class B2KstTauXConf(LineBuilder) :
                                       MaxCandidates = 30
                                       )
 
-     
+
     #
 
     self.registerLine( self.TauTau_Line )
@@ -634,17 +634,17 @@ class B2KstTauXConf(LineBuilder) :
     self.registerLine( self.TauMu_SS_Line )
     self.registerLine( self.MuMu_SS_Line )
     self.registerLine( self.DDSL_Line )
-  
-  
+
+
   #####################################################
   def _makeB2XX(self, name, tauSel, KstarSel, config):
-    
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B']   + "*MeV)"
-    
+
 #    _bcut    = "(VFASPF(VCHI2)  <   "   + config['VCHI2_B']       + ")  &"\
 #               "(BPVVDCHI2          >   "   + config['FDCHI2_B']      + ") & (BPVVD < " +config['FD_B_Max_KTT'] +")" # & (PT > "+config['PT_B_KTT']+" * MeV ) "
- 
+
 #    _CombineTau = CombineParticles( DecayDescriptors = ["[B0 -> K*(892)0 tau+ tau-]cc"],
 #                                    CombinationCut   = _combcut,
 #                                    MotherCut        = _bcut)
@@ -663,7 +663,7 @@ class B2KstTauXConf(LineBuilder) :
 #    _CombineTau.DecayDescriptors = ["[B0 -> K*(892)0 tau+ tau-]cc"]
 #    _CombineTau.CombinationCut   = _combcut
 #    _CombineTau.MotherCut        = _bcut
-    
+
      return (Selection(name+"_TauTau",
                       Algorithm          = _CombineTau,
                       RequiredSelections = [ tauSel , KstarSel ] ))
@@ -671,17 +671,17 @@ class B2KstTauXConf(LineBuilder) :
 
   #####################################################
   def _makeB2XXSS(self, name, tauSel, KstarSel, config):
-      
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B']   + "*MeV)"
-    
+
 #    _bcut    = "(VFASPF(VCHI2)  <   "   + config['VCHI2_B']       + ") & "\
 #               "(BPVVDCHI2          >   "   + config['FDCHI2_B']      + ") & (BPVVD < " +config['FD_B_Max_KTT'] +")" # & (PT > "+config['PT_B_KTT']+" * MeV ) "
-   
+
 #    _CombineTau = CombineParticles( DecayDescriptors = ["[B0 ->  K*(892)0 tau+ tau+]cc","[B0 ->  K*(892)0 tau- tau-]cc"],
 #                                    CombinationCut   = _combcut,
 #                                    MotherCut        = _bcut)
-                                      
+
      _CombineTau = DaVinci__N3BodyDecays(
                    DecayDescriptors = ["[B0 -> K*(892)0 tau+ tau+]cc","[B0 -> K*(892)0 tau- tau-]cc"],
                    Combination12Cut = "AM<5000",
@@ -690,21 +690,21 @@ class B2KstTauXConf(LineBuilder) :
                                "& ( BPVVDCHI2     > %(FDCHI2_B)s )"\
                                "& ( BPVVD         < %(FD_B_Max_KTT)s )" %config
                    )
-    
+
      return (Selection(name+"_TauTauSS",
                       Algorithm          = _CombineTau,
                       RequiredSelections = [ tauSel ,KstarSel] ))
-  
+
 
   #####################################################
   def _makeB2XMu(self, name, tauSel,  muonSel, KstarSel, config):
-    
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B']   + "*MeV)"
 
 #    _bcut    ="(VFASPF(VCHI2)  <   "   + config['VCHI2_B_Mu']       + ") & "\
 #               "(BPVVD          >   "   + config['FD_B_Mu']      + ") & (BPVVD < " +config['FD_B_Max_KTM'] +")" # & (PT > "+config['PT_B_KTM']+" * MeV ) "
-             
+
 #    _CombineTau = CombineParticles( DecayDescriptors = ["[B0 -> K*(892)0 tau+ mu-]cc","[B0 -> K*(892)0 tau- mu+]cc"],
 #                                    CombinationCut   = _combcut,
 #                                    MotherCut        = _bcut)
@@ -721,17 +721,17 @@ class B2KstTauXConf(LineBuilder) :
      return (Selection(name+"_TauMu",
                       Algorithm          = _CombineTau,
                       RequiredSelections = [ tauSel, muonSel, KstarSel ] ))
-  
-    
+
+
   #####################################################
   def _makeB2XMuSS(self, name, tauSel, muonSel, KstarSel,config):
-        
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B']   + "*MeV)"
-    
+
 #    _bcut    ="(VFASPF(VCHI2)  <   "   + config['VCHI2_B_Mu']       + ") & "\
 #               "(BPVVD          >   "   + config['FD_B_Mu']      + ")   & (BPVVD < " +config['FD_B_Max_KTM'] +")" # & (PT > "+config['PT_B_KTM']+" * MeV ) "
- 
+
 #    _CombineTau = CombineParticles( DecayDescriptors = ["[B0 ->  K*(892)0 tau+ mu+]cc","[B0 ->  K*(892)0 tau- mu-]cc"],
 #                                   CombinationCut   = _combcut,
 #                                   MotherCut        = _bcut)
@@ -744,7 +744,7 @@ class B2KstTauXConf(LineBuilder) :
                                "& ( BPVVD         > %(FD_B_Mu)s )"\
                                "& ( BPVVD         < %(FD_B_Max_KTM)s )" %config
                    )
-    
+
      return (Selection(name+"_TauMuSS",
                       Algorithm          = _CombineTau,
                       RequiredSelections = [ tauSel, muonSel, KstarSel ] ))
@@ -752,13 +752,13 @@ class B2KstTauXConf(LineBuilder) :
 
   #####################################################
   def _makeB2DXMu(self, name, DSel,  muonSel, KstarSel, config):
-    
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B']   + "*MeV)"
 
 #    _bcut    ="(VFASPF(VCHI2)  <   "   + config['VCHI2_B_Mu']       + ") & "\
 #               "(BPVVD          >   "   + config['FD_B_Mu']      + ")  & (BPVVD < " +config['FD_B_Max_KTM'] +")" # & (PT > "+config['PT_B_KTM']+" * MeV ) "
-            
+
 #    _CombineD = CombineParticles( DecayDescriptors = ["[B0 ->  K*(892)0 D+ mu-]cc"],
 #                                   CombinationCut   = _combcut,
 #                                   MotherCut        = _bcut)
@@ -775,11 +775,11 @@ class B2KstTauXConf(LineBuilder) :
      return (Selection(name+"_DDSL",
                       Algorithm          = _CombineD,
                       RequiredSelections = [ DSel, muonSel, KstarSel ] ))
-  
+
 
   #####################################################
   def _makeB2XMuMu(self, name, muonSel_KMM, KstarSel_KMM, config):
-    
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B_KMM']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B_KMM']   + "*MeV)"
 
@@ -787,7 +787,7 @@ class B2KstTauXConf(LineBuilder) :
 #               "(VFASPF(VCHI2)  <   "   + config['VCHI2_B_Mu_KMM']       + ") & "\
 #               "(BPVVD          >   "   + config['FD_B_Mu_KMM']      + ") & "\
 #               "(BPVDIRA >"         + config['B_COSDIRA_KMM']   + ") "
-         
+
 #    _CombineTau = CombineParticles( DecayDescriptors = ["[B0 ->  K*(892)0 mu+ mu-]cc"],
 #                                   CombinationCut   = _combcut,
 #                                   MotherCut        = _bcut)
@@ -801,15 +801,15 @@ class B2KstTauXConf(LineBuilder) :
                                "& ( BPVVD          > %(FD_B_Mu_KMM)s )"\
                                "& ( BPVDIRA        > %(B_COSDIRA_KMM)s )" %config
                    )
- 
+
      return (Selection(name+"_MuMu",
                       Algorithm          = _CombineTau,
                       RequiredSelections = [ muonSel_KMM, KstarSel_KMM ] ))
-  
+
 
   #####################################################
   def _makeB2XMuMuSS(self, name, muonSel_KMM, KstarSel_KMM, config):
-    
+
 #    _combcut = "(AM  > " + config['MASS_LOW_B_KMM']    + "*MeV) & "\
 #               "(AM  < " + config['MASS_HIGH_B_KMM']   + "*MeV)"
 
@@ -817,7 +817,7 @@ class B2KstTauXConf(LineBuilder) :
 #               "(VFASPF(VCHI2)  <   "   + config['VCHI2_B_Mu_KMM']       + ") & "\
 #               "(BPVVD          >   "   + config['FD_B_Mu_KMM']      + ") & "\
 #               " (BPVDIRA >"         + config['B_COSDIRA_KMM']   + ") "
-          
+
 #    _CombineTau = CombineParticles( DecayDescriptors = ["[B0 ->  K*(892)0 mu+ mu+]cc","[B0 ->  K*(892)0 mu- mu-]cc"],
 #                                   CombinationCut   = _combcut,
 #                                   MotherCut        = _bcut)
@@ -835,15 +835,15 @@ class B2KstTauXConf(LineBuilder) :
      return (Selection(name+"_MuMuSS",
                       Algorithm          = _CombineTau,
                       RequiredSelections = [ muonSel_KMM, KstarSel_KMM ] ))
-  
+
 
   #####################################################
   def _makeKstar(self, name, config) :
-             
+
      _combcut = " (AM  > "           + config['MASS_LOW_Kst']    + "*MeV) & "\
                 " (AM  < "           + config['MASS_HIGH_Kst']   + "*MeV)   "
 
-     
+
      _bcut = " (PT > "             + config['PT_Kst']   + "*MeV) &"\
                "(BPVVD          >   "   + config['FD_Kst_Mu_KMM']      + ") & "\
              " (VFASPF(VCHI2)  <   "   + config['VCHI2_Kst']       + ")  "
@@ -853,27 +853,27 @@ class B2KstTauXConf(LineBuilder) :
      _daucut = { 'pi+' : '( (TRCHI2DOF < 4) & (PROBNNpi>0.5))',
                  'K-' : '( (TRCHI2DOF < 4) & (PROBNNk>0.2))' }
 
-     
+
      _CombineKst   = CombineParticles( DecayDescriptors = ["[K*(892)0 -> K+ pi-]cc"],
-                                       CombinationCut   = _combcut, 
+                                       CombinationCut   = _combcut,
                                        MotherCut        = _bcut ,
                                        DaughtersCuts    = _daucut
-                                       )    
+                                       )
 
      return Selection(name,
                       Algorithm          = _CombineKst,
                       RequiredSelections = [StdLoosePions,StdNoPIDsKaons]
                       )
 
-  
+
   #####################################################
   def _makeKstar_KMM(self, name, config) :
-             
+
      _combcut = " (AM  > "           + config['MASS_LOW_Kst']    + "*MeV) & "\
                 " (AM  < "           + config['MASS_HIGH_Kst']   + "*MeV) &  "\
 		" (AMAXDOCA('')  <"  + config['DOCAMAX_KST_KMM']   + "*mm)"
 
-     
+
      _bcut = " (PT > "             + config['PT_Kst']   + "*MeV) &"\
              " (VFASPF(VCHI2)  <   "   + config['VCHI2_Kst']       + ") &  "\
 	     " (MIPCHI2DV(PRIMARY) > "+config['MINIPCHI2_KST_KMM'] +") &"\
@@ -883,12 +883,12 @@ class B2KstTauXConf(LineBuilder) :
      _daucut = { 'pi+' : '( (TRCHI2DOF < 4) & (PROBNNpi>0.5) & (MIPCHI2DV(PRIMARY) > '+config['MINIPCHI2_PI_KMM']  +'))',
                  'K-' : '( (TRCHI2DOF < 4) & (PROBNNk>0.2)  & (MIPCHI2DV(PRIMARY) > '+config['MINIPCHI2_K_KMM']  +'))' }
 
-     
+
      _CombineKst_KMM   = CombineParticles( DecayDescriptors = ["[K*(892)0 -> K+ pi-]cc"],
-                                       CombinationCut   = _combcut, 
+                                       CombinationCut   = _combcut,
                                        MotherCut        = _bcut ,
                                        DaughtersCuts    = _daucut
-                                       )    
+                                       )
 
      return Selection(name,
                       Algorithm          = _CombineKst_KMM,
@@ -898,33 +898,33 @@ class B2KstTauXConf(LineBuilder) :
 
   #####################################################
   def _makeMuons(self, name, config) :
-    """                     
-      Muon selection          
-      """                     
+    """
+      Muon selection
+      """
     _code =     "(PT > "                    + config['PT_MU']          + "*MeV) & "\
             "(TRCHI2DOF < "             + config['TRACKCHI2_MU']   + ")      "
-    
+
     _Filter = FilterDesktop(Code = _code)
-    
-    return Selection(name,  
+
+    return Selection(name,
                      Algorithm          = _Filter,
-                     RequiredSelections = [ StdTightMuons ] )    
+                     RequiredSelections = [ StdTightMuons ] )
 
 
-  #####################################################  
+  #####################################################
   def _makeMuons_KMM(self, name, config) :
-    """                     
-      Muon selection          
-      """                     
+    """
+      Muon selection
+      """
     _code =     "(PT > "                    + config['PT_MU_KMM']          + "*MeV) & "\
             "(TRCHI2DOF < "             + config['TRACKCHI2_MU']   + ")      &" \
 	    "(	MIPCHI2DV(PRIMARY) > "+config['MINIPCHI2_MU_KMM']  +")  "
-    
+
     _Filter_KMM = FilterDesktop(Code = _code)
-    
-    return Selection(name,  
+
+    return Selection(name,
                      Algorithm          = _Filter_KMM,
-                     RequiredSelections = [ StdTightMuons ] )    
+                     RequiredSelections = [ StdTightMuons ] )
 
 
   #####################################################
@@ -933,9 +933,9 @@ class B2KstTauXConf(LineBuilder) :
       Pion selection for B -> DD
       """
     _code = self._hadFinalStateKinematicCuts(config) +" & (PROBNNpi > 0.55)"
-    
+
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm          = _Filter,
                      RequiredSelections = [ StdLoosePions ] )
@@ -946,21 +946,21 @@ class B2KstTauXConf(LineBuilder) :
     """
       Kaon selection for B -> DD
       """
-    _code = self._hadFinalStateKinematicCuts(config)  
-    
+    _code = self._hadFinalStateKinematicCuts(config)
+
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm          = _Filter,
                      RequiredSelections = [ StdLooseKaons ] )
-  
+
 
   #####################################################
   def _makeD(self, name, pionSel, kaonSel, config) :
 
      _preambulo = [ "c1c2c3 = ((('pi+') == ABSID) | (('K+') == ABSID))" ,
                     "ipsm    = MINTREE( c1c2c3 , MIPCHI2DV(PRIMARY) )"]
-            
+
 #     _combcut = " (((AM  > "           + config['MASS_LOW_D']    + "*MeV) & "\
 #                " (AM  < "           + config['MASS_HIGH_D']   + "*MeV))  | "\
 #                " ((AM  > "           + config['MASS_LOW_Ds']    + "*MeV) & "\
@@ -968,7 +968,7 @@ class B2KstTauXConf(LineBuilder) :
 #                " (APT  > "          + config['APT_D']   + "*MeV)  & "\
 #                " (AMAXDOCA('')  <"  + config['AMAXDOCA_D']   + "*mm)  & "\
 #                " (ANUM(PT > "       + config['MaxPT_D']   + "*MeV) >= 1) "
-     
+
 #     _bcut = " (PT > "             + config['PT_D']   + "*MeV) &"\
 #             " (BPVDIRA >"         + config['DIRA_D']   + ") &"\
 #             " (VFASPF(VCHI2) < "  + config['VCHI2_D']   + ")&"\
@@ -976,9 +976,9 @@ class B2KstTauXConf(LineBuilder) :
 #             " (BPVVDRHO >  "      + config['VDRHOmin_D']   + "*mm) &"\
 #             " (BPVVDRHO <  "      + config['VDRHOmax_D']   + "*mm) &"\
 #             " (BPVVDZ >  "        + config['VDZ_D']   + "*mm) "
-       
+
 #     _CombineD   = CombineParticles( DecayDescriptors = ["[D+ -> pi+ K- pi+]cc","[D+ -> K+ K- pi+]cc"],
-#                                     CombinationCut   = _combcut, 
+#                                     CombinationCut   = _combcut,
 #                                     MotherCut        = _bcut+"& (M>1800.*MeV) & (M<2030.*MeV)" ,
 #                                     Preambulo        = _preambulo)
 
@@ -997,7 +997,7 @@ class B2KstTauXConf(LineBuilder) :
                                "& ( in_range ( %(VDRHOmin_D)s, BPVVDRHO, %(VDRHOmax_D)s ) )"\
                                "& ( BPVVDZ        > %(VDZ_D)s )"\
                                "& ( in_range ( %(MASS_LOW_Dmother)s, M, %(MASS_HIGH_Dmother)s ) )" %config
-                   )    
+                   )
 
      return Selection(name,
                       Algorithm          = _CombineD,
@@ -1005,7 +1005,7 @@ class B2KstTauXConf(LineBuilder) :
                       )
 
 
-  #####################################################   
+  #####################################################
   def _hadFinalStateKinematicCuts(self, config) :
     _code = "(P  > "                    + config['P_HAD_ALL_FINAL_STATE']     + "*MeV) & "\
       "(PT > "                    + config['PT_HAD_ALL_FINAL_STATE']          + "*MeV) & "\
@@ -1014,4 +1014,3 @@ class B2KstTauXConf(LineBuilder) :
       "(TRGHOSTPROB < "           + config['TRGHOPROB_HAD_ALL_FINAL_STATE']   + ")     "
 
     return _code
-  
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py
index 3b4495ffd4ab871009a984ae915a1aeb9887c167..dcadc69b9e992f179e2e1ba58f7ac3e5c9a21b8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py
@@ -89,9 +89,9 @@ default_config = {
         'KstarCuts'     : "(VFASPF(VCHI2/VDOF)<16) & (ADMASS('K*(892)0')< 300*MeV)",
 
         'KsDDCuts'      : "(ADMASS('KS0') < 30.*MeV) & (BPVVDCHI2>25)",
-        'KsLLComCuts'   : "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(25, ''))",  
+        'KsLLComCuts'   : "(ADAMASS('KS0') < 50.*MeV) & (ADOCACHI2CUT(25, ''))",
         'KsLLCuts'      : "(ADMASS('KS0') < 30.*MeV) & (BPVVDCHI2>25) & (VFASPF(VCHI2) < 25.)",
-        
+
         'PhiCuts'       : """
                           (HASVERTEX) & (VFASPF(VCHI2)<16) & (MM<1.05*GeV) & (MIPCHI2DV(PRIMARY)>2.)
                           & (INTREE( (ID=='K+') & (PT>200*MeV) & (TRGHOSTPROB<0.4) ))
@@ -105,7 +105,7 @@ default_config = {
 
         'LambdastarComCuts' : "(AM < 5.6*GeV)",
         'LambdastarCuts': "(VFASPF(VCHI2) < 25.)",
-        
+
         'BComCuts'      : "(in_range(3.7*GeV, AM, 6.8*GeV))",
         'BMomCuts'      : "(in_range(4.0*GeV,  M, 6.5*GeV)) & (VFASPF(VCHI2/VDOF) < 25.) & (BPVDIRA> 0.999) & (BPVDLS>0) & (BPVIPCHI2()<400)",
 
@@ -139,20 +139,20 @@ default_config = {
         'RelatedInfoTools'     : [
             {'Type'              : 'RelInfoVertexIsolation',
              'Location'          : 'VertexIsoInfo',
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'DaughterLocations' : {key: val.format('VertexIsoInfo') for key, val in daughter_vtx_locations.items()}},
             {'Type'              : 'RelInfoVertexIsolationBDT',
              'Location'          : 'VertexIsoBDTInfo',
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'DaughterLocations' : {key: val.format('VertexIsoBDTInfo') for key, val in daughter_vtx_locations.items()}},
             {'Type'              : 'RelInfoConeVariables',
              'ConeAngle'         : 0.5,
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'Location' : 'TrackIsoInfo05',
              'DaughterLocations' : {key: val.format('TrackIsoInfo') for key, val in daughter_locations.items()}},
             {'Type'              : 'RelInfoConeIsolation',
              'ConeSize'          : 0.5,
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'Location' : 'ConeIsoInfo05',
              'DaughterLocations' : {key: val.format('ConeIsoInfo') for key, val in daughter_locations.items()}},
             {'Type'              : 'RelInfoBs2MuMuTrackIsolations',
@@ -184,7 +184,7 @@ default_config = {
              'ConeSize'         : 2.0,
              'Location'          : 'ConeIsoInfo20'
             }
-            ]        
+            ]
         },
     'STREAMS'           : ['Leptonic' ],
     'WGs'               : ['RD']
@@ -192,20 +192,20 @@ default_config = {
 
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles 
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
 class B2LLXBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, name, config ): 
-        
+    def __init__(self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        self.name = name 
+        self.name = name
         self.config = config
 
         """
@@ -214,85 +214,85 @@ class B2LLXBDTConf(LineBuilder):
         from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon
 
         self.SelDiElectron = self.createSubSel( OutputList = self.name + "SelDiElectron",
-                                                InputList = StdDiElectronFromTracks , 
+                                                InputList = StdDiElectronFromTracks ,
                                                 Cuts = config['DiElectronCuts']
                                                 )
-        
+
         self.SelDiMuon = self.createSubSel( OutputList = self.name + "SelDiMuon",
-                                             InputList = StdLooseDiMuon , 
+                                             InputList = StdLooseDiMuon ,
                                              Cuts = config['DiMuonCuts']
                                              )
-                
+
         """
         Basic particles, long tracks
         """
         from StandardParticles import StdLooseANNPions, StdLooseANNKaons, StdLooseANNProtons
-        
+
         self.SelPions = self.createSubSel( OutputList = self.name + "SelPions",
-                                           InputList =  StdLooseANNPions , 
+                                           InputList =  StdLooseANNPions ,
                                            Cuts = config['PionCuts']
                                            )
-        
+
         self.SelKaons = self.createSubSel( OutputList = self.name + "SelKaons",
-                                           InputList = StdLooseANNKaons, 
+                                           InputList = StdLooseANNKaons,
                                            Cuts = config['KaonCuts']
                                            )
-                                                   
+
         self.SelProtons = self.createSubSel( OutputList = self.name + "SelProtons",
-                                           InputList = StdLooseANNProtons, 
+                                           InputList = StdLooseANNProtons,
                                            Cuts = config['ProtonCuts']
                                            )
 
         from StandardParticles import StdAllLooseANNPions
         self.SelPions4LP = self.createSubSel( OutputList = self.name + "SelPions4LP",
-                                              InputList =  StdAllLooseANNPions , 
+                                              InputList =  StdAllLooseANNPions ,
                                               Cuts = config['Pion4LPCuts']
                                               )
-        
+
 
         """
         Kstar
         """
         from StandardParticles import StdVeryLooseDetachedKst2Kpi
-        
+
         self.SelKstar = self.createSubSel( OutputList = self.name + "SelKstar",
-                                           InputList =  StdVeryLooseDetachedKst2Kpi, 
+                                           InputList =  StdVeryLooseDetachedKst2Kpi,
                                            Cuts = config['KstarCuts']
                                            )
-        
+
         """
         Kshort, both LL and DD
         """
         from StandardParticles import StdLooseKsDD, StdLooseKsLL
-        
+
         self.SelKsDD = self.createSubSel( OutputList = self.name + "SelKsDD",
                                           InputList = StdLooseKsDD,
                                           Cuts = config['KsDDCuts'] )
-        
-        """ 
+
+        """
         self.SelKsLL = self.createSubSel( OutputList = self.name + "SelKsLL",
                                           InputList = StdLooseKsLL,
                                           Cuts = config['KsLLCuts'] )
         """
-        
+
         self.SelKsLL = self.createCombinationSel( OutputList = self.name + "SelKsLL",
                                                   DecayDescriptor = "KS0 -> pi+ pi-",
-                                                  DaughterLists = [ self.SelPions4LP ],                    
+                                                  DaughterLists = [ self.SelPions4LP ],
                                                   PreVertexCuts  = config['KsLLComCuts'],
                                                   PostVertexCuts = config['KsLLCuts'] )
-                
+
         self.SelKs = MergedSelection( self.name + "SelKs",
                                       RequiredSelections = [ self.SelKsDD,
                                                              self.SelKsLL ] )
 
-                                                           
+
         """
-        Phi 
+        Phi
         """
         from StandardParticles import StdLoosePhi2KK
-        
+
         self.SelPhi = self.createSubSel( OutputList = self.name + "SelPhi",
-                                         InputList =  StdLoosePhi2KK, 
+                                         InputList =  StdLoosePhi2KK,
                                          Cuts = config['PhiCuts']
                                          )
 
@@ -309,10 +309,10 @@ class B2LLXBDTConf(LineBuilder):
 
         self.SelLambdaLL = self.createCombinationSel( OutputList = self.name + "SelLambdaLL",
                                                       DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
-                                                      DaughterLists = [ self.SelProtons, self.SelPions4LP ],   
+                                                      DaughterLists = [ self.SelProtons, self.SelPions4LP ],
                                                       PreVertexCuts  = config['LambdaLLComCuts'],
                                                       PostVertexCuts = config['LambdaLLCuts'] )
-        
+
         self.SelLambda = MergedSelection( self.name + "SelLambda",
                                           RequiredSelections = [ self.SelLambdaDD,
                                                                  self.SelLambdaLL ] )
@@ -328,7 +328,7 @@ class B2LLXBDTConf(LineBuilder):
 
 
         #
-        #  Stripping lines here 
+        #  Stripping lines here
         #
         self.B2LLHVars = {
             "sqrt(L1_IPCHI2_OWNPV)"      : "sqrt(CHILD(MIPCHI2DV(), 1, 1))",
@@ -337,7 +337,7 @@ class B2LLXBDTConf(LineBuilder):
             "sqrt(H_IPCHI2_OWNPV)"       : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(B_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
             "log(L1_PT)"                 : "log(CHILD(PT, 1, 1))",
-            "log(L2_PT)"                 : "log(CHILD(PT, 1, 2))", 
+            "log(L2_PT)"                 : "log(CHILD(PT, 1, 2))",
             "log(Jpsi_PT)"               : "log(CHILD(PT, 1))",
             "log(H_PT)"                  : "log(CHILD(PT, 2))",
             "log(B_PT)"                  : "log(PT)",
@@ -346,7 +346,7 @@ class B2LLXBDTConf(LineBuilder):
             "B_DIRA_OWNPV"               : "BPVDIRA"
             }
 
-        
+
         """
         Bu2eeK
         """
@@ -359,12 +359,12 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaBu2eeK = self.applyMVA( self.name + "MvaBu2eeK",
                                         SelB        = self.SelBu2eeK,
                                         MVAVars     = self.B2LLHVars,
-                                        MVACutValue = config['Bu2eeKMVACut'], 
+                                        MVACutValue = config['Bu2eeKMVACut'],
                                         MVAxmlFile  = config['Bu2LLKXmlFile']
                                         )
 
-        self.Bu2eeKLine = StrippingLine( self.name + '_Bu2eeKLine',                                                
-                                         RelatedInfoTools = config['RelatedInfoTools'],                                        
+        self.Bu2eeKLine = StrippingLine( self.name + '_Bu2eeKLine',
+                                         RelatedInfoTools = config['RelatedInfoTools'],
                                          algos     = [ self.MvaBu2eeK ],
                                          MDSTFlag  = False
                                          )
@@ -377,25 +377,25 @@ class B2LLXBDTConf(LineBuilder):
         """
         self.SelBu2mumuK = self.createCombinationSel( OutputList = self.name + "SelBu2mumuK",
                                                       DecayDescriptor = "[B+ -> J/psi(1S) K+]cc",
-                                                      DaughterLists = [ self.SelDiMuon, self.SelKaons ],                    
+                                                      DaughterLists = [ self.SelDiMuon, self.SelKaons ],
                                                       PreVertexCuts  = config['BComCuts'],
                                                       PostVertexCuts = config['BMomCuts'] )
 
         self.MvaBu2mumuK = self.applyMVA( self.name + "MvaBu2mumuK",
                                           SelB        = self.SelBu2mumuK,
                                           MVAVars     = self.B2LLHVars,
-                                          MVACutValue = config['Bu2mumuKMVACut'], 
+                                          MVACutValue = config['Bu2mumuKMVACut'],
                                           MVAxmlFile  = config['Bu2LLKXmlFile']
                                           )
-                
-        self.Bu2mumuKLine = StrippingLine( self.name + '_Bu2mumuKLine',                                                
+
+        self.Bu2mumuKLine = StrippingLine( self.name + '_Bu2mumuKLine',
                                            RelatedInfoTools = config['RelatedInfoTools'],
                                            algos     = [ self.MvaBu2mumuK ],
                                            MDSTFlag  = False
                                            )
 
         self.registerLine( self.Bu2mumuKLine )
-        
+
 
         #
         # Bd2LLKstar
@@ -412,10 +412,10 @@ class B2LLXBDTConf(LineBuilder):
             "sqrt(X_IPCHI2_OWNPV)"       : "sqrt(CHILD(MIPCHI2DV(), 2 ))",
             "sqrt(B_IPCHI2_OWNPV)"       : "sqrt(BPVIPCHI2())" ,
             "log(L1_PT)"                 : "log(CHILD(PT, 1, 1))",
-            "log(L2_PT)"                 : "log(CHILD(PT, 1, 2))", 
+            "log(L2_PT)"                 : "log(CHILD(PT, 1, 2))",
             "log(Jpsi_PT)"               : "log(CHILD(PT, 1))",
             "log(H1_PT)"                 : "log(CHILD(PT, 2, 1))",
-            "log(H2_PT)"                 : "log(CHILD(PT, 2, 2))", 
+            "log(H2_PT)"                 : "log(CHILD(PT, 2, 2))",
             "log(X_PT)"                  : "log(CHILD(PT, 2))",
             "log(B_PT)"                  : "log(PT)",
             "sqrt(Jpsi_FDCHI2_OWNPV)"    : "sqrt(CHILD(BPVVDCHI2,1))",
@@ -433,16 +433,16 @@ class B2LLXBDTConf(LineBuilder):
                                                         DaughterLists = [ self.SelDiElectron, self.SelKstar ],
                                                         PreVertexCuts  = config['BComCuts'],
                                                         PostVertexCuts = config['BMomCuts'] )
-        
+
         self.MvaBd2eeKstar = self.applyMVA( self.name + "MvaBd2eeKstar",
                                             SelB        = self.SelBd2eeKstar,
                                             MVAVars     = self.B2LLXVars,
-                                            MVACutValue = config['Bd2eeKstarMVACut'], 
+                                            MVACutValue = config['Bd2eeKstarMVACut'],
                                             MVAxmlFile  = config['Bd2LLKstarXmlFile']
                                             )
-        
-        self.Bd2eeKstarLine = StrippingLine( self.name + '_Bd2eeKstarLine',                                                
-                                             RelatedInfoTools = config['RelatedInfoTools'], 
+
+        self.Bd2eeKstarLine = StrippingLine( self.name + '_Bd2eeKstarLine',
+                                             RelatedInfoTools = config['RelatedInfoTools'],
                                              algos     = [ self.MvaBd2eeKstar ],
                                              MDSTFlag  = False
                                              )
@@ -461,11 +461,11 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaBd2mumuKstar = self.applyMVA( self.name + "MvaBd2mumuKstar",
                                               SelB        = self.SelBd2mumuKstar,
                                               MVAVars     = self.B2LLXVars,
-                                              MVACutValue = config['Bd2mumuKstarMVACut'], 
+                                              MVACutValue = config['Bd2mumuKstarMVACut'],
                                               MVAxmlFile  = config['Bd2LLKstarXmlFile']
                                               )
-                
-        self.Bd2mumuKstarLine = StrippingLine( self.name + '_Bd2mumuKstarLine',                                                
+
+        self.Bd2mumuKstarLine = StrippingLine( self.name + '_Bd2mumuKstarLine',
                                                RelatedInfoTools = config['RelatedInfoTools'],
                                                algos     = [ self.MvaBd2mumuKstar ],
                                                MDSTFlag  = False
@@ -485,16 +485,16 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaBd2eeKs = self.applyMVA( self.name + "MvaBd2eeKs",
                                          SelB        = self.SelBd2eeKs,
                                          MVAVars     = self.B2LLXVars,
-                                         MVACutValue = config['Bd2eeKsMVACut'], 
+                                         MVACutValue = config['Bd2eeKsMVACut'],
                                          MVAxmlFile  = config['Bd2LLKsXmlFile']
                                          )
-        
-        self.Bd2eeKsLine = StrippingLine( self.name + '_Bd2eeKsLine',                                                
-                                          RelatedInfoTools = config['RelatedInfoTools'],                                        
+
+        self.Bd2eeKsLine = StrippingLine( self.name + '_Bd2eeKsLine',
+                                          RelatedInfoTools = config['RelatedInfoTools'],
                                           algos     = [ self.MvaBd2eeKs ],
                                           MDSTFlag  = False
                                           )
-        
+
         self.registerLine( self.Bd2eeKsLine )
 
 
@@ -510,16 +510,16 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaBd2mumuKs = self.applyMVA( self.name + "MvaBd2mumuKs",
                                            SelB        = self.SelBd2mumuKs,
                                            MVAVars     = self.B2LLXVars,
-                                           MVACutValue = config['Bd2mumuKsMVACut'], 
+                                           MVACutValue = config['Bd2mumuKsMVACut'],
                                            MVAxmlFile  = config['Bd2LLKsXmlFile']
                                            )
-        
-        self.Bd2mumuKsLine = StrippingLine( self.name + '_Bd2mumuKsLine',                                                
+
+        self.Bd2mumuKsLine = StrippingLine( self.name + '_Bd2mumuKsLine',
                                             RelatedInfoTools = config['RelatedInfoTools'],
                                             algos     = [ self.MvaBd2mumuKs ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.Bd2mumuKsLine )
 
 
@@ -535,20 +535,20 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaBs2eePhi = self.applyMVA( self.name + "MvaBs2eePhi",
                                           SelB        = self.SelBs2eePhi,
                                           MVAVars     = self.B2LLXVars,
-                                          MVACutValue = config['Bs2eePhiMVACut'], 
+                                          MVACutValue = config['Bs2eePhiMVACut'],
                                           MVAxmlFile  = config['Bs2LLPhiXmlFile']
                                           )
-        
-        self.Bs2eePhiLine = StrippingLine( self.name + '_Bs2eePhiLine',                                                
+
+        self.Bs2eePhiLine = StrippingLine( self.name + '_Bs2eePhiLine',
                                            RelatedInfoTools = config['RelatedInfoTools'],
                                            algos     = [ self.MvaBs2eePhi ],
-                                           EnableFlavourTagging = True, 
+                                           EnableFlavourTagging = True,
                                            MDSTFlag  = False
                                            )
-        
+
         self.registerLine( self.Bs2eePhiLine )
 
-        
+
         """
         Bs2mumuPhi
         """
@@ -561,17 +561,17 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaBs2mumuPhi = self.applyMVA( self.name + "MvaBs2mumuPhi",
                                             SelB        = self.SelBs2mumuPhi,
                                             MVAVars     = self.B2LLXVars,
-                                            MVACutValue = config['Bs2mumuPhiMVACut'], 
+                                            MVACutValue = config['Bs2mumuPhiMVACut'],
                                             MVAxmlFile  = config['Bs2LLPhiXmlFile']
                                             )
-        
-        self.Bs2mumuPhiLine = StrippingLine( self.name + '_Bs2mumuPhiLine',                                                
+
+        self.Bs2mumuPhiLine = StrippingLine( self.name + '_Bs2mumuPhiLine',
                                              RelatedInfoTools = config['RelatedInfoTools'],
                                              algos     = [ self.MvaBs2mumuPhi ],
-                                             EnableFlavourTagging = True, 
+                                             EnableFlavourTagging = True,
                                              MDSTFlag  = False
                                              )
-        
+
         self.registerLine( self.Bs2mumuPhiLine )
 
 
@@ -587,16 +587,16 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaLb2eeLambda = self.applyMVA( self.name + "MvaLb2eeLambda",
                                              SelB        = self.SelLb2eeLambda,
                                              MVAVars     = self.B2LLXVars,
-                                             MVACutValue = config['Lb2eeLambdaMVACut'], 
+                                             MVACutValue = config['Lb2eeLambdaMVACut'],
                                              MVAxmlFile  = config['Lb2LLLambdaXmlFile']
                                              )
-        
-        self.Lb2eeLambdaLine = StrippingLine( self.name + '_Lb2eeLambdaLine',                                                
-                                              RelatedInfoTools = config['RelatedInfoTools'],                                        
+
+        self.Lb2eeLambdaLine = StrippingLine( self.name + '_Lb2eeLambdaLine',
+                                              RelatedInfoTools = config['RelatedInfoTools'],
                                               algos     = [ self.MvaLb2eeLambda ],
                                               MDSTFlag  = False
                                               )
-        
+
         self.registerLine( self.Lb2eeLambdaLine )
 
 
@@ -612,45 +612,45 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaLb2mumuLambda = self.applyMVA( self.name + "MvaLb2mumuLambda",
                                                SelB        = self.SelLb2mumuLambda,
                                                MVAVars     = self.B2LLXVars,
-                                               MVACutValue = config['Lb2mumuLambdaMVACut'], 
+                                               MVACutValue = config['Lb2mumuLambdaMVACut'],
                                                MVAxmlFile  = config['Lb2LLLambdaXmlFile']
                                                )
-        
-        self.Lb2mumuLambdaLine = StrippingLine( self.name + '_Lb2mumuLambdaLine',                                                
+
+        self.Lb2mumuLambdaLine = StrippingLine( self.name + '_Lb2mumuLambdaLine',
                                                 RelatedInfoTools = config['RelatedInfoTools'],
                                                 algos     = [ self.MvaLb2mumuLambda ],
                                                 MDSTFlag  = False
                                                 )
-        
+
         self.registerLine( self.Lb2mumuLambdaLine )
 
-        
+
         #
         # Lb-> LL Kstar
-        #        
+        #
         """
         Lb2eePK
         """
-        
+
         self.SelLb2eePK = self.createCombinationSel( OutputList = self.name + "SelLb2eePK",
                                                      DecayDescriptor = "[Lambda_b0 -> J/psi(1S) Lambda(1520)0]cc",
                                                      DaughterLists = [ self.SelDiElectron, self.SelLambdastar ],
                                                      PreVertexCuts  = config['LbComCuts'],
                                                      PostVertexCuts = config['LbMomCuts'] )
-        
+
         self.MvaLb2eePK = self.applyMVA( self.name + "MvaLb2eePK",
                                          SelB        = self.SelLb2eePK,
                                          MVAVars     = self.B2LLXVars,
-                                         MVACutValue = config['Lb2eePKMVACut'], 
+                                         MVACutValue = config['Lb2eePKMVACut'],
                                          MVAxmlFile  = config['Lb2LLPKXmlFile']
                                          )
-        
+
         self.Lb2eePKLine = StrippingLine( self.name + '_Lb2eePKLine',
-                                          RelatedInfoTools = config['RelatedInfoTools'],                                        
+                                          RelatedInfoTools = config['RelatedInfoTools'],
                                           algos     = [ self.MvaLb2eePK ],
                                           MDSTFlag  = False
                                           )
-        
+
         self.registerLine( self.Lb2eePKLine )
 
 
@@ -666,19 +666,19 @@ class B2LLXBDTConf(LineBuilder):
         self.MvaLb2mumuPK = self.applyMVA( self.name + "MvaLb2mumuPK",
                                            SelB        = self.SelLb2mumuPK,
                                            MVAVars     = self.B2LLXVars,
-                                           MVACutValue = config['Lb2mumuPKMVACut'], 
+                                           MVACutValue = config['Lb2mumuPKMVACut'],
                                            MVAxmlFile  = config['Lb2LLPKXmlFile']
                                            )
-        
-        self.Lb2mumuPKLine = StrippingLine( self.name + '_Lb2mumuPKLine',       
-                                            RelatedInfoTools = config['RelatedInfoTools'], 
+
+        self.Lb2mumuPKLine = StrippingLine( self.name + '_Lb2mumuPKLine',
+                                            RelatedInfoTools = config['RelatedInfoTools'],
                                             algos     = [ self.MvaLb2mumuPK ],
                                             MDSTFlag  = False
                                             )
-        
+
         self.registerLine( self.Lb2mumuPKLine )
-        
-        
+
+
 
     def createSubSel( self, OutputList, InputList, Cuts ) :
         '''create a selection using a FilterDesktop'''
@@ -704,7 +704,7 @@ class B2LLXBDTConf(LineBuilder):
                            Algorithm = combiner,
                            RequiredSelections = DaughterLists)
 
-    def applyMVA( self, name, 
+    def applyMVA( self, name,
                   SelB,
                   MVAVars,
                   MVAxmlFile,
@@ -720,7 +720,7 @@ class B2LLXBDTConf(LineBuilder):
                                 XMLFile   = MVAxmlFile,
                                 Variables = MVAVars,
                                 ToolName  = name )
-        
+
         return Selection( name,
                           Algorithm =  _FilterB,
                           RequiredSelections = [ SelB ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py
index 2edf121a9b3c1c21f8fe0443001f5a61412b7083..4be471720881735c9c8c5eb94f196d1ae07df3ee 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py
@@ -482,11 +482,11 @@ class B2XLLConf(LineBuilder) :
         #                  RequiredSelections = [ Electrons ] )
 
         from Configurables import DiElectronMaker,ProtoParticleCALOFilter
-        from CommonParticles.Utils import trackSelector 
+        from CommonParticles.Utils import trackSelector
         ee = DiElectronMaker('diElectronsForXLL' + name)
         ee.Particle = "J/psi(1S)"
         ee.DecayDescriptor = "J/psi(1S) -> e+ e-"
-        selector = trackSelector(ee, trackTypes=["Long", "Downstream"]) 
+        selector = trackSelector(ee, trackTypes=["Long", "Downstream"])
         if samesign:
             ee.OppositeSign = False
         ee.addTool( ProtoParticleCALOFilter('Electron'))
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py
index 8cc298f528431c3ffc312d0e1be332b96c0312ef..59d763bdb992993e60377e94bd4850f22de818c4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py
@@ -43,91 +43,91 @@ default_config = {
     'BUILDERTYPE' : 'B2XMuMuConf',
     'CONFIG'     :
     {
-    "A1_Comb_MassHigh": 4200.0, 
-    "A1_Comb_MassLow": 0.0, 
-    "A1_Dau_MaxIPCHI2": 16.0, 
-    "A1_FlightChi2": 36.0, 
-    "A1_MassHigh": 4000.0, 
-    "A1_MassLow": 0.0, 
-    "A1_MinIPCHI2": 4.0, 
-    "A1_VtxChi2": 8.0, 
-    "B_Comb_MassHigh": 7100.0, 
-    "B_Comb_MassLow": 4600.0, 
-    "B_DIRA": 0.9999, 
-    "B_Dau_MaxIPCHI2": 9.0, 
-    "B_FlightCHI2": 64.0, 
-    "B_IPCHI2": 16.0, 
-    "B_MassHigh": 7000.0, 
-    "B_MassLow": 4700.0, 
-    "B_VertexCHI2": 8.0, 
+    "A1_Comb_MassHigh": 4200.0,
+    "A1_Comb_MassLow": 0.0,
+    "A1_Dau_MaxIPCHI2": 16.0,
+    "A1_FlightChi2": 36.0,
+    "A1_MassHigh": 4000.0,
+    "A1_MassLow": 0.0,
+    "A1_MinIPCHI2": 4.0,
+    "A1_VtxChi2": 8.0,
+    "B_Comb_MassHigh": 7100.0,
+    "B_Comb_MassLow": 4600.0,
+    "B_DIRA": 0.9999,
+    "B_Dau_MaxIPCHI2": 9.0,
+    "B_FlightCHI2": 64.0,
+    "B_IPCHI2": 16.0,
+    "B_MassHigh": 7000.0,
+    "B_MassLow": 4700.0,
+    "B_VertexCHI2": 8.0,
     "DECAYS": [
-    "B0 -> J/psi(1S) phi(1020)", 
-    "[B0 -> J/psi(1S) K*(892)0]cc", 
-    "B0 -> J/psi(1S) rho(770)0", 
-    "[B+ -> J/psi(1S) rho(770)+]cc", 
-    "B0 -> J/psi(1S) f_2(1950)", 
-    "B0 -> J/psi(1S) KS0", 
-    "[B0 -> J/psi(1S) D~0]cc", 
-    "[B+ -> J/psi(1S) K+]cc", 
-    "[B+ -> J/psi(1S) pi+]cc", 
-    "[B+ -> J/psi(1S) K*(892)+]cc", 
-    "[B+ -> J/psi(1S) D+]cc", 
-    "[B+ -> J/psi(1S) D*(2010)+]cc", 
-    "[Lambda_b0 -> J/psi(1S) Lambda0]cc", 
-    "[Lambda_b0 -> J/psi(1S) Lambda(1520)0]cc", 
-    "B0 -> J/psi(1S) pi0", 
-    "[B+ -> J/psi(1S) a_1(1260)+]cc", 
-    "[B+ -> J/psi(1S) K_1(1270)+]cc", 
-    "[B+ -> J/psi(1S) K_2(1770)+]cc", 
-    "B0 -> J/psi(1S) K_1(1270)0", 
-    "[B+ -> J/psi(1S) K_1(1400)+]cc", 
+    "B0 -> J/psi(1S) phi(1020)",
+    "[B0 -> J/psi(1S) K*(892)0]cc",
+    "B0 -> J/psi(1S) rho(770)0",
+    "[B+ -> J/psi(1S) rho(770)+]cc",
+    "B0 -> J/psi(1S) f_2(1950)",
+    "B0 -> J/psi(1S) KS0",
+    "[B0 -> J/psi(1S) D~0]cc",
+    "[B+ -> J/psi(1S) K+]cc",
+    "[B+ -> J/psi(1S) pi+]cc",
+    "[B+ -> J/psi(1S) K*(892)+]cc",
+    "[B+ -> J/psi(1S) D+]cc",
+    "[B+ -> J/psi(1S) D*(2010)+]cc",
+    "[Lambda_b0 -> J/psi(1S) Lambda0]cc",
+    "[Lambda_b0 -> J/psi(1S) Lambda(1520)0]cc",
+    "B0 -> J/psi(1S) pi0",
+    "[B+ -> J/psi(1S) a_1(1260)+]cc",
+    "[B+ -> J/psi(1S) K_1(1270)+]cc",
+    "[B+ -> J/psi(1S) K_2(1770)+]cc",
+    "B0 -> J/psi(1S) K_1(1270)0",
+    "[B+ -> J/psi(1S) K_1(1400)+]cc",
     "B0 -> J/psi(1S) K_1(1400)0",
     "[Xi_b- -> J/psi(1S) Xi-]cc",
-    "[Omega_b- -> J/psi(1S) Omega-]cc", 
-    "B0 -> J/psi(1S) f_1(1285)", 
+    "[Omega_b- -> J/psi(1S) Omega-]cc",
+    "B0 -> J/psi(1S) f_1(1285)",
     "B0 -> J/psi(1S) omega(782)"
     ],
-    "Dau_DIRA": -0.9, 
-    "Dau_VertexCHI2": 12.0, 
-    "Dimu_Dau_MaxIPCHI2": 6.0, 
-    "Dimu_FlightChi2": 9.0, 
-    "DimuonUPPERMASS": 7100.0, 
-    "DimuonWS": True, 
-    "HLT1_FILTER": None, 
-    "HLT2_FILTER": None, 
-    "HadronWS": False, 
-    "Hadron_MinIPCHI2": 6.0, 
-    "K12OmegaK_CombMassHigh": 2000, 
-    "K12OmegaK_CombMassLow": 400, 
-    "K12OmegaK_MassHigh": 2100, 
-    "K12OmegaK_MassLow": 300, 
-    "K12OmegaK_VtxChi2": 8.0, 
-    "KpiVXCHI2NDOF": 8.0, 
-    "KsWINDOW": 30.0, 
-    "Kstar_Comb_MassHigh": 6200.0, 
-    "Kstar_Comb_MassLow": 0.0, 
-    "Kstar_Dau_MaxIPCHI2": 6.0, 
-    "Kstar_FlightChi2": 16.0, 
-    "Kstar_MassHigh": 6200.0, 
-    "Kstar_MassLow": 0.0, 
-    "Kstar_MinIPCHI2": 0.0, 
-    "KstarplusWINDOW": 300.0, 
-    "L0DU_FILTER": None, 
-    "LambdaWINDOW": 30.0, 
-    "LongLivedPT": 0.0, 
+    "Dau_DIRA": -0.9,
+    "Dau_VertexCHI2": 12.0,
+    "Dimu_Dau_MaxIPCHI2": 6.0,
+    "Dimu_FlightChi2": 9.0,
+    "DimuonUPPERMASS": 7100.0,
+    "DimuonWS": True,
+    "HLT1_FILTER": None,
+    "HLT2_FILTER": None,
+    "HadronWS": False,
+    "Hadron_MinIPCHI2": 6.0,
+    "K12OmegaK_CombMassHigh": 2000,
+    "K12OmegaK_CombMassLow": 400,
+    "K12OmegaK_MassHigh": 2100,
+    "K12OmegaK_MassLow": 300,
+    "K12OmegaK_VtxChi2": 8.0,
+    "KpiVXCHI2NDOF": 8.0,
+    "KsWINDOW": 30.0,
+    "Kstar_Comb_MassHigh": 6200.0,
+    "Kstar_Comb_MassLow": 0.0,
+    "Kstar_Dau_MaxIPCHI2": 6.0,
+    "Kstar_FlightChi2": 16.0,
+    "Kstar_MassHigh": 6200.0,
+    "Kstar_MassLow": 0.0,
+    "Kstar_MinIPCHI2": 0.0,
+    "KstarplusWINDOW": 300.0,
+    "L0DU_FILTER": None,
+    "LambdaWINDOW": 30.0,
+    "LongLivedPT": 0.0,
     "LongLivedTau": 2,
     'HyperonWindow' : 50.0,
     'HyperonCombWindow' : 65.0,
     'HyperonMaxDocaChi2' : 20.0,
-    "MuonNoPIDs_PIDmu": 0.0, 
-    "MuonPID": -3.0, 
-    "Muon_IsMuon": True, 
-    "Muon_MinIPCHI2": 6.0, 
-    "OmegaChi2Prob": 1e-05, 
-    "Omega_CombMassWin": 400, 
-    "Omega_MassWin": 400, 
-    "Pi0ForOmegaMINPT": 800.0, 
-    "Pi0MINPT": 800.0, 
+    "MuonNoPIDs_PIDmu": 0.0,
+    "MuonPID": -3.0,
+    "Muon_IsMuon": True,
+    "Muon_MinIPCHI2": 6.0,
+    "OmegaChi2Prob": 1e-05,
+    "Omega_CombMassWin": 400,
+    "Omega_MassWin": 400,
+    "Pi0ForOmegaMINPT": 800.0,
+    "Pi0MINPT": 800.0,
     "RelatedInfoTools": [
      {
      "Location": "KSTARMUMUVARIABLES",
@@ -140,47 +140,47 @@ default_config = {
     "Variables": ['K_SLL_ISO_HAD', 'PI_SLL_ISO_HAD' ]
     },
     {
-    "Location": "ConeIsoInfo", 
-    "Type": "RelInfoConeVariables", 
+    "Location": "ConeIsoInfo",
+    "Type": "RelInfoConeVariables",
     "Variables": [
-    "CONEANGLE", 
-    "CONEMULT", 
-    "CONEPTASYM", 
-    "CONEPT", 
-    "CONEP", 
-    "CONEPASYM", 
-    "CONEDELTAETA", 
+    "CONEANGLE",
+    "CONEMULT",
+    "CONEPTASYM",
+    "CONEPT",
+    "CONEP",
+    "CONEPASYM",
+    "CONEDELTAETA",
     "CONEDELTAPHI"
     ]
-    }, 
+    },
     {
-    "Location": "VtxIsoInfo", 
-    "Type": "RelInfoVertexIsolation", 
+    "Location": "VtxIsoInfo",
+    "Type": "RelInfoVertexIsolation",
     "Variables": [
-    "VTXISONUMVTX", 
-    "VTXISODCHI2ONETRACK", 
-    "VTXISODCHI2MASSONETRACK", 
-    "VTXISODCHI2TWOTRACK", 
+    "VTXISONUMVTX",
+    "VTXISODCHI2ONETRACK",
+    "VTXISODCHI2MASSONETRACK",
+    "VTXISODCHI2TWOTRACK",
     "VTXISODCHI2MASSTWOTRACK"
     ]
     },
     {
-    "Location": "VtxIsoBDTInfo", 
+    "Location": "VtxIsoBDTInfo",
     "Type": "RelInfoVertexIsolationBDT"
     }
-    ], 
-    "SpdMult": 600, 
-    "Track_GhostProb": 0.5, 
+    ],
+    "SpdMult": 600,
+    "Track_GhostProb": 0.5,
     "UseNoPIDsHadrons": True
-    }, 
-    
+    },
+
     #{"Type" : "RelInfoConeIsolation"
     #     ,'ConeSize'         : 1.0
     #     ,'Variables' : [ 'CC_ANGLE', 'CC_MULT', 'CC_SPT', 'CC_VPT', 'CC_PX', 'CC_PY', 'CC_PZ', 'CC_PASYM', 'CC_PTASYM', 'CC_PXASYM', 'CC_PYASYM', 'CC_PZASYM', 'CC_DELTAETA', 'CC_DELTAPHI', 'CC_IT',  'CC_MAXPT_Q', 'CC_MAXPT_PT', 'CC_MAXPT_PX', 'CC_MAXPT_PY', 'CC_MAXPT_PZ', 'CC_MAXPT_PE',  'NC_ANGLE', 'NC_MULT', 'NC_SPT', 'NC_VPT', 'NC_PX', 'NC_PY', 'NC_PZ', 'NC_PASYM', 'NC_PTASYM', 'NC_PXASYM', 'NC_PYASYM', 'NC_PZASYM', 'NC_DELTAETA', 'NC_DELTAPHI', 'NC_IT',  'NC_MAXPT_PT', 'NC_MAXPT_PX', 'NC_MAXPT_PY', 'NC_MAXPT_PZ' ]
     #     ,'Location':'ConeIsoInfoCCNC'}
-    
+
     'WGs'     : [ 'RD' ],
-    'STREAMS' : ['Leptonic'] 
+    'STREAMS' : ['Leptonic']
     }
 
 #################
@@ -201,7 +201,7 @@ class B2XMuMuConf(LineBuilder) :
         LineBuilder.__init__(self, name, config)
 
         self.name = name
-        
+
         # Bd2KstartMuMu cuts definitions
         self.BdCombCut = "(AM > %(B_Comb_MassLow)s * MeV) & (AM < %(B_Comb_MassHigh)s * MeV)" %config
 
@@ -216,7 +216,7 @@ class B2XMuMuConf(LineBuilder) :
 
         DaughterCuts = "(VFASPF(VCHI2/VDOF) < %(Dau_VertexCHI2)s) & " \
                        "(BPVDIRA> %(Dau_DIRA)s)" %config
-        
+
         self.KstarCombCut = "(AM > %(Kstar_Comb_MassLow)s * MeV) & " \
                             "(AM < %(Kstar_Comb_MassHigh)s * MeV) & " \
                             "(ADOCACHI2CUT(20.,''))" %config
@@ -225,28 +225,28 @@ class B2XMuMuConf(LineBuilder) :
                         "(BPVVDCHI2 > %(Kstar_FlightChi2)s) & " \
                         "(MIPCHI2DV(PRIMARY) > %(Kstar_MinIPCHI2)s) & " \
                         "(MAXTREE(ISBASIC,MIPCHI2DV(PRIMARY))> %(Kstar_Dau_MaxIPCHI2)s )" %config
-        
-        self.DiMuonCombCut = "(AM < %(DimuonUPPERMASS)s *MeV)" %config 
+
+        self.DiMuonCombCut = "(AM < %(DimuonUPPERMASS)s *MeV)" %config
         self.DiMuonCut = DaughterCuts + " & (BPVVDCHI2 > %(Dimu_FlightChi2)s) & " \
                          "(MAXTREE(ISBASIC,MIPCHI2DV(PRIMARY))> %(Dimu_Dau_MaxIPCHI2)s )" %config
-        
+
 
         self.TrackCuts = "(TRGHP < %(Track_GhostProb)s)" %config
 
         self.HypBachCuts = "(MIPCHI2DV(PRIMARY) > %(Hadron_MinIPCHI2)s)" %config
-        
+
         self.HadronCuts = "(MIPCHI2DV(PRIMARY) > %(Hadron_MinIPCHI2)s) & (HASRICH)" %config
-        
+
         self.KaonCut = self.TrackCuts + " & " + self.HadronCuts
         self.PionCut = self.TrackCuts + " & " + self.HadronCuts
-        
+
         self.MuonCut = self.TrackCuts + " & (MIPCHI2DV(PRIMARY) > %(Muon_MinIPCHI2)s) & (PIDmu> %(MuonPID)s)" %config
 
         self.Dimuon = self.__Dimuon__(config)
 
         self.Protons = self.__Protons__(config)
         self.Kaons = self.__Kaons__(config)
-        self.Pions = self.__Pions__(config)       
+        self.Pions = self.__Pions__(config)
         self.Kshort = self.__Kshort__(config)
         self.Dplus = self.__Dplus__(config)
         self.Dzero = self.__Dzero__(config)
@@ -257,7 +257,7 @@ class B2XMuMuConf(LineBuilder) :
         self.Rho = self.__Rho__(self.Pions, config)
         self.F2 = self.__F2__(self.Rho, config)
         self.Phi = self.__Phi__(self.Rho, config)
-        self.Kstar = self.__Kstar__(self.Rho, config)        
+        self.Kstar = self.__Kstar__(self.Rho, config)
         self.Lambdastar = self.__Lambdastar__(self.Rho, config)
         self.Xi = self.__Xi__(self.LambdaLL, self.LambdaDD, config)
         self.Omega = self.__Omega__(self.LambdaLL, self.LambdaDD, config)
@@ -298,19 +298,19 @@ class B2XMuMuConf(LineBuilder) :
             'K_2(1770)+'    : [ self.K2 ],
             'K_1(1270)0'    : [ self.K10 ],
             'K_1(1400)+'    : [ self.K12OmegaK ],
-            'K_1(1400)0'    : [ self.K12OmegaKS ], 
+            'K_1(1400)0'    : [ self.K12OmegaKS ],
             'f_1(1285)'     : [ self.F1 ]
             }
 
-        self.DeclaredDaughters = [] 
-        
+        self.DeclaredDaughters = []
+
         for d in config['DECAYS']:
             for k in self.AvailableDaughters.keys():
-                if k in d: self.DeclaredDaughters += self.AvailableDaughters.pop(k) 
-                
-        
+                if k in d: self.DeclaredDaughters += self.AvailableDaughters.pop(k)
+
+
         self.Bs = self.__Bs__( self.Dimuon,
-                               daughters = self.DeclaredDaughters,  
+                               daughters = self.DeclaredDaughters,
                                conf = config)
 
         self.FilterSPD = {
@@ -319,7 +319,7 @@ class B2XMuMuConf(LineBuilder) :
                 "from LoKiNumbers.decorators import *", "from LoKiCore.basic import LHCb"
                 ]
                 }
-        
+
         if config['DECAYS']:
             # standard lines
             self.line = StrippingLine(
@@ -335,11 +335,11 @@ class B2XMuMuConf(LineBuilder) :
                 EnableFlavourTagging = True,
                 MaxCandidates = 4000
                 )
-        
+
             self.registerLine(self.line)
 
 
-        
+
     def __Dimuon__(self, conf):
         '''
         Create a new dimuon from scratch
@@ -352,23 +352,23 @@ class B2XMuMuConf(LineBuilder) :
         else:
             CombineDiMuon.DecayDescriptors = ["J/psi(1S) -> mu- mu+"]
         CombineDiMuon.DaughtersCuts = { "mu+" : self.MuonCut, "mu-" : self.MuonCut }
-        CombineDiMuon.CombinationCut = self.DiMuonCombCut 
+        CombineDiMuon.CombinationCut = self.DiMuonCombCut
         CombineDiMuon.MotherCut     = self.DiMuonCut
 
-        IsMuonFlag = conf['Muon_IsMuon'] 
+        IsMuonFlag = conf['Muon_IsMuon']
         from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
         Muons = StdAllLooseMuons if IsMuonFlag else StdAllNoPIDsMuons
-         
+
         from PhysSelPython.Wrappers import Selection
         SelDiMuon = Selection("Sel_" + self.name + "_DiMuon", Algorithm = CombineDiMuon, RequiredSelections = [ Muons ] )
         return SelDiMuon
 
 
-    
+
     def __Kaons__(self, conf):
         """
         Filter kaons from StdAllNoPIDsKaons or StdAllLooseKaons
-        """  
+        """
 
         _kaons = None
         UseNoPIDsHadrons=conf['UseNoPIDsHadrons']
@@ -386,7 +386,7 @@ class B2XMuMuConf(LineBuilder) :
     def __Protons__(self, conf):
         """
         Filter protons from StdAllLooseProtons or StdAllLooseProtons
-        """  
+        """
 
         _protons = None
         UseNoPIDsHadrons=conf['UseNoPIDsHadrons']
@@ -405,7 +405,7 @@ class B2XMuMuConf(LineBuilder) :
     def __Pions__(self, conf):
         """
         Filter pions from StdAllNoPIDsPions or StdAllLoosePions
-        """  
+        """
 
         _pions = None
         UseNoPIDsHadrons=conf['UseNoPIDsHadrons']
@@ -418,7 +418,7 @@ class B2XMuMuConf(LineBuilder) :
                          RequiredSelections = [ _pions ] ,
                          Algorithm = _filter)
         return _sel
- 
+
     def __A1CombCut__(self, conf):
         """
         Returns the A1 cut string
@@ -428,7 +428,7 @@ class B2XMuMuConf(LineBuilder) :
         "(ADOCACHI2CUT(20.,'')) &" \
         "(AHASCHILD(MIPCHI2DV(PRIMARY) > %(A1_Dau_MaxIPCHI2)s ))" %conf
         return _A1CombCut
-        
+
     def __A1Cut__(self, conf):
         """
         Returns the A1 cut string
@@ -437,9 +437,9 @@ class B2XMuMuConf(LineBuilder) :
         "(M < %(A1_MassHigh)s * MeV) & "\
         "(VFASPF(VCHI2PDOF) < %(A1_VtxChi2)s) & "\
         "(BPVVDCHI2 > %(A1_FlightChi2)s) & "\
-        "(MIPCHI2DV(PRIMARY) > %(A1_MinIPCHI2)s) " %conf 
+        "(MIPCHI2DV(PRIMARY) > %(A1_MinIPCHI2)s) " %conf
         return _A1Cut
-        
+
 
     def __KsCuts__(self, conf):
         """
@@ -456,11 +456,11 @@ class B2XMuMuConf(LineBuilder) :
     def __Kshort__(self, conf):
         """
         Filter kshort from StdLooseKshort
-        """  
+        """
         _ksdd = AutomaticData(Location = 'Phys/StdLooseKsDD/Particles')
         _ksll = AutomaticData(Location = 'Phys/StdVeryLooseKsLL/Particles')
         _filter_ksdd = FilterDesktop(Code = self.__KsCuts__(conf))
-        _filter_ksll = FilterDesktop(Code = self.__KsCuts__(conf))        
+        _filter_ksll = FilterDesktop(Code = self.__KsCuts__(conf))
         _selksdd = Selection("Selection_"+self.name+"_Ksdd",
                              RequiredSelections = [ _ksdd ] ,
                              Algorithm = _filter_ksdd)
@@ -477,7 +477,7 @@ class B2XMuMuConf(LineBuilder) :
         Returns the Lambda cut string
         """
         _LambdaCuts = """
-        (ADMASS('Lambda0') < %(LambdaWINDOW)s *MeV) & 
+        (ADMASS('Lambda0') < %(LambdaWINDOW)s *MeV) &
         (PT > %(LongLivedPT)s *MeV) &
         (BPVLTIME() > %(LongLivedTau)s *ps)
         """ % conf
@@ -486,11 +486,11 @@ class B2XMuMuConf(LineBuilder) :
     def __LambdaSeparate__(self, conf):
         """
         Filter Lambda from StdVeryLooseLambdaLL and StdLooseLambdaDD
-        """  
+        """
         _lambdadd = AutomaticData(Location = 'Phys/StdLooseLambdaDD/Particles')
         _lambdall = AutomaticData(Location = 'Phys/StdVeryLooseLambdaLL/Particles')
         _filter_lambdadd = FilterDesktop(Code = self.__LambdaCuts__(conf))
-        _filter_lambdall = FilterDesktop(Code = self.__LambdaCuts__(conf))        
+        _filter_lambdall = FilterDesktop(Code = self.__LambdaCuts__(conf))
         _sellambdadd = Selection("Selection_"+self.name+"_Lambdadd",
                              RequiredSelections = [ _lambdadd ] ,
                              Algorithm = _filter_lambdadd)
@@ -531,11 +531,11 @@ class B2XMuMuConf(LineBuilder) :
         _sel_xi2lambda0pi_lll = Selection("Selection_"+self.name+"_"+hyperon+"LLL",
             RequiredSelections = [ LambdaLL, LongTracks ],
             Algorithm = _xi2lambda0pi)
-        
+
         _sel_xi2lambda0pi_ddl = Selection("Selection_"+self.name+"_"+hyperon+"DDL",
             RequiredSelections = [ LambdaDD, LongTracks ],
             Algorithm = _xi2lambda0pi)
-        
+
         _sel_xi2lambda0pi_ddd = Selection("Selection_"+self.name+"_"+hyperon+"DDD",
             RequiredSelections = [ LambdaDD, DownTracks ],
             Algorithm = _xi2lambda0pi)
@@ -608,12 +608,12 @@ class B2XMuMuConf(LineBuilder) :
     def __Pi0__(self, conf):
         """
         Filter Pi0 from Std Pi0
-        """  
+        """
         _pi0resolved = AutomaticData(Location = 'Phys/StdLooseResolvedPi0/Particles')
         _pi0merged = AutomaticData(Location = 'Phys/StdLooseMergedPi0/Particles')
         _filter_pi0resolved = FilterDesktop(Code = self.__Pi0Cuts__(conf) )
         #+ " & ( 250*MeV < MINTREE('gamma' == ID, PT))"  )
-        _filter_pi0merged = FilterDesktop(Code = self.__Pi0Cuts__(conf)  )        
+        _filter_pi0merged = FilterDesktop(Code = self.__Pi0Cuts__(conf)  )
         _selpi0resolved = Selection("Selection_"+self.name+"_pi0resolved",
                              RequiredSelections = [ _pi0resolved ] ,
                              Algorithm = _filter_pi0resolved)
@@ -629,13 +629,13 @@ class B2XMuMuConf(LineBuilder) :
         """
         Returns the KaonPion cut string
         """
-        
+
         _Pi0Cuts = """
         (PT > %(Pi0ForOmegaMINPT)s )
         """ % conf
         return _Pi0Cuts
 
-    
+
     def __Pi0ForOmega__(self, conf):
         """
         Filter Pi0 from Std Pi0
@@ -654,34 +654,34 @@ class B2XMuMuConf(LineBuilder) :
                                RequiredSelections = [ _selpi0resolved,_selpi0merged ])
         return _sel
 
-    
+
     def __Kstar2KPi0__( self, Kaons, Pi0, conf):
         """
-        Make K*(892)+ -> K+ pi0 
+        Make K*(892)+ -> K+ pi0
         """
         _kstar2kpizero = CombineParticles()
         _kstar2kpizero.DecayDescriptor = "[K*(892)+ -> K+ pi0]cc"
         _kstar2kpizero.MotherCut = "(ADMASS('K*(892)+') < %(KstarplusWINDOW)s *MeV)" % conf
 
         _kstarConf = _kstar2kpizero.configurable("Combine_"+self.name+"_KPi0")
-                                                 
+
         _selKSTAR2KPIZERO = Selection( "Selection_"+self.name+"_Kstar2kpizero",
                                        Algorithm = _kstarConf,
                                        RequiredSelections = [ Kaons, Pi0 ] )
         return _selKSTAR2KPIZERO
-        
+
 
 
     def __Rho2PiPi0__( self, Pions, Pi0, conf):
         """
-        Make rho(770)+ -> pi+ pi0 
+        Make rho(770)+ -> pi+ pi0
         """
         _rho2pipizero = CombineParticles()
         _rho2pipizero.DecayDescriptor = "[rho(770)+ -> pi+ pi0]cc"
         _rho2pipizero.MotherCut = "(ADMASS('rho(770)+') < %(KstarplusWINDOW)s *MeV)" % conf
 
         _rhoConf = _rho2pipizero.configurable("Combine_"+self.name+"_PiPi0")
-                                                 
+
         _selRHO2PIPIZERO = Selection( "Selection_"+self.name+"_rho2pipizero",
                                        Algorithm = _rhoConf,
                                        RequiredSelections = [ Pions, Pi0 ] )
@@ -690,23 +690,23 @@ class B2XMuMuConf(LineBuilder) :
 
     def __Omega2PiPiPi0__( self, Pions, Pi0, conf):
         """
-        Make omega -> pi+ pi- pi0 
+        Make omega -> pi+ pi- pi0
         """
         #_omega2pipipizero = CombineParticles()
-        
-        _omega2pipipizero = DaVinci__N3BodyDecays() 
+
+        _omega2pipipizero = DaVinci__N3BodyDecays()
         _omega2pipipizero.DecayDescriptor = "omega(782) -> pi+ pi- pi0"
         _omega2pipipizero.CombinationCut = "(ADAMASS('omega(782)') < %(Omega_CombMassWin)s * MeV) " %conf
         _omega2pipipizero.Combination12Cut = "(AM < 800*MeV)&(ACHI2DOCA(1,2) < 8)"
-        
+
         _omega2pipipizero.MotherCut = "(ADMASS('omega(782)') < %(Omega_MassWin)s *MeV) & " \
                                       "(VFASPF(VPCHI2)> %(OmegaChi2Prob)s )"  %conf
-                         
-                                 
+
+
 
         #_omegaConf = _omega2pipipizero.configurable("Combine_"+self.name+"_PiPiPi0")
         #_omegaConf.ParticleCombiners.update ( { '' : 'OfflineVertexFitter:PUBLIC' } )
-                                                 
+
         _selOMEGA2PIPIPIZERO = Selection( "Selection_"+self.name+"_omega2pipipizero",
                                           Algorithm = _omega2pipipizero,
                                           RequiredSelections = [ Pions, Pi0 ] )
@@ -716,15 +716,15 @@ class B2XMuMuConf(LineBuilder) :
     def __K12OmegaK__(self, K, Omega, conf):
         """
         Make a K1-> Omega(782) K+
-        """      
+        """
         _k12omegak = CombineParticles()
         _k12omegak.DecayDescriptor = "[K_1(1400)+ -> K+ omega(782)]cc"
         _k12omegak.CombinationCut = "(AM > %(K12OmegaK_MassLow)s * MeV) & (AM < %(K12OmegaK_MassHigh)s * MeV)" %conf
         _k12omegak.MotherCut = "(M > %(K12OmegaK_CombMassLow)s * MeV) & (M < %(K12OmegaK_CombMassHigh)s * MeV) & (VFASPF(VCHI2PDOF) < %(K12OmegaK_VtxChi2)s)" %conf
-        
+
         #_k12omegakConf = _k12omegak.configurable("Combine_"+self.name+"_OmegaK")
-        #_k12omegakConf.ParticleCombiners.update ( { '' : 'OfflineVertexFitter:PUBLIC' } )                   
-        
+        #_k12omegakConf.ParticleCombiners.update ( { '' : 'OfflineVertexFitter:PUBLIC' } )
+
         _selK12OMEGAK = Selection( "Selection_"+self.name+"_k12omegak",
                                      Algorithm = _k12omegak,
                                      RequiredSelections = [ K, Omega ] )
@@ -734,7 +734,7 @@ class B2XMuMuConf(LineBuilder) :
     def __K12OmegaKS__(self, Kshort, Omega, conf):
         """
         Make a K1-> Omega(782) K+
-        """      
+        """
         _k12omegaks = CombineParticles()
         _k12omegaks.DecayDescriptor = "K_1(1400)0 -> KS0 omega(782)"
         _k12omegaks.CombinationCut = "(AM > %(K12OmegaK_MassLow)s * MeV) & (AM < %(K12OmegaK_MassHigh)s * MeV)" %conf
@@ -744,7 +744,7 @@ class B2XMuMuConf(LineBuilder) :
 
         #_k12omegaksConf = _k12omegaks.configurable("Combine_"+self.name+"_OmegaKs")
         #_k12omegaksConf.ParticleCombiners.update ( { '' : 'OfflineVertexFitter:PUBLIC' } )
-                
+
         _selK12OMEGAKS = Selection( "Selection_"+self.name+"_k12omegaks",
                                      Algorithm = _k12omegaks,
                                      RequiredSelections = [ Kshort, Omega ] )
@@ -764,7 +764,7 @@ class B2XMuMuConf(LineBuilder) :
     def __Kstar2KsPi__(self, Kshort, Pions, conf):
         """
         Make a kstarplus
-        """      
+        """
         _kstar2kspi = CombineParticles()
         _kstar2kspi.DecayDescriptor = "[K*(892)+ -> KS0 pi+]cc"
         _kstar2kspi.CombinationCut = self.KstarCombCut
@@ -774,68 +774,68 @@ class B2XMuMuConf(LineBuilder) :
                                      Algorithm = _kstar2kspi,
                                      RequiredSelections = [ Kshort, Pions ] )
         return _selKSTAR2KSPI
-    
+
 
     def __Phi__(self, Rho, conf):
         """
-        Make a phi through substitution 
-        """      
+        Make a phi through substitution
+        """
 
         phiSubMMZAlg = SubPIDMMFilter(self.name+"_PhiSubMMZ_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K+', 'K-'] ]  )
 
-        phiSubMMPAlg = SubPIDMMFilter(self.name+"_PhiSubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K+', 'K+'] ]  )     
+        phiSubMMPAlg = SubPIDMMFilter(self.name+"_PhiSubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K+', 'K+'] ]  )
 
-        phiSubMMMAlg = SubPIDMMFilter(self.name+"_PhiSubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K-', 'K-'] ]  )   
+        phiSubMMMAlg = SubPIDMMFilter(self.name+"_PhiSubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K-', 'K-'] ]  )
 
         phiSubMMZSel = Selection( self.name+"_PhiSubMMZ_Sel", Algorithm = phiSubMMZAlg, RequiredSelections = [ Rho ] )
 
         phiSubMMPSel = Selection( self.name+"_PhiSubMMP_Sel", Algorithm = phiSubMMPAlg, RequiredSelections = [ Rho ] )
-        
+
         phiSubMMMSel = Selection( self.name+"_PhiSubMMM_Sel", Algorithm = phiSubMMMAlg, RequiredSelections = [ Rho ] )
 
-        phiMerge = MergedSelection( self.name+"_PhiMerge", RequiredSelections = [ phiSubMMZSel, phiSubMMPSel, phiSubMMMSel ] ) 
-        
+        phiMerge = MergedSelection( self.name+"_PhiMerge", RequiredSelections = [ phiSubMMZSel, phiSubMMPSel, phiSubMMMSel ] )
+
         phiSubAlg = SubstitutePID( self.name+"_PhiSub_Alg", Code = "ALL",  MaxChi2PerDoF = -666 )
 
         #(DECTREE('rho(770)0 -> K+ K-')) | (DECTREE('rho(770)0 -> K+ K+')) | (DECTREE('rho(770)0 -> K- K-'))",
-        
+
         phiSubAlg.Substitutions = {
             'rho(770)0 -> K+ K-' : 'phi(1020)' ,
             'rho(770)0 -> K+ K+' : 'phi(1020)' ,
             'rho(770)0 -> K- K-' : 'phi(1020)'
             }
-        
+
         phiSubSel =  Selection( self.name+"_PhiSub_Sel", Algorithm = phiSubAlg, RequiredSelections = [ phiMerge ] )
 
         phiFilterAlg = FilterDesktop( Code = "(ABSID=='phi(1020)')" )
 
         phiFilterSel = Selection( self.name + "_PhiFilter", Algorithm = phiFilterAlg, RequiredSelections = [ phiSubSel ] )
-        
+
         return phiFilterSel
 
-    
+
     def __F2__(self, Rho, conf):
         """
         Make a f_2(1950) -> p pbar
         """
         f2SubMMZAlg = SubPIDMMFilter(self.name+"_F2SubMMZ_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p+', 'p~-'] ]  )
 
-        f2SubMMPAlg = SubPIDMMFilter(self.name+"_F2SubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p+', 'p+'] ]  )     
+        f2SubMMPAlg = SubPIDMMFilter(self.name+"_F2SubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p+', 'p+'] ]  )
 
-        f2SubMMMAlg = SubPIDMMFilter(self.name+"_F2SubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p~-', 'p~-'] ]  )   
+        f2SubMMMAlg = SubPIDMMFilter(self.name+"_F2SubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p~-', 'p~-'] ]  )
 
         f2SubMMZSel = Selection( self.name+"_F2SubMMZ_Sel", Algorithm = f2SubMMZAlg, RequiredSelections = [ Rho ] )
 
         f2SubMMPSel = Selection( self.name+"_F2SubMMP_Sel", Algorithm = f2SubMMPAlg, RequiredSelections = [ Rho ] )
-        
+
         f2SubMMMSel = Selection( self.name+"_F2SubMMM_Sel", Algorithm = f2SubMMMAlg, RequiredSelections = [ Rho ] )
-        
-        f2Merge    = MergedSelection( self.name+"_F2Merge", RequiredSelections = [ f2SubMMZSel, f2SubMMPSel, f2SubMMMSel ] ) 
 
-        f2SubAlg = SubstitutePID( self.name+"_F2Sub_Alg", 
+        f2Merge    = MergedSelection( self.name+"_F2Merge", RequiredSelections = [ f2SubMMZSel, f2SubMMPSel, f2SubMMMSel ] )
+
+        f2SubAlg = SubstitutePID( self.name+"_F2Sub_Alg",
                                    Code = "ALL" , #(DECTREE('rho(770)0 -> p+ p~-')) | (DECTREE('rho(770)0 -> p+ p+')) | (DECTREE('rho(770)0 -> p~- p~-'))",
                                    MaxChi2PerDoF = -666 )
-        
+
         f2SubAlg.Substitutions = {
             'rho(770)0 -> p+ p~-' : 'f_2(1950)' ,
             'rho(770)0 -> p+ p+'   : 'f_2(1950)' ,
@@ -845,16 +845,16 @@ class B2XMuMuConf(LineBuilder) :
         f2SubSel =  Selection( self.name+"_F2Sub_Sel", Algorithm = f2SubAlg, RequiredSelections = [ f2Merge ] )
 
         f2FilterAlg = FilterDesktop( Code = "(ABSID=='f_2(1950)')" )
-        
+
         f2FilterSel = Selection( self.name + "_F2Filter", Algorithm = f2FilterAlg, RequiredSelections = [ f2SubSel ] )
-        
+
         return f2FilterSel
-    
-    
+
+
     def __Rho__(self, Pions, conf):
         """
         Make a rho
-        """      
+        """
         wsCombinations=conf['HadronWS']
         _rho2pipi = CombineParticles()
         if wsCombinations == True:
@@ -874,77 +874,77 @@ class B2XMuMuConf(LineBuilder) :
         """
         Make a kstar
         """
-                
+
         kstarSubMMZAlg = SubPIDMMFilter(self.name+"_KstarSubMMZ_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K+', 'pi-'], ['pi+', 'K-' ] ])
-        
-        kstarSubMMPAlg = SubPIDMMFilter(self.name+"_KstarSubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K+', 'pi+'], ['pi+', 'K+' ] ])     
 
-        kstarSubMMMAlg = SubPIDMMFilter(self.name+"_KstarSubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K-', 'pi-'], ['pi-', 'K-' ] ]) 
+        kstarSubMMPAlg = SubPIDMMFilter(self.name+"_KstarSubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K+', 'pi+'], ['pi+', 'K+' ] ])
+
+        kstarSubMMMAlg = SubPIDMMFilter(self.name+"_KstarSubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'K-', 'pi-'], ['pi-', 'K-' ] ])
 
         kstarSubMMZSel = Selection( self.name+"_KstarSubMMZ_Sel", Algorithm = kstarSubMMZAlg, RequiredSelections = [ Rho ] )
 
         kstarSubMMPSel = Selection( self.name+"_KstarSubMMP_Sel", Algorithm = kstarSubMMPAlg, RequiredSelections = [ Rho ] )
-        
+
         kstarSubMMMSel = Selection( self.name+"_KstarSubMMM_Sel", Algorithm = kstarSubMMMAlg, RequiredSelections = [ Rho ] )
-        
+
         kstarMerge     = MergedSelection( self.name+"_KstarMerge", RequiredSelections = [ kstarSubMMZSel, kstarSubMMPSel, kstarSubMMMSel ] )
 
         kstarSubAlg    = SubstitutePID( self.name+"_KstarSub_Alg", Code = "ALL", MaxChi2PerDoF = -666 )
 
-        #kstarSubAlg.Code = "ALL" #(DECTREE('rho(770)0 -> K+ pi-')) | (DECTREE('rho(770)0 -> K- pi+')) | (DECTREE('rho(770)0 -> K+ pi+')) | (DECTREE('rho(770)0 -> K- pi-'))" 
-        
+        #kstarSubAlg.Code = "ALL" #(DECTREE('rho(770)0 -> K+ pi-')) | (DECTREE('rho(770)0 -> K- pi+')) | (DECTREE('rho(770)0 -> K+ pi+')) | (DECTREE('rho(770)0 -> K- pi-'))"
+
         kstarSubAlg.Substitutions = {
             'rho(770)0 -> K+ pi-' : 'K*(892)0',
             'rho(770)0 -> K+ pi+' : 'K*(892)0',
             'rho(770)0 -> pi+ K-' : 'K*(892)~0',
             'rho(770)0 -> K- pi-' : 'K*(892)~0'
             }
-        
-        
+
+
         kstarSubSel =  Selection( self.name+"_KstarSub_Sel", Algorithm = kstarSubAlg, RequiredSelections = [ kstarMerge ] )
 
         kstarFilterAlg = FilterDesktop( Code = "(ABSID=='K*(892)0')" )
-        
+
         kstarFilterSel = Selection( self.name + "_KstarFilter", Algorithm = kstarFilterAlg, RequiredSelections = [ kstarSubSel ] )
-        
+
         return kstarFilterSel
-       
 
-    def __A1__(self, Pions, conf): 
+
+    def __A1__(self, Pions, conf):
         """
         Make A1 objects:
-            a_1 - > pi pi pi 
-        """      
+            a_1 - > pi pi pi
+        """
         # First make an a_1(1260)+ selection
         #_a12pipipi = CombineParticles()
-        _a12pipipi = DaVinci__N3BodyDecays() 
+        _a12pipipi = DaVinci__N3BodyDecays()
         _a12pipipi.DecayDescriptors = [ "[a_1(1260)+ -> pi+ pi+ pi-]cc" ]
         _a12pipipi.CombinationCut = self.__A1CombCut__(conf)
         _a12pipipi.MotherCut = self.__A1Cut__(conf)
-        
+
         _a12pipipi.Combination12Cut = "(AM < %(A1_Comb_MassHigh)s * MeV) & "\
-                                      "(ACHI2DOCA(1,2) < 8)"  % conf 
-        
+                                      "(ACHI2DOCA(1,2) < 8)"  % conf
+
         selA1 = Selection( "Selection_"+self.name+"_a1",
                            Algorithm=_a12pipipi,
                            RequiredSelections=[Pions] )
-        
-        return selA1 
+
+        return selA1
 
     def __F1__(self, Pions, conf):
         """
         Make F1 object:
-            f_1 -> pi pi pi pi 
+            f_1 -> pi pi pi pi
         """
-        _f12pipipipi = DaVinci__N4BodyDecays() 
+        _f12pipipipi = DaVinci__N4BodyDecays()
         _f12pipipipi.DecayDescriptors = [ "f_1(1285) -> pi+ pi- pi+ pi-" ]
 
         _f12pipipipi.CombinationCut = self.__A1CombCut__(conf)
         _f12pipipipi.MotherCut = self.__A1Cut__(conf)
 
         _f12pipipipi.Combination12Cut = "(AM < %(A1_Comb_MassHigh)s * MeV) & "\
-                                        "(ACHI2DOCA(1,2) < 8)"  % conf 
-                                        
+                                        "(ACHI2DOCA(1,2) < 8)"  % conf
+
         _f12pipipipi.Combination123Cut = "(AM < %(A1_Comb_MassHigh)s * MeV) & "\
                                          "(ACHI2DOCA(1,3) < 8) & "\
                                          "(ACHI2DOCA(2,3) < 8) " % conf
@@ -954,11 +954,11 @@ class B2XMuMuConf(LineBuilder) :
                            RequiredSelections=[Pions] )
         return selF1
 
-    def __K1__(self, A1, conf): 
+    def __K1__(self, A1, conf):
         """
         SubPID:
             K_1 -> K pi pi
-        """      
+        """
         #replace head with K_1(1270)
         _a1k1_SubPID = SubstitutePID(self.name+"_a1k1_SubPID", Code="(DECTREE('a_1(1260)+ -> pi+ pi+ pi-')) | (DECTREE('a_1(1260)- -> pi- pi- pi+'))",
                                      Substitutions={'a_1(1260)+ -> pi+ pi+ pi-' : 'K_1(1270)+', 'a_1(1260)- -> pi- pi- pi+' : 'K_1(1270)-'}, MaxChi2PerDoF=-666, MaxParticles = 4000)
@@ -966,12 +966,12 @@ class B2XMuMuConf(LineBuilder) :
                              Algorithm = _a1k1_SubPID, RequiredSelections = [A1])
         #replace daughters for K_1(1270)+, order is important for this tool
         _a1k1_SubPIDp = SubPIDMMFilter(self.name+"_a1k1_SubPIDp", Code="DECTREE('K_1(1270)+ -> pi+ pi+ pi-')",
-                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K+','pi+','pi-'], ['pi+','K+','pi-']], MaxParticles = 4000 ) 
+                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K+','pi+','pi-'], ['pi+','K+','pi-']], MaxParticles = 4000 )
         _sel_k1p =  Selection(self.name+"_a1k1_SubPIDAlgp",
                               Algorithm = _a1k1_SubPIDp, RequiredSelections = [_sel_k1])
         #replace daughters for K_1(1270)-
         _a1k1_SubPIDm = SubPIDMMFilter(self.name+"_a1k1_SubPIDm", Code="DECTREE('K_1(1270)- -> pi- pi- pi+')",
-                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K-','pi-','pi+'], ['pi-','K-','pi+']], MaxParticles = 4000 ) 
+                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K-','pi-','pi+'], ['pi-','K-','pi+']], MaxParticles = 4000 )
         _sel_k1m =  Selection(self.name+"_a1k1_SubPIDAlgm",
                               Algorithm = _a1k1_SubPIDm, RequiredSelections = [_sel_k1])
 
@@ -981,11 +981,11 @@ class B2XMuMuConf(LineBuilder) :
 
         return pick
 
-    def __K2__(self, A1, conf): 
+    def __K2__(self, A1, conf):
         """
         SubPID:
             K_2 -> K K K
-        """      
+        """
         #replace head with K_2(1770)
         _a1k2_SubPID = SubstitutePID(self.name+"_a1k2_SubPID", Code="(DECTREE('a_1(1260)+ -> pi+ pi+ pi-')) | (DECTREE('a_1(1260)- -> pi- pi- pi+'))",
                                       Substitutions={'a_1(1260)+ -> pi+ pi+ pi-' : 'K_2(1770)+', 'a_1(1260)- -> pi- pi- pi+' : 'K_2(1770)-'}, MaxChi2PerDoF=-666, MaxParticles = 4000)
@@ -993,12 +993,12 @@ class B2XMuMuConf(LineBuilder) :
                              Algorithm = _a1k2_SubPID, RequiredSelections = [A1])
         #replace daughters for K_2(1770)+, order is important for this tool
         _a1k2_SubPIDp = SubPIDMMFilter(self.name+"_a1k2_SubPIDp", Code="DECTREE('K_2(1770)+ -> pi+ pi+ pi-')",
-                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K+','K+','K-']], MaxParticles = 4000 )        
+                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K+','K+','K-']], MaxParticles = 4000 )
         _sel_k2p =  Selection(self.name+"_a1k2_SubPIDAlgp",
                               Algorithm = _a1k2_SubPIDp, RequiredSelections = [_sel_k2])
         #replace daughters for K_2(1770)-
         _a1k2_SubPIDm = SubPIDMMFilter(self.name+"_a1k2_SubPIDm", Code="DECTREE('K_2(1770)- -> pi- pi- pi+')",
-                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K-','K-','K+']], MaxParticles = 4000 )        
+                                       MinMM=0, MaxMM=conf['A1_Comb_MassHigh'], PIDs = [['K-','K-','K+']], MaxParticles = 4000 )
         _sel_k2m =  Selection(self.name+"_a1k2_SubPIDAlgm",
                               Algorithm = _a1k2_SubPIDm, RequiredSelections = [_sel_k2])
 
@@ -1017,21 +1017,21 @@ class B2XMuMuConf(LineBuilder) :
         _k102kspipi = DaVinci__N3BodyDecays()
         _k102kspipi.DecayDescriptors = [ "K_1(1270)0 -> pi+ pi- KS0" ]
         _k102kspipi.Combination12Cut = "(AM < %(A1_Comb_MassHigh)s * MeV) & "\
-                                       "(ACHI2DOCA(1,2) < 20)"  % conf 
+                                       "(ACHI2DOCA(1,2) < 20)"  % conf
         _k102kspipi.CombinationCut = self.__A1CombCut__(conf)
         _k102kspipi.MotherCut = self.__A1Cut__(conf)
 
         _sel_k10 = Selection( "Selection_"+self.name+"_k10",
                               Algorithm=_k102kspipi,
                               RequiredSelections=[Kshort,Pions] )
-        
+
         pick = Selection(self.name+"_K10_PickDecay",
                      Algorithm = FilterDesktop( Code = "(DECTREE('K_1(1270)0 -> KS0 pi+ pi-'))" ),
                      RequiredSelections = [_sel_k10])
 
         return pick
 
-        
+
 
 
     def __Lambdastar__(self, Rho, conf):
@@ -1039,41 +1039,41 @@ class B2XMuMuConf(LineBuilder) :
         Make a Lambdastar
         """
         lambdastarSubMMZAlg = SubPIDMMFilter(self.name+"_LambdastarSubMMZ_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p+', 'K-'], ['K+', 'p~-' ] ])
-        
-        lambdastarSubMMPAlg = SubPIDMMFilter(self.name+"_LambdastarSubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p+', 'K+'], ['K+', 'p+' ] ])     
 
-        lambdastarSubMMMAlg = SubPIDMMFilter(self.name+"_LambdastarSubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p~-', 'K-'], ['K-', 'p~-' ] ]) 
+        lambdastarSubMMPAlg = SubPIDMMFilter(self.name+"_LambdastarSubMMP_Alg", Code= "DECTREE('rho(770)0 -> pi+ pi+')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p+', 'K+'], ['K+', 'p+' ] ])
+
+        lambdastarSubMMMAlg = SubPIDMMFilter(self.name+"_LambdastarSubMMM_Alg", Code= "DECTREE('rho(770)0 -> pi- pi-')", MinMM=0, MaxMM=6050, PIDs = [ [ 'p~-', 'K-'], ['K-', 'p~-' ] ])
 
         lambdastarSubMMZSel = Selection( self.name+"_LambdastarSubMMZ_Sel", Algorithm = lambdastarSubMMZAlg, RequiredSelections = [ Rho ] )
 
         lambdastarSubMMPSel = Selection( self.name+"_LambdastarSubMMP_Sel", Algorithm = lambdastarSubMMPAlg, RequiredSelections = [ Rho ] )
-        
+
         lambdastarSubMMMSel = Selection( self.name+"_LambdastarSubMMM_Sel", Algorithm = lambdastarSubMMMAlg, RequiredSelections = [ Rho ] )
-        
+
         lambdastarMerge     = MergedSelection( self.name+"_LambdastarMerge", RequiredSelections = [ lambdastarSubMMZSel, lambdastarSubMMPSel, lambdastarSubMMMSel ] )
 
         lambdastarSubAlg    = SubstitutePID( self.name+"_LambdastarSub_Alg", Code = "ALL", MaxChi2PerDoF = -666 )
 
         #lambdastarSubAlg.Code = "ALL"
-        
-        #(DECTREE('rho(770)0 -> p+ K-')) | (DECTREE('rho(770)0 -> K+ p~-')) | (DECTREE('rho(770)0 -> p+ K+')) | (DECTREE('rho(770)0 -> p~- K-'))" 
-        
+
+        #(DECTREE('rho(770)0 -> p+ K-')) | (DECTREE('rho(770)0 -> K+ p~-')) | (DECTREE('rho(770)0 -> p+ K+')) | (DECTREE('rho(770)0 -> p~- K-'))"
+
         lambdastarSubAlg.Substitutions = {
             'rho(770)0 -> p+ K-' : 'Lambda(1520)0',
             'rho(770)0 -> p+ K+' : 'Lambda(1520)0',
             'rho(770)0 -> p~- K-' : 'Lambda(1520)~0',
             'rho(770)0 -> K+ p~-' : 'Lambda(1520)~0'
             }
-        
-        
+
+
         lambdastarSubSel =  Selection( self.name+"_LambdastarSub_Sel", Algorithm = lambdastarSubAlg, RequiredSelections = [ lambdastarMerge ] )
 
         lambdastarFilterAlg = FilterDesktop( Code = "(ABSID=='Lambda(1520)0')" )
-          
+
         lambdastarFilterSel = Selection( self.name + "_LambdastarFilter", Algorithm = lambdastarFilterAlg, RequiredSelections = [ lambdastarSubSel ] )
-        
-        return lambdastarFilterSel    
-    
+
+        return lambdastarFilterSel
+
 
     def __Dplus__(self, conf):
         """
@@ -1086,7 +1086,7 @@ class B2XMuMuConf(LineBuilder) :
         """
         Make a D0, the D0->Kpi should cover all the D we need (no PID requirement)
         """
-        _dzero = AutomaticData(Location = 'Phys/StdLooseD02KPi/Particles') 
+        _dzero = AutomaticData(Location = 'Phys/StdLooseD02KPi/Particles')
         _filter_dzero = FilterDesktop(Code = self.KstarCut)
         _seldzero = Selection("Selection_"+self.name+"_dzero",
                              RequiredSelections = [ _dzero] ,
@@ -1101,26 +1101,24 @@ class B2XMuMuConf(LineBuilder) :
 
         return _dstar
 
-    
+
     def __Bs__(self, Dimuon, daughters, conf):
         """
         Make and return a Bs selection
-        """      
+        """
 
         _b2xmumu = CombineParticles()
         _b2xmumu.DecayDescriptors = conf['DECAYS']
 
 
-        
+
         _b2xmumu.CombinationCut = self.BdCombCut
         _b2xmumu.MotherCut = self.BdCut
-        
+
         _sel_Daughters = MergedSelection("Selection_"+self.name+"_daughters",
                                          RequiredSelections = daughters )
-        
+
         sel = Selection( "Selection_"+self.name+"_B2XMuMu",
                          Algorithm = _b2xmumu,
                          RequiredSelections = [ Dimuon, _sel_Daughters ])
         return sel
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py
index 81cf8c26edc3374d8f3fdac58c4248c680d1470d..c69f39234171e943b9d3d216ef10130317726299 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py
@@ -42,7 +42,7 @@ daughter_locations = {
     "[Beauty -> (X+ -> X+ l+) ^l-]CC ":"{0}L2",
     "[Beauty -> (X0 -> ^X+ l-) l+]CC ":"{0}H",
     "[Beauty -> (X+ -> ^X+ l+) l-]CC ":"{0}H",
-    
+
     # B2K*mutau
     "[Beauty -> (X+ -> X0 ^l+) l-]CC ":"{0}L1",
     "[Beauty -> (X+ -> X0 l+) ^l-]CC ":"{0}L2",
@@ -50,14 +50,14 @@ daughter_locations = {
     "[Beauty -> (X+ -> (X0 -> X+ ^X-) l+) l-]CC ":"{0}H2",
     "[Beauty -> ^(X+ -> (X0 -> X+ X-) l+) l-]CC ":"{0}HHH",
     "[Beauty -> (X+ -> ^(X0 -> X+ X-) l+) l-]CC ":"{0}HH",
-    
+
     # B2phimutau
     "[Beauty -> (X0-> X+ X-) ^l+ l-]CC ":"{0}L1",
     "[Beauty -> (X0-> X+ X-) l+ ^l-]CC ":"{0}L2",
     "[Beauty -> (X0-> ^X+ X-) l+ l-]CC ":"{0}H1",
     "[Beauty -> (X0-> X+ ^X-) l+ l-]CC ":"{0}H1",
     "[Beauty -> ^(X0-> X+ X-) l+ l-]CC ":"{0}HH",
-    
+
     # B2Kmutau WS
     "[Beauty -> (X0 -> X+ ^l-) l-]CC ":"{0}L1",
     "[Beauty -> (X+ -> X+ ^l+) l+]CC ":"{0}L1",
@@ -65,7 +65,7 @@ daughter_locations = {
     "[Beauty -> (X+ -> X+ l+) ^l+]CC ":"{0}L2",
     "[Beauty -> (X0 -> ^X+ l-) l-]CC ":"{0}H",
     "[Beauty -> (X+ -> ^X+ l+) l+]CC ":"{0}H",
-    
+
     # B2K*mutau WS
     "[Beauty -> (X+ -> X0 ^l+) l+]CC ":"{0}L1",
     "[Beauty -> (X+ -> X0 l+) ^l+]CC ":"{0}L2",
@@ -73,7 +73,7 @@ daughter_locations = {
     "[Beauty -> (X+ -> (X0 -> X+ ^X-) l+) l+]CC ":"{0}H2",
     "[Beauty -> ^(X+ -> (X0 -> X+ X-) l+) l+]CC ":"{0}HHH",
     "[Beauty -> (X+ -> ^(X0 -> X+ X-) l+) l+]CC ":"{0}HH",
-    
+
     # B2phimutau WS
     "[Beauty -> (X0-> X+ X-) ^l+ l+]CC ":"{0}L1",
     "[Beauty -> (X0-> X+ X-) l+ ^l+]CC ":"{0}L2",
@@ -111,7 +111,7 @@ default_config = {
                      'StrippingB2XTauMu_K_3pi_loose_WSLine']
     },
     'WGs'           : ['RD'],
-    'CONFIG'        : { 
+    'CONFIG'        : {
         # Common cuts
         "MINIPCHI2"      : 16.0    # adimensiional
         ,"TrackCHI2"     : 3       # adimensional
@@ -121,7 +121,7 @@ default_config = {
         ,"PIDmu"         : 2.0     # adimensiional
         ,"B_MIN_MASS"    : 2000    # MeV
         ,"B_MAX_MASS"    : 10000    # MeV
-        
+
         ####  Bd->K*0 tau(mu) mu
         # Daughters
         ,"MuonPT_kst"        : 500.0   # MeV
@@ -129,20 +129,20 @@ default_config = {
         ,"KPiPT_kst"         : 500.0   # MeV
         ,"KaonP_kst"         : 2.0     # GeV
         ,"PionP_kst"         : 2.0     # GeV
-        
+
         # K*0 cuts
         ,"KstMassWin"    : 150.0   # MeV
         ,"KstAMassWin"   : 180.0   # MeV
         ,"KstVCHI2DOF"   : 15.0    # adimensiional
-        
+
         # Xmu cuts
         ,"XMuVCHI2DOF_kst" : 15.0    # adimensiional
-        
+
         # B cuts
         ,"BDIRA_kst"         : 0.95    # adimensiional
         ,"BVCHI2DOF_kst"     : 25.0    # adimensiional
         ,"B_FDCHI2_kst"      : 80      # adimensiional
-        
+
         ####  Bd->phi tau(mu) mu
         # Phi cuts
         ,"PhiAMassWin"    : 30.0   # MeV
@@ -162,7 +162,7 @@ default_config = {
         ,"KPiPT_K"         : 800.0   # MeV
         ,"KaonP_K"         : 3.0     # GeV
         ,"MINIPCHI2_K"     : 36.0
-        ,"KaonPIDK_K"      : 5    
+        ,"KaonPIDK_K"      : 5
 
         # Xmu cuts
         ,"XMuVCHI2DOF_K" : 9.0    # adimensiional
@@ -180,10 +180,10 @@ default_config = {
         ,"BVCHI2DOF_K_3pi"     : 4.0    # adimensiional
         ,"MuonP_K_3pi"         : 6.0     # GeV
         ,"KaonP_K_3pi"         : 6.0     # GeV
-        ,"KaonPIDK_K_3pi"      : 6    
+        ,"KaonPIDK_K_3pi"      : 6
         ,"B_MIN_MASS_K_3pi"    : 3000    # MeV
         ,"B_MAX_MASS_K_3pi"    : 10000    # MeV
-        
+
         # Wrong sign combinations
         ,'MuTauWS'       : True
 
@@ -231,7 +231,7 @@ default_config = {
              'pvdis_h'          : 40.,
              'makeTrackCuts'    : False,
              'IsoTwoBody'       : False},
- 
+
     {'Type'              : 'RelInfoConeVariables',
      'ConeAngle'         : 1.0,
      'Location'          : 'ConeVarsInfo10'
@@ -257,7 +257,7 @@ default_config = {
      'Location'          : 'ConeIsoInfo20'
     },
         ]
-    },    
+    },
 }
 
 
@@ -272,7 +272,7 @@ class B2XTauMuConf(LineBuilder) :
     __configuration_keys__ = default_config['CONFIG'].keys()
 
 
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
@@ -297,37 +297,37 @@ class B2XTauMuConf(LineBuilder) :
         self.selmuon = Selection( "Mufor" + name,
                                   Algorithm = self._muonFilter(),
                                   RequiredSelections = [StdAllLooseMuons])
-                                  
+
 
         ############### KAON AND PION SELECTIONS ################
-        
+
         self.selKaon = Selection( "Kfor" + name,
                                   Algorithm = self._kaonFilter(),
                                   RequiredSelections = [StdLooseKaons])
-        
+
 
         self.selPion = Selection( "Pifor" + name,
                                   Algorithm = self._pionFilter(),
                                   RequiredSelections = [StdLoosePions])
-                                  
-                                                             
+
+
 
         ################ phi -> KK SELECTION ##########################
-        
+
         self.selphi2kk = Selection( "Phi2KKfor" + name,
                                     Algorithm = self._Phi2KKFilter(),
                                     RequiredSelections = [self.selKaon] )
 
 
         ################ Kst0 -> Kpi SELECTION ##########################
-        
+
         self.selkst02kpi = Selection( "Kst02KPifor" + name,
                                     Algorithm = self._Kst02KPiFilter(),
                                     RequiredSelections = [self.selKaon, self.selPion] )
 
 
         ################ Kst(1430)0 -> K+ Mu- (OS) SELECTION ##########################
-        
+
         self.selkmuOS = Selection(name = "KMuOSFor"+name,
                                   Algorithm          = self._KMuOSFilter(),
                                   RequiredSelections = [self.selKaon,self.selmuon])
@@ -336,9 +336,9 @@ class B2XTauMuConf(LineBuilder) :
         self.selkmuOS_K = Selection(name = "KMuOSFor_K"+name,
                                     Algorithm = self._KMuFilter_K(),
                                     RequiredSelections = [self.selkmuOS])
-        
+
         ################ Delta++ -> K+ Mu+  (SS) SELECTION ##########################
-        
+
         self.selkmuSS = Selection(name = "KMuSSFor"+name,
                                   Algorithm          = self._KMuSSFilter(),
                                   RequiredSelections = [self.selKaon,self.selmuon])
@@ -352,14 +352,14 @@ class B2XTauMuConf(LineBuilder) :
 
 
         ################ Kst(1430)+ -> phi Mu  SELECTION ##########################
-        
+
         self.selkstarmu = Selection(name = "Kst0MuFor"+name,
                                     Algorithm          = self._Kst0MuFilter(),
                                     RequiredSelections = [self.selkst02kpi,self.selmuon])
 
 
         ################ K_2(1770)+ -> Kst0 Mu  SELECTION ##########################
-        
+
         self.selphimu = Selection(name = "PhiMuFor"+name,
                                     Algorithm          = self._PhiMuFilter(),
                                     RequiredSelections = [self.selphi2kk,self.selmuon])
@@ -383,7 +383,7 @@ class B2XTauMuConf(LineBuilder) :
                                              BVCHI2DOF = config['BVCHI2DOF_kst'],
                                              BDIRA = config['BDIRA_kst'],
                                              B_FDCHI2 = config["B_FDCHI2_kst"],
-                                             B_MIN_MASS = config['B_MIN_MASS'], 
+                                             B_MIN_MASS = config['B_MIN_MASS'],
                                              B_MAX_MASS = config['B_MAX_MASS'])
 
 
@@ -422,9 +422,9 @@ class B2XTauMuConf(LineBuilder) :
 
         ### B -> Phi Tau(3pi) Mu
         self.selb2PhiTauMu_3pi = self._B2XTauMu_3pi_3Body(name_phi_3pi,
-                                                    DecayDescriptors = ["[B0 ->  phi(1020) tau+ mu-]cc",  
-                                                                        "[B0 ->  phi(1020) tau- mu+]cc"], 
-                                                    
+                                                    DecayDescriptors = ["[B0 ->  phi(1020) tau+ mu-]cc",
+                                                                        "[B0 ->  phi(1020) tau- mu+]cc"],
+
                                                     LeptonSel = [ StdTightDetachedTau3pi, self.selmuon ],
                                                     XSel = [self.selphi2kk],
                                                     TauPT = 0.,
@@ -455,7 +455,7 @@ class B2XTauMuConf(LineBuilder) :
                                                   BPT = config['B_PT_K'],
                                                   BDIRA = config['BDIRA_K_3pi'],
                                                   B_FDCHI2 = config["B_FDCHI2_K"],
-                                                  B_MIN_MASS = config['B_MIN_MASS_K_3pi'], 
+                                                  B_MIN_MASS = config['B_MIN_MASS_K_3pi'],
                                                   B_MAX_MASS = config['B_MAX_MASS_K_3pi'])
 
 
@@ -477,7 +477,7 @@ class B2XTauMuConf(LineBuilder) :
                                                   BPT = config['B_PT_K'],
                                                   BDIRA = config['BDIRA_K'],
                                                   B_FDCHI2 = config["B_FDCHI2_K"],
-                                                  B_MIN_MASS = config['B_MIN_MASS'], 
+                                                  B_MIN_MASS = config['B_MIN_MASS'],
                                                   B_MAX_MASS = config['B_MAX_MASS'])
 
 
@@ -534,7 +534,7 @@ class B2XTauMuConf(LineBuilder) :
 
         ### B -> Phi Tau(3pi) Mu
         self.selb2PhiTauMu_3pi_WS = self._B2XTauMu_3pi_3Body(name_phi_3pi_WS,
-                                                       DecayDescriptors = ["[B0 ->  phi(1020)  tau+ mu+]cc"], 
+                                                       DecayDescriptors = ["[B0 ->  phi(1020)  tau+ mu+]cc"],
                                                        LeptonSel = [StdTightDetachedTau3pi, self.selmuon],
                                                        XSel = [self.selphi2kk],
                                                        TauPT = 0,
@@ -552,7 +552,7 @@ class B2XTauMuConf(LineBuilder) :
         self.selb2KTauMu_3pi_WS = self._B2XTauMu_3pi(name_k_3pi_WS,
                                                      DecayDescriptors = ["[B+ ->  K*(1410)0  tau-]cc",     # K*(1410)0 -> K+ mu-
                                                                          "[B+ ->  Delta(1600)++  tau+]cc"], # Delta(1600)++ -> K+ mu+
-                                                    
+
                                                      LeptonSel = [StdTightDetachedTau3pi],
                                                      # XSel = [self.selkmuOS,
                                                      #           self.selkmuSS],
@@ -572,7 +572,7 @@ class B2XTauMuConf(LineBuilder) :
         self.selb2KTauMu_3pi_loose_WS = self._B2XTauMu_3pi(name_k_3pi_loose_WS,
                                                      DecayDescriptors = ["[B+ ->  K*(1410)0  tau-]cc",     # K*(1410)0 -> K+ mu-
                                                                          "[B+ ->  Delta(1600)++  tau+]cc"], # Delta(1600)++ -> K+ mu+
-                                                    
+
                                                      LeptonSel = [StdTightDetachedTau3pi],
                                                      XSel = [self.selkmuOS,
                                                                self.selkmuSS],
@@ -587,44 +587,44 @@ class B2XTauMuConf(LineBuilder) :
                                                      B_FDCHI2 = config["B_FDCHI2_K"],
                                                      B_MIN_MASS = config['B_MIN_MASS'], B_MAX_MASS = config['B_MAX_MASS'])
 
-        
+
         ################# DECLARE THE STRIPPING LINES #################################
-        
-        self.B2KstTauMu = StrippingLine(name_kst+ 'Line', 
-                                        prescale = config["Prescale"], 
+
+        self.B2KstTauMu = StrippingLine(name_kst+ 'Line',
+                                        prescale = config["Prescale"],
                                         selection = self.selb2Kst0TauMu,
                                         #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"],
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2PhiTauMu = StrippingLine(name_phi+ 'Line', 
-                                        prescale = config["Prescale"], 
+        self.B2PhiTauMu = StrippingLine(name_phi+ 'Line',
+                                        prescale = config["Prescale"],
                                         selection = self.selb2PhiTauMu,
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2KTauMu = StrippingLine(name_k+ 'Line', 
-                                        prescale = config["Prescale"], 
+        self.B2KTauMu = StrippingLine(name_k+ 'Line',
+                                        prescale = config["Prescale"],
                                         selection = self.selb2KTauMu,
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2PhiTauMu_3pi = StrippingLine(name_phi_3pi+ 'Line', 
-                                            prescale = config["Prescale"], 
+        self.B2PhiTauMu_3pi = StrippingLine(name_phi_3pi+ 'Line',
+                                            prescale = config["Prescale"],
                                             selection = self.selb2PhiTauMu_3pi,
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2KTauMu_3pi = StrippingLine(name_k_3pi+ 'Line', 
-                                            prescale = config["Prescale"], 
+        self.B2KTauMu_3pi = StrippingLine(name_k_3pi+ 'Line',
+                                            prescale = config["Prescale"],
                                             selection = self.selb2KTauMu_3pi,
                                           #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"],
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
 
-        self.B2KTauMu_3pi_loose = StrippingLine(name_k_3pi_loose+ 'Line', 
-                                            prescale = config["Prescale"], 
+        self.B2KTauMu_3pi_loose = StrippingLine(name_k_3pi_loose+ 'Line',
+                                            prescale = config["Prescale"],
                                             selection = self.selb2KTauMu_3pi_loose,
                                           #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"],
                                         RelatedInfoTools = config["RelatedInfoTools"],
@@ -632,61 +632,61 @@ class B2XTauMuConf(LineBuilder) :
 
 
 
-        self.B2KstTauMu_WS = StrippingLine(name_kst_WS+ 'Line', 
-                                        prescale = config["Prescale_WS"], 
+        self.B2KstTauMu_WS = StrippingLine(name_kst_WS+ 'Line',
+                                        prescale = config["Prescale_WS"],
                                         selection = self.selb2Kst0TauMu_WS,
                                            #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"],
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2PhiTauMu_WS = StrippingLine(name_phi_WS+ 'Line', 
-                                        prescale = config["Prescale_WS"], 
+        self.B2PhiTauMu_WS = StrippingLine(name_phi_WS+ 'Line',
+                                        prescale = config["Prescale_WS"],
                                         selection = self.selb2PhiTauMu_WS,
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2KTauMu_WS = StrippingLine(name_k_WS+ 'Line', 
-                                        prescale = config["Prescale_WS"], 
+        self.B2KTauMu_WS = StrippingLine(name_k_WS+ 'Line',
+                                        prescale = config["Prescale_WS"],
                                         selection = self.selb2KTauMu_WS,
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2PhiTauMu_3pi_WS = StrippingLine(name_phi_3pi_WS+ 'Line', 
-                                               prescale = config["Prescale_WS"], 
+        self.B2PhiTauMu_3pi_WS = StrippingLine(name_phi_3pi_WS+ 'Line',
+                                               prescale = config["Prescale_WS"],
                                                selection = self.selb2PhiTauMu_3pi_WS,
                                         RelatedInfoTools = config["RelatedInfoTools"],
                                         MDSTFlag = False)
 
-        self.B2KTauMu_3pi_WS = StrippingLine(name_k_3pi_WS+ 'Line', 
-                                               prescale = config["Prescale_WS"], 
+        self.B2KTauMu_3pi_WS = StrippingLine(name_k_3pi_WS+ 'Line',
+                                               prescale = config["Prescale_WS"],
                                                selection = self.selb2KTauMu_3pi_WS,
                                              #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"],
                                              RelatedInfoTools = config["RelatedInfoTools"],
-                                        MDSTFlag = False) 
+                                        MDSTFlag = False)
 
 
-        self.B2KTauMu_3pi_loose_WS = StrippingLine(name_k_3pi_loose_WS+ 'Line', 
-                                               prescale = config["Prescale_WS"], 
+        self.B2KTauMu_3pi_loose_WS = StrippingLine(name_k_3pi_loose_WS+ 'Line',
+                                               prescale = config["Prescale_WS"],
                                                selection = self.selb2KTauMu_3pi_loose_WS,
                                              #RequiredRawEvents = ["Rich","Velo","Tracker","Trigger","Muon","Calo"],
                                              RelatedInfoTools = config["RelatedInfoTools"],
-                                        MDSTFlag = False) 
+                                        MDSTFlag = False)
 
 
-        self.registerLine(self.B2KstTauMu)        
-        self.registerLine(self.B2PhiTauMu)        
-        self.registerLine(self.B2KTauMu)        
-        self.registerLine(self.B2KTauMu_3pi)        
-        self.registerLine(self.B2KTauMu_3pi_loose)        
-        self.registerLine(self.B2PhiTauMu_3pi)        
+        self.registerLine(self.B2KstTauMu)
+        self.registerLine(self.B2PhiTauMu)
+        self.registerLine(self.B2KTauMu)
+        self.registerLine(self.B2KTauMu_3pi)
+        self.registerLine(self.B2KTauMu_3pi_loose)
+        self.registerLine(self.B2PhiTauMu_3pi)
 
-        if config["MuTauWS"]: 
-            self.registerLine(self.B2KstTauMu_WS)        
-            self.registerLine(self.B2PhiTauMu_WS)        
-            self.registerLine(self.B2KTauMu_WS)        
-            self.registerLine(self.B2PhiTauMu_3pi_WS)        
-            self.registerLine(self.B2KTauMu_3pi_WS)        
-            self.registerLine(self.B2KTauMu_3pi_loose_WS)        
+        if config["MuTauWS"]:
+            self.registerLine(self.B2KstTauMu_WS)
+            self.registerLine(self.B2PhiTauMu_WS)
+            self.registerLine(self.B2KTauMu_WS)
+            self.registerLine(self.B2PhiTauMu_3pi_WS)
+            self.registerLine(self.B2KTauMu_3pi_WS)
+            self.registerLine(self.B2KTauMu_3pi_loose_WS)
 
 
 
@@ -695,37 +695,37 @@ class B2XTauMuConf(LineBuilder) :
 
         _code = "(TRCHI2DOF< %(TrackCHI2)s)" % self.__confdict__
         _code += " & (MIPCHI2DV(PRIMARY)> %(MINIPCHI2)s)" % self.__confdict__
-        _code += " & (TRGHOSTPROB < %(TrackGhostProb)s)" % self.__confdict__ 
-        _code += " & (PIDmu > %(PIDmu)s)" % self.__confdict__ 
-        
+        _code += " & (TRGHOSTPROB < %(TrackGhostProb)s)" % self.__confdict__
+        _code += " & (PIDmu > %(PIDmu)s)" % self.__confdict__
+
         _mu = FilterDesktop( Code = _code )
-        return _mu 
-        
+        return _mu
+
 
     def _pionFilter( self ):
-        
+
         _code = "(TRCHI2DOF< %(TrackCHI2)s)" % self.__confdict__
         _code += " & (MIPCHI2DV(PRIMARY)> %(MINIPCHI2)s)" % self.__confdict__
-        _code += " & (TRGHOSTPROB < %(TrackGhostProb)s)" % self.__confdict__ 
-        _code += " & (PIDK < %(PionPIDK)s)" % self.__confdict__ 
+        _code += " & (TRGHOSTPROB < %(TrackGhostProb)s)" % self.__confdict__
+        _code += " & (PIDK < %(PionPIDK)s)" % self.__confdict__
 
         _pi = FilterDesktop( Code = _code )
         return _pi
-        
+
 
     def _kaonFilter( self ):
-        
+
         _code = "(TRCHI2DOF< %(TrackCHI2)s)" % self.__confdict__
         _code += " & (MIPCHI2DV(PRIMARY)> %(MINIPCHI2)s)" % self.__confdict__
-        _code += " & (TRGHOSTPROB < %(TrackGhostProb)s)" % self.__confdict__ 
-        _code += " & (PIDK > %(KaonPIDK)s)" % self.__confdict__ 
+        _code += " & (TRGHOSTPROB < %(TrackGhostProb)s)" % self.__confdict__
+        _code += " & (PIDK > %(KaonPIDK)s)" % self.__confdict__
 
         _ka = FilterDesktop( Code = _code )
-        return _ka     
+        return _ka
 
 
     def _KMuFilter_K( self ):
-        
+
         _code = "(MINTREE(ABSID=='K+',P)> %(KaonP_K_3pi)s *GeV) & "\
                 "(MINTREE(ABSID=='K+',PT)> %(KPiPT_K)s *MeV) & "\
                 "(MINTREE(ABSID=='K+',PIDK)> %(KaonPIDK_K_3pi)s ) & "\
@@ -734,10 +734,10 @@ class B2XTauMuConf(LineBuilder) :
         _code += " & (MINTREE(ABSID=='mu+',MIPCHI2DV(PRIMARY)) > %(MINIPCHI2_K)s )" % self.__confdict__
 
         _kmu = FilterDesktop( Code = _code )
-        return _kmu     
+        return _kmu
+
 
 
-   
     def _Phi2KKFilter( self ):
 
         _decayDescriptors = [ 'phi(1020) -> K+ K-' ]
@@ -750,7 +750,7 @@ class B2XTauMuConf(LineBuilder) :
 
         _phi2kpi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                       CombinationCut = _combinationCut,
-                                      MotherCut = _motherCut)                            
+                                      MotherCut = _motherCut)
         return _phi2kpi
 
 
@@ -770,7 +770,7 @@ class B2XTauMuConf(LineBuilder) :
         _kst02kpi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                       DaughtersCuts = _daughtersCuts,
                                       CombinationCut = _combinationCut,
-                                      MotherCut = _motherCut)                            
+                                      MotherCut = _motherCut)
         return _kst02kpi
 
 
@@ -783,7 +783,7 @@ class B2XTauMuConf(LineBuilder) :
 
 
         _phiMu = CombineParticles( DecayDescriptors = _decayDescriptors,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _phiMu
 
 
@@ -800,7 +800,7 @@ class B2XTauMuConf(LineBuilder) :
 
         _kst0Mu = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     DaughtersCuts = _daughtersCuts,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _kst0Mu
 
 
@@ -810,7 +810,7 @@ class B2XTauMuConf(LineBuilder) :
         _daughtersCuts = {  "K+"  : "(P > %(KaonP_K)s *GeV) & (PIDK> %(KaonPIDK_K)s) & (PT > %(KPiPT_K)s *MeV) & (MIPCHI2DV(PRIMARY) > %(MINIPCHI2_K)s )" % self.__confdict__
                             ,"mu+" : " (MIPCHI2DV(PRIMARY) > %(MINIPCHI2_K)s )" % self.__confdict__ }
 
-        _combinationCut = "((ACHILD(PT,1)+ACHILD(PT,2)) > %(KMuSumPT_K)s)" % self.__confdict__ 
+        _combinationCut = "((ACHILD(PT,1)+ACHILD(PT,2)) > %(KMuSumPT_K)s)" % self.__confdict__
 
         _motherCut = "(VFASPF(VCHI2/VDOF)  < %(XMuVCHI2DOF_K)s) "\
                      "& (PT >%(KMuPT_K)s)"% self.__confdict__
@@ -819,7 +819,7 @@ class B2XTauMuConf(LineBuilder) :
         _kMu = CombineParticles( DecayDescriptors = _decayDescriptors,
                                  DaughtersCuts = _daughtersCuts,
                                  CombinationCut = _combinationCut,
-                                 MotherCut = _motherCut)                            
+                                 MotherCut = _motherCut)
         return _kMu
 
 
@@ -830,7 +830,7 @@ class B2XTauMuConf(LineBuilder) :
         _daughtersCuts = {  "K+"  : "(P > %(KaonP_K)s *GeV) & (PIDK> %(KaonPIDK_K)s) & (PT > %(KPiPT_K)s *MeV) & (MIPCHI2DV(PRIMARY) > %(MINIPCHI2_K)s )" % self.__confdict__
                             ,"mu+" : " (MIPCHI2DV(PRIMARY) > %(MINIPCHI2_K)s )" % self.__confdict__}
 
-        _combinationCut = "((ACHILD(PT,1)+ACHILD(PT,2)) > %(KMuSumPT_K)s)" % self.__confdict__ 
+        _combinationCut = "((ACHILD(PT,1)+ACHILD(PT,2)) > %(KMuSumPT_K)s)" % self.__confdict__
 
         _motherCut = "(VFASPF(VCHI2/VDOF)  < %(XMuVCHI2DOF_K)s) "\
                      "& (PT > %(KMuPT_K)s)"% self.__confdict__
@@ -839,7 +839,7 @@ class B2XTauMuConf(LineBuilder) :
         _kMu = CombineParticles( DecayDescriptors = _decayDescriptors,
                                  DaughtersCuts = _daughtersCuts,
                                  CombinationCut = _combinationCut,
-                                 MotherCut = _motherCut)                            
+                                 MotherCut = _motherCut)
         return _kMu
 
 
@@ -868,16 +868,16 @@ class B2XTauMuConf(LineBuilder) :
                      " & (VFASPF(VCHI2/VDOF) < %(BVCHI2DOF)s)"\
                      " & (BPVDIRA > %(BDIRA)s)"\
                      " & (BPVVDCHI2 > %(B_FDCHI2)s)"  % locals()
-        
+
 
         _B = CombineParticles(DecayDescriptors = DecayDescriptors,
                               DaughtersCuts = _daughtersCuts,
                               CombinationCut = _combinationCut,
                               MotherCut = _motherCut)
-                          
+
         _sel_Daughters = MergedSelection(name+"_daughters",
                                          RequiredSelections = XMuSel )
-        
+
         sel = Selection( name,
                          Algorithm = _B,
                          RequiredSelections = [ MuSel, _sel_Daughters ])
@@ -903,7 +903,7 @@ class B2XTauMuConf(LineBuilder) :
                       B_MAX_MASS):
 
         _daughtersCuts = {  "tau+"  : "(P > %(TauP)s *GeV) & (PT > %(TauPT)s *MeV) & (MIPCHI2DV(PRIMARY) > %(TauIPCHI2)s )" % locals() }
-                          
+
         _combinationCut = "(AM< ( %(B_MAX_MASS)s + 200) *MeV)" % locals()
         _motherCut = "  (MM < %(B_MAX_MASS)s *MeV)"\
                      " & (MM> %(B_MIN_MASS)s *MeV)"\
@@ -913,18 +913,18 @@ class B2XTauMuConf(LineBuilder) :
                      " & (BPVVDCHI2 > %(B_FDCHI2)s)" % locals()
 
 
-            
+
         _B = CombineParticles(DecayDescriptors = DecayDescriptors,
                               DaughtersCuts = _daughtersCuts,
                               CombinationCut = _combinationCut,
                               MotherCut = _motherCut)
-                          
+
         _sel_Daughters = MergedSelection(name+"_daughters",
                                          RequiredSelections = XSel )
 
         _req_selections = LeptonSel
         _req_selections.append(_sel_Daughters)
-        
+
         sel = Selection( name,
                          Algorithm = _B,
                          RequiredSelections = _req_selections)
@@ -949,7 +949,7 @@ class B2XTauMuConf(LineBuilder) :
                       B_MAX_MASS):
 
         _daughtersCuts = {  "tau+"  : "(P > %(TauP)s *GeV) & (PT > %(TauPT)s *MeV) & (MIPCHI2DV(PRIMARY) > %(TauIPCHI2)s )" % locals() }
-                          
+
         _combinationCut = "(AM< ( %(B_MAX_MASS)s + 200) *MeV)" % locals()
         _motherCut = "  (MM < %(B_MAX_MASS)s *MeV)"\
                      " & (MM> %(B_MIN_MASS)s *MeV)"\
@@ -960,23 +960,17 @@ class B2XTauMuConf(LineBuilder) :
 
         _Comb12Cuts = "(AM < %(Comb12_MaxMass)s *MeV)" % locals()
 
-        _B = Combine3Particles(DecayDescriptors = DecayDescriptors, 
+        _B = Combine3Particles(DecayDescriptors = DecayDescriptors,
                                DaughtersCuts = _daughtersCuts,
                                Combination12Cut = _Comb12Cuts,
                                CombinationCut = _combinationCut,
                                MotherCut = _motherCut)
-            
+
 
         _req_selections = LeptonSel
         _req_selections += XSel
-        
+
         sel = Selection( name,
                          Algorithm = _B,
                          RequiredSelections = _req_selections)
         return sel
-
-
-
-
-
-    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py
index 87442b5569acd35ad53a5f9c7854f450614775df..37792e3f1ade22816a9a9b11a98ca72183acbaf7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py
@@ -21,7 +21,7 @@ from GaudiKernel.SystemOfUnits import mm
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
   """
 __all__ = (
-  'B2XTauTauConf',  
+  'B2XTauTauConf',
   'default_config'
   )
 
@@ -39,7 +39,7 @@ default_config =  {
   'Photon_CL_Min'                 : 0.2,
   #
   'FD_B_Max'                      : 80,
-  'PT_B'                          : 2000 * MeV, 
+  'PT_B'                          : 2000 * MeV,
   'P_B'                           : 10000 * MeV,
   'PT_Kst'                        : 1000 * MeV,
   'VCHI2_B'                       : 150, # dimensionless
@@ -92,7 +92,7 @@ default_config =  {
   },
   'STREAMS'     : ['Bhadron']
   }
-  
+
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
@@ -104,29 +104,29 @@ from StandardParticles import StdLooseKaons, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons
 
 class B2XTauTauConf(LineBuilder) :
-    
+
     """
       Builder for B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
       """
-    
-    __configuration_keys__ = default_config['CONFIG'].keys()  
 
-    
+    __configuration_keys__ = default_config['CONFIG'].keys()
+
+
     def __init__(self, name, config):
 
       LineBuilder.__init__(self, name, config)
 
       trackCuts     = "(MIPCHI2DV(PRIMARY) > %(IPCHI2_Tr)s) & (TRCHI2DOF < %(TRACKCHI2_Tr)s) & (TRGHOSTPROB < %(TRGHOPROB_Tr)s)" % config
       KCuts         = trackCuts + " & (PT > %(PT_K)s) & (P > %(P_K)s)" % config
-      if config['UsePID'] : KCuts += " & (PROBNNk>0.2)" 
-      
+      if config['UsePID'] : KCuts += " & (PROBNNk>0.2)"
+
       self.FilterSPD = {
                   'Code' : " ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(SpdMult)s )" % config ,
                   'Preambulo' : ["from LoKiNumbers.decorators import *", "from LoKiCore.basic import LHCb"]
                   }
-      
+
       self.rawTau        = DataOnDemand("Phys/StdTightDetachedTau3pi/Particles")
-      
+
       self.selKaon       = SimpleSelection( "Kaon"+name, FilterDesktop, [ StdLooseKaons ], Code = KCuts)
       self.selPhi        = self._makePhi( "Phi"+name, trackCuts, config )
       self.selEtap       = self._makeEtap( "Etap"+name, trackCuts, config )
@@ -156,22 +156,22 @@ class B2XTauTauConf(LineBuilder) :
 #### Make resonances ###################################################
 
     def _makePhi(self, name, trackSel, config) :
-               
+
        combcut = "in_range ( %(MASS_LOW_Phi)s, AM, %(MASS_HIGH_Phi)s )" % config
-       mothercut = " (PT > %(PT_Phi)s*MeV) & (VFASPF(VCHI2) < %(VCHI2_Phi)s)  " % config 
+       mothercut = " (PT > %(PT_Phi)s*MeV) & (VFASPF(VCHI2) < %(VCHI2_Phi)s)  " % config
 
-       Kcuts = trackSel 
-       if config['UsePID'] : Kcuts += ' & (PROBNNk>0.2)' 
+       Kcuts = trackSel
+       if config['UsePID'] : Kcuts += ' & (PROBNNk>0.2)'
 
        daucut = { 'K+' : Kcuts, 'K-' : Kcuts }
 
        return SimpleSelection( name, CombineParticles, [StdLooseKaons],
                                DecayDescriptors = ["phi(1020) -> K+ K-"],
-                               CombinationCut   = combcut, 
+                               CombinationCut   = combcut,
                                MotherCut        = mothercut,
                                DaughtersCuts    = daucut )
 
-    
+
     def _makeEtap(self, name, trackSel, config ) :
 
       combcut   = "(APT> %(PT_Etap)s) & (in_range ( %(MASS_LOW_Etap)s, AM, %(MASS_HIGH_Etap)s))" % config
@@ -186,18 +186,18 @@ class B2XTauTauConf(LineBuilder) :
                              DaughtersCuts    = daucut )
 
     def _makeKstar(self, name, trackSel, config) :
-               
-       combcut = "in_range ( %(MASS_LOW_Kst)s, AM, %(MASS_HIGH_Kst)s )" % config 
-       mothercut = " (PT > %(PT_Kst)s*MeV) & (VFASPF(VCHI2) < %(VCHI2_Kst)s) & (BPVVD > %(FD_Kst_Mu_KMM)s) " % config 
 
-       Kcuts = trackSel 
+       combcut = "in_range ( %(MASS_LOW_Kst)s, AM, %(MASS_HIGH_Kst)s )" % config
+       mothercut = " (PT > %(PT_Kst)s*MeV) & (VFASPF(VCHI2) < %(VCHI2_Kst)s) & (BPVVD > %(FD_Kst_Mu_KMM)s) " % config
+
+       Kcuts = trackSel
        Picuts = trackSel
-       if config['UsePID'] : 
-           Kcuts += ' & (PROBNNk>0.2)' 
-           Picuts += ' & (PROBNNpi>0.2)' 
+       if config['UsePID'] :
+           Kcuts += ' & (PROBNNk>0.2)'
+           Picuts += ' & (PROBNNpi>0.2)'
 
        daucut = { 'pi+' : Picuts, 'K-' : Kcuts }
-       
+
        return SimpleSelection(name+"_Kstar", CombineParticles, [StdLoosePions,StdNoPIDsKaons],
                               DecayDescriptors = ["[K*(892)0 -> K+ pi-]cc"],
                               CombinationCut   = combcut,
@@ -208,44 +208,44 @@ class B2XTauTauConf(LineBuilder) :
 #### Make B ###################################################
 
     def _makeBd2HTauTau(self, name, tauSel, HSel, config, SS = False):
-      
+
       combcut    = "in_range ( %(MASS_LOW_B)s, AM, %(MASS_HIGH_B)s )" % config
       mothercut  = "( VFASPF(VCHI2) < %(VCHI2_B)s ) & ( BPVVDCHI2 > %(FDCHI2_B)s ) & ( BPVVD < %(FD_B_Max)s ) " % config
       mothercut  += " & (PT > %(PT_B)s) & (P > %(P_B)s) " % config
-      
+
       part = "eta_prime"
       n    = name+"_TauTau"
       if "Phi" in name : part = "phi(1020)"
       elif "Kstar" in name : part = "K*(892)0"
 
-      
+
       descriptors = ["B_s0 -> %s tau+ tau-" % part ]
 
       if "Kstar" in name : descriptors = ["[B_s0 -> %s tau+ tau-]cc" % part ]
 
-      if SS : 
+      if SS :
         n += "SS"
         descriptors = ["[B_s0 -> %s tau+ tau+]cc" % part,"[B_s0 -> %s tau- tau-]cc" % part]
-      
+
       Combine = DaVinci__N3BodyDecays(
                      DecayDescriptors = descriptors,
                      Combination12Cut = "AM < 7000",
                      CombinationCut = combcut,
                      MotherCut = mothercut
                      )
-      
+
       return Selection(n, Algorithm = Combine, RequiredSelections = [ tauSel , HSel ] )
 
 
     def _makeBu2KTauTau(self, name, tauSel, KSel, config, SS = False):
-      
+
       combcut    = "in_range ( %(MASS_LOW_BK)s, AM, %(MASS_HIGH_B)s )" % config
       mothercut  = "( VFASPF(VCHI2) < %(VCHI2_BK)s ) & ( BPVVDCHI2 > %(FDCHI2_BK)s ) & ( BPVVD < %(FD_B_Max)s ) " % config
       mothercut  += " & (PT > %(PT_B)s) & (P > %(P_B)s)" % config
-      
+
       n = name+"TauTau"
       descriptors = ["[B+ -> K+ tau+ tau-]cc"]
-      if SS : 
+      if SS :
         n = name+"TauTauSS"
         descriptors = ["[B+ -> K- tau+ tau+]cc","[B+ -> K+ tau+ tau+]cc"]
 
@@ -255,13 +255,13 @@ class B2XTauTauConf(LineBuilder) :
                      CombinationCut = combcut,
                      MotherCut = mothercut
                      )
-      
+
       return Selection(n, Algorithm = Combine, RequiredSelections = [ tauSel , KSel ] )
 
 #### Helpers to make lines
 
     def _makeLine(self, name, sel, config) :
-        
+
         line = StrippingLine(name,
                        prescale    = config['B2HTauTau_LinePrescale'],
                        postscale   = config['B2HTauTau_LinePostscale'],
@@ -269,8 +269,7 @@ class B2XTauTauConf(LineBuilder) :
                        FILTER = self.FilterSPD,
                        RelatedInfoTools = config['RelInfoTools'],
                        selection = sel,
-                       MaxCandidates = 50 
+                       MaxCandidates = 50
                      )
         self.registerLine( line )
         return line
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py
index f1201ae468b3c87f0495faff01d03b9273ec5e9c..756eb8812024fe434cfc8a4bb7e2f609877893ed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py
@@ -30,7 +30,7 @@ StrippingReport                                                INFO Event 750000
  |!StrippingBLVB2DpiLine_TIMING                                |  0.0012|         9|  1.000|   0.017|
  |!StrippingBLVBs2DspiLine_TIMING                              |  0.0007|         5|  1.200|   0.016|
  |!StrippingBLVB2LcpLine_TIMING                                |  0.0019|        14|  1.143|   0.017|
- 
+
 
 MC: Lambda -> K mu (MC11a/33112001)
 ###################################
@@ -79,9 +79,9 @@ MC: B+ -> Phi K+ (12103061)
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
  |!StrippingBLVB2KhhLine                                       | 16.3140|     16314|  1.005|   7.537|
-              
+
 Exported symbols (use python help!):
-   - 
+   -
 """
 
 __author__ = ["Oliver Gruenberg"]
@@ -115,7 +115,7 @@ default_config = {
                       "MaxTrGhp"            : 0.4,
                       # CombiCuts
                       "MaxDoca"             : 0.3,
-                      # MassCuts 
+                      # MassCuts
                       "mDiffD"              : 100.0,
                       "mDiffDs"             : 100.0,
                       "mDiffbLoose"         : 500.0,
@@ -128,7 +128,7 @@ default_config = {
                       "MinVDChi2Loose"      : 100,
                       "MinVDChi2Tight"      : 225,
                       "MaxVtxChi2Dof"       : 9,
-                      "MinDira"             : 0.0, 
+                      "MinDira"             : 0.0,
                       "MinTauLoose"         : 0.0, # (ps)
                       "MinTauTight"         : 1.0, # (ps)
                       "MinTauLambda"        : 10.0, # (ps)
@@ -138,13 +138,13 @@ default_config = {
                       "La2KmuPrescale"      : 1,
                       "Lb2KmuPrescale"      : 1,
                       ### Xi_b- -> K*0 mu-
-                      "Xib2KhmuPrescale"    : 1, 
-                      "B2KhhPrescale"       : 1,                      
+                      "Xib2KhmuPrescale"    : 1,
+                      "B2KhhPrescale"       : 1,
                       ### Lb -> D(s)+ mu-
                       "Lb2DmuPrescale"      : 1,
                       "Lb2DsmuPrescale"     : 1,
                       "B2LcmuPrescale"      : 1,
-                      ### B(s)0 -> Lc+ mu- 
+                      ### B(s)0 -> Lc+ mu-
                       "Lb2LcpiPrescale"     : 0.1,
                       "B2DpiPrescale"       : 0.1,
                       "Bs2DspiPrescale"     : 0.1,
@@ -166,15 +166,15 @@ default_config = {
 class BLVLinesConf(LineBuilder) :
     """
     Builder
-    
+
     """
 
     #######################################################
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     #######################################################
-    
+
     def __init__(self, name = "BLV", config = default_config) :
 
         LineBuilder.__init__(self, name, config)
@@ -200,7 +200,7 @@ class BLVLinesConf(LineBuilder) :
         self.bCoCutS  = "(ADAMASS(5323*MeV) < %(mDiffbStand)s*MeV)" %config
         self.BdCoCutS = "(ADAMASS('B0') < %(mDiffbStand)s*MeV)" %config
         self.BsCoCutS = "(ADAMASS('B_s0') < %(mDiffbStand)s*MeV)" %config
-        self.LbCoCutL = "(ADAMASS('Lambda_b0') < %(mDiffbLoose)s*MeV)" %config        
+        self.LbCoCutL = "(ADAMASS('Lambda_b0') < %(mDiffbLoose)s*MeV)" %config
         self.LbCoCutS = "(ADAMASS('Lambda_b0') < %(mDiffbStand)s*MeV)" %config
         self.LbCoCutT = "(ADAMASS('Lambda_b0') < %(mDiffbTight)s*MeV)" %config
 
@@ -208,7 +208,7 @@ class BLVLinesConf(LineBuilder) :
         ################
         self.bCutS   = "(ADMASS(5323*MeV) < %(mDiffbStand)s*MeV)" %config
         self.BdCutS  = "(ADMASS('B0') < %(mDiffbStand)s*MeV)" %config
-        self.BuCutT  = "(ADMASS('B+') < %(mDiffbTight)s*MeV)" %config      
+        self.BuCutT  = "(ADMASS('B+') < %(mDiffbTight)s*MeV)" %config
         self.BsCutS  = "(ADMASS('B_s0') < %(mDiffbStand)s*MeV)" %config
         self.LbCutL  = "(ADMASS('Lambda_b0') < %(mDiffbLoose)s*MeV)" %config
         self.LbCutS  = "(ADMASS('Lambda_b0') < %(mDiffbStand)s*MeV)" %config
@@ -222,7 +222,7 @@ class BLVLinesConf(LineBuilder) :
                                 & (BPVDIRA > %(MinDira)s)
                                 & (BPVLTIME() > %(MinTauLoose)s*ps)
                                 """ %config
-        
+
         self.bMotherCutsTight = """
                                 (BPVIPCHI2() < %(MaxIPChi2)s)
                                 & (BPVVDCHI2 > %(MinVDChi2Tight)s)
@@ -237,7 +237,7 @@ class BLVLinesConf(LineBuilder) :
                                     (ADAMASS('Lambda0') < %(mDiffLa)s*MeV)
                                     & (AMAXDOCA('') < %(MaxDoca)s*mm)
                                     """ %config
-        
+
         self.La2KmuMotherCut = """
                                (ADMASS('Lambda0') < %(mDiffLa)s*MeV)
                                & (BPVIPCHI2() < %(MaxIPChi2)s)
@@ -264,14 +264,14 @@ class BLVLinesConf(LineBuilder) :
                                       (ADOCA(1,3) < %(MaxDoca)s*mm)
                                       & (ADOCA(2,3) < %(MaxDoca)s*mm)
                                       """ %config
-        
+
         self.Xib2KhmuMotherCut = self.XibCutL + " & " + self.bMotherCutsLoose
 
         ###### B+ -> K*0 pi+
         ####################
-        self.Bu2KhhMotherCut = self.BuCutT + " & " + self.bMotherCutsLoose                
+        self.Bu2KhhMotherCut = self.BuCutT + " & " + self.bMotherCutsLoose
+
 
-        
         ### Lb -> D(s)+ mu- and Lb -> Lc+ pi-
         #####################################
         self.Lb2DmuCombinationCut = self.LbCoCutS + " & " + self.DocaCut
@@ -288,27 +288,27 @@ class BLVLinesConf(LineBuilder) :
         self.Bd2DpiMotherCut      = self.BdCutS + " & " + self.bMotherCutsTight
 
         ###### B_s0 -> D_s- pi+
-        #######################        
+        #######################
         self.Bs2DspiCombinationCut = self.BsCoCutS + " & " + self.DocaCut
-        self.Bs2DspiMotherCut      = self.BsCutS + " & " + self.bMotherCutsTight      
+        self.Bs2DspiMotherCut      = self.BsCutS + " & " + self.bMotherCutsTight
 
 #######################################################################################################
 
         ### Lambda0 -> K- mu+
         La2Kmu_name      = name+"La2Kmu"
-        self.selLa2Kmu   = self.makeLa2Kmu(La2Kmu_name)      
+        self.selLa2Kmu   = self.makeLa2Kmu(La2Kmu_name)
 
         ### Lambda_b0 -> K- mu+
         Lb2Kmu_name      = name+"Lb2Kmu"
         self.selLb2Kmu   = self.makeLb2Kmu(Lb2Kmu_name)
 
-        ### Xi_b- -> K*0 mu- 
-        Xib2Khmu_name    = name+"Xib2Khmu"         
+        ### Xi_b- -> K*0 mu-
+        Xib2Khmu_name    = name+"Xib2Khmu"
         self.selXib2Khmu = self.makeXib2Khmu(Xib2Khmu_name)
-        B2Khh_name     = name+"B2Khh" 
-        self.selB2Khh  = self.makeB2Khh(B2Khh_name) 
-        
-        ### Lb -> D(s)+ mu-         
+        B2Khh_name     = name+"B2Khh"
+        self.selB2Khh  = self.makeB2Khh(B2Khh_name)
+
+        ### Lb -> D(s)+ mu-
         Lb2Dmu_name      = name+"Lb2Dmu"
         self.selLb2Dmu   = self.makeLb2Dmu(Lb2Dmu_name)
         Lb2Dsmu_name     = name+"Lb2Dsmu"
@@ -316,7 +316,7 @@ class BLVLinesConf(LineBuilder) :
         Lb2Lcpi_name     = name+"Lb2Lcpi"
         self.selLb2Lcpi  = self.makeLb2Lcpi(Lb2Lcpi_name)
 
-        ### B(s)0 -> Lc+ mu- 
+        ### B(s)0 -> Lc+ mu-
         B2Lcmu_name      = name+"B2Lcmu"
         self.selB2Lcmu   = self.makeB2Lcmu(B2Lcmu_name)
         B2Dpi_name       = name+"B2Dpi"
@@ -324,8 +324,8 @@ class BLVLinesConf(LineBuilder) :
         Bs2Dspi_name     = name+"Bs2Dspi"
         self.selBs2Dspi  = self.makeBs2Dspi(Bs2Dspi_name)
         B2Lcp_name       = name+"B2Lcp"
-        self.selB2Lcp    = self.makeB2Lcp(B2Lcp_name) 
-        
+        self.selB2Lcp    = self.makeB2Lcp(B2Lcp_name)
+
 #######################################################################################################
 
         self.La2KmuLine = StrippingLine(La2Kmu_name+"Line",
@@ -371,9 +371,9 @@ class BLVLinesConf(LineBuilder) :
                                              "[Lambda0 -> ^X  l]CC"  : "BsMuMuTrackIsoK",
                                              "[Lambda0 ->  X ^l]CC"  : "BsMuMuTrackIsomu",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                         ) # closes Strippingline
-            
+
         self.Lb2KmuLine = StrippingLine(Lb2Kmu_name+"Line",
                                         prescale = config["Lb2KmuPrescale"],
                                         postscale = config["Postscale"],
@@ -417,19 +417,19 @@ class BLVLinesConf(LineBuilder) :
                                              "[Lambda_b0 -> ^X  l]CC"  : "BsMuMuTrackIsoK",
                                              "[Lambda_b0 ->  X ^l]CC"  : "BsMuMuTrackIsomu",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        ) # closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        ) # closes Strippingline
 
-####################################################################################################### 
+#######################################################################################################
 ### Xi_b- -> K*0 mu-
-####################################################################################################### 
+#######################################################################################################
 
         self.Xib2KhmuLine = StrippingLine(Xib2Khmu_name+"Line",
                                           prescale = config["Xib2KhmuPrescale"],
                                           postscale = config["Postscale"],
                                           MDSTFlag = config["MDSTflag"],
                                           selection = self.selXib2Khmu,
-                                          RelatedInfoTools = [          
+                                          RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -472,15 +472,15 @@ class BLVLinesConf(LineBuilder) :
                                              "[Xi_b- ->  X ^X  l]CC"  : "BsMuMuTrackIsopi",
                                              "[Xi_b- ->  X  X ^l]CC"  : "BsMuMuTrackIsomu",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                          ) # closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                          ) # closes Strippingline
 
         self.B2KhhLine = StrippingLine(B2Khh_name+"Line",
                                        prescale = config["B2KhhPrescale"],
                                        postscale = config["Postscale"],
                                        MDSTFlag = config["MDSTflag"],
                                        selection = self.selB2Khh,
-                                       RelatedInfoTools = [ 
+                                       RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -523,19 +523,19 @@ class BLVLinesConf(LineBuilder) :
                                              "[B+ ->  K+ ^pi-  pi+]CC"  : "BsMuMuTrackIsopi1",
                                              "[B+ ->  K+  pi- ^pi+]CC"  : "BsMuMuTrackIsopi2",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                         ) # closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                         ) # closes Strippingline
 
-####################################################################################################### 
+#######################################################################################################
 ### Lb -> D(s)+ mu-
-####################################################################################################### 
- 
+#######################################################################################################
+
         self.Lb2DmuLine = StrippingLine(Lb2Dmu_name+"Line",
                                         prescale = config["Lb2DmuPrescale"],
                                         postscale = config["Postscale"],
                                         MDSTFlag = config["MDSTflag"],
                                         selection = self.selLb2Dmu,
-                                        RelatedInfoTools = [                                        
+                                        RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -591,7 +591,7 @@ class BLVLinesConf(LineBuilder) :
                                          postscale = config["Postscale"],
                                          MDSTFlag = config["MDSTflag"],
                                          selection = self.selLb2Dsmu,
-                                         RelatedInfoTools = [                                        
+                                         RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -640,14 +640,14 @@ class BLVLinesConf(LineBuilder) :
                                              "[Lambda_b0 -> (D_s+ ->  K-  K+  pi+) ^l]CC"  : "BsMuMuTrackIsomu",
                                              }, },
                                            ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
-                                         ) # closes Strippingline                                         
+                                         ) # closes Strippingline
 
         self.Lb2LcpiLine = StrippingLine(Lb2Lcpi_name+"Line",
                                          prescale = config["Lb2LcpiPrescale"],
                                          postscale = config["Postscale"],
                                          MDSTFlag = config["MDSTflag"],
                                          selection = self.selLb2Lcpi,
-                                         RelatedInfoTools = [                                        
+                                         RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -695,12 +695,12 @@ class BLVLinesConf(LineBuilder) :
                                              "[Lambda_b0 -> (Lambda_c+ ->  K-  p+ ^pi+)  pi-]CC"  : "BsMuMuTrackIsopi1",
                                              "[Lambda_b0 -> (Lambda_c+ ->  K-  p+  pi+) ^pi-]CC"  : "BsMuMuTrackIsopi2",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                         ) # closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                         ) # closes Strippingline
 
-####################################################################################################### 
+#######################################################################################################
 ### B(s)0 -> Lc+ mu-
-####################################################################################################### 
+#######################################################################################################
 
         self.b2LcmuLine = StrippingLine(B2Lcmu_name+"Line",
                                         prescale = config["B2LcmuPrescale"],
@@ -755,15 +755,15 @@ class BLVLinesConf(LineBuilder) :
                                              "[B0 -> (Lambda_c+ ->  K-  p+ ^pi+)  l]CC"  : "BsMuMuTrackIsopi",
                                              "[B0 -> (Lambda_c+ ->  K-  p+  pi+) ^l]CC"  : "BsMuMuTrackIsomu",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                         ) # closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                         ) # closes Strippingline
 
         self.B2DpiLine = StrippingLine(B2Dpi_name+"Line",
                                        prescale = config["B2DpiPrescale"],
                                        postscale = config["Postscale"],
                                        MDSTFlag = config["MDSTflag"],
                                        selection = self.selB2Dpi,
-                                       RelatedInfoTools = [                                        
+                                       RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -812,14 +812,14 @@ class BLVLinesConf(LineBuilder) :
                                              "[B0 -> (D- ->  K+  pi-  pi-) ^pi+]CC"  : "BsMuMuTrackIsopi3",
                                              }, },
                                            ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
-                                         ) # closes Strippingline 
+                                         ) # closes Strippingline
 
         self.Bs2DspiLine = StrippingLine(Bs2Dspi_name+"Line",
                                          prescale = config["Bs2DspiPrescale"],
                                          postscale = config["Postscale"],
                                          MDSTFlag = config["MDSTflag"],
                                          selection = self.selBs2Dspi,
-                                         RelatedInfoTools = [                                        
+                                         RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -868,14 +868,14 @@ class BLVLinesConf(LineBuilder) :
                                              "[B_s0 -> (D_s- ->  K+  K-  pi-) ^pi+]CC"  : "BsMuMuTrackIsopi2",
                                              }, },
                                            ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
-                                         ) # closes Strippingline                                          
-                                                                                                      
-        self.b2LcpLine = StrippingLine(B2Lcp_name+"Line",                                           
-                                       prescale = config["B2LcpPrescale"], 
+                                         ) # closes Strippingline
+
+        self.b2LcpLine = StrippingLine(B2Lcp_name+"Line",
+                                       prescale = config["B2LcpPrescale"],
                                        postscale = config["Postscale"],
                                        MDSTFlag = config["MDSTflag"],
                                        selection = self.selB2Lcp,
-                                       RelatedInfoTools = [                                        
+                                       RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -923,17 +923,17 @@ class BLVLinesConf(LineBuilder) :
                                              "[B0 -> (Lambda_c+ ->  K-  p+ ^pi+)  X]CC"  : "BsMuMuTrackIsopi",
                                              "[B0 -> (Lambda_c+ ->  K-  p+  pi+) ^X]CC"  : "BsMuMuTrackIsop2",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                         ) # closes Strippingline 
-        
-####################################################################################################### 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                         ) # closes Strippingline
+
+#######################################################################################################
 
-        ### Lambda_(b)0 -> K- mu+ 
+        ### Lambda_(b)0 -> K- mu+
         self.registerLine(self.La2KmuLine)
         self.registerLine(self.Lb2KmuLine)
 
         ### Xi_b- -> K*0 mu-
-        self.registerLine(self.Xib2KhmuLine) 
+        self.registerLine(self.Xib2KhmuLine)
         self.registerLine(self.B2KhhLine)
 
         ### Lb -> D(s)+ mu-
@@ -944,30 +944,30 @@ class BLVLinesConf(LineBuilder) :
         ### B(s)0 -> Lc+ mu-
         self.registerLine(self.b2LcmuLine)
         self.registerLine(self.B2DpiLine)
-        self.registerLine(self.Bs2DspiLine)        
+        self.registerLine(self.Bs2DspiLine)
         self.registerLine(self.b2LcpLine)
 
 #######################################################################################################
 
     def makeLa2Kmu(self,name):
-    
+
         La2Kmu = CombineParticles("Combine"+name)
         La2Kmu.DecayDescriptors = [ "[Lambda0 -> K+ mu-]cc","[Lambda0 -> K+ mu+]cc" ]
         La2Kmu.DaughtersCuts = { "K+" : self.TrackCuts + " & ((PIDK-PIDpi)>5)" + " & ((PIDK-PIDp)>0)",
                                  "mu-" : self.TrackCuts }
-                             
-        La2Kmu.CombinationCut = self.La2KmuCombinationCut  
+
+        La2Kmu.CombinationCut = self.La2KmuCombinationCut
         La2Kmu.MotherCut      = self.La2KmuMotherCut
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
-    
+
         return Selection (name, Algorithm = La2Kmu, RequiredSelections = [ _myKaons, _myMuons ])
 
 #######################################################################################################
 
     def makeLb2Kmu(self,name):
-    
+
         Lb2Kmu = CombineParticles("Combine"+name)
         Lb2Kmu.DecayDescriptors = [ "[Lambda_b0 -> K+ mu-]cc","[Lambda_b0 -> K+ mu+]cc" ]
         Lb2Kmu.DaughtersCuts = { "K+" : self.TrackCuts + " & ((PIDK-PIDpi)>0)",
@@ -975,18 +975,18 @@ class BLVLinesConf(LineBuilder) :
 
         Lb2Kmu.CombinationCut = self.Lb2KmuCombinationCut
         Lb2Kmu.MotherCut      = self.Lb2KmuMotherCut
- 
+
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
-    
+
         return Selection (name, Algorithm = Lb2Kmu, RequiredSelections = [ _myKaons, _myMuons ])
 
 #######################################################################################################
 ### Xi_b- -> K*0 mu-
-####################################################################################################### 
+#######################################################################################################
 
     def makeXib2Khmu(self,name):
-    
+
         Xib2Khmu = DaVinci__N3BodyDecays("Combine"+name)
         Xib2Khmu.DecayDescriptors = [ "[Xi_b- -> K+ pi- mu-]cc","[Xi_b- -> K- pi+ mu-]cc","[Xi_b- -> K- pi- mu+]cc" ]
         Xib2Khmu.DaughtersCuts = { "K+"  : self.TrackCuts + " & ((PIDK-PIDpi)>0)",
@@ -996,17 +996,17 @@ class BLVLinesConf(LineBuilder) :
         Xib2Khmu.Combination12Cut = self.Xib2KhmuCombination12Cut
         Xib2Khmu.CombinationCut   = self.Xib2KhmuCombinationCut
         Xib2Khmu.MotherCut        = self.Xib2KhmuMotherCut
- 
+
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
         _myPions = DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
-        _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")    
-    
+        _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
+
         return Selection (name, Algorithm = Xib2Khmu, RequiredSelections = [ _myKaons, _myPions, _myMuons ])
 
 #######################################################################################################
 
     def makeB2Khh(self,name):
-    
+
         B2Khh = DaVinci__N3BodyDecays("Combine"+name)
         B2Khh.DecayDescriptors = [ "[B+ -> K+ pi- pi+]cc" ]
         B2Khh.DaughtersCuts = { "K+"  : self.TrackCuts + " & ((PIDK-PIDpi)>0)",
@@ -1015,18 +1015,18 @@ class BLVLinesConf(LineBuilder) :
         B2Khh.Combination12Cut = self.Xib2KhmuCombination12Cut
         B2Khh.CombinationCut   = self.Xib2KhmuCombinationCut
         B2Khh.MotherCut        = self.Bu2KhhMotherCut
-    
+
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
-        _myPions = DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")    
-    
+        _myPions = DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
+
         return Selection (name, Algorithm = B2Khh, RequiredSelections = [ _myKaons, _myPions ])
 
-####################################################################################################### 
-### Lb -> D(s)+ mu- 
-####################################################################################################### 
+#######################################################################################################
+### Lb -> D(s)+ mu-
+#######################################################################################################
 
     def makeLb2Dmu(self,name):
-    
+
         Lb2Dmu = CombineParticles("Combine"+name)
         Lb2Dmu.DecayDescriptors = [ "[Lambda_b0 -> D+ mu-]cc","[Lambda_b0 -> D+ mu+]cc" ]
         Lb2Dmu.DaughtersCuts = { "D+" : self.DCut, "mu-" : self.TrackCuts }
@@ -1036,47 +1036,47 @@ class BLVLinesConf(LineBuilder) :
 
         _myDplus = DataOnDemand(Location = "Phys/StdLooseDplus2KPiPi/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-   
+
         return Selection (name, Algorithm = Lb2Dmu, RequiredSelections = [ _myDplus, _myMuons ])
- 
+
 #######################################################################################################
 
     def makeLb2Dsmu(self,name):
-    
+
         Lb2Dsmu = CombineParticles("Combine"+name)
         Lb2Dsmu.DecayDescriptors = [ "[Lambda_b0 -> D_s+ mu-]cc","[Lambda_b0 -> D_s+ mu+]cc" ]
-        Lb2Dsmu.DaughtersCuts = { "D_s+" : self.DsCut, "mu-" : self.TrackCuts } 
+        Lb2Dsmu.DaughtersCuts = { "D_s+" : self.DsCut, "mu-" : self.TrackCuts }
 
         Lb2Dsmu.CombinationCut = self.Lb2DmuCombinationCut
         Lb2Dsmu.MotherCut      = self.Lb2DmuMotherCut
 
         _myDsplus = DataOnDemand(Location = "Phys/StdLooseDsplus2KKPi/Particles")
         _myMuons  = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
         return Selection (name, Algorithm = Lb2Dsmu, RequiredSelections = [ _myDsplus, _myMuons ])
 
 #######################################################################################################
 
     def makeLb2Lcpi(self,name):
-    
+
         Lb2Lcpi = CombineParticles("Combine"+name)
         Lb2Lcpi.DecayDescriptors = [ "[Lambda_b0 -> Lambda_c+ pi-]cc" ]
         Lb2Lcpi.DaughtersCuts = { "pi-" : self.TrackCuts }
 
         Lb2Lcpi.CombinationCut = self.Lb2DmuCombinationCut
-        Lb2Lcpi.MotherCut      = self.Lb2DmuMotherCut    
- 
+        Lb2Lcpi.MotherCut      = self.Lb2DmuMotherCut
+
         _myLambdaC = DataOnDemand(Location = "Phys/StdLooseLambdac2PKPi/Particles")
         _myPions   = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-    
+
         return Selection (name, Algorithm = Lb2Lcpi, RequiredSelections = [ _myLambdaC, _myPions ])
 
-####################################################################################################### 
+#######################################################################################################
 ### B(s)0 -> Lc+ mu-
-####################################################################################################### 
+#######################################################################################################
 
     def makeB2Lcmu(self,name):
-    
+
         B2Lcmu = CombineParticles("Combine"+name)
         B2Lcmu.DecayDescriptors = [ "[B0 -> Lambda_c+ mu-]cc","[B0 -> Lambda_c+ mu+]cc" ]
         B2Lcmu.DaughtersCuts = { "mu-" : self.TrackCuts }
@@ -1086,7 +1086,7 @@ class BLVLinesConf(LineBuilder) :
 
         _myLambdaC = DataOnDemand(Location = "Phys/StdLooseLambdac2PKPi/Particles")
         _myMuons   = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
         return Selection (name, Algorithm = B2Lcmu, RequiredSelections = [ _myLambdaC, _myMuons ])
 
 #######################################################################################################
@@ -1108,7 +1108,7 @@ class BLVLinesConf(LineBuilder) :
 #######################################################################################################
 
     def makeB2Dpi(self,name):
-    
+
         B2Dpi = CombineParticles("Combine"+name)
         B2Dpi.DecayDescriptors = [ "[B0 -> D- pi+]cc" ]
         B2Dpi.DaughtersCuts = { "pi+" : self.TrackCuts, "D-" : self.DCut }
@@ -1118,23 +1118,23 @@ class BLVLinesConf(LineBuilder) :
 
         _myDplus = DataOnDemand(Location = "Phys/StdLooseDplus2KPiPi/Particles")
         _myPions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-    
+
         return Selection (name, Algorithm = B2Dpi, RequiredSelections = [ _myDplus, _myPions ])
 
 #######################################################################################################
 
     def makeBs2Dspi(self,name):
-    
+
         Bs2Dspi = CombineParticles("Combine"+name)
         Bs2Dspi.DecayDescriptors = [ "[B_s0 -> D_s- pi+]cc" ]
         Bs2Dspi.DaughtersCuts = { "pi+" : self.TrackCuts, "D_s-" : self.DsCut }
-    
+
         Bs2Dspi.CombinationCut = self.Bs2DspiCombinationCut
         Bs2Dspi.MotherCut      = self.Bs2DspiMotherCut
 
         _myDsplus = DataOnDemand(Location = "Phys/StdLooseDsplus2KKPi/Particles")
         _myPions  = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-    
+
         return Selection (name, Algorithm = Bs2Dspi, RequiredSelections = [ _myDsplus, _myPions ])
 
 #######################################################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py
index 8b51328f47f4a38d287f5c9b4d76d6f154c5eef0..4d5aa00cacabf31804516c7fabfa4e7af6a66451 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py
@@ -12,7 +12,7 @@ __author__  = 'SB'
 __date__    = '08/10/2017'
 __version__ = '$Revision: 1 $'
 
-__all__ = ( 'Bd2KSLLXConf', 'default_config' ) 
+__all__ = ( 'Bd2KSLLXConf', 'default_config' )
 
 """
   Bd --> ll KS X selections
@@ -22,17 +22,17 @@ default_config = {
     'NAME'                       : 'Bd2KSLLX',
     'BUILDERTYPE'                : 'Bd2KSLLXConf',
     'CONFIG'                     :
-        {                       
-        'BFlightCHI2'            : 10   
-        , 'BdIPCHI2'             : 200    
-        , 'BVertexCHI2'          : 12    
-        , 'DiLeptonPT'           : 1000.0    
-        , 'DiLeptonFDCHI2'       : 10   
-        , 'DiLeptonIPCHI2'       : 3.5   
-        , 'DiLeptonVCHI2'       : 5   
-        , 'LeptonIPCHI2'         : 4.0  
-        , 'LeptonPT'             : 300  
-        , 'KaonPT'               : 300  
+        {
+        'BFlightCHI2'            : 10
+        , 'BdIPCHI2'             : 200
+        , 'BVertexCHI2'          : 12
+        , 'DiLeptonPT'           : 1000.0
+        , 'DiLeptonFDCHI2'       : 10
+        , 'DiLeptonIPCHI2'       : 3.5
+        , 'DiLeptonVCHI2'       : 5
+        , 'LeptonIPCHI2'         : 4.0
+        , 'LeptonPT'             : 300
+        , 'KaonPT'               : 300
         , 'KaonIPCHI2'           : 3
         , 'DiHadronMass'         : 2600
         , 'KSIPCHI2'             : 4.0
@@ -50,7 +50,7 @@ default_config = {
     'WGs'     : [ 'RD' ],
     'STREAMS' : [ 'Leptonic' ]
     }
-    
+
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
@@ -61,7 +61,7 @@ from StrippingUtils.Utils import LineBuilder
 class Bd2KSLLXConf(LineBuilder) :
     # now just define keys. Default values are fixed later
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
@@ -74,41 +74,41 @@ class Bd2KSLLXConf(LineBuilder) :
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
         from StandardParticles import StdLoosePhi2KK as Phis
-        from StandardParticles import StdLooseKsLL as KshortsLL 
-        from StandardParticles import StdLooseKsDD as KshortsDD    
+        from StandardParticles import StdLooseKsLL as KshortsLL
+        from StandardParticles import StdLooseKsDD as KshortsDD
         from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD  
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars  
+        from StandardParticles import StdLooseLambdaDD as LambdasDD
+        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
 
         SelKshortsLL = self._filterHadron( name   = "KshortsLLFor" + self._name,
-                                           sel    =  KshortsLL, 
+                                           sel    =  KshortsLL,
                                            params = config )
         SelKshortsDD = self._filterHadron( name   = "KshortsDDFor" + self._name,
                                            sel    =  KshortsDD,
                                            params = config )
- 
+
         from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
-        from StandardParticles import StdLooseDiMuon as DiMuons 
+        from StandardParticles import StdLooseDiMuon as DiMuons
 
         ElecID = "(PIDe > %(PIDe)s)" % config
         MuonID = "(HASMUON)&(ISMUON)"
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID     = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
-                
-        
-        SelDiElectron = self._filterDiLepton( "SelDiElectronFor" + self._name, 
+
+
+        SelDiElectron = self._filterDiLepton( "SelDiElectronFor" + self._name,
                                               dilepton = DiElectrons,
                                               params   = config,
                                               idcut    = DiElectronID )
-        
-        SelDiMuon = self._filterDiLepton( "SelDiMuonsFor" + self._name, 
+
+        SelDiMuon = self._filterDiLepton( "SelDiMuonsFor" + self._name,
                                           dilepton = DiMuons,
                                           params   = config,
                                           idcut    = DiMuonID )
-        
+
         SelB2eeX = self._makeB2LLX(eeXLine_name,
                                    dilepton = SelDiElectron,
                                    hadrons  = [ SelKshortsLL, SelKshortsDD ],
@@ -125,12 +125,12 @@ class Bd2KSLLXConf(LineBuilder) :
             'Code'      : " ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < 600 )" ,
             'Preambulo' : [ "from LoKiNumbers.decorators import *", "from LoKiCore.basic import LHCb" ]
             }
-        
+
         self.B2eeXLine = StrippingLine(eeXLine_name + "Line",
                                        prescale          = 1,
                                        postscale         = 1,
                                        selection         = SelB2eeX,
-                                       FILTER            = SPDFilter, 
+                                       FILTER            = SPDFilter,
                                        RequiredRawEvents = ['Trigger', 'Muon', 'Calo', 'Rich', 'Velo', 'Tracker'],
                                        MDSTFlag          = False )
 
@@ -138,7 +138,7 @@ class Bd2KSLLXConf(LineBuilder) :
                                        prescale          = 1,
                                        postscale         = 1,
                                        selection         = SelB2mmX,
-                                       FILTER            = SPDFilter, 
+                                       FILTER            = SPDFilter,
                                        RequiredRawEvents = ['Trigger', 'Muon', 'Calo', 'Rich', 'Velo', 'Tracker'],
                                        MDSTFlag          = False )
 
@@ -179,26 +179,26 @@ class Bd2KSLLXConf(LineBuilder) :
                 "(MIPCHI2DV(PRIMARY) > %(DiLeptonIPCHI2)s)" % params
 
         # add additional cut on PID if requested
-        if idcut : _Code += ( " & " + idcut ) 
+        if idcut : _Code += ( " & " + idcut )
 
         _Filter = FilterDesktop( Code = _Code )
-    
+
         return Selection(name, Algorithm = _Filter, RequiredSelections = [ dilepton ] )
 #####################################################
     def _makeB2LLX( self, name, dilepton, hadrons, params, masscut):
         """
-        CombineParticles / Selection for the B 
+        CombineParticles / Selection for the B
         """
 
         _Decays = [ "B0 -> J/psi(1S) KS0"]
-        
+
         _Cut = "((VFASPF(VCHI2/VDOF) < %(BVertexCHI2)s) & (BPVIPCHI2()<%(BdIPCHI2)s)"\
                "& (PT>%(BdTransvMom)s) & (BPVVDCHI2 > %(BFlightCHI2)s)" % params
         _Cut += "& (%s))" % masscut
-        
+
         _Combine = CombineParticles( DecayDescriptors = _Decays,
                                      MotherCut        = _Cut )
-        
+
         _Merge = MergedSelection( "Merge" + name, RequiredSelections = hadrons )
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ dilepton, _Merge ] ) 
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ dilepton, _Merge ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py
index c5c749d5fcebacb164cdf527c89174c430913705..17f615dd2c32a25f12520c2baff108eb4e1ca076 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -38,30 +38,30 @@ default_config =  {
         'ElectronTrackCHI2pNDOF'  :    5.   ,
         'ElectronGhostProb'       :    0.5  ,
         'ElectronIPCHI2'          :    1.   ,
-        'ElectronPIDepi'          :   -2.   ,          
+        'ElectronPIDepi'          :   -2.   ,
         #
         'eeCuts'                  : "(HASVERTEX) & (VFASPF(VCHI2)<16) & (((MM<1.5*GeV)) | ((MM>2.2*GeV) & (MM<4.2*GeV)))",
         #
-        'KaonPT'                  :  400.   ,  # MeV 
-        'KaonP'                   : 3000.   ,  # MeV  
+        'KaonPT'                  :  400.   ,  # MeV
+        'KaonP'                   : 3000.   ,  # MeV
         'KaonTrackCHI2pNDOF'      :    5.   ,
         'KaonGhostProb'           :    0.35 ,
-        'KaonIPCHI2'              :    4.   , 
-        'KaonPIDKpi'              :   -5.   , 
+        'KaonIPCHI2'              :    4.   ,
+        'KaonPIDKpi'              :   -5.   ,
         #
         'PionPT'                  :  250.   ,  # MeV
-        'PionP'                   : 2000.   ,  # MeV 
+        'PionP'                   : 2000.   ,  # MeV
         'PionTrackCHI2pNDOF'      :    5.   ,
         'PionGhostProb'           :    0.35 ,
-        'PionIPCHI2'              :    4.   , 
-        'PionPIDpiK'              :   10.   ,  # PIDpi-PIDK > -5, i.e., PIDK<5 
+        'PionIPCHI2'              :    4.   ,
+        'PionPIDpiK'              :   10.   ,  # PIDpi-PIDK > -5, i.e., PIDK<5
         #
-        'KstarVertexCHI2'         :   16.   , 
+        'KstarVertexCHI2'         :   16.   ,
         'KstarMassW'              :  150.   ,  # MeV
         #
         'BComMassW'               : 1200.   ,  # MeV
         'BVertexCHI2'             :   16.   ,  # /ndf
-        'BMassW'                  : 1000.   ,  # MeV  
+        'BMassW'                  : 1000.   ,  # MeV
         'BDIRA'                   :    0.999,
         'BDTCutValue'             :   -0.95 ,
         'BDTWeightsFile'          : '$TMVAWEIGHTSROOT/data/Bd2eeKstar_BDTG_v1r0.xml',
@@ -84,14 +84,14 @@ default_config =  {
                                        , "pvdis_h"    : 40.
                                        , "makeTrackCuts" : False
                                        , "IsoTwoBody" : False
-                                       } ],       
+                                       } ],
         'RelatedInfoTools2'       : [ { "Type" : "RelInfoBs2MuMuTrackIsolations"
                                        , "DaughterLocations" : {
                                            '[B0 -> ( K*(892)0 -> K+ pi-) ( J/psi(1S) -> ^e+ e-) ]CC' : 'Electron1ISO',
                                            '[B0 -> ( K*(892)0 -> K+ pi-) ( J/psi(1S) ->  e+^e-) ]CC' : 'Electron2ISO',
                                            '[B0 -> ( K*(892)0 ->^K+ pi-) ( J/psi(1S) ->  e+ e-) ]CC' : 'KaonISO',
                                            '[B0 -> ( K*(892)0 -> K+^pi-) ( J/psi(1S) ->  e+ e-) ]CC' : 'PionISO'
-                                           } 
+                                           }
                                        , "tracktype"  : 3
                                        , "angle"      : 0.27
                                        , "fc"         : 0.60
@@ -103,7 +103,7 @@ default_config =  {
                                        , "pvdis_h"    : 40.
                                        , "makeTrackCuts" : False
                                        , "IsoTwoBody" : False
-                                       } ],       
+                                       } ],
         },
     'STREAMS'           : ['Bhadron' ],
     'WGs'               : ['RD']
@@ -114,18 +114,18 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-    
+
 class Bd2eeKstarBDTConf(LineBuilder):
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config ):
-        
+
         LineBuilder.__init__(self, name, config)
-        
+
         Bd2eeKstarBDTName = name
         Bd2eeKstarBDTLineName = Bd2eeKstarBDTName + "Line"
-        
+
         self.SelEE = makeEE( 'eeFor'+Bd2eeKstarBDTName,
                              ElectronPT = config['ElectronPT'],
                              ElectronTrackCHI2pNDOF = config['ElectronTrackCHI2pNDOF'],
@@ -135,7 +135,7 @@ class Bd2eeKstarBDTConf(LineBuilder):
                              #
                              eeCuts = config['eeCuts']
                              )
-        
+
         self.SelKstar = makeKstar('KstarFor'+Bd2eeKstarBDTName,
                                   KaonPT = config['KaonPT'],
                                   KaonP = config['KaonP'],
@@ -152,9 +152,9 @@ class Bd2eeKstarBDTConf(LineBuilder):
                                   PionPIDpiK = config['PionPIDpiK'],
                                   #
                                   KstarVertexCHI2 = config['KstarVertexCHI2'],
-                                  KstarMassW = config['KstarMassW']                   
+                                  KstarMassW = config['KstarMassW']
                                   )
-        
+
         self.SelBd2eeKstar = makeBd2eeKstar( "Sel_"+Bd2eeKstarBDTName,
                                              SelEE = self.SelEE,
                                              SelKstar = self.SelKstar,
@@ -170,17 +170,17 @@ class Bd2eeKstarBDTConf(LineBuilder):
                                            BDTCutValue = config['BDTCutValue'],
                                            BDTWeightsFile = config['BDTWeightsFile']
                                            )
-        
+
         self.line = StrippingLine( Bd2eeKstarBDTLineName,
                                    prescale = config['LinePrescale'],
                                    postscale = config['LinePostscale'],
                                    selection = self.CutBDTBd2eeKstar,
                                    RelatedInfoTools = config[ 'RelatedInfoTools']
                                    )
-        
+
         #self.registerLine(self.line)
 
-        # new line with new Brem cor 
+        # new line with new Brem cor
         self.FilterEE = filterEE( 'filterEEFor'+Bd2eeKstarBDTName,
                                   ElectronPT = config['ElectronPT'],
                                   ElectronTrackCHI2pNDOF = config['ElectronTrackCHI2pNDOF'],
@@ -190,8 +190,8 @@ class Bd2eeKstarBDTConf(LineBuilder):
                                   #
                                   eeCuts = config['eeCuts']
                                   )
-        
-         
+
+
         self.SelBd2DieeKstar = makeBd2eeKstar( "Sel2_"+Bd2eeKstarBDTName,
                                                SelEE = self.FilterEE,
                                                SelKstar = self.SelKstar,
@@ -207,16 +207,16 @@ class Bd2eeKstarBDTConf(LineBuilder):
                                             BDTCutValue = config['BDTCutValue'],
                                             BDTWeightsFile = config['BDTWeightsFile']
                                             )
-        
+
         self.line2 = StrippingLine( Bd2eeKstarBDTLineName+"2",
                                     prescale = config['LinePrescale'],
                                     postscale = config['LinePostscale'],
                                     selection = self.CutBDTBd2eeKstar2,
                                     RelatedInfoTools = config[ 'RelatedInfoTools2']
                                     )
-        
-        self.registerLine(self.line2) 
-       
+
+        self.registerLine(self.line2)
+
 
 def makeEE( name,
             #
@@ -230,13 +230,13 @@ def makeEE( name,
             ):
 
     _StdLooseDetachedDiElectron = DataOnDemand(Location = "Phys/StdLooseDetachedDiElectron/Particles" )
-    
+
     ElectronPCut = "(INTREE( (ID=='e+') & (PT> %(ElectronPT)s *MeV) & (TRCHI2DOF < %(ElectronTrackCHI2pNDOF)s) & (BPVIPCHI2() > %(ElectronIPCHI2)s) & (PIDe>%(ElectronPIDepi)s) & (TRGHOSTPROB<%(ElectronGhostProb)s ) ))" % locals()
 
     ElectronMCut = "(INTREE( (ID=='e-') & (PT> %(ElectronPT)s *MeV) & (TRCHI2DOF < %(ElectronTrackCHI2pNDOF)s) & (BPVIPCHI2() > %(ElectronIPCHI2)s) & (PIDe>%(ElectronPIDepi)s) & (TRGHOSTPROB<%(ElectronGhostProb)s ) ))" % locals()
-    
+
     _EE = FilterDesktop( Code = eeCuts + " & " + ElectronPCut + " & " + ElectronMCut )
-    
+
     return Selection( name,
                       Algorithm = _EE,
                       RequiredSelections = [ _StdLooseDetachedDiElectron ]
@@ -252,15 +252,15 @@ def filterEE( name,
               #
               eeCuts
               ):
-    
+
     _StdLooseDetachedDiElectron = DataOnDemand(Location = "Phys/StdDiElectronFromTracks/Particles" )
-    
+
     ElectronPCut = "(INTREE( (ID=='e+') & (PT> %(ElectronPT)s *MeV) & (TRCHI2DOF < %(ElectronTrackCHI2pNDOF)s) & (BPVIPCHI2() > %(ElectronIPCHI2)s) & (PIDe>%(ElectronPIDepi)s) & (TRGHOSTPROB<%(ElectronGhostProb)s ) ))" % locals()
 
     ElectronMCut = "(INTREE( (ID=='e-') & (PT> %(ElectronPT)s *MeV) & (TRCHI2DOF < %(ElectronTrackCHI2pNDOF)s) & (BPVIPCHI2() > %(ElectronIPCHI2)s) & (PIDe>%(ElectronPIDepi)s) & (TRGHOSTPROB<%(ElectronGhostProb)s ) ))" % locals()
-    
+
     _EE = FilterDesktop( Code = eeCuts + " & " + ElectronPCut + " & " + ElectronMCut )
-    
+
     return Selection( name,
                       Algorithm = _EE,
                       RequiredSelections = [ _StdLooseDetachedDiElectron ]
@@ -287,14 +287,14 @@ def makeKstar(name,
               ):
 
     _StdVeryLooseDetachedKst2Kpi = DataOnDemand(Location = "Phys/StdVeryLooseDetachedKst2Kpi/Particles" )
-    
+
     KaonCut = "(INTREE( (ABSID=='K+') & (PT> %(KaonPT)s *MeV) & (P>%(KaonP)s *MeV) & (TRCHI2DOF < %(KaonTrackCHI2pNDOF)s) & (BPVIPCHI2()> %(KaonIPCHI2)s ) & (PIDK>%(KaonPIDKpi)s) & (TRGHOSTPROB<%(KaonGhostProb)s ) ))" % locals()
     PionCut = "(INTREE( (ABSID=='pi+') &  (PT> %(PionPT)s *MeV) & (P>%(PionP)s *MeV) & (TRCHI2DOF < %(PionTrackCHI2pNDOF)s) & (BPVIPCHI2()> %(PionIPCHI2)s ) & (PIDK<%(PionPIDpiK)s) & (TRGHOSTPROB<%(PionGhostProb)s) ))" % locals()
-    
+
     KstarMomCut = "(VFASPF(VCHI2/VDOF)< %(KstarVertexCHI2)s) & (ADMASS('K*(892)0')< %(KstarMassW)s *MeV)" % locals()
-    
+
     _Kstar = FilterDesktop( Code = KstarMomCut + " & " + KaonCut + " & " + PionCut )
-                                   
+
     return Selection( name,
                       Algorithm = _Kstar,
                       RequiredSelections = [ _StdVeryLooseDetachedKst2Kpi ]
@@ -310,12 +310,12 @@ def makeBd2eeKstar( name,
                     BMassW,
                     BDIRA
                     ):
-    
+
     Bd2eeKstarBDTComCut = "(ADAMASS('B0')< %(BComMassW)s *MeV)" % locals()
     Bd2eeKstarBDTMomCut = "(ADMASS('B0')< %(BMassW)s *MeV) & (VFASPF(VCHI2/VDOF)< %(BVertexCHI2)s) & (BPVDIRA> %(BDIRA)s )" % locals()
-    
+
     _Bd2eeKstar = CombineParticles( DecayDescriptor = "[ B0 -> J/psi(1S) K*(892)0 ]cc",
-                                    CombinationCut = Bd2eeKstarBDTComCut, 
+                                    CombinationCut = Bd2eeKstarBDTComCut,
                                     MotherCut = Bd2eeKstarBDTMomCut
                                     )
     return Selection( name,
@@ -329,9 +329,9 @@ def applyBDT( name,
               SelBd2eeKstar,
               BDTCutValue,
               BDTWeightsFile ):
-    
+
     _FilterBd2eeKstar = FilterDesktop( Code = "FILTER('Bd2eeKstarBDTSelection/Bd2eeKstarBDT')" )
-    
+
     BDTSel = Selection( name,
                         Algorithm = _FilterBd2eeKstar,
                         RequiredSelections = [ SelBd2eeKstar ]
@@ -346,6 +346,5 @@ def applyBDT( name,
     MyBDT = Bd2eeKstarBDTSelection( LineName + '.Bd2eeKstarBDT' )
     MyBDT.BDTCut = BDTCutValue
     MyBDT.WeightsFile = BDTWeightsFile
-    
-    return BDTSel 
-    
+
+    return BDTSel
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py
index b8e57afd59a0aeaa3ed2b4712758585ec0312df3..f7d7b08ee6006cde78c20b6028ef1f5864fbd0f8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py
@@ -123,7 +123,7 @@ default_config = {
           'B2XGBVtxChi2DOF'  : 9.,
           'B2XGBVtxMaxIPChi2': 9., # was 25
 
-          # Trigger TOS                                                                                                                                       
+          # Trigger TOS
           'Hlt1TISTOSLinesDict': {'Hlt1(Two)?TrackMVA(Loose)?Decision%TOS':0,
                                   'Hlt1(Phi)?IncPhi.*Decision%TOS':0,
                                   'Hlt1B2GammaGamma.*Decision%TOS':0,
@@ -257,7 +257,7 @@ class Beauty2XGammaConf(LineBuilder) :
                                           get_vtxisol_relinfo(top),
                                           get_vtxisol_relinfo_radiative(top)]
 
-        
+
 
         # Generic track (pi) = h
         _trkFilter = FilterDesktop(Code = "(HASTRACK) & (TRCHI2DOF < %(B2XGTrkChi2DOF)s)& (MIPCHI2DV(PRIMARY) > %(B2XGTrkMinIPChi2)s) & (TRGHOSTPROB < %(TrackGhostProb)s) & (PT > %(B2XGTrkMinPT)s) & (P > %(B2XGTrkMinP)s)" % self.__confdict__ )
@@ -1946,7 +1946,7 @@ def get_cone_relinfo(angle, head=None, children=None):
             'Variables': ['CONEANGLE', 'CONEMULT', 'CONEP', 'CONEPASYM', 'CONEPT', 'CONEPTASYM']}
     # Some shortcuts
     base_location = 'ConeVarsInfo/%%s/%s' % angle
-    # Head                                                                                                                        
+    # Head
     if head:
         tool.update({'Location'    : base_location % 'B',
                      'TopSelection': head})
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclTDCPV.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclTDCPV.py
index 93159bf84134e08b5334fe057346818262505f6d..237b78b1b598340e43f774ea902b8d96b6ac4d69 100755
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclTDCPV.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclTDCPV.py
@@ -41,8 +41,8 @@ default_config = {
           ,'TrChi2'              : 4.       # dimensionless (was 3)
           ,'PhiMassWin'          : 15.      # MeV
           ,'KstMassWin'          : 100.     # MeV  was(150)
-          ,'mKspipiMax'          : 2000.    # MeV 
-          ,'mKsKpiMax'           : 2300.    # MeV 
+          ,'mKspipiMax'          : 2000.    # MeV
+          ,'mKsKpiMax'           : 2300.    # MeV
           ,'PhiVCHI2'            : 25.       # dimensionless
           ,'KstVCHI2'            : 25.       # dimensionless
           ,'BdDIRA'		 : 0.2      # rad (was 0.06)
@@ -50,10 +50,10 @@ default_config = {
           ,'ProbNNk'		 : 0.05     # very nominal ProbNNk cut for the kaons
           ,'KsPT'                : 300.     # MeV very loose PT cut for the KS
           ,'photonPT'            : 2500.    # MeV
-          ,'B_PT'                : 2500.    # MeV (was 3000)  
+          ,'B_PT'                : 2500.    # MeV (was 3000)
           ,'SumVec_PT'		 : 500.     # MeV (was 1500) hadron PT cut
           ,'MinTrack_PT'         : 250.     # MeV (was 500)
-          ,'MinTrack_P'          : 3000.    # MeV 
+          ,'MinTrack_P'          : 3000.    # MeV
           ,'B_APT'		 : 3000.    # MeV (was 5000)
           ,'BMassMin'            : 4000.    # MeV
           ,'BMassMax'            : 7000.    # MeV
@@ -77,7 +77,7 @@ default_config = {
                                        'Hlt2(Phi)?IncPhi.*Decision%TOS' : 0
                                       }
 
- 
+
           ,'Bs2PhiGammaPreScale'               : 1.0
           ,'Bs2PhiGammaPostScale'              : 1.0
           ,'Bd2KstGammaPreScale'               : 1.0
@@ -93,7 +93,7 @@ default_config = {
 class Beauty2XGammaExclTDCPVConf(LineBuilder):
     """
     Definition of B -> X Gamma stripping
-    
+
     Constructs B0 -> [K*,Kspipi] Gamma and Bs -> [Phi,KsKpi] Gamma Selections and StrippingLines from
     a configuration dictionary.
     Usage:
@@ -111,17 +111,17 @@ class Beauty2XGammaExclTDCPVConf(LineBuilder):
     selKspipi                    : nominal K* -> Ks pipi Selection object
     selKsKpi                     : nominal X -> Ks Kpi Selection object
     selBs2PhiGamma               : nominal Bs -> Phi Gamma Selection object with wide Bs mass window
-    selBd2KstGamma               : nominal B0 -> K* Gamma object Object 
+    selBd2KstGamma               : nominal B0 -> K* Gamma object Object
     Bs2PhiGammaLine              : Stripping line out of selBs2PhiGamma
     Bd2KstGamma                  : Stripping line out of selBd2KstGamma
     lines                  : List of lines
 
     Exports as class data member:
-    StrippingBeauty2XGammaExclTDCPVConf.__configuration_keys__ : List of required configuration parameters.    
+    StrippingBeauty2XGammaExclTDCPVConf.__configuration_keys__ : List of required configuration parameters.
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
@@ -145,7 +145,7 @@ class Beauty2XGammaExclTDCPVConf(LineBuilder):
                                     config['MinTrack_PT'],
                                     config['MinTrack_P'],
                                     config['ProbNNk'])
-                                    
+
         self.selKst = makeKstar('KStarSel' + self.name,
                                 config['TrIPchi2'],
                                 config['TrChi2'],
@@ -268,7 +268,7 @@ class Beauty2XGammaExclTDCPVConf(LineBuilder):
                                              selection=self.selBd2KstGamma
                                             )
         self.registerLine(self.Bd2KstGammaLine)
-       
+
         self.Bd2KspipiGammaLine = StrippingLine(self.name + 'Bd2KspipiGammaLine',
                                              prescale=config['Bd2KspipiGammaPreScale'],
                                              postscale=config['Bd2KspipiGammaPostScale'],
@@ -285,10 +285,10 @@ class Beauty2XGammaExclTDCPVConf(LineBuilder):
                                              selection=self.selBs2KsKpiGamma
                                              )
         self.registerLine(self.Bs2KsKpiGammaLine)
-       
 
 
- 
+
+
 def makePhoton(name, photonPT):
     """Create photon Selection object starting from DataOnDemand 'Phys/StdLooseAllPhotons'.
     """
@@ -304,18 +304,18 @@ def makeKs(name, KsPT, ProbNNpi, GhostProb_Max) :
     """
     # DD Ks0's
     _KsDDFilter =  FilterDesktop(Code = "( (BPVLTIME() > 2.*ps) & (PT> %(KsPT)s*MeV) )" % locals() )
-    _sel_KsDD = Selection("sel_KsDD", Algorithm=_KsDDFilter, RequiredSelections=[DataOnDemand("Phys/StdLooseKsDD/Particles")])    
+    _sel_KsDD = Selection("sel_KsDD", Algorithm=_KsDDFilter, RequiredSelections=[DataOnDemand("Phys/StdLooseKsDD/Particles")])
     # LL Ks0's
     _preambulo = ["goodPion = ( (TRGHOSTPROB < %(GhostProb_Max)s) & (PROBNNpi > %(ProbNNpi)s) )" % locals()]
     _KsLLFilter =  FilterDesktop(Preambulo=_preambulo,Code = "( (VFASPF(VCHI2/VDOF)<25) & (PT> %(KsPT)s*MeV) & ( NINTREE( ('pi+'==ABSID) & goodPion ) == 2 ) )" % locals())
-    _sel_KsLL = Selection("sel_KsLL", Algorithm=_KsLLFilter, RequiredSelections=[DataOnDemand("Phys/StdVeryLooseKsLL/Particles")])    
+    _sel_KsLL = Selection("sel_KsLL", Algorithm=_KsLLFilter, RequiredSelections=[DataOnDemand("Phys/StdVeryLooseKsLL/Particles")])
     return MergedSelection(name,RequiredSelections = [_sel_KsDD,_sel_KsLL])
 
 
 def makePhi2KK(name, TrIPchi2Phi, TrChi2, PhiMassWin, PhiVCHI2, GhostProb_Max, SumVec_PT, MinTrack_PT, MinTrack_P, ProbNNk) :
     """
     Create and return a Phi->KK Selection object, starting from DataOnDemand 'Phys/StdLoosePhi2KK'.
-    """																		
+    """
     _preambulo = ["goodKaon = ( (MIPCHI2DV(PRIMARY) > %(TrIPchi2Phi)s) & (TRCHI2DOF < %(TrChi2)s) & (TRGHOSTPROB < %(GhostProb_Max)s) & (P > %(MinTrack_P)s) & (PT > %(MinTrack_PT)s) & (PROBNNk > %(ProbNNk)s))" % locals(),
                   "goodPhi = ( (VFASPF(VCHI2/VDOF) < %(PhiVCHI2)s) & (ADMASS('phi(1020)') < 10.*%(PhiMassWin)s*MeV) & (SUMTREE(PT, ISBASIC, 0.0) > %(SumVec_PT)s))" % locals()]
     _code = "goodPhi & (NINTREE( ('K+'==ABSID) & goodKaon ) == 2) "
@@ -362,7 +362,7 @@ def makeKsKpi(name, sel_Ks, TrIPchi2Kst, TrChi2, mKsKpiMax, KstVCHI2, GhostProb_
     """
     Create and return a X->KsKpi Selection object
     @return: Selection object
-    
+
     """
     _diTrackPreVertexCuts = " (AM < (%(mKsKpiMax)s))" %locals()
     _diTrackPostVertexCuts = "(HASVERTEX) & (VFASPF(VCHI2/VDOF) < %(KstVCHI2)s)" %locals()
@@ -387,8 +387,8 @@ def makeKsKpi(name, sel_Ks, TrIPchi2Kst, TrChi2, mKsKpiMax, KstVCHI2, GhostProb_
 def makeBs2PhiGamma(name, phiSel, gammaSel, BsVTXchi2, BsPVIPchi2, BMassMin, BMassMax, BPT, B_APT, PhiMassWin, DTF_CL, Hlt1Dict, Hlt2Dict):
     """
     Create and return a Bs -> Phi Gamma Selection object, starting with the daughters' selections.
-    """  
-    _combinationCut = "((AM > 0.5*%(BMassMin)s) & (AM < 2*%(BMassMax)s))"  % locals() 
+    """
+    _combinationCut = "((AM > 0.5*%(BMassMin)s) & (AM < 2*%(BMassMax)s))"  % locals()
     _motherCut = "(VFASPF(VCHI2/VDOF) <%(BsVTXchi2)s) & (BPVIPCHI2() < %(BsPVIPchi2)s) & (PT > %(BPT)s) & (M > 0.5*%(BMassMin)s) & (M < 2.*%(BMassMax)s) & (SUMTREE(PT, ISBASIC, 0.0) > %(B_APT)s)" % locals()
     _Bs = CombineParticles(DecayDescriptor="B_s0 -> phi(1020) gamma",
                            CombinationCut=_combinationCut,
@@ -398,7 +398,7 @@ def makeBs2PhiGamma(name, phiSel, gammaSel, BsVTXchi2, BsPVIPchi2, BMassMin, BMa
     #  add the DTF version of the cuts with a very loose requirement that the fit converges
     # PV constraint switched on, but very loose CL cut
     _code = "( (dtf_prob > %(DTF_CL)s) & (in_range(%(BMassMin)s,mB,%(BMassMax)s)) &  (abs(mX-1020) < %(PhiMassWin)s) )"  % locals()
-    _preambulo = [ "dtf_prob = DTF_PROB(True )", 
+    _preambulo = [ "dtf_prob = DTF_PROB(True )",
                    "mB       = DTF_FUN(M, True)",
                    "mX       = DTF_FUN(CHILD(1, M), True)"
                  ]
@@ -410,7 +410,7 @@ def makeBs2PhiGamma(name, phiSel, gammaSel, BsVTXchi2, BsPVIPchi2, BMassMin, BMa
 def makeBd2KstGamma(name, kstSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMin, BMassMax, BPT, B_APT, KstMassWin, BdDira, DTF_CL,Hlt1Dict, Hlt2Dict):
     """
     Create and return a Bd -> K* Gamma Selection object, starting with the daughters' selections.
-    """  
+    """
     _combinationCut = "((AM > 0.3*%(BMassMin)s) & (AM < 2.5*%(BMassMax)s))" % locals()
     _motherCut = " (VFASPF(VCHI2/VDOF) <%(B0VTXchi2)s) & (BPVIPCHI2() < %(B0PVIPchi2)s) & (PT > %(BPT)s) & (M > 0.3*%(BMassMin)s) & (M < 2.*%(BMassMax)s) & (SUMTREE(PT, ISBASIC, 0.0) > %(B_APT)s) & (acos(BPVDIRA) < %(BdDira)s) " % locals()
     _Bd = CombineParticles(DecayDescriptor="[B0 -> K*(892)0 gamma]cc",
@@ -421,7 +421,7 @@ def makeBd2KstGamma(name, kstSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMin, BMa
     #  add the DTF version of the cuts with a very loose requirement that the fit converges
     # PV constraint switched on, but very loose CL cut
     _code = "((dtf_prob > %(DTF_CL)s) & (in_range(%(BMassMin)s,mB,%(BMassMax)s)) &  (abs(mX-895) < %(KstMassWin)s) )"  % locals()
-    _preambulo = [ "dtf_prob = DTF_PROB(True )", 
+    _preambulo = [ "dtf_prob = DTF_PROB(True )",
                    "mB       = DTF_FUN(M, True)",
                    "mX       = DTF_FUN(CHILD(1, M), True)"
                  ]
@@ -435,7 +435,7 @@ def makeBd2KspipiGamma(name, KspipiSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMi
     Create and return a Bd -> Kspipi Gamma Selection object, starting with the daughters' selections.
     @return: Selection object
 
-    """  
+    """
     _combinationCut = "((AM > 0.5*%(BMassMin)s) & (AM < 2*%(BMassMax)s))" % locals()
     _motherCut = "(VFASPF(VCHI2/VDOF) <%(B0VTXchi2)s) & (BPVIPCHI2() < %(B0PVIPchi2)s) & (PT > %(BPT)s) & (M > 0.5*%(BMassMin)s) & (M < 2.*%(BMassMax)s) & (SUMTREE(PT, ISBASIC, 0.0) > %(B_APT)s) & (acos(BPVDIRA) < %(BdDira)s)" % locals()
     _Bd = CombineParticles(DecayDescriptor="B0 -> K*_2(1430)0 gamma",
@@ -445,7 +445,7 @@ def makeBd2KspipiGamma(name, KspipiSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMi
     sel_KspipiGamma_init = Selection("Bd2KspipiG_init", Algorithm=_Bd, RequiredSelections=[gammaSel, KspipiSel])
 
     _code = "((dtf_prob > %(DTF_CL)s) & (in_range(%(BMassMin)s,mB,%(BMassMax)s)) &  (mX < %(mKspipiMax)s))"  % locals()
-    _preambulo = [ "dtf_prob = DTF_PROB(True, 'KS0' )", 
+    _preambulo = [ "dtf_prob = DTF_PROB(True, 'KS0' )",
                    "mB       = DTF_FUN(M, True, 'KS0')",
                    "mX       = DTF_FUN(CHILD(1, M), True, 'KS0')"
                  ]
@@ -458,7 +458,7 @@ def makeBs2KsKpiGamma(name, KsKpiSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMin,
     Create and return a Bd -> KsKpi Gamma Selection object, starting with the daughters' selections.
     @return: Selection object
 
-    """  
+    """
     _combinationCut = "((AM > 0.5*%(BMassMin)s) & (AM < 2*%(BMassMax)s))" % locals()
     _motherCut = "(VFASPF(VCHI2/VDOF) <%(B0VTXchi2)s) & (BPVIPCHI2() < %(B0PVIPchi2)s) & (PT > %(BPT)s) & (M > 0.5*%(BMassMin)s) & (M < 2.*%(BMassMax)s)  & (SUMTREE(PT, ISBASIC, 0.0) > %(B_APT)s) & (acos(BPVDIRA) < %(BdDira)s) " % locals()
     _Bs = CombineParticles(DecayDescriptor="[B_s0 -> K*_2(1430)0 gamma]cc",
@@ -468,7 +468,7 @@ def makeBs2KsKpiGamma(name, KsKpiSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMin,
     sel_KsKpiGamma_init = Selection("Bs2KsKpiG_init", Algorithm=_Bs, RequiredSelections=[gammaSel, KsKpiSel])
 
     _code = "((dtf_prob > %(DTF_CL)s) & (in_range(%(BMassMin)s,mB,%(BMassMax)s)) &  (mX < %(mKsKpiMax)s))"  % locals()
-    _preambulo = [ "dtf_prob = DTF_PROB(True,'KS0' )", 
+    _preambulo = [ "dtf_prob = DTF_PROB(True,'KS0' )",
                    "mB       = DTF_FUN(M, True, 'KS0')",
                    "mX       = DTF_FUN(CHILD(1, M), True, 'KS0')"
                  ]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclusive.py
index 7c295da76858e21876df9617815b7d30e5944003..66e8f5dc2c1991e6379ce54f7b0b2453fd5ea6c9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaExclusive.py
@@ -38,7 +38,7 @@ default_config = {
     'CONFIG'      : {'TrIPchi2'             : 16.       # Dimensionless (was 25)
           ,'TrChi2'              : 3.        # dimensionless
 #          ,'TrMaxPT'             : 1200.     # MeV
-          
+
           ,'PhiMassWin'          : 15.       # MeV
           ,'KstMassWin'          : 100.      # MeV  was(150)
           ,'PhiVCHI2'            : 9.       # dimensionless
@@ -47,12 +47,12 @@ default_config = {
 
           ,'photonPT'            : 2500.     # MeV
 
-          ,'B_PT'                : 2000.     # MeV (was 3000)  
+          ,'B_PT'                : 2000.     # MeV (was 3000)
           ,'SumVec_PT'			 : 1500.	#MeV (was 1500)
           ,'MinTrack_PT'         : 500.		#MeV
           ,'MinTrack_P'          : 3000.    #MeV
           ,'B_APT'				 : 3000.		#MeV (was 5000)
-          
+
           ,'BMassMin'            : 4000.     # MeV
           ,'BMassMax'           : 7000.     # MeV
           ,'BsPVIPchi2'          : 9.       # Dimensionless
@@ -73,7 +73,7 @@ default_config = {
 class Beauty2XGammaExclusiveConf(LineBuilder):
     """
     Definition of B -> X Gamma stripping
-    
+
     Constructs B0 -> K* Gamma and Bs -> Phi Gamma Selections and StrippingLines from
     a configuration dictionary.
     Usage:
@@ -89,17 +89,17 @@ class Beauty2XGammaExclusiveConf(LineBuilder):
     selPhi2KK                    : nominal Phi -> K+K- Selection object
     selKst                       : nominal K* -> K pi Selection object
     selBs2PhiGamma               : nominal Bs -> Phi Gamma Selection object with wide Bs mass window
-    selBd2KstGamma               : nominal B0 -> K* Gamma object Object 
+    selBd2KstGamma               : nominal B0 -> K* Gamma object Object
     Bs2PhiGammaLine              : Stripping line out of selBs2PhiGamma
     Bd2KstGamma                  : Stripping line out of selBd2KstGamma
     lines                  : List of lines
 
     Exports as class data member:
-    Beauty2XGammaExclusiveConf.__configuration_keys__ : List of required configuration parameters.    
+    Beauty2XGammaExclusiveConf.__configuration_keys__ : List of required configuration parameters.
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         # Selection of B daughters: photon, phi and kstar
@@ -115,7 +115,7 @@ class Beauty2XGammaExclusiveConf(LineBuilder):
                              	    config['SumVec_PT'],
                                     config['MinTrack_PT'],
                                     config['MinTrack_P'])
-                                    
+
         self.selKst = makeKstar('KStarSel' + self.name,
                                 config['TrIPchi2'],
                                 config['TrChi2'],
@@ -162,15 +162,15 @@ class Beauty2XGammaExclusiveConf(LineBuilder):
                                              EnableFlavourTagging = True,
                                              selection=self.selBd2KstGamma)
         self.registerLine(self.Bd2KstGammaLine)
-        
+
 def makePhoton(name, photonPT):
     """Create photon Selection object starting from DataOnDemand 'Phys/StdLooseAllPhotons'.
 
     @arg name: name of the Selection.
     @arg photonPT: PT of the photon
-    
+
     @return: Selection object
-    
+
     """
     # Configure clusterization
     #from Configurables import CaloClusterizationTool, CellularAutomatonAlg
@@ -187,16 +187,16 @@ def makePhoton(name, photonPT):
 def makePhi2KK(name, TrIPchi2Phi, TrChi2, PhiMassWin, PhiVCHI2, GhostProb_Max, SumVec_PT, MinTrack_PT, MinTrack_P) :
     """
     Create and return a Phi->KK Selection object, starting from DataOnDemand 'Phys/StdLoosePhi2KK'.
-    
+
     @arg name: name of the Selection.
     @arg TrIPchi2Phi: minimum IP chi2 of the K+ tracks
     @arg TrChi2: minimum chi2 of the K+ tracks
     @arg PhiMassWin: selected Phi mass window
     @arg PhiVCHI2: vertex chi2 of the Phi
-    
+
     @return: Selection object
-    
-    """																																																																																																								
+
+    """
 #    _preambulo = ["goodKaon = ((MIPCHI2DV(PRIMARY) > %(TrIPchi2Phi)s) & (TRCHI2DOF < %(TrChi2)s) & (P > %(MinTrack_P)s) & (PT > %(MinTrack_PT)s))" % locals(),
     _preambulo = ["goodKaon = ((MIPCHI2DV(PRIMARY) > %(TrIPchi2Phi)s) & (TRCHI2DOF < %(TrChi2)s) & (MAXTREE(TRGHOSTPROB, HASTRACK) < %(GhostProb_Max)s) & (P > %(MinTrack_P)s) & (PT > %(MinTrack_PT)s))" % locals(),
                   "goodPhi = (((VFASPF(VCHI2/VDOF) < %(PhiVCHI2)s)) & (ADMASS('phi(1020)') < %(PhiMassWin)s*MeV) & (SUMTREE(PT, ISBASIC, 0.0) > %(SumVec_PT)s))" % locals()]
@@ -208,15 +208,15 @@ def makePhi2KK(name, TrIPchi2Phi, TrChi2, PhiMassWin, PhiVCHI2, GhostProb_Max, S
 def makeKstar(name, TrIPchi2Kst, TrChi2, KstMassWin, KstVCHI2, GhostProb_Max, SumVec_PT, MinTrack_PT, MinTrack_P) :
     """
     Create and return a K*->Kpi Selection object, starting from DataOnDemand 'Phys/StdVeryLooseDetachedKst2Kpi'.
-    
+
     @arg name: name of the Selection.
     @arg TrIPchi2Kst: tracks IP chi2
     @arg TrChi2: tracks chi2
     @arg KstMassWin: K* mass window
     @arg KstVCHI2: vertex chi2 of the K*
-    
+
     @return: Selection object
-    
+
     """
     _preambulo = ["goodTrack = ((MIPCHI2DV(PRIMARY) > %(TrIPchi2Kst)s) & (TRCHI2DOF < %(TrChi2)s) & (MAXTREE(TRGHOSTPROB, HASTRACK) < %(GhostProb_Max)s) & (P > %(MinTrack_P)s) & (PT > %(MinTrack_PT)s))" % locals(),
                   "goodKstar = (((VFASPF(VCHI2/VDOF) < %(KstVCHI2)s)) & (ADMASS('K*(892)0') < %(KstMassWin)s*MeV) & (SUMTREE(PT, ISBASIC, 0.0) > %(SumVec_PT)s))" % locals()]
@@ -229,17 +229,17 @@ def makeKstar(name, TrIPchi2Kst, TrChi2, KstMassWin, KstVCHI2, GhostProb_Max, Su
 def makeBs2PhiGamma(name, phiSel, gammaSel, BsVTXchi2, BsPVIPchi2, BMassMin, BMassMax, BPT, B_APT):
     """
     Create and return a Bs -> Phi Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg phiSel: Phi -> K+ K+ selection
     @arg gammaSel: photon selection
     @arg BsVTXchi2: Vtx Chi2 of the Bs
     @arg BsPVIPchi2: IP chi2 of the Bs wrt the PV
     @arg BsMassWin: Bs mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     _motherCut = "(VFASPF(VCHI2/VDOF) <%(BsVTXchi2)s) & (BPVIPCHI2() < %(BsPVIPchi2)s) & (PT > %(BPT)s) & (M > %(BMassMin)s) & (M < %(BMassMax)s)  & (SUMTREE(PT, ISBASIC, 0.0) > %(B_APT)s)" % locals()
  #   _motherCut = "(VFASPF(VCHI2/VDOF) <%(BsVTXchi2)s) & (BPVIPCHI2() < %(BsPVIPchi2)s) & (M > %(BMassMin)s) & (M < %(BMassMax)s)" % locals()
     _combinationCut = "((AM > 0.75*%(BMassMin)s) & (AM < 1.25*%(BMassMax)s))"  % locals()
@@ -259,10 +259,10 @@ def makeBd2KstGamma(name, kstSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMin, BMa
     @arg B0VTXchi2: Vtx Chi2 of the Bs
     @arg B0PVIPchi2: IP chi2 of the B0 wrt the PV
     @arg B0MassWin: B0 mass window
-    
+
     @return: Selection object
 
-    """  
+    """
     _combinationCut = "((AM > 0.75*%(BMassMin)s) & (AM < 1.25*%(BMassMax)s))" % locals()
     _motherCut = "(VFASPF(VCHI2/VDOF) <%(B0VTXchi2)s) & (BPVIPCHI2() < %(B0PVIPchi2)s) & (PT > %(BPT)s) & (M > %(BMassMin)s) & (M < %(BMassMax)s)  & (SUMTREE(PT, ISBASIC, 0.0) > %(B_APT)s) & (acos(BPVDIRA) < %(BdDira)s)" % locals()
 #    _motherCut = "(VFASPF(VCHI2/VDOF) <%(B0VTXchi2)s) & (BPVIPCHI2() < %(B0PVIPchi2)s) & (M > %(BMassMin)s) & (M < %(BMassMax)s)" % locals()
@@ -272,5 +272,5 @@ def makeBd2KstGamma(name, kstSel, gammaSel, B0VTXchi2, B0PVIPchi2, BMassMin, BMa
                            ReFitPVs=False)#True)
     #return Selection(name, Algorithm=_Bd, RequiredSelections=[kstSel, gammaSel])
     return Selection(name, Algorithm=_Bd, RequiredSelections=[gammaSel, kstSel])
-        
+
 # EOF
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaNoBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaNoBias.py
index 07bca733114bcf31cf36f6fb2d3bd873abedf2f4..39bd407e28d084e92fcba7e57102b4d07d170d30 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaNoBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGammaNoBias.py
@@ -28,7 +28,7 @@ default_config = {
     'BUILDERTYPE' : 'Beauty2XGammaNoBiasConf',
     'CONFIG'      : {
            'TrChi2'              : 100.        # dimensionless, useless (default is 4)
-          
+
           ,'PhiMassWin'          : 400.       # MeV was 20
           ,'KstMassWin'          : 3000.      # MeV was 150
 
@@ -53,7 +53,7 @@ default_config = {
 class Beauty2XGammaNoBiasConf(LineBuilder):
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         # Selection of B daughters: photon, phi and kstar
@@ -111,16 +111,16 @@ class Beauty2XGammaNoBiasConf(LineBuilder):
                                                                    'Location'    : 'VertexIsolInfoRadiative'}],
                                              selection=tisTosSelection(self.selBd2KstGamma,config['TISTOSLinesDict']))
         self.registerLine(self.Bd2KstGammaLine)
-                                
-        
+
+
 def makePhoton(name, photonPT):
     """Create photon Selection object starting from DataOnDemand 'Phys/StdLooseAllPhotons'.
 
     @arg name: name of the Selection.
     @arg photonPT: PT of the photon
-    
+
     @return: Selection object
-    
+
     """
     _code = "(PT> %(photonPT)s*MeV)" % locals()
     _gammaFilter = FilterDesktop(Code=_code)
@@ -130,13 +130,13 @@ def makePhoton(name, photonPT):
 def makePhi2KK(name, TrChi2, PhiMassWin) :
     """
     Create and return a Phi->KK Selection object, starting from DataOnDemand 'Phys/StdLoosePhi2KK'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: minimum chi2 of the K+ tracks
     @arg PhiMassWin: selected Phi mass window
-    
+
     @return: Selection object
-    
+
     """
     _preambulo = ["goodKaon = ((TRCHI2DOF < %(TrChi2)s))" % locals(),
                   "goodPhi = ((ADMASS('phi(1020)') < %(PhiMassWin)s*MeV))" % locals()]
@@ -148,13 +148,13 @@ def makePhi2KK(name, TrChi2, PhiMassWin) :
 def makeKstar(name, TrChi2, KstMassWin) :
     """
     Create and return a K*->Kpi Selection object, starting from DataOnDemand 'Phys/StdVeryLooseDetachedKst2Kpi'.
-    
+
     @arg name: name of the Selection.
     @arg TrChi2: tracks chi2
     @arg KstMassWin: K* mass window
-    
+
     @return: Selection object
-    
+
     """
     _preambulo = ["goodTrack = ((TRCHI2DOF < %(TrChi2)s))" % locals(),
                   "goodKstar = ((ADMASS('K*(892)0') < %(KstMassWin)s*MeV))" % locals()]
@@ -166,15 +166,15 @@ def makeKstar(name, TrChi2, KstMassWin) :
 def makeBs2PhiGamma(name, phiSel, gammaSel, BsMassWin):
     """
     Create and return a Bs -> Phi Gamma Selection object, starting with the daughters' selections.
-  
+
     @arg name: name of the Selection.
     @arg phiSel: Phi -> K+ K+ selection
     @arg gammaSel: photon selection
     @arg BsMassWin: Bs mass window
-    
+
     @return: Selection object
-    
-    """  
+
+    """
     _motherCut = "(ADMASS('B_s0')<%(BsMassWin)s*MeV)" % locals()
     _Bs = CombineParticles(DecayDescriptor="B_s0 -> phi(1020) gamma",
                            MotherCut=_motherCut,
@@ -189,16 +189,16 @@ def makeBd2KstGamma(name, kstSel, gammaSel, B0MassWin):
     @arg kstSel: K* -> K pi selection
     @arg gammaSel: photon selection
     @arg B0MassWin: B0 mass window
-    
+
     @return: Selection object
 
-    """  
+    """
     _motherCut = "(ADMASS('B0')<%(B0MassWin)s*MeV)" % locals()
     _Bd = CombineParticles(DecayDescriptor="[B0 -> K*(892)0 gamma]cc",
                            MotherCut=_motherCut,
                            ReFitPVs=False)#True)
     return Selection(name, Algorithm=_Bd, RequiredSelections=[gammaSel, kstSel])
-        
+
 def makeTISTOSFilter(name,dict_TISTOS):
     specs = dict_TISTOS
     from Configurables import TisTosParticleTagger
@@ -212,5 +212,3 @@ def tisTosSelection(sel,TISTOSdict):
     return Selection(sel.name()+'TISTOS', Algorithm=tisTosFilter, RequiredSelections=[sel])
 
 # EOF
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py
index ca174017e21b2e419cf227781dfcfeb51e560951..05674960d5a910183976944ba63771ef8342422d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py
@@ -63,7 +63,7 @@ from StrippingUtils.Utils		import LineBuilder, checkConfig
 
 class Bs2MuMuGammaConf( LineBuilder ) :
     """Class defining the Bs -> mu mu gamma stripping line"""
-    
+
 
     __configuration_keys__ = ('Prescale',
                               'GammaPT',
@@ -82,13 +82,13 @@ class Bs2MuMuGammaConf( LineBuilder ) :
                               'DIRA'
                               )
 
-    def __init__( self, name, config ):        
-        
+    def __init__( self, name, config ):
+
         LineBuilder.__init__(self, name, config)
-        
+
         # make the various stripping selections
         self.selBs2MuMuGamma = makeBs2MuMuGamma(name, config)
-        
+
         self.lineBs2MuMuGamma = StrippingLine( name+"Line",
                                                prescale  = config['Prescale'],
                                                selection = self.selBs2MuMuGamma,
@@ -126,7 +126,7 @@ class Bs2MuMuGammaConf( LineBuilder ) :
 
 #### Long Track Bs2MuMu2017 Isolations:
 #       the 3 variables TRKISOBDTFIRSTVALUE, TRKISOBDTSECONDVALUE, TRKISOBDTTHIRDVALUE
-#       are the highest BDT score of the tracks w.r.t the muon.                
+#       are the highest BDT score of the tracks w.r.t the muon.
                 {"Type": "RelInfoTrackIsolationBDT",
                  "Variables": -1, #Set A+C 2017
                  "DaughterLocations": {
@@ -137,7 +137,7 @@ class Bs2MuMuGammaConf( LineBuilder ) :
 
 #### Velo Track Bs2MuMu2017 Isolations:
 #       the 3 variables TRKISOBDTFIRSTVALUE, TRKISOBDTSECONDVALUE, TRKISOBDTTHIRDVALUE
-#       are the highest BDT score of the tracks w.r.t the muon.                
+#       are the highest BDT score of the tracks w.r.t the muon.
                 {"Type": "RelInfoTrackIsolationBDT",
                  "Variables": -2, #Set A 2017
                  "DaughterLocations": {
@@ -149,15 +149,15 @@ class Bs2MuMuGammaConf( LineBuilder ) :
                 ]
 
                                                )
-        
+
         self.registerLine(self.lineBs2MuMuGamma)
-        
+
 def makeBs2MuMuGamma(name, config):
 
     _Muon_cuts = "(MIPCHI2DV(PRIMARY) > %(TrIPChi2)s) "\
         "& (TRCHI2DOF < %(TrChi2)s) "\
         "& (TRGHOSTPROB < %(TrGhostProb)s)" % config
-    
+
     _Gamma_cuts = "(PT > %(GammaPT)s*MeV) "\
         "& (E > %(GammaE)s*MeV) "\
         "& (CL > %(GammaCL)s)" % config
@@ -175,19 +175,19 @@ def makeBs2MuMuGamma(name, config):
         "& (PT > %(BPT)s*MeV) "\
         "& (BPVIPCHI2() < %(BIPChi2)s)" % config
 
-    
+
     return Combine3BodySelection(name,
                                  [StdLooseMuons, StdLooseAllPhotons],
                                  DecayDescriptor = "B_s0 -> mu+ mu- gamma",
-                                 DaughtersCuts = {"mu-":	_Muon_cuts, 
+                                 DaughtersCuts = {"mu-":	_Muon_cuts,
                                                   "mu+":	_Muon_cuts,
                                                   "gamma":	_Gamma_cuts
                                                   },
                                  Combination12Cut = _Comb12_cuts,
                                  CombinationCut = _Comb_cuts,
-                                 MotherCut = _Mother_cuts, 
+                                 MotherCut = _Mother_cuts,
                                  )
 
 
 
-########################################################################  
+########################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py
index c5341e69ac52d13e27eecdc76873c839fd93d54e..b731caf35fb8c0de9edea892646d3ac3cfb7fa68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
- 
+
 '''
 Module for construction of Bs-->MuMu stripping selections and lines
 
@@ -100,7 +100,7 @@ default_config = {
     'B_maximum_decaytime_bsst' : 0.2,
     'ProbNN'                   : 0.4,
     'SUMPT'                    : 4500
-    
+
     },
     'STREAMS' : {
       'Dimuon' : ['StrippingBs2MuMuLinesNoMuIDFullDSTLine',
@@ -118,9 +118,9 @@ default_config = {
                    'StrippingBs2MuMuLinesBu2JPsiKLine'
                    ]
     },
-    
+
     }
-    
+
 ##########################################
 ## define local stdjets
 from Gaudi.Configuration   import *
@@ -135,23 +135,23 @@ StdJetsNoJetIDNoBan = JetMakerConf(stdjets_name_noban,
                                    PtMin = 500.,
                                    JetIDCut = False).algorithms[0]
 
-## configure Data-On-Demand service                                                        
+## configure Data-On-Demand service
 locations = updateDoD ( StdJetsNoJetIDNoBan )
 
 
 # the muons banning and B adding is line dependent (need to provide the location of the muons/B!)
 def create_stdjets(strob,line_location,stdjets_name_ban, stdjets_name_addb):
-    
+
     myconf1 = JetMakerConf(stdjets_name_ban,
                            R = 0.7 ,
                            PtMin = 500.,
                            listOfParticlesToBan = [line_location],
                            JetIDCut = False).algorithms[0]
-    
+
     if "StdJetsNoJetIDBan" in dir(strob): strob.StdJetsNoJetIDBan.append(myconf1)
     else: strob.StdJetsNoJetIDBan= [myconf1]
-                                      
-    ## configure Data-On-Demand service                                            
+
+    ## configure Data-On-Demand service
     locations = updateDoD ( myconf1 )
 
     myconf2 = JetMakerConf(stdjets_name_addb,
@@ -162,8 +162,8 @@ def create_stdjets(strob,line_location,stdjets_name_ban, stdjets_name_addb):
 
     if "StdJetsNoJetIDAddB" in dir(strob):  strob.StdJetsNoJetIDAddB.append(myconf2)
     else:  strob.StdJetsNoJetIDAddB=[myconf2]
-        
-    ## configure Data-On-Demand service                                            
+
+    ## configure Data-On-Demand service
     locations = updateDoD ( myconf2 )
 
 ##########################################
@@ -195,14 +195,14 @@ class Bs2MuMuLinesConf(LineBuilder) :
     defaultLine    : Stripping line made from selDefault
     looseLine      : Stripping line made from selLoose
     lines          : lsit of lines:  [ defaultLine, looseLine ]
-    
+
     Exports as class data member:
     Bs2MuMuLinesConf.__configuration_keys__ : List of required configuration parameters.
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
 
-    def __init__(self, 
+    def __init__(self,
                  name,
                  config=default_config):#None ) :
 
@@ -250,7 +250,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                   VCHI2_VDOF = config['VCHI2_VDOF_loose'],
                                   TrackGhostProb = config['TrackGhostProb']
                                   )
-        
+
         self.selBu = makeBu(bu_name,
                             K_MIPChi2DV = config['daughter_IPChi2'],
                             Jpsi_BPVVDChi2 = config['BPVVDChi2'],
@@ -266,7 +266,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
                             DOCA = config['DOCA']   ,
                             TrChi2 = config['daughter_TrChi2'] ,
                             BPVIPChi2= config['B_BPVIPChi2'] ,
-                            TrackGhostProb = config['TrackGhostProb']                           
+                            TrackGhostProb = config['TrackGhostProb']
                             )
 
         self.selBd = makeBd(bd_name,
@@ -278,7 +278,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
                             BPVIPChi2= config['B_BPVIPChi2']
                             )
 
-        self.selSS = makeSS(ss_name,                            
+        self.selSS = makeSS(ss_name,
                             BPVVDChi2 = config['BPVVDChi2'],
                             Muon_MIPChi2DV = config['daughter_IPChi2'],
                             DOCA = config['DOCA'],
@@ -298,7 +298,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                      minimum_decaytime = config['B_minimum_decaytime_LTUB'],
                                      muon_PT = config['muon_PT_LTUB']
                                      )
-        
+
         self.selbsst = makeBsst2mm(bsst_name,
                                    TrackGhostProb = config['TrackGhostProb_bsst'],
                                    DOCA = config['DOCA_LTUB'],
@@ -312,7 +312,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                    maximum_decaytime = config['B_maximum_decaytime_bsst'],
                                    muon_PT = config['muon_PT_LTUB']
                                    )
-        
+
         self.selBs2KKLTUB = makeBs2KKLTUB(Bs2KKltub_name,
                                           TrackGhostProb = config['TrackGhostProb'],
                                           DOCA = config['DOCA_LTUB'],
@@ -330,7 +330,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
 
         stdjets_name_ban_default_DST = "StdJetsNoJetIDBanMuonsDefDST"
         stdjets_name_addb_default_DST = "StdJetsNoJetIDAddBDefDST"
- 
+
         stdjets_name_ban_wide = "StdJetsNoJetIDBanMuonsWide"
         stdjets_name_addb_wide = "StdJetsNoJetIDAddBWide"
 
@@ -368,9 +368,9 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : ["MU_BDT"],
               "DaughterLocations"  : {
                 "B_s0 -> ^mu+ mu-" : "Muon1BDT",
-                "B_s0 -> mu+ ^mu-" : "Muon2BDT" } 
+                "B_s0 -> mu+ ^mu-" : "Muon2BDT" }
             },
- 
+
             { "Type" : "RelInfoBs2MuMuTrackIsolations"
               , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' ,'BSMUMUTRACKID','BSMUMUTRACKTOPID','ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS' ]
               ,"DaughterLocations" : {
@@ -380,7 +380,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
 
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -411,7 +411,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT13vars_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
-              "Variables" : 4,    
+              "Variables" : 4,
               "DaughterLocations" : {
             "B_s0 -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_4",
             "B_s0 -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_4"},
@@ -446,9 +446,9 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : ["MU_BDT"],
               "DaughterLocations"  : {
                 "B_s0 -> ^mu+ mu-" : "Muon1BDT",
-                "B_s0 -> mu+ ^mu-" : "Muon2BDT" } 
+                "B_s0 -> mu+ ^mu-" : "Muon2BDT" }
             },
- 
+
             { "Type" : "RelInfoBs2MuMuTrackIsolations"
               , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' ,'BSMUMUTRACKID','BSMUMUTRACKTOPID','ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS' ]
               ,"DaughterLocations" : {
@@ -458,7 +458,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
 
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -489,7 +489,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT13vars_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
-              "Variables" : 4,    
+              "Variables" : 4,
               "DaughterLocations" : {
             "B_s0 -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_4",
             "B_s0 -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_4"},
@@ -519,24 +519,24 @@ class Bs2MuMuLinesConf(LineBuilder) :
        { "Type" : "RelInfoBs2MuMuBIsolations"
               , "Variables" : ['BSMUMUCDFISO', 'BSMUMUOTHERBMAG', 'BSMUMUOTHERBANGLE', 'BSMUMUOTHERBBOOSTMAG', 'BSMUMUOTHERBBOOSTANGLE', 'BSMUMUOTHERBTRACKS', 'BSMUMUPARTID','BSMUMUTOPID']
               , "Location"  : "BSMUMUVARIABLES"},
-            
+
             { "Type" : "RelInfoMuonIDPlus",
               "Variables" : ["MU_BDT"],
               "DaughterLocations"  : {
                 "B_s0 -> ^mu+ mu-" : "Muon1BDT",
                 "B_s0 -> mu+ ^mu-" : "Muon2BDT" }
             },
- 
+
             { "Type" : "RelInfoBs2MuMuTrackIsolations"
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
               ,"DaughterLocations" : {
             "B_s0 -> ^mu+ mu-" : "Muon1iso",
-            "B_s0 -> mu+ ^mu-" : "Muon2iso"},                                                                                                                            
+            "B_s0 -> mu+ ^mu-" : "Muon2iso"},
                            },
 
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -549,7 +549,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : 1,
             "DaughterLocations" : {
             "B_s0 -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_1",
-            "B_s0 -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_1"},              
+            "B_s0 -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_1"},
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
@@ -577,10 +577,10 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Type" : "RelInfoTrackIsolationBDT2",
               "Location" : "TrackIsolationBDT2"
             }
-            
+
             ]
                                       )
-        
+
 
         self.looseLine = StrippingLine(loose_name+"Line",
                                        prescale = config['LooseLinePrescale'],
@@ -597,12 +597,12 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                     #RequiredRawEvents = ["Calo"],
                                     algos = [ self.selBu ],
                                     RelatedInfoTools = [
-          
+
                 { "Type" : "RelInfoBs2MuMuBIsolations"
                   ,"TopSelection": self.selBu.requiredSelections()[0]
                   , "Variables" : ['BSMUMUCDFISO', 'BSMUMUOTHERBMAG', 'BSMUMUOTHERBANGLE', 'BSMUMUOTHERBBOOSTMAG', 'BSMUMUOTHERBBOOSTANGLE', 'BSMUMUOTHERBTRACKS', 'BSMUMUPARTID','BSMUMUTOPID']
                   , "Location"  : "BSMUMUVARIABLES"},
-                
+
                 { "Type" : "RelInfoBs2MuMuTrackIsolations"
                   ,"TopSelection": self.selBu.requiredSelections()[0]
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
@@ -610,7 +610,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
             "J/psi(1S) -> ^mu+ mu-" : "Muon1iso",
             "J/psi(1S) -> mu+ ^mu-" : "Muon2iso"}
               },
-            
+
 #            { "Type" : "RelInfoMuonIDPlus",
 #              "Variables" : ["MU_BDT"],
 #              "DaughterLocations"  : {
@@ -670,7 +670,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
             }
                 ]
                                     )
-     
+
         self.buFullDSTLine = StrippingLine(bu_name+"FullDSTLine",
                                     prescale = config['BuPrescale'],
                                     postscale = config['DefaultPostscale'],
@@ -678,12 +678,12 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                     #RequiredRawEvents = ["Calo"],
                                     algos = [ self.selBu ],
                                     RelatedInfoTools = [
-          
+
                 { "Type" : "RelInfoBs2MuMuBIsolations"
                   ,"TopSelection": self.selBu.requiredSelections()[0]
                   , "Variables" : ['BSMUMUCDFISO', 'BSMUMUOTHERBMAG', 'BSMUMUOTHERBANGLE', 'BSMUMUOTHERBBOOSTMAG', 'BSMUMUOTHERBBOOSTANGLE', 'BSMUMUOTHERBTRACKS', 'BSMUMUPARTID','BSMUMUTOPID']
                   , "Location"  : "BSMUMUVARIABLES"},
-                
+
                 { "Type" : "RelInfoBs2MuMuTrackIsolations"
                   ,"TopSelection": self.selBu.requiredSelections()[0]
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
@@ -691,7 +691,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
             "J/psi(1S) -> ^mu+ mu-" : "Muon1iso",
             "J/psi(1S) -> mu+ ^mu-" : "Muon2iso"}
               },
-            
+
 #            { "Type" : "RelInfoMuonIDPlus",
 #              "Variables" : ["MU_BDT"],
 #              "DaughterLocations"  : {
@@ -759,12 +759,12 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                     #RequiredRawEvents = ["Calo"],
                                     algos = [ self.selBs ],
                                  RelatedInfoTools = [
-            
+
                 { "Type" : "RelInfoBs2MuMuBIsolations"
                   ,"TopSelection": self.selBs.requiredSelections()[0]
                   , "Variables" : ['BSMUMUCDFISO', 'BSMUMUOTHERBMAG', 'BSMUMUOTHERBANGLE', 'BSMUMUOTHERBBOOSTMAG', 'BSMUMUOTHERBBOOSTANGLE', 'BSMUMUOTHERBTRACKS', 'BSMUMUPARTID','BSMUMUTOPID']
                   , "Location"  : "BSMUMUVARIABLES"},
-                
+
                 { "Type" : "RelInfoBs2MuMuTrackIsolations"
                   ,"TopSelection": self.selBs.requiredSelections()[0]
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
@@ -772,14 +772,14 @@ class Bs2MuMuLinesConf(LineBuilder) :
             "J/psi(1S) -> ^mu+ mu-" : "Muon1iso",
             "J/psi(1S) -> mu+ ^mu-" : "Muon2iso"}
               },
-            
+
 #            { "Type" : "RelInfoMuonIDPlus",
 #              "Variables" : ["MU_BDT"],
 #              "DaughterLocations"  : {
 #                "B_s0 -> ^mu+ mu-" : "Muon1BDT",
 #                "B_s0 -> mu+ ^mu-" : "Muon2BDT" }
 #            },
-            
+
              { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "TopSelection": self.selBs.requiredSelections()[0],
               "Variables" : ['ZVISO'],
@@ -839,28 +839,28 @@ class Bs2MuMuLinesConf(LineBuilder) :
                                     postscale = config['DefaultPostscale'],
                                     MDSTFlag = False,
                                     #RequiredRawEvents = ["Calo"],
-                                    algos = [ self.selBd ], 
+                                    algos = [ self.selBd ],
                                     RelatedInfoTools = [
-  
+
                 { "Type" : "RelInfoBs2MuMuBIsolations"
                   ,"TopSelection": self.selBd.requiredSelections()[0]
                   , "Variables" : ['BSMUMUCDFISO', 'BSMUMUOTHERBMAG', 'BSMUMUOTHERBANGLE', 'BSMUMUOTHERBBOOSTMAG', 'BSMUMUOTHERBBOOSTANGLE', 'BSMUMUOTHERBTRACKS', 'BSMUMUPARTID','BSMUMUTOPID']
                   , "Location"  : "BSMUMUVARIABLES"},
-                
+
                 { "Type" : "RelInfoBs2MuMuTrackIsolations"
                   ,"TopSelection": self.selBd.requiredSelections()[0]
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
                   ,"DaughterLocations" : {
             "J/psi(1S) -> ^mu+ mu-" : "Muon1iso",
             "J/psi(1S) -> mu+ ^mu-" : "Muon2iso"}                                                                                                                                      },
-            
+
 #            { "Type" : "RelInfoMuonIDPlus",
 #              "Variables" : ["MU_BDT"],
 #              "DaughterLocations"  : {
 #                "B_s0 -> ^mu+ mu-" : "Muon1BDT",
 #                "B_s0 -> mu+ ^mu-" : "Muon2BDT" }
 #            },
-            
+
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "TopSelection": self.selBd.requiredSelections()[0],
               "Variables" : ['ZVISO'],
@@ -872,7 +872,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : 0,
                 "DaughterLocations" : {
             "J/psi(1S) -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_0",
-            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_0"}    ,         
+            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_0"}    ,
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsA_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
@@ -880,7 +880,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : 1,
               "DaughterLocations" : {
             "J/psi(1S) -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_1",
-            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_1"}    , 
+            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_1"}    ,
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
@@ -888,7 +888,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : 2,
               "DaughterLocations" : {
             "J/psi(1S) -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_2",
-            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_2"}    , 
+            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_2"}    ,
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
@@ -896,7 +896,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : 3,
               "DaughterLocations" : {
             "J/psi(1S) -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_3",
-            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_3"}    , 
+            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_3"}    ,
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT13vars_v1r4.xml"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
@@ -904,7 +904,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "Variables" : 4,
               "DaughterLocations" : {
             "J/psi(1S) -> ^mu+ mu-" : "Muon1TrackIsoBDTInfo_4",
-            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_4"}    , 
+            "J/psi(1S) -> mu+ ^mu-" : "Muon2TrackIsoBDTInfo_4"}    ,
               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT15vars_v1r4.xml"
               },
             {
@@ -940,7 +940,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "DaughterLocations"  : {
                 "[B_s0 -> ^mu+ mu+]CC" : "Muon1BDT",
                 "[B_s0 -> mu+ ^mu+]CC" : "Muon2BDT" }
-            }, 
+            },
 
             { "Type" : "RelInfoBs2MuMuTrackIsolations"
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
@@ -950,7 +950,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               },
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -993,7 +993,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
             }
             ]
                                     )
-       
+
         self.ltubLine = StrippingLine(ltub_name+"Line",
                                     prescale = config['Bs2mmLTUBLinePrescale'],
                                     postscale = config['DefaultPostscale'],
@@ -1017,18 +1017,18 @@ class Bs2MuMuLinesConf(LineBuilder) :
                 "B_s0 -> ^mu+ mu-" : "Muon1BDT",
                 "B_s0 -> mu+ ^mu-" : "Muon2BDT" }
             },
- 
+
             { "Type" : "RelInfoBs2MuMuTrackIsolations"
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
               ,"DaughterLocations" : {
             "B_s0 -> ^mu+ mu-" : "Muon1iso",
             "B_s0 -> mu+ ^mu-" : "Muon2iso" }
-             
-   
+
+
               },
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -1090,19 +1090,19 @@ class Bs2MuMuLinesConf(LineBuilder) :
               "DaughterLocations"  : {
                 "B*_s0 -> ^mu+ mu-" : "Muon1BDT",
                 "B*_s0 -> mu+ ^mu-" : "Muon2BDT" }
-            }, 
+            },
 
             { "Type" : "RelInfoBs2MuMuTrackIsolations"
                       , "Variables" : [  'BSMUMUTRACKPLUSISO', 'BSMUMUTRACKPLUSISOTWO' , 'ISOTWOBODYQPLUS', 'ISOTWOBODYMASSISOPLUS', 'ISOTWOBODYCHI2ISOPLUS', 'ISOTWOBODYISO5PLUS','BSMUMUTRACKID','BSMUMUTRACKTOPID' ]
               ,"DaughterLocations" : {
             "B*_s0 -> ^mu+ mu-" : "Muon1iso",
             "B*_s0 -> mu+ ^mu-" : "Muon2iso" }
-             
-   
+
+
               },
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -1156,11 +1156,11 @@ class Bs2MuMuLinesConf(LineBuilder) :
               'LocationJetsNoMu' : "Phys/"+stdjets_name_ban_KKLTUB+"/Particles",
               'LocationJetsNoRemove' : "Phys/"+stdjets_name_noban+"/Particles",
               'LocationJetsForceB' : "Phys/"+stdjets_name_addb_KKLTUB+"/Particles"},
-            
+
             { "Type" : "RelInfoBs2MuMuBIsolations"
               , "Variables" : ['BSMUMUCDFISO', 'BSMUMUOTHERBMAG', 'BSMUMUOTHERBANGLE', 'BSMUMUOTHERBBOOSTMAG', 'BSMUMUOTHERBBOOSTANGLE', 'BSMUMUOTHERBTRACKS', 'BSMUMUPARTID','BSMUMUTOPID']
               , "Location"  : "BSMUMUVARIABLES"},
-            
+
 #            { "Type" : "RelInfoMuonIDPlus",
 #              "Variables" : ["MU_BDT"],
 #              "DaughterLocations"  : {
@@ -1177,7 +1177,7 @@ class Bs2MuMuLinesConf(LineBuilder) :
               },
             { "Type" : "RelInfoBs2MuMuZVisoBDT",
               "Variables" : ['ZVISO'],
-              "Location"  : "RelInfoZVisoBDT"  
+              "Location"  : "RelInfoZVisoBDT"
               },
             { "Type" : "RelInfoTrackIsolationBDT",
               "Variables" : 0,
@@ -1245,7 +1245,7 @@ def makeDefault(name, BPVVDChi2, Muon_MIPChi2DV, TrackGhostProb, DOCA, VCHI2_VDO
     starts from Phys/StdNoPIDsMuons
 
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -1253,14 +1253,14 @@ def makeDefault(name, BPVVDChi2, Muon_MIPChi2DV, TrackGhostProb, DOCA, VCHI2_VDO
     Bs2MuMuNoMuID = CombineParticles("Combine"+name)
     Bs2MuMuNoMuID.DecayDescriptor = "B_s0 -> mu+ mu-"
     # Set the OfflineVertexFitter to keep the 4 tracks and not the J/Psi Kstar:
-  
+
     Bs2MuMuNoMuID.ReFitPVs = True
     Bs2MuMuNoMuID.DaughtersCuts = { "mu+" : "(MIPCHI2DV(PRIMARY)> %(Muon_MIPChi2DV)s )&(TRCHI2DOF < %(TrChi2)s)"\
                                     " & (0.5<PPINFO(LHCb.ProtoParticle.InAccMuon,-1))"\
                                     " & (PT < 40*GeV)"\
                                     " & (P < 500*GeV)"\
                                     " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
-    
+
     Bs2MuMuNoMuID.CombinationCut = "(ADAMASS('B_s0')<500*MeV)"\
                                    "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
 
@@ -1271,7 +1271,7 @@ def makeDefault(name, BPVVDChi2, Muon_MIPChi2DV, TrackGhostProb, DOCA, VCHI2_VDO
                               "& (BPVIPCHI2()< %(BPVIPChi2)s) "\
                               "& (BPVLTIME()<13.248*ps)"\
                               "& (PT > %(B_Pt)s*MeV)"% locals()
-                             
+
     _stdNoPIDsMuons = DataOnDemand(Location = "Phys/StdNoPIDsMuons/Particles")
 
     return Selection (name,
@@ -1285,18 +1285,18 @@ def makeBs2mmWide(name, BPVVDChi2, Muon_MIPChi2DV, DOCA, VCHI2_VDOF, TrChi2, BPV
     starts from Phys/StdLooseMuons
 
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
     #from Configurables import OfflineVertexFitter
     Bs2MuMuWideMass = CombineParticles("Combine"+name)
     Bs2MuMuWideMass.DecayDescriptor = "B_s0 -> mu+ mu-"
-  
+
     Bs2MuMuWideMass.ReFitPVs = True
     Bs2MuMuWideMass.DaughtersCuts = { "mu+" : "(MIPCHI2DV(PRIMARY)> %(Muon_MIPChi2DV)s)&(TRCHI2DOF < %(TrChi2)s)" \
                                     " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
-    
+
     Bs2MuMuWideMass.CombinationCut = "(ADAMASS('B_s0')<1200*MeV)"\
                                      "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
 
@@ -1305,7 +1305,7 @@ def makeBs2mmWide(name, BPVVDChi2, Muon_MIPChi2DV, DOCA, VCHI2_VDOF, TrChi2, BPV
                                 "& (BPVDIRA > 0) "\
                                 "& (BPVVDCHI2> %(BPVVDChi2)s)"\
                                 "& (BPVIPCHI2()< %(BPVIPChi2)s) "% locals()
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
 
     return Selection (name,
@@ -1315,18 +1315,18 @@ def makeBs2mmWide(name, BPVVDChi2, Muon_MIPChi2DV, DOCA, VCHI2_VDOF, TrChi2, BPV
 def makeSS(name, BPVVDChi2, Muon_MIPChi2DV, DOCA, VCHI2_VDOF, TrChi2, BPVIPChi2, TrackGhostProb) :
     """
     Bs2mumu selection object (tighter selection a la roadmap)
-    with muon Id and same sign muons 
+    with muon Id and same sign muons
     starts from Phys/StdLooseMuons
 
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
     #from Configurables import OfflineVertexFitter
     Bs2MuMuSS = CombineParticles("Combine"+name)
     Bs2MuMuSS.DecayDescriptor = "[B_s0 -> mu+ mu+]cc"
-  
+
     Bs2MuMuSS.ReFitPVs = True
     Bs2MuMuSS.DaughtersCuts = { "mu+" : "(MIPCHI2DV(PRIMARY)> %(Muon_MIPChi2DV)s )&(TRCHI2DOF < %(TrChi2)s )"\
                                     " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
@@ -1338,7 +1338,7 @@ def makeSS(name, BPVVDChi2, Muon_MIPChi2DV, DOCA, VCHI2_VDOF, TrChi2, BPVIPChi2,
                                 "& (BPVDIRA > 0) "\
                                 "& (BPVVDCHI2>  %(BPVVDChi2)s)"\
                                 "& (BPVIPCHI2()< %(BPVIPChi2)s) "% locals()
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
 
     return Selection (name,
@@ -1346,7 +1346,7 @@ def makeSS(name, BPVVDChi2, Muon_MIPChi2DV, DOCA, VCHI2_VDOF, TrChi2, BPVIPChi2,
                       RequiredSelections = [ _stdLooseMuons])
 
 def makeLoose(name, MuIPChi2, MuTrChi2, BIPChi2, BFDChi2, DOCA, VCHI2_VDOF, TrackGhostProb ) :
-    """      
+    """
     loose Bs2mumu selection object to monitor selection,
     systematics from cuts, etc.
     starts from Phys/StdNoPIDsMuons
@@ -1363,12 +1363,12 @@ def makeLoose(name, MuIPChi2, MuTrChi2, BIPChi2, BFDChi2, DOCA, VCHI2_VDOF, Trac
     #from Configurables import OfflineVertexFitter
     Bs2MuMuNoMuIDLoose = CombineParticles("Combine"+name)
     Bs2MuMuNoMuIDLoose.DecayDescriptor = "B_s0 -> mu+ mu-"
-   
+
     Bs2MuMuNoMuIDLoose.ReFitPVs = True
     Bs2MuMuNoMuIDLoose.DaughtersCuts = { "mu+" : "(TRCHI2DOF < %(MuTrChi2)s ) "\
                                          "& (MIPCHI2DV(PRIMARY)> %(MuIPChi2)s ) "\
                                     " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
-  
+
     Bs2MuMuNoMuIDLoose.CombinationCut = "(ADAMASS('B_s0')<600*MeV)"\
                                         "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
 
@@ -1395,14 +1395,14 @@ def makeBu(name, K_MIPChi2DV,  Jpsi_BPVVDChi2, DOCA, TrChi2, BPVIPChi2, TrackGho
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
-   
+
     SelDJPsi = makeDetachedJPsi(name+"SelJpsi",  Jpsi_BPVVDChi2, DOCA, TrChi2, TrackGhostProb)
 
     PreselBu2JPsiKCommon = CombineParticles("PreselBu2JPsiKCommon")
     PreselBu2JPsiKCommon.DecayDescriptor =  " [B+ -> J/psi(1S) K+]cc ";
-   
+
     PreselBu2JPsiKCommon.ReFitPVs = True
     PreselBu2JPsiKCommon.DaughtersCuts = { "K+" : "(ISLONG) & (TRCHI2DOF < %(TrChi2)s ) &(MIPCHI2DV(PRIMARY)>%(K_MIPChi2DV)s)& (PT>250*MeV) "\
                                     " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
@@ -1426,16 +1426,16 @@ def makeBs(name, Phi_MIPChi2DV,  Jpsi_BPVVDChi2, DOCA, TrChi2, BPVIPChi2, TrackG
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
-   
+
     SelDJPsi = makeDetachedJPsi(name+"SelJpsi",  Jpsi_BPVVDChi2, DOCA, TrChi2, TrackGhostProb)
 
     makePhi = CombineParticles("makePhi")
     makePhi.DecayDescriptor =  "phi(1020) -> K+ K-"
     makePhi.DaughtersCuts = {"K+": "(ISLONG) & (TRCHI2DOF < %(TrChi2)s ) & (MIPCHI2DV(PRIMARY)> 4.) & (PT>250*MeV)"\
                                     " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
-    
+
     _kaons = DataOnDemand(Location='Phys/StdNoPIDsKaons/Particles')
 
     makePhi.CombinationCut =  "(ADAMASS('phi(1020)')<20*MeV)"
@@ -1449,7 +1449,7 @@ def makeBs(name, Phi_MIPChi2DV,  Jpsi_BPVVDChi2, DOCA, TrChi2, BPVIPChi2, TrackG
     PreselBs2JPsiPhiCommon.DaughtersCuts = {}
     PreselBs2JPsiPhiCommon.CombinationCut = "(ADAMASS('B_s0') < 500*MeV)"
     PreselBs2JPsiPhiCommon.MotherCut = "(BPVIPCHI2()< %(BPVIPChi2)s)& (VFASPF(VCHI2)<75)"% locals()
-    
+
     return  Selection( name,
                        Algorithm = PreselBs2JPsiPhiCommon,
                        RequiredSelections=[SelDJPsi,SelPhi] )
@@ -1466,9 +1466,9 @@ def makeBd(name, Kst_MIPChi2DV,  Jpsi_BPVVDChi2, TrackGhostProb, DOCA, TrChi2, B
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
-   
+
     SelDJPsi = makeDetachedJPsi(name+"SelJpsi",  Jpsi_BPVVDChi2, DOCA, TrChi2, TrackGhostProb)
 
 
@@ -1496,7 +1496,7 @@ def makeBd(name, Kst_MIPChi2DV,  Jpsi_BPVVDChi2, TrackGhostProb, DOCA, TrChi2, B
     ## make BtoJPsiKstar
     PreselBd2JPsiKstCommon = CombineParticles("PreselBd2JPsiKstCommon")
     PreselBd2JPsiKstCommon.DecayDescriptor = "[B0 -> J/psi(1S) K*(892)0]cc"
-   
+
     PreselBd2JPsiKstCommon.ReFitPVs = True
     PreselBd2JPsiKstCommon.DaughtersCuts = {}
     PreselBd2JPsiKstCommon.CombinationCut = "(ADAMASS('B0') < 500*MeV)"
@@ -1520,12 +1520,12 @@ def makeDetachedJPsi(name, Jpsi_BPVVDChi2, DOCA, TrChi2, TrackGhostProb) :
     #from Configurables import OfflineVertexFitter
     DetachedJPsi = CombineParticles("Combine"+name)
     DetachedJPsi.DecayDescriptor = "J/psi(1S) -> mu+ mu-"
-  
+
     DetachedJPsi.ReFitPVs = True
     DetachedJPsi.DaughtersCuts = { "mu+" : "(TRCHI2DOF <  %(TrChi2)s) "\
                                    "& (MIPCHI2DV(PRIMARY)> 25.)"\
                                    " & ( TRGHOSTPROB < %(TrackGhostProb)s )"% locals() }
-                                 
+
     DetachedJPsi.CombinationCut = "(ADAMASS('J/psi(1S)')<100*MeV) "\
                                   "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
 
@@ -1546,21 +1546,21 @@ def makeBs2mmLTUB(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, B_Pt, BPVIPChi
     starts from Phys/StdAllLooseMuons
 
     Please contact Harry Cliff if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
     #from Configurables import OfflineVertexFitter
     Bs2MuMuLTUB = CombineParticles("Combine"+name)
     Bs2MuMuLTUB.DecayDescriptor = "B_s0 -> mu+ mu-"
-   
+
     Bs2MuMuLTUB.ReFitPVs = True
     Bs2MuMuLTUB.DaughtersCuts = { "mu+" : "(PT > 500*MeV) & (TRCHI2DOF < %(TrChi2)s )"\
                                     " & (0.5<PPINFO(LHCb.ProtoParticle.InAccMuon,-1))"\
                                     " & (PT < %(muon_PT)s*GeV)"\
                                     " & (P < 500*GeV)"\
                                     " & ( TRGHOSTPROB <  %(TrackGhostProb)s )" % locals()}
-    
+
     Bs2MuMuLTUB.CombinationCut = "(ADAMASS('B_s0')<500*MeV)"\
                                  "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
 
@@ -1570,7 +1570,7 @@ def makeBs2mmLTUB(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, B_Pt, BPVIPChi
                             "& (BPVLTIME()>%(minimum_decaytime)s*ps)"\
                             "& (BPVLTIME()<13.248*ps)"\
                             "& (PT >  %(B_Pt)s*MeV)"% locals()
-                             
+
     _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
 
     return Selection (name,
@@ -1599,7 +1599,7 @@ def makeBsst2mm(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, PID, SUMPT, B_Pt
                                     " & (PROBNNmu > %(PID)s)" \
                                     " & (P < 500*GeV)"\
                                     " & ( TRGHOSTPROB <  %(TrackGhostProb)s )" % locals() }
-    
+
     Bsst2mm.CombinationCut = "(ADAMASS('B_s0')<500*MeV)"\
                              " & (ASUM(PT) > %(SUMPT)s)"\
                              "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
@@ -1610,7 +1610,7 @@ def makeBsst2mm(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, PID, SUMPT, B_Pt
                         "& (BPVLTIME()>%(minimum_decaytime)s*ps)"\
                         "& (BPVLTIME()<%(maximum_decaytime)s*ps)"\
                         "& (PT >  %(B_Pt)s*MeV)"% locals()
-                             
+
     _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
 
     return Selection (name,
@@ -1623,7 +1623,7 @@ def makeBs2KKLTUB(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, B_Pt, BPVIPChi
     starts from Phys/StdAllLooseKaons
 
     Please contact Harry Cliff if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -1637,7 +1637,7 @@ def makeBs2KKLTUB(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, B_Pt, BPVIPChi
                                     " & (P < 500*GeV)"\
                                     " & (TRGHOSTPROB <  %(TrackGhostProb)s )"\
                                     " & (PIDK > 5) "% locals() }
-    
+
     Bs2KKLTUB.CombinationCut = "(ADAMASS('B_s0')<500*MeV)"\
                                "& (AMAXDOCA('')<%(DOCA)s*mm)"% locals()
 
@@ -1647,7 +1647,7 @@ def makeBs2KKLTUB(name, TrackGhostProb, DOCA, VCHI2_VDOF, TrChi2, B_Pt, BPVIPChi
                               "& (BPVLTIME()>%(minimum_decaytime)s*ps)"\
                               "& (BPVLTIME()<13.248*ps)"\
                               "& (PT > %(B_Pt)s*MeV)"% locals()
-                             
+
     _stdAllLooseKaons = DataOnDemand(Location = "Phys/StdAllLooseKaons/Particles")
 
     return Selection (name,
@@ -1659,9 +1659,9 @@ def makeDetachedJPsiLoose(name) :
     """
     loose detached JPsi selection to monitor selection,
     systematics from cuts, etc.
-    
+
     prescaled
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -1675,7 +1675,7 @@ def makeDetachedJPsiLoose(name) :
     DetachedJPsiLoose.ReFitPVs = True
     DetachedJPsiLoose.DaughtersCuts = { "mu+" : "(TRCHI2DOF < 10 ) "\
                                     "& (MIPCHI2DV(PRIMARY)> 9.)"}
-                                 
+
     DetachedJPsiLoose.CombinationCut = "(ADAMASS('J/psi(1S)')<120*MeV) "\
                                    "& (AMAXDOCA('')<0.5*mm)"
 
@@ -1697,7 +1697,7 @@ def makePromptJPsi(name) :
     B--> JPsi X calibration and normalization channels.
     Selection is aligned to the Bs2MuMu selection.
     heavily prescaled
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -1710,16 +1710,16 @@ def makePromptJPsi(name) :
     PromptJPsi.OfflineVertexFitter.useResonanceVertex = False
     PromptJPsi.ReFitPVs = True
     PromptJPsi.DaughtersCuts = { "mu+" : "(TRCHI2DOF < 4 ) "}
-    
+
     PromptJPsi.CombinationCut = "(ADAMASS('J/psi(1S)')<100*MeV) "\
                                 "& (AMAXDOCA('')<0.3*mm)"
-    
+
     PromptJPsi.MotherCut = "(VFASPF(VCHI2)<15) "\
                            "& (ADMASS('J/psi(1S)') < 100*MeV )"
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
 
     return Selection (name,
                       Algorithm = PromptJPsi,
                       RequiredSelections = [ _stdLooseMuons ])
-'''
\ No newline at end of file
+'''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py
index 7e781aca0cfaac459676698b1f33302763169eee..c2156b228306a5456d9760ed4303bc90432fc1d0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py
@@ -85,7 +85,7 @@ children_Bs_gg = {'Gamma1': "B_s0 -> ^gamma gamma",
 class StrippingBs2gammagammaConf(LineBuilder):
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
 
     def __init__(self, name, config) :
         LineBuilder.__init__(self, name, config)
@@ -201,7 +201,7 @@ class StrippingBs2gammagammaConf(LineBuilder):
                     self.get_cone_relinfo(1.0, head = topsel, children=children_Bs_gg),
                     ]
                 , EnableFlavourTagging = False)
-    
+
     def _Bs2gammagammaDouble_X_Line( self, name, config) :
         BsGG_DC_double = "(PT>0.5*%(gammaConvPT)s*MeV) & (P>0.5*%(gammaP)s*MeV)" % config
         BsGG_CC_double = "(in_range(%(BsLowMassDouble)s*MeV, AM, %(BsHighMassDouble)s*MeV))" % config
@@ -290,7 +290,7 @@ class StrippingBs2gammagammaConf(LineBuilder):
         return MergedSelection(name, RequiredSelections = [
             self.TOSFilter(name+trigger1+"_subsel", [sel], trigger1),
             self.TOSFilter(name+trigger2+"_subsel", [sel], trigger2)] )
-    
+
     @staticmethod
     def get_cone_relinfo(angle, head=None, children=None):
         tool = {'Type'     : 'RelInfoConeVariables',
@@ -306,4 +306,3 @@ class StrippingBs2gammagammaConf(LineBuilder):
             tool.update({'DaughterLocations': dict([(sel_string, base_location % name)
                                                     for name, sel_string in children.items()])})
         return tool
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py
index 9525a9df00850b4c13449e0b4028c0c9697320ea..4e0daf567e13eedac8df88320e53762a3c90b950 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py
@@ -12,7 +12,7 @@ __author__  = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Si
 __date__    = '16/06/2014'
 __version__ = '$Revision: 4 $'
 
-__all__ = ( 'Bu2LLKConf', 'default_config' ) 
+__all__ = ( 'Bu2LLKConf', 'default_config' )
 
 """
   B --> ll K selections for (SS and OS leptons):
@@ -24,7 +24,7 @@ __all__ = ( 'Bu2LLKConf', 'default_config' )
   B --> ee phi  versus  B --> mumu phi
   Lb --> ee Lambda  versus  Lb --> mumu Lambda
   Lb --> ee p K  versus  Lb --> mumu p K (SS, OS hadrons)
-  Lb --> ee p pi  versus  Lb --> mumu p pi (SS, OS hadrons)  
+  Lb --> ee p pi  versus  Lb --> mumu p pi (SS, OS hadrons)
   B --> ee K pi  versus  B --> mumu K pi (SS, OS hadrons)
   B --> ee pi pi  versus  B --> mumu pi pi (SS, OS hadrons)
   Bs --> ee K K  versus  Bs --> mumu K K (SS, OS hadrons)
@@ -36,7 +36,7 @@ __all__ = ( 'Bu2LLKConf', 'default_config' )
 daughter_neutral_locations = {
     # Locations of pi0 in K*+ -> K+ pi0, for opposite- and same-sign leptons.
     "[Beauty -> (K*(892)+ -> K+  ^pi0) (X0 ->  l+  l-)]CC" : "{0}pi0H2",
-    "[Beauty -> (K*(892)+ -> K+  ^pi0) (X0 ->  l+  l+)]CC" : "{0}pi0H2",    
+    "[Beauty -> (K*(892)+ -> K+  ^pi0) (X0 ->  l+  l+)]CC" : "{0}pi0H2",
 }
 
 daughter_locations = {
@@ -78,7 +78,7 @@ daughter_locations = {
     "[Beauty ->  (X0 ->  p+  pi-)  (X0 ->  l+ ^l-)]CC" : "{0}L2",
     "[Beauty -> ^(X0 ->  p+  pi-)  (X0 ->  l+  l-)]CC" : "{0}HH",
     "[Beauty ->  (X0 ->  p+  pi-) ^(X0 ->  l+  l-)]CC" : "{0}LL",
-    # 4-body decays involving K*(892)+, with pi0 in final state. (Note: had some trouble with generic X+ in the 3-body descriptors matching the K*(892)+, and getting junk output).  
+    # 4-body decays involving K*(892)+, with pi0 in final state. (Note: had some trouble with generic X+ in the 3-body descriptors matching the K*(892)+, and getting junk output).
     "[Beauty -> (K*(892)+ -> ^K+  pi0) (X0 ->  l+  l-)]CC" : "{0}pi0H1",
     "[Beauty -> (K*(892)+ -> K+  pi0) (X0 ->  ^l+  l-)]CC" : "{0}pi0L1",
     "[Beauty -> (K*(892)+ -> K+  pi0) (X0 ->  l+  ^l-)]CC" : "{0}pi0L2",
@@ -86,7 +86,7 @@ daughter_locations = {
     "[Beauty ->  (X0 ->  X+  X-)  (X0 ->  l+  (l- -> ^X-  X-  X+))]CC" : "{0}L21",
     "[Beauty ->  (X0 ->  X+  X-)  (X0 ->  l+  (l- ->  X- ^X-  X+))]CC" : "{0}L22",
     "[Beauty ->  (X0 ->  X+  X-)  (X0 ->  l+  (l- ->  X-  X- ^X+))]CC" : "{0}L23",
-    
+
     # SAME SIGN
     # 3-body
     "[Beauty -> ^X+  (X+ ->  l+  l+)]CC" : "{0}H",
@@ -137,7 +137,7 @@ daughter_locations = {
     "[Beauty -> ^(X0 ->  p+  pi-)  (X ->  l-  l-)]CC" : "{0}HH",
     "[Beauty ->  (X0 ->  p+  pi-) ^(X ->  l+  l+)]CC" : "{0}LL",
     "[Beauty ->  (X0 ->  p+  pi-) ^(X ->  l-  l-)]CC" : "{0}LL",
-    # 4-body decays involving K*(892)+, with pi0 in final state. (Note: had some trouble with generic X+ in the 3-body descriptors matching the K*(892)+, and getting junk output).  
+    # 4-body decays involving K*(892)+, with pi0 in final state. (Note: had some trouble with generic X+ in the 3-body descriptors matching the K*(892)+, and getting junk output).
     "[Beauty -> (K*(892)+ -> ^K+  pi0) (X0 ->  l+  l+)]CC" : "{0}pi0H1",
     "[Beauty -> (K*(892)+ -> K+  pi0) (X0 ->  ^l+  l+)]CC" : "{0}pi0L1",
     "[Beauty -> (K*(892)+ -> K+  pi0) (X0 ->  l+  ^l+)]CC" : "{0}pi0L2",
@@ -188,17 +188,17 @@ default_config = {
     'NAME'                       : 'Bu2LLK',
     'BUILDERTYPE'                : 'Bu2LLKConf',
     'CONFIG'                     :
-        {                       
-        'BFlightCHI2'            : 100   
-        , 'BDIRA'                : 0.9995 
-        , 'BIPCHI2'              : 25   
-        , 'BVertexCHI2'          : 9    
-        , 'DiLeptonPT'           : 0    
-        , 'DiLeptonFDCHI2'       : 16   
-        , 'DiLeptonIPCHI2'       : 0    
-        , 'LeptonIPCHI2'         : 9   
-        , 'LeptonPT'             : 350  
-        , 'LeptonPTTight'        : 500 
+        {
+        'BFlightCHI2'            : 100
+        , 'BDIRA'                : 0.9995
+        , 'BIPCHI2'              : 25
+        , 'BVertexCHI2'          : 9
+        , 'DiLeptonPT'           : 0
+        , 'DiLeptonFDCHI2'       : 16
+        , 'DiLeptonIPCHI2'       : 0
+        , 'LeptonIPCHI2'         : 9
+        , 'LeptonPT'             : 350
+        , 'LeptonPTTight'        : 500
         , 'TauPT'                : 0
         , 'TauVCHI2DOF'          : 150
         , 'KaonIPCHI2'           : 9
@@ -213,7 +213,7 @@ default_config = {
         , 'ProbNNCut'            : 0.05
         , 'ProbNNCutTight'       : 0.1
         , 'DiHadronMass'         : 2600
-        , 'DiHadronVtxCHI2'      : 25        
+        , 'DiHadronVtxCHI2'      : 25
         , 'DiHadronADOCACHI2'    : 30
         , 'UpperMass'            : 5500
         , 'BMassWindow'          : 1500
@@ -229,7 +229,7 @@ default_config = {
         , 'K1_MassWindow_Hi'     : 4200
         , 'K1_VtxChi2'           : 12
         , 'K1_SumPTHad'          : 1200 #800
-        , 'K1_SumIPChi2Had'      : 48.0  
+        , 'K1_SumIPChi2Had'      : 48.0
         , 'Bu2eeLinePrescale'    : 1
         , 'Bu2eeLine2Prescale'   : 1
         , 'Bu2eeSSLine2Prescale' : 1
@@ -244,20 +244,20 @@ default_config = {
         , 'RelatedInfoTools'     : [
             {'Type'              : 'RelInfoVertexIsolation',
              'Location'          : 'VertexIsoInfo',
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'DaughterLocations' : {key: val.format('VertexIsoInfo') for key, val in daughter_vtx_locations.items()}},
             {'Type'              : 'RelInfoVertexIsolationBDT',
              'Location'          : 'VertexIsoBDTInfo',
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'DaughterLocations' : {key: val.format('VertexIsoBDTInfo') for key, val in daughter_vtx_locations.items()}},
             {'Type'              : 'RelInfoConeVariables',
              'ConeAngle'         : 0.5,
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'Location' : 'TrackIsoInfo05',
              'DaughterLocations' : {key: val.format('TrackIsoInfo') for key, val in daughter_locations.items() + daughter_neutral_locations.items()}},
             {'Type'              : 'RelInfoConeIsolation',
              'ConeSize'          : 0.5,
-             'IgnoreUnmatchedDescriptors': True, 
+             'IgnoreUnmatchedDescriptors': True,
              'Location' : 'ConeIsoInfo05',
              'DaughterLocations' : {key: val.format('ConeIsoInfo') for key, val in daughter_locations.items() + daughter_neutral_locations.items()}},
             {'Type'              : 'RelInfoTrackIsolationBDT',
@@ -303,7 +303,7 @@ default_config = {
     'WGs'     : [ 'RD' ],
     'STREAMS' : [ 'Leptonic' ]
     }
-    
+
 # This tool applies the BDT track isolation from the 2017 B->mumu analysis to the Jpsi daughters
 # It is separated from the other tools, since it cannot be applied to lines containing taus
 RelInfoTrackIsolationBDT2 = [
@@ -312,7 +312,7 @@ RelInfoTrackIsolationBDT2 = [
      'Particles' : [1,2]
     }
 ]
-    
+
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
@@ -322,24 +322,24 @@ from StrippingUtils.Utils import LineBuilder
 
 class Bu2LLKConf(LineBuilder) :
     """
-    Builder for R_X measurements 
+    Builder for R_X measurements
     """
-        
+
     # now just define keys. Default values are fixed later
-    __configuration_keys__ = ( 
-        'BFlightCHI2'        
-        , 'BDIRA'             
-        , 'BIPCHI2'           
-        , 'BVertexCHI2'       
-        , 'DiLeptonPT'        
-        , 'DiLeptonFDCHI2'     
-        , 'DiLeptonIPCHI2'     
-        , 'LeptonIPCHI2'       
-        , 'LeptonPT'      
+    __configuration_keys__ = (
+        'BFlightCHI2'
+        , 'BDIRA'
+        , 'BIPCHI2'
+        , 'BVertexCHI2'
+        , 'DiLeptonPT'
+        , 'DiLeptonFDCHI2'
+        , 'DiLeptonIPCHI2'
+        , 'LeptonIPCHI2'
+        , 'LeptonPT'
         , 'LeptonPTTight'
-        , 'TauPT' 
+        , 'TauPT'
         , 'TauVCHI2DOF'
-        , 'KaonIPCHI2'        
+        , 'KaonIPCHI2'
         , 'KaonPT'
         , 'KaonPTLoose'
         , 'PionPTRho'
@@ -350,7 +350,7 @@ class Bu2LLKConf(LineBuilder) :
         , 'Pi0PT'
         , 'ProbNNCut'
         , 'ProbNNCutTight'
-        , 'DiHadronMass'               
+        , 'DiHadronMass'
         , 'DiHadronVtxCHI2'
         , 'DiHadronADOCACHI2'
         , 'UpperMass'
@@ -359,8 +359,8 @@ class Bu2LLKConf(LineBuilder) :
         , 'UpperBsMass'
         , 'UpperLbMass'
         , 'BMassWindowTau'
-        , 'PIDe' 
-        , 'RICHPIDe_Up' 
+        , 'PIDe'
+        , 'RICHPIDe_Up'
         , 'Trk_Chi2'
         , 'Trk_GhostProb'
         , 'K1_MassWindow_Lo'
@@ -368,20 +368,20 @@ class Bu2LLKConf(LineBuilder) :
         , 'K1_VtxChi2'
         , 'K1_SumPTHad'
         , 'K1_SumIPChi2Had'
-        , 'Bu2eeLinePrescale'  
-        , 'Bu2eeLine2Prescale' 
+        , 'Bu2eeLinePrescale'
+        , 'Bu2eeLine2Prescale'
         , 'Bu2eeSSLine2Prescale'
-        , 'Bu2eeLine3Prescale' 
-        , 'Bu2eeLine4Prescale' 
-        , 'Bu2mmLinePrescale'  
+        , 'Bu2eeLine3Prescale'
+        , 'Bu2eeLine4Prescale'
+        , 'Bu2mmLinePrescale'
         , 'Bu2mmSSLinePrescale'
-        , 'Bu2meLinePrescale'  
+        , 'Bu2meLinePrescale'
         , 'Bu2meSSLinePrescale'
-        , 'Bu2mtLinePrescale'  
+        , 'Bu2mtLinePrescale'
         , 'Bu2mtSSLinePrescale'
         , 'RelatedInfoTools'
       )
-    
+
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
@@ -402,21 +402,21 @@ class Bu2LLKConf(LineBuilder) :
         from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
-        from StandardParticles import StdAllLooseProtons as AllProtons        
+        from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
         from StandardParticles import StdLoosePhi2KK as Phis
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars  
-  
+        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
+
 
         # V0s
-        from StandardParticles import StdVeryLooseKsLL as KshortsLL 
-        from StandardParticles import StdLooseKsDD as KshortsDD    
+        from StandardParticles import StdVeryLooseKsLL as KshortsLL
+        from StandardParticles import StdLooseKsDD as KshortsDD
         from StandardParticles import StdVeryLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD  
-        from StandardParticles import StdKs2PiPiLL as BrunelKshortsLL 
-        from StandardParticles import StdKs2PiPiDD as BrunelKshortsDD    
+        from StandardParticles import StdLooseLambdaDD as LambdasDD
+        from StandardParticles import StdKs2PiPiLL as BrunelKshortsLL
+        from StandardParticles import StdKs2PiPiDD as BrunelKshortsDD
         from StandardParticles import StdLambda2PPiLL as BrunelLambdasLL
-        from StandardParticles import StdLambda2PPiDD as BrunelLambdasDD  
+        from StandardParticles import StdLambda2PPiDD as BrunelLambdasDD
 
         # NEUTRALS
         from StandardParticles import StdLooseResolvedPi0 as Pi0sRes
@@ -435,9 +435,9 @@ class Bu2LLKConf(LineBuilder) :
                                         params = config )
 
         SelKshortsLL = self._filterHadron( name   = "KshortsLLFor" + self._name,
-                                           sel    = [KshortsLL,BrunelKshortsLL], 
+                                           sel    = [KshortsLL,BrunelKshortsLL],
                                            params = config )
-      
+
         SelKshortsDD = self._filterHadron( name   = "KshortsDDFor" + self._name,
                                            sel    =  [KshortsDD,BrunelKshortsDD],
                                            params = config )
@@ -506,7 +506,7 @@ class Bu2LLKConf(LineBuilder) :
         SelPhis = self._filterHadron( name   = "PhisFor" + self._name,
                                       sel    =  Phis,
                                       params = config )
-   
+
         SelLambdasLL = self._filterHadron( name   = "LambdasLLFor" + self._name,
                                            sel    =  [LambdasLL,BrunelLambdasLL],
                                            params = config )
@@ -546,13 +546,13 @@ class Bu2LLKConf(LineBuilder) :
         SelppsSS = self._makeppSS( name  = "ppsSSFor" + self._name,
                                         protons = Protons,
                                         params = config )
- 
+
         # 2 : Make Dileptons
 
         from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDetachedDiElectronLU as DiElectronsLU
         from StandardParticles import StdLooseDiElectron as DiElectrons
-        from StandardParticles import StdLooseDiMuon as DiMuons 
+        from StandardParticles import StdLooseDiMuon as DiMuons
 
         ElecID = "(PIDe > %(PIDe)s)" % config
         MuonID = "(HASMUON)&(ISMUON)"
@@ -573,11 +573,11 @@ class Bu2LLKConf(LineBuilder) :
         # DIFFERENT CUTS FOR THE LU LINE:
         # THEY ALWAYS HAVE PID ON THE LONG TRACK (DLLe > PIDe )
         # ONLY LU COMBINATIONS, NO UU COMBINATIONS
-        #DiElectronIDLU = "((2 == NINTREE((((TRTYPE==3) & (PIDe > %(PIDe)s)) | (TRTYPE==4)))) & (NINTREE((TRTYPE==4)) == 1))" % config # 0.47 %       
-  
+        #DiElectronIDLU = "((2 == NINTREE((((TRTYPE==3) & (PIDe > %(PIDe)s)) | (TRTYPE==4)))) & (NINTREE((TRTYPE==4)) == 1))" % config # 0.47 %
+
         # ONLY LU COMBINATIONS AND RICHPIDe>(RICHPIDe from config) OR HASBREMADDED FOR THE UPSTREAM TRACKS
         DiElectronIDLU = "((2 == NINTREE(((TRTYPE==3) & (PIDe > %(PIDe)s)) | ((TRTYPE==4) & ((INFO(16,-1000)==1) | (PPHASRICH & (PPINFO(100,-10000,-10000) > %(RICHPIDe_Up)s)))) )) & (NINTREE((TRTYPE==4)) == 1))" % config # 0.28%
-   
+
         # LOOSEST CUT, INCLUDING UU AND NO PID ON UPSTREAM
         #DiElectronIDLU = "((2 == NINTREE((((TRTYPE==3) & (PIDe > %(PIDe)s)) | (TRTYPE==4)))) & (NINTREE((TRTYPE==4)) > 0))" % config # 0.96 %
 
@@ -586,9 +586,9 @@ class Bu2LLKConf(LineBuilder) :
 
 
         DiMuonID     = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
-        
-        
-        SelDiElectron = self._filterDiLepton( "SelDiElectronFor" + self._name, 
+
+
+        SelDiElectron = self._filterDiLepton( "SelDiElectronFor" + self._name,
                                               dilepton = DiElectrons,
                                               params   = config,
                                               idcut    = DiElectronID )
@@ -597,8 +597,8 @@ class Bu2LLKConf(LineBuilder) :
                                                                                            dilepton = DiElectrons,
                                                                                            params   = config,
                                                                                            idcut    = DiElectronID )
-        
-        SelDiElectronFromTracks = self._filterDiLepton( "SelDiElectronFromTracksFor" + self._name, 
+
+        SelDiElectronFromTracks = self._filterDiLepton( "SelDiElectronFromTracksFor" + self._name,
                                                         dilepton = DiElectronsFromTracks,
                                                         params   = config,
                                                         idcut    = DiElectronID )
@@ -608,19 +608,19 @@ class Bu2LLKConf(LineBuilder) :
                                                         params   = config,
                                                         idcut    = DiElectronID )
 
-        SelDiElectronFromTracks_SS = self._filterDiLeptonTight( "SelDiElectronFromTracksSSFor" + self._name, 
+        SelDiElectronFromTracks_SS = self._filterDiLeptonTight( "SelDiElectronFromTracksSSFor" + self._name,
                                                         dilepton = EE_SS,
                                                         params   = config,
                                                         idcut    = DiElectronID )
 
-        SelDiElectronLU = self._filterDiLepton( "SelDiElectronLU" + self._name, 
+        SelDiElectronLU = self._filterDiLepton( "SelDiElectronLU" + self._name,
                                                         dilepton = DiElectronsLU,
                                                         params   = config,
                                                         idcut    = DiElectronIDLU )
 
 
-        
-        SelDiMuon = self._filterDiLepton( "SelDiMuonsFor" + self._name, 
+
+        SelDiMuon = self._filterDiLepton( "SelDiMuonsFor" + self._name,
                                           dilepton = DiMuons,
                                           params   = config,
                                           idcut    = DiMuonID )
@@ -628,20 +628,20 @@ class Bu2LLKConf(LineBuilder) :
         SelDiMuonTight = self._filterDiLeptonTight( "SelDiMuonsTightFor" + self._name,
                                           dilepton = DiMuons,
                                           params   = config,
-                                          idcut    = DiMuonID )        
+                                          idcut    = DiMuonID )
 
 
-        SelDiMuon_SS = self._filterDiLeptonTight( "SelMuMuSSFor" + self._name, 
+        SelDiMuon_SS = self._filterDiLeptonTight( "SelMuMuSSFor" + self._name,
                                           dilepton = MuMu_SS,
                                           params   = config,
                                           idcut    = DiMuonID )
 
-        SelMuE = self._filterDiLepton( "SelMuEFor" + self._name, 
+        SelMuE = self._filterDiLepton( "SelMuEFor" + self._name,
                                        dilepton = MuE,
                                        params   = config,
                                        idcut    = None )
 
-        SelMuE_SS = self._filterDiLepton( "SelMuESSFor" + self._name, 
+        SelMuE_SS = self._filterDiLepton( "SelMuESSFor" + self._name,
                                           dilepton = MuE_SS,
                                           params   = config,
                                           idcut    = None )
@@ -662,9 +662,9 @@ class Bu2LLKConf(LineBuilder) :
         from StandardParticles import StdAllLooseGammaLL as PhotonConversion
 
         SelPhoton = self._filterPhotons( "SelPhotonFor" + self._name,
-                                         photons = PhotonConversion ) 
+                                         photons = PhotonConversion )
+
 
-        
         # 4 : Combine Particles
 
         SelB2eeX = self._makeB2LLX_normal(eeXLine_name,
@@ -719,20 +719,20 @@ class Bu2LLKConf(LineBuilder) :
                                    dilepton = SelDiMuon_SS,
                                    hadrons  = [ SelPions, SelKaons, SelKstars, SelPhis, SelKshortsLL, SelKshortsDD, SelLambdasLL, SelLambdasDD, SelKstarsPlusLL, SelKstarsPlusDD, SelKstarsPlusPi0Res, SelKstarsPlusPi0Mrg, SelK2s, SelKPis, SelKKs, SelpKs, SelpPis, Selpps,SelKKsSS, SelpKsSS ],#SelK1s,SelpPisSS,SelPiPisSS,SelppsSS,SelKPisSS, SelPiPis
                                    params   = config,
-                                   masscut  = "ADAMASS('B+') <  %(BMassWindow)s *MeV"% config)         
+                                   masscut  = "ADAMASS('B+') <  %(BMassWindow)s *MeV"% config)
 
 
         SelB2meX = self._makeB2LLX(meXLine_name,
                                    dilepton = SelMuE,
                                    hadrons  = [ SelPions, SelKaons, SelKstars, SelPhis, SelKshortsLL, SelKshortsDD, SelLambdasLL, SelLambdasDD, SelKstarsPlusLL, SelKstarsPlusDD, SelKstarsPlusPi0Res, SelKstarsPlusPi0Mrg, SelKKs, SelpKs],#, Selpps],#, SelKPisSS, SelKKsSS, SelpKsSS, SelppsSS ],#SelK1s, SelpPisSS,  SelPiPisSS,SelK2s,SelKPis,SelPiPis,SelpPis,
                                    params   = config,
-                                   masscut  = "ADAMASS('B+') <  %(BMassWindow)s *MeV" % config )  
+                                   masscut  = "ADAMASS('B+') <  %(BMassWindow)s *MeV" % config )
 
         SelB2meX_SS = self._makeB2LLX(meXSSLine_name,
                                       dilepton = SelMuE_SS,
                                       hadrons  = [ SelPions, SelKaons, SelKstars, SelPhis, SelKshortsLL, SelKshortsDD, SelLambdasLL, SelLambdasDD, SelKstarsPlusLL, SelKstarsPlusDD, SelKstarsPlusPi0Res, SelKstarsPlusPi0Mrg, SelKKs, SelpKs],#, Selpps],#, SelKPisSS, SelKKsSS, SelpKsSS ],#SelK1s, SelpPisSS, SelPiPisSS, SelppsSS, SelK2s,SelKPis,SelPiPis,SelpPis,
                                       params   = config,
-                                      masscut  = "ADAMASS('B+') <  %(BMassWindow)s *MeV" % config )  
+                                      masscut  = "ADAMASS('B+') <  %(BMassWindow)s *MeV" % config )
 
         SelB2mtX = self._makeB2LLX(mtXLine_name,
                                    dilepton = SelMuTau,
@@ -747,8 +747,8 @@ class Bu2LLKConf(LineBuilder) :
                                       masscut  = "ADAMASS('B+') <  %(BMassWindowTau)s *MeV" % config )
 
         SelB2gammaX = self._makeB2GammaX(eeXLine_name + "3",
-                                         photons = SelPhoton, 
-                                         hadrons = [ SelKstars, SelPhis, SelLambdasLL,  SelLambdasDD,  SelK1s, SelPiPis, SelKPis, SelKKs, SelpKs, SelpPis, Selpps ], 
+                                         photons = SelPhoton,
+                                         hadrons = [ SelKstars, SelPhis, SelLambdasLL,  SelLambdasDD,  SelK1s, SelPiPis, SelKPis, SelKKs, SelpKs, SelpPis, Selpps ],
                                          params  = config,
                                          masscut = "ADAMASS('B+') <  %(BMassWindow)s *MeV"% config )
 
@@ -766,13 +766,13 @@ class Bu2LLKConf(LineBuilder) :
             'Code'      : " ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < 450 )" ,
             'Preambulo' : [ "from LoKiNumbers.decorators import *", "from LoKiCore.basic import LHCb" ]
             }
-        
+
         self.B2eeXLine = StrippingLine(eeXLine_name + "Line",
                                        prescale          = config['Bu2eeLinePrescale'],
                                        postscale         = 1,
                                        selection         = SelB2eeX,
                                        RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                       FILTER            = SPDFilter, 
+                                       FILTER            = SPDFilter,
                                        RequiredRawEvents = [],
                                        MDSTFlag          = False)
 
@@ -783,7 +783,7 @@ class Bu2LLKConf(LineBuilder) :
                                        RelatedInfoTools  = config['RelatedInfoTools'], #+ RelInfoTrackIsolationBDT2,
                                        FILTER            = SPDFilter,
                                        RequiredRawEvents = [],
-                                       MDSTFlag          = False, 
+                                       MDSTFlag          = False,
                                        MaxCandidates = 400)
 
         self.B2eeXFromTracksLine = StrippingLine(eeXLine_name + "Line2",
@@ -791,7 +791,7 @@ class Bu2LLKConf(LineBuilder) :
                                                  postscale         = 1,
                                                  selection         = SelB2eeXFromTracks,
                                                  RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                                 FILTER            = SPDFilter, 
+                                                 FILTER            = SPDFilter,
                                                  RequiredRawEvents = [],
                                                  MDSTFlag          = False)
 
@@ -810,7 +810,7 @@ class Bu2LLKConf(LineBuilder) :
                                                  postscale         = 1,
                                                  selection         = SelB2eeXFromTracks_SS,
                                                  RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                                 FILTER            = SPDFilter, 
+                                                 FILTER            = SPDFilter,
                                                  RequiredRawEvents = [],
                                                  MDSTFlag          = False,
                                                  MaxCandidates = 300)
@@ -820,7 +820,7 @@ class Bu2LLKConf(LineBuilder) :
                                        postscale         = 1,
                                        selection         = SelB2mmX,
                                        RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                       FILTER            = SPDFilter, 
+                                       FILTER            = SPDFilter,
                                        RequiredRawEvents = [],
                                        MDSTFlag          = False)
 
@@ -840,7 +840,7 @@ class Bu2LLKConf(LineBuilder) :
                                        postscale         = 1,
                                        selection         = SelB2mmX_SS,
                                        RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                       FILTER            = SPDFilter, 
+                                       FILTER            = SPDFilter,
                                        RequiredRawEvents = [],
                                        MDSTFlag          = False,
                                        MaxCandidates = 300)
@@ -850,7 +850,7 @@ class Bu2LLKConf(LineBuilder) :
                                        postscale         = 1,
                                        selection         = SelB2meX,
                                        RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                       FILTER            = SPDFilter, 
+                                       FILTER            = SPDFilter,
                                        RequiredRawEvents = [],
                                        MDSTFlag          = False,
                                        MaxCandidates = 400)
@@ -861,7 +861,7 @@ class Bu2LLKConf(LineBuilder) :
                                           postscale         = 1,
                                           selection         = SelB2meX_SS,
                                           RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                          FILTER            = SPDFilter, 
+                                          FILTER            = SPDFilter,
                                           RequiredRawEvents = [],
                                           MDSTFlag          = False,
                                           MaxCandidates = 300)
@@ -889,9 +889,9 @@ class Bu2LLKConf(LineBuilder) :
         self.B2gammaXLine = StrippingLine(eeXLine_name + "Line3",
                                           prescale          = config['Bu2eeLine3Prescale'],
                                           postscale         = 1,
-                                          selection         = SelB2gammaX, 
+                                          selection         = SelB2gammaX,
                                           RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                          FILTER            = SPDFilter, 
+                                          FILTER            = SPDFilter,
                                           RequiredRawEvents = [],
                                           MDSTFlag          = False,
                                           MaxCandidates = 300)
@@ -902,7 +902,7 @@ class Bu2LLKConf(LineBuilder) :
                                                  selection         = SelB2eeXLU,
                                                  postselalg        = self._storeInputBremPhotons(eeXLine_name + "Line4", outputlocprefix="Leptonic/Phys/"),
                                                  RelatedInfoTools  = config['RelatedInfoTools'] + RelInfoTrackIsolationBDT2,
-                                                 FILTER            = SPDFilter, 
+                                                 FILTER            = SPDFilter,
                                                  RequiredRawEvents = [],
                                                  MDSTFlag          = False,
                                                  MaxCandidates = 300)
@@ -925,7 +925,7 @@ class Bu2LLKConf(LineBuilder) :
         self.registerLine( self.B2mtX_SSLine )
         self.registerLine( self.B2gammaXLine )
         self.registerLine( self.B2eeXLULine )
-        
+
 #####################################################
     def _filterHadron( self, name, sel, params ):
         """
@@ -948,7 +948,7 @@ class Bu2LLKConf(LineBuilder) :
 
         _Filter = FilterDesktop( Code = _Code )
 
-        return Selection( name, Algorithm = _Filter, RequiredSelections = sel_list ) 
+        return Selection( name, Algorithm = _Filter, RequiredSelections = sel_list )
 #####################################################
     def _filterDiLepton( self, name, dilepton, params, idcut = None ) :
         """
@@ -964,10 +964,10 @@ class Bu2LLKConf(LineBuilder) :
                 "(MIPCHI2DV(PRIMARY) > %(DiLeptonIPCHI2)s)" % params
 
         # add additional cut on PID if requested
-        if idcut : _Code += ( " & " + idcut ) 
+        if idcut : _Code += ( " & " + idcut )
 
         _Filter = FilterDesktop( Code = _Code )
-    
+
         return Selection(name, Algorithm = _Filter, RequiredSelections = [ dilepton ] )
 
 #####################################################
@@ -990,7 +990,7 @@ class Bu2LLKConf(LineBuilder) :
         _Filter = FilterDesktop( Code = _Code )
 
         return Selection(name, Algorithm = _Filter, RequiredSelections = [ dilepton ] )
-                                            
+
 
 #####################################################
     def _filterMuTau( self, name, dilepton, params, idcut = None ) :
@@ -1007,10 +1007,10 @@ class Bu2LLKConf(LineBuilder) :
                 "(MIPCHI2DV(PRIMARY) > %(DiLeptonIPCHI2)s)" % params
 
         # add additional cut on PID if requested
-        if idcut : _Code += ( " & " + idcut ) 
+        if idcut : _Code += ( " & " + idcut )
 
         _Filter = FilterDesktop( Code = _Code )
-    
+
         return Selection(name, Algorithm = _Filter, RequiredSelections = [ dilepton ] )
 #####################################################
     def _filterPhotons( self, name, photons ):
@@ -1072,12 +1072,12 @@ class Bu2LLKConf(LineBuilder) :
                           "(ADAMASS('K*(892)+') < %(KstarPMassWindow)s *MeV)" % params
 
         _MotherCut = "(ADMASS('K*(892)+') < %(KstarPMassWindow)s *MeV) " % params
-        
+
         _KaonCut = "(PT > %(KaonPT)s *MeV) & " \
             "(ISBASIC & (MIPCHI2DV(PRIMARY) > %(KaonIPCHI2)s))" % params
 
         _PionCut = "(PT > %(Pi0PT)s * MeV)" % params
-        
+
         _Combine = CombineParticles( DecayDescriptor = _Decays,
                                      CombinationCut  = _CombinationCut,
                                      MotherCut       = _MotherCut)
@@ -1088,11 +1088,11 @@ class Bu2LLKConf(LineBuilder) :
             }
 
         return Selection(name, Algorithm = _Combine, RequiredSelections = [ kaons, pions ] )
-        
+
 #####################################################
     def _makePiPi( self, name, pions, params):
         """
-        Make a rho -> pi+ pi- in a range below 2600 MeV. 
+        Make a rho -> pi+ pi- in a range below 2600 MeV.
         """
 
         _Decays = "rho(770)0 -> pi+ pi-"
@@ -1115,11 +1115,11 @@ class Bu2LLKConf(LineBuilder) :
             "pi-" : _DaughterCut
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ pions ] )    
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ pions ] )
 #####################################################
     def _makePiPiSS( self, name, pions, params):
         """
-        Make a same-sign rho -> pi+ pi+ in a range below 2600 MeV. 
+        Make a same-sign rho -> pi+ pi+ in a range below 2600 MeV.
         """
 
         _Decays = "[rho(770)0 -> pi+ pi+]cc"
@@ -1140,11 +1140,11 @@ class Bu2LLKConf(LineBuilder) :
             "pi+"  : _DaughterCut,
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ pions ] ) 
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ pions ] )
 #####################################################
     def _makeKPi( self, name, kaons, pions, params):
         """
-        Make a K* -> K+ pi- in entire range below 2600 MeV. 
+        Make a K* -> K+ pi- in entire range below 2600 MeV.
         """
 
         _Decays = "[K*_0(1430)0 -> K+ pi-]cc"
@@ -1172,7 +1172,7 @@ class Bu2LLKConf(LineBuilder) :
 #####################################################
     def _makeKPiSS( self, name, kaons, pions, params):
         """
-        Make a same-sign K* -> K+ pi+ in entire range below 2600 MeV. 
+        Make a same-sign K* -> K+ pi+ in entire range below 2600 MeV.
         """
 
         _Decays = "[K*_0(1430)0 -> K+ pi+]cc"
@@ -1201,7 +1201,7 @@ class Bu2LLKConf(LineBuilder) :
 #####################################################
     def _makeKK( self, name, kaons, params):
         """
-        Make an f2(1525) -> K+ K- in entire range. 
+        Make an f2(1525) -> K+ K- in entire range.
         """
 
         _Decays = "f'_2(1525) -> K+ K-"
@@ -1224,11 +1224,11 @@ class Bu2LLKConf(LineBuilder) :
             "K-" : _DaughterCut
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ kaons ] )    
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ kaons ] )
 #####################################################
     def _makeKKSS( self, name, kaons, params):
         """
-        Make a same-sign f2(1525) -> K+ K+ in entire range. 
+        Make a same-sign f2(1525) -> K+ K+ in entire range.
         """
 
         _Decays = "[f'_2(1525) -> K+ K+]cc"
@@ -1254,7 +1254,7 @@ class Bu2LLKConf(LineBuilder) :
 #####################################################
     def _makepK( self, name, protons, kaons, params):
         """
-        Make a Lambda* -> p K- in entire range. 
+        Make a Lambda* -> p K- in entire range.
         """
 
         _Decays = "[Lambda(1520)0 -> p+ K-]cc"
@@ -1281,11 +1281,11 @@ class Bu2LLKConf(LineBuilder) :
             "K-" : _DaughterCut_K
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, kaons ] )        
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, kaons ] )
 #####################################################
     def _makepKSS( self, name, protons, kaons, params):
         """
-        Make a same-sign Lambda* -> p K+ in entire range. 
+        Make a same-sign Lambda* -> p K+ in entire range.
         """
 
         _Decays = "[Lambda(1520)0 -> p+ K+]cc"
@@ -1310,11 +1310,11 @@ class Bu2LLKConf(LineBuilder) :
             "K+" : _DaughterCut_K
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, kaons ] )   
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, kaons ] )
 #####################################################
     def _makepPi( self, name, protons, pions, params):
         """
-        Make a N* -> p pi- in entire range until 2600 MeV. 
+        Make a N* -> p pi- in entire range until 2600 MeV.
         """
 
         _Decays = "[N(1440)0 -> p+ pi-]cc"
@@ -1339,11 +1339,11 @@ class Bu2LLKConf(LineBuilder) :
             "pi-" : _DaughterCut_pi
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, pions ] )        
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, pions ] )
 #####################################################
     def _makepPiSS( self, name, protons, pions, params):
         """
-        Make a same-sign N* -> p pi+ in entire range below 2600 MeV. 
+        Make a same-sign N* -> p pi+ in entire range below 2600 MeV.
         """
 
         _Decays = "[N(1440)0 -> p+ pi+]cc"
@@ -1368,11 +1368,11 @@ class Bu2LLKConf(LineBuilder) :
             "pi+" : _DaughterCut_pi
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, pions ] ) 
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons, pions ] )
 #####################################################
     def _makepp( self, name, protons, params):
         """
-        Make a f2 -> p pbar in entire range. 
+        Make a f2 -> p pbar in entire range.
         """
 
         _Decays = "f_2(1950) -> p+ p~-"
@@ -1398,7 +1398,7 @@ class Bu2LLKConf(LineBuilder) :
 #####################################################
     def _makeppSS( self, name, protons, params):
         """
-        Make a same-sign f2 -> p p in entire range. 
+        Make a same-sign f2 -> p p in entire range.
         """
 
         _Decays = "[f_2(1950) -> p+ p+]cc"
@@ -1420,7 +1420,7 @@ class Bu2LLKConf(LineBuilder) :
             "p+"  : _DaughterCut,
             }
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons ] )      
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ protons ] )
 #####################################################
     def _makeK1( self, name, kaons, pions, params ) :
         """
@@ -1445,7 +1445,7 @@ class Bu2LLKConf(LineBuilder) :
             "K+"  : _daughtersCuts_K,
             "pi+" : _daughtersCuts_pi }
 
-        _Combine.Combination12Cut = _K1Comb12Cuts 
+        _Combine.Combination12Cut = _K1Comb12Cuts
         _Combine.CombinationCut   = _K1CombCuts
         _Combine.MotherCut        = _K1MotherCuts
 
@@ -1475,7 +1475,7 @@ class Bu2LLKConf(LineBuilder) :
             "K-"  : _daughtersCuts,
          }
 
-        _Combine.Combination12Cut = _K2Comb12Cuts 
+        _Combine.Combination12Cut = _K2Comb12Cuts
         _Combine.CombinationCut   = _K2CombCuts
         _Combine.MotherCut        = _K2MotherCuts
 
@@ -1484,17 +1484,17 @@ class Bu2LLKConf(LineBuilder) :
 ####################################################
     def _makeMuE( self, name, params, electronid = None, muonid = None , samesign = False):
         """
-        Makes MuE combinations 
+        Makes MuE combinations
         """
 
         from StandardParticles import StdLooseMuons as Muons
-        from StandardParticles import StdLooseElectrons as Electrons 
+        from StandardParticles import StdLooseElectrons as Electrons
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ e-]cc"
         if samesign : _DecayDescriptor = "[J/psi(1S) -> mu+ e+]cc"
 
-        _MassCut = "(AM > 100*MeV)" 
-        
+        _MassCut = "(AM > 100*MeV)"
+
         _MotherCut = "(VFASPF(VCHI2/VDOF) < 9)"
 
         _DaughtersCut = "(PT > %(LeptonPT)s) & " \
@@ -1514,19 +1514,19 @@ class Bu2LLKConf(LineBuilder) :
             "mu+" : _MuonCut,
             "e+"  : _ElectronCut
             }
-        
+
         return Selection(name, Algorithm = _Combine, RequiredSelections = [ Muons, Electrons ] )
 ####################################################
     def _makeMuMuSS( self, name, params, muonid = None):
         """
-        Makes MuMu same sign combinations 
+        Makes MuMu same sign combinations
         """
         from StandardParticles import StdLooseMuons as Muons
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ mu+]cc"
 
-        _MassCut = "(AM > 100*MeV)" 
-        
+        _MassCut = "(AM > 100*MeV)"
+
         _MotherCut = "(VFASPF(VCHI2/VDOF) < 9)"
 
         _DaughtersCut = "(PT > %(LeptonPT)s) & " \
@@ -1543,12 +1543,12 @@ class Bu2LLKConf(LineBuilder) :
         _Combine.DaughtersCuts = {
             "mu+" : _MuonCut,
             }
-        
+
         return Selection(name, Algorithm = _Combine, RequiredSelections = [ Muons ] )
 ####################################################
     def _makeEESS( self, name, params, electronid = None):
         """
-        Makes EE same-sign combinations 
+        Makes EE same-sign combinations
         """
         from Configurables import DiElectronMaker,ProtoParticleCALOFilter
         from CommonParticles.Utils import trackSelector
@@ -1556,7 +1556,7 @@ class Bu2LLKConf(LineBuilder) :
         ee = DiElectronMaker('DiElectronsSS' + name)
         ee.Particle = "J/psi(1S)"
         #ee.DecayDescriptor = "[J/psi(1S) -> e+ e+]cc"
-        selector = trackSelector(ee, trackTypes=["Long"]) 
+        selector = trackSelector(ee, trackTypes=["Long"])
 
         ee.addTool( ProtoParticleCALOFilter('Electron'))
         ee.Electron.Selection = ["RequiresDet='CALO'"]
@@ -1610,7 +1610,7 @@ class Bu2LLKConf(LineBuilder) :
 #####################################################
     def _makeB2LLX( self, name, dilepton, hadrons, params, masscut = "(ADAMASS('B+')< 1500 *MeV" ):
         """
-        CombineParticles / Selection for the B 
+        CombineParticles / Selection for the B
         """
 
         _Decays = [ "[ B+ -> J/psi(1S) K+ ]cc",
@@ -1618,7 +1618,7 @@ class Bu2LLKConf(LineBuilder) :
                     "[ B+ -> J/psi(1S) K*(892)+ ]cc",
                     "[ B+ -> J/psi(1S) K_1(1270)+ ]cc",
                     "[ B+ -> J/psi(1S) K_2(1770)+ ]cc",
-                    " B0 -> J/psi(1S) KS0 ", 
+                    " B0 -> J/psi(1S) KS0 ",
                     " B0 -> J/psi(1S) rho(770)0 ",
                     "[ B0 -> J/psi(1S) K*(892)0 ]cc",
                     "[ B0 -> J/psi(1S) K*_0(1430)0 ]cc",
@@ -1628,53 +1628,53 @@ class Bu2LLKConf(LineBuilder) :
                     "[ Lambda_b0 -> J/psi(1S) Lambda0 ]cc",
                     "[ Lambda_b0 -> J/psi(1S) N(1440)0 ]cc",
                     "[ Lambda_b0 -> J/psi(1S) Lambda(1520)0 ]cc" ]
-        
+
         _Cut = "((VFASPF(VCHI2/VDOF) < %(BVertexCHI2)s) "\
                "& (BPVIPCHI2() < %(BIPCHI2)s) "\
                "& (BPVDIRA > %(BDIRA)s) "\
                "& (BPVVDCHI2 > %(BFlightCHI2)s))" % params
-        
+
         _Combine = CombineParticles( DecayDescriptors = _Decays,
                                      CombinationCut   = masscut,
                                      MotherCut        = _Cut )
-        
+
         _Merge = MergedSelection( "Merge" + name, RequiredSelections = hadrons )
 
         return Selection(name, Algorithm = _Combine, RequiredSelections = [ dilepton, _Merge ] )
 #####################################################
     def _makeB2LLX_normal( self, name, dilepton, hadrons, params, masscut = "(ADAMASS('B+')< 1500 *MeV" ):
         """
-        CombineParticles / Selection for the B 
+        CombineParticles / Selection for the B
         """
 
         _Decays = [ "[ B+ -> J/psi(1S) K+ ]cc",
                     "[ B+ -> J/psi(1S) pi+ ]cc",
                     "[ B+ -> J/psi(1S) K*(892)+ ]cc",
-                    " B0 -> J/psi(1S) KS0 ", 
+                    " B0 -> J/psi(1S) KS0 ",
                     "[ B0 -> J/psi(1S) K*(892)0 ]cc",
                     " B_s0 -> J/psi(1S) phi(1020) ",
                     "[ Lambda_b0 -> J/psi(1S) Lambda0 ]cc",
                     "[ Lambda_b0 -> J/psi(1S) Lambda(1520)0 ]cc" ]
-        
+
         _Cut = "((VFASPF(VCHI2/VDOF) < %(BVertexCHI2)s) "\
                "& (BPVIPCHI2() < %(BIPCHI2)s) "\
                "& (BPVDIRA > %(BDIRA)s) "\
                "& (BPVVDCHI2 > %(BFlightCHI2)s))" % params
-        
+
         _Combine = CombineParticles( DecayDescriptors = _Decays,
                                      CombinationCut   = masscut,
                                      MotherCut        = _Cut )
-        
+
         _Merge = MergedSelection( "Merge" + name, RequiredSelections = hadrons )
 
         return Selection(name, Algorithm = _Combine, RequiredSelections = [ dilepton, _Merge ] )
 #####################################################
     def _makeB2LLX_busy( self, name, dilepton, hadrons, params, masscut = "(ADAMASS('B+')< 1500 *MeV" ):
         """
-        CombineParticles / Selection for the B 
+        CombineParticles / Selection for the B
         """
 
-        _Decays = [ 
+        _Decays = [
                     "[ B+ -> J/psi(1S) K_1(1270)+ ]cc",
                     "[ B+ -> J/psi(1S) K_2(1770)+ ]cc",
                     " B0 -> J/psi(1S) rho(770)0 ",
@@ -1682,32 +1682,32 @@ class Bu2LLKConf(LineBuilder) :
                     " B_s0 -> J/psi(1S) f'_2(1525) ",
                     " B_s0 -> J/psi(1S) f_2(1950) ",
                     "[ Lambda_b0 -> J/psi(1S) N(1440)0 ]cc", ]
-        
+
         _Cut = "((VFASPF(VCHI2/VDOF) < %(BVertexCHI2)s) "\
                "& (BPVIPCHI2() < %(BIPCHI2)s) "\
                "& (BPVDIRA > %(BDIRA)s) "\
                "& (BPVVDCHI2 > %(BFlightCHI2)s))" % params
-        
+
         _Combine = CombineParticles( DecayDescriptors = _Decays,
                                      CombinationCut   = masscut,
                                      MotherCut        = _Cut )
-        
+
         _Merge = MergedSelection( "Merge" + name, RequiredSelections = hadrons )
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ dilepton, _Merge ] ) 
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ dilepton, _Merge ] )
 #####################################################
     def _makeB2GammaX( self, name, photons, hadrons, params, masscut = "(ADAMASS('B+')< 1500 *MeV" ):
         """
-        CombineParticles / Selection for the B 
+        CombineParticles / Selection for the B
         """
 
         _Decays =  [ "[ B0   -> gamma K*(892)0 ]cc",
                      "[ B0 -> gamma K*_0(1430)0 ]cc",
                      " B0 -> gamma rho(770)0 ",
-                     " B_s0 -> gamma phi(1020) ", 
+                     " B_s0 -> gamma phi(1020) ",
                      " B_s0 -> gamma f'_2(1525) ",
                      " B_s0 -> gamma f_2(1950) ",
-                     "[ Lambda_b0 -> gamma Lambda0 ]cc",                   
+                     "[ Lambda_b0 -> gamma Lambda0 ]cc",
                      "[ Lambda_b0 -> gamma N(1440)0 ]cc",
                      "[ Lambda_b0 -> gamma Lambda(1520)0 ]cc" ]
 
@@ -1715,14 +1715,14 @@ class Bu2LLKConf(LineBuilder) :
                "& (BPVIPCHI2() < %(BIPCHI2)s) "\
                "& (BPVDIRA > %(BDIRA)s) "\
                "& (BPVVDCHI2 > %(BFlightCHI2)s))" % params
-        
+
         _Combine = CombineParticles( DecayDescriptors = _Decays,
                                      CombinationCut   = masscut,
                                      MotherCut        = _Cut )
-        
+
         _Merge = MergedSelection( "Merge" + name, RequiredSelections = hadrons )
 
-        return Selection(name, Algorithm = _Combine, RequiredSelections = [ _Merge, photons ] ) 
+        return Selection(name, Algorithm = _Combine, RequiredSelections = [ _Merge, photons ] )
 #####################################################
     def _storeInputBremPhotons( self, linename, outputlocprefix = "Leptonic/Phys/", photonloc = "Phys/StdVeryLooseAllPhotons/Particles" ):
         from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
@@ -1752,4 +1752,3 @@ class Bu2LLKConf(LineBuilder) :
 
         return makePhotons
 #####################################################
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py
index db328df3d90b255be31d9fcef845f3e7a3803797..34e61189f6fd985ed2029aefc45a1ff2a5bfae16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py
@@ -62,7 +62,7 @@ default_config = {
 #                     'BDaug_LL_PTsum'            : 3000.0,
                      'B_Mlow'                    : 500.0,
                      'B_Mhigh'                   : 700.0,
-                     
+
                      'B_Pmin'                    : 5000.0,
                      'B_VtxChi2'                 : 10.0,
                      'B_Dira'                    : 0.9999,
@@ -81,36 +81,36 @@ default_config = {
      "Variables": ['MU_SLL_ISO_1', 'MU_SLL_ISO_2']
      },
     {
-    "Location": "ConeIsoInfo", 
-    "Type": "RelInfoConeVariables", 
+    "Location": "ConeIsoInfo",
+    "Type": "RelInfoConeVariables",
     "Variables": [
-    "CONEANGLE", 
-    "CONEMULT", 
-    "CONEPTASYM", 
-    "CONEPT", 
-    "CONEP", 
-    "CONEPASYM", 
-    "CONEDELTAETA", 
+    "CONEANGLE",
+    "CONEMULT",
+    "CONEPTASYM",
+    "CONEPT",
+    "CONEP",
+    "CONEPASYM",
+    "CONEDELTAETA",
     "CONEDELTAPHI"
     ]
-    }, 
+    },
     {
-    "Location": "VtxIsoInfo", 
-    "Type": "RelInfoVertexIsolation", 
+    "Location": "VtxIsoInfo",
+    "Type": "RelInfoVertexIsolation",
     "Variables": [
-    "VTXISONUMVTX", 
-    "VTXISODCHI2ONETRACK", 
-    "VTXISODCHI2MASSONETRACK", 
-    "VTXISODCHI2TWOTRACK", 
+    "VTXISONUMVTX",
+    "VTXISODCHI2ONETRACK",
+    "VTXISODCHI2MASSONETRACK",
+    "VTXISODCHI2TWOTRACK",
     "VTXISODCHI2MASSTWOTRACK"
     ]
     },
     {
-    "Location": "VtxIsoBDTInfo", 
+    "Location": "VtxIsoBDTInfo",
     "Type": "RelInfoVertexIsolationBDT"
     },
-     ], 
-                     }, 
+     ],
+                     },
     }
 
 
@@ -200,7 +200,7 @@ class Bu2MajoLepConf(LineBuilder) :
         _fdChi2Cut  = "(BPVVDCHI2>%s)"                 % config['B_LL_FDChi2']
         _massCutLow2     = "(M>(5279-%s)*MeV)"               % config['B_Mlow']
         _massCutHigh2    = "(M<(5279+%s)*MeV)"               % config['B_Mhigh']
-        
+
 
 
         _motherCuts = _pCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdCut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2
@@ -326,13 +326,13 @@ class Bu2MajoLepConf(LineBuilder) :
         _fdChi2Cut  = "(BPVVDCHI2>%s)"                 % config['B_DD_FDChi2']
         _massCutLow2     = "(M>(5279-%s)*MeV)"               % config['B_Mlow']
         _massCutHigh2    = "(M<(5279+%s)*MeV)"               % config['B_Mhigh']
-        
+
 
 
 
         _motherCuts = _pCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdCut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2
-        
-        
+
+
         _B = CombineParticles()
 
         _B.DecayDescriptors = [ "B+ -> mu+ KS0", "B- -> mu- KS0" ]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py
index 3c4959b84468993987cc6e36eb48b56183f66983..0423931f9b4df7a1559d4b95debdecff3f125fbf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py
@@ -16,7 +16,7 @@
 # Signal:  Isolated StdTightANNMuons in low mult events, pT > 5GeV/c, IPS>20, NTracks<150
 __author__ = ['Xabier Cid Vidal']
 __all__ = ('Bu2MuNuConf',
-           'create_stdjets',           
+           'create_stdjets',
            'relInfoJetsVars',
            'relInfoConeVars',
            'relInfoCylVars',
@@ -60,17 +60,17 @@ default_config = {
 
 # the muons banning is line dependent (need to provide the location of the muons!)
 def create_stdjets(strobj,line_location,stdjets_name_ban):
-    
+
     myconf1 = JetMakerConf(stdjets_name_ban,
                            R = 0.7 ,
                            PtMin = 500.,
                            listOfParticlesToBan = [line_location],
                            JetIDCut = False).algorithms[0]
-    
+
     if "StdJetsNoJetIDBan" in dir(strobj): strobj.StdJetsNoJetIDBan.append(myconf1)
     else: strobj.StdJetsNoJetIDBan= [myconf1]
-    
-    ## configure Data-On-Demand service                                                                     
+
+    ## configure Data-On-Demand service
     locations = updateDoD ( myconf1 )
 
 
@@ -86,15 +86,15 @@ relInfoPFVars = ["PFCHARGEDMASS","PFALLMASS","PFCHARGEDTOTPT","PFALLTOTPT","PFCH
 class Bu2MuNuConf( LineBuilder ) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__( self, name, config ) :
 
         LineBuilder.__init__( self, name, config )
 
         self._myname = name
         self._config = config
-        self.useNN = config["useNN"]        
-        
+        self.useNN = config["useNN"]
+
         #################################################################################
         # Define the initial selection for the signal muons
         _cutMu = "(MIPCHI2DV(PRIMARY)> %(IPchi2Mu)s)&(TRCHI2DOF < %(TrChi2Mu)s ) &"\
@@ -102,7 +102,7 @@ class Bu2MuNuConf( LineBuilder ) :
 
         _cutMuControl = "(MIPCHI2DV(PRIMARY)> %(IPchi2MuControl)s) &"\
                         "(PT>%(pTminMuControl)s*GeV)" %config
-        
+
         if self.useNN:
             self.selMuonsControl = FilterDesktop(self._myname + '_MuForBu2MuNuControl',
                                                  Preambulo = [ "from LoKiTracks.decorators import *"],
@@ -128,13 +128,13 @@ class Bu2MuNuConf( LineBuilder ) :
                                           Inputs = ["Phys/StdTightMuons/Particles"]
                                           )
 
-            
+
         self.selMuonsLocationControl = updateDoD(self.selMuonsControl)
         self.selMuonsLocationControl = self.selMuonsLocationControl.keys()[0]
         self.selMuonsLocation = updateDoD(self.selMuons)
         self.selMuonsLocation = self.selMuonsLocation.keys()[0]
         #################################################################################
-        # filter high multiplicity events        
+        # filter high multiplicity events
         self.filterTracks = " ( CONTAINS('Rec/Track/Best')< %(maxNTracks)s ) " %self._config
 
 
@@ -149,7 +149,7 @@ class Bu2MuNuConf( LineBuilder ) :
                                     'UseVarsJetsWithB' : False,
                                     'LocationJetsNoMu' : "Phys/"+stdjets_name_ban_control+"/Particles",
                                     'LocationJetsNoRemove' : "Phys/"+stdjets_name_noban+"/Particles"}]
-        
+
         # jet variables for signal
         stdjets_name_ban_signal = "StdJetsNoJetIDBanSignal"
         RelatedInfoToolsSignal = [{'Type' : 'RelInfoJetsVariables',
@@ -158,7 +158,7 @@ class Bu2MuNuConf( LineBuilder ) :
                                    'UseVarsJetsWithB' : False,
                                    'LocationJetsNoMu' : "Phys/"+stdjets_name_ban_signal+"/Particles",
                                    'LocationJetsNoRemove' : "Phys/"+stdjets_name_noban+"/Particles"}]
-        
+
         ## these are common for both lines!
         otherRelatedInfos = [
             # cone variables
@@ -206,11 +206,11 @@ class Bu2MuNuConf( LineBuilder ) :
              'Variables':relInfoPFVars,
              'Location': 'PFVariables'}]
 
-        
+
         RelatedInfoToolsControl.extend(otherRelatedInfos)
         RelatedInfoToolsSignal.extend(otherRelatedInfos)
-                               
-        
+
+
         #################################################################################
         #control line (prescaled!)
         self.ControlLine = StrippingLine( self._myname + 'ControlLine',
@@ -219,24 +219,24 @@ class Bu2MuNuConf( LineBuilder ) :
                                           selection = DataOnDemand( self.selMuonsLocationControl ),
                                           RelatedInfoTools = RelatedInfoToolsControl,
                                           #RequiredRawEvents = ["Calo"],
-                                          MDSTFlag = False                                         
+                                          MDSTFlag = False
                                           )
-        
+
         # signal line (no prescale)
         self.SignalLine = StrippingLine( self._myname + 'SignalLine',
                                          prescale  = config[ 'PrescaleSignal'],
-                                         postscale = config[ 'PostscaleSignal'],                                    
+                                         postscale = config[ 'PostscaleSignal'],
                                          FILTER = self.filterTracks,
                                          selection = DataOnDemand( self.selMuonsLocation ),
                                          RelatedInfoTools = RelatedInfoToolsSignal,
                                          #RequiredRawEvents = ["Calo"],
                                          MDSTFlag = False
                                          )
-        
-        
+
+
         self.registerLine( self.ControlLine)
         self.registerLine( self.SignalLine)
-        
+
 
         #################################################################################
         # This is for the relatedinfos based on jets
@@ -244,14 +244,10 @@ class Bu2MuNuConf( LineBuilder ) :
                                            R = 0.7 ,
                                            PtMin = 500.,
                                            JetIDCut = False).algorithms[0]
-        
-        ## configure Data-On-Demand service                                                               
+
+        ## configure Data-On-Demand service
         locations = updateDoD ( StdJetsNoJetIDNoBan )
-        
+
         ## add the jets with the specific banning
         create_stdjets(self,self.ControlLine.outputLocation(),stdjets_name_ban_control)
         create_stdjets(self,self.SignalLine.outputLocation(),stdjets_name_ban_signal)
-
-        
-
- 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py
index c14e432361806f3a1465ccf1aad35eaabc7389a4..0d167f8abdc310d7c9e8f847156b8d1b395285c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py
@@ -14,7 +14,7 @@ Module for construction of D+ -> mu l+ l- lines
 Performance
 
 Full.dst:
-######### 
+#########
 StrippingReport                                                INFO Event 1000000, Good event 1000000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
  |_StrippingGlobal_                                            |  0.0142|       142|       |   8.622|
@@ -22,21 +22,21 @@ StrippingReport                                                INFO Event 100000
  |!StrippingD23MuD2MueeLine_TIMING                             |  0.0029|        29|  1.103|   0.076|
  |!StrippingD23MuD23PiLine_TIMING                              |  0.0058|        58|  1.328|   0.024|
 
-     
+
 MC: D+ -> 3pi (21163012)
 ########################
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
- |!StrippingD23MuD23PiLine                                     |  0.6500|       650|  1.008|   0.569| 
+ |!StrippingD23MuD23PiLine                                     |  0.6500|       650|  1.008|   0.569|
 
 MC: D+ -> K 2pi (21163020)
 ##########################
 StrippingReport                                                INFO Event 100000, Good event 100000
- |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|      
+ |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
  |!StrippingD23MuD23PiLine                                     |  0.0130|        13|  1.077|   0.266|
- 
+
 Exported symbols (use python help!):
-   - 
+   -
 """
 
 __author__ = ["Oliver Gruenberg"]
@@ -74,7 +74,7 @@ default_config = {
     # CombiCuts
     "MaxDoca"              : 0.3, # (mm)
     "mDiffDLoose"          : 150, # (MeV)
-    "mDiffDTight"          : 150, # (MeV)    
+    "mDiffDTight"          : 150, # (MeV)
     # MotherCuts
     "MaxIPChi2"            : 25,
     "MinVDChi2"            : 225,
@@ -82,7 +82,7 @@ default_config = {
     "MinDira"              : 0.0,
     "MinTau"               : 0.1, # (ps)
     # scalings
-    "Postscale"            : 1, 
+    "Postscale"            : 1,
     "D23MuPrescale"        : 1,
     "D2MueePrescale"       : 1,
     "D23PiPrescale"        : 0.01,
@@ -100,11 +100,11 @@ default_config = {
 class D23MuLinesConf(LineBuilder) :
     """
     Builder
-    
+
     """
 
-    __configuration_keys__ = default_config['CONFIG'].keys()  
-    
+    __configuration_keys__ = default_config['CONFIG'].keys()
+
     def __init__(self, name = "D23Mu", config = default_config) :
 
         LineBuilder.__init__(self, name, config)
@@ -140,15 +140,15 @@ class D23MuLinesConf(LineBuilder) :
                           """ %config
 
 #############################################################################
-        
+
         D23Mu_name  = name+"D23Mu"
         D2Muee_name = name+"D2Muee"
-        D23Pi_name  = name+"D23Pi"        
+        D23Pi_name  = name+"D23Pi"
 
         self.selD23Mu  = self.makeD23Mu(D23Mu_name)
         self.selD2Muee = self.makeD2Muee(D2Muee_name)
         self.selD23Pi  = self.makeD23Pi(D23Pi_name)
-        
+
 #############################################################################
 
         self.D23Mu_Line = StrippingLine(D23Mu_name+"Line",
@@ -199,15 +199,15 @@ class D23MuLinesConf(LineBuilder) :
                                              "[D+ ->  mu+ ^mu+  l]CC"  : "BsMuMuTrackIsomu2",
                                              "[D+ ->  mu+  mu+ ^l]CC"  : "BsMuMuTrackIsomu3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.D2Muee_Line = StrippingLine(D2Muee_name+"Line",
                                          prescale = config["D2MueePrescale"],
                                          postscale = config["Postscale"],
                                          MDSTFlag = config["MDSTflag"],
                                          selection = self.selD2Muee,
-                                         RelatedInfoTools = [ 
+                                         RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -250,7 +250,7 @@ class D23MuLinesConf(LineBuilder) :
                                              "[D+ ->  l ^l  l]CC"  : "BsMuMuTrackIsomu2",
                                              "[D+ ->  l  l ^l]CC"  : "BsMuMuTrackIsomu3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                          ) # closes Strippingline
 
         self.D23Pi_Line = StrippingLine(D23Pi_name+"Line",
@@ -258,7 +258,7 @@ class D23MuLinesConf(LineBuilder) :
                                         postscale = config["Postscale"],
                                         MDSTFlag = config["MDSTflag"],
                                         selection = self.selD23Pi,
-                                        RelatedInfoTools = [ 
+                                        RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -301,62 +301,62 @@ class D23MuLinesConf(LineBuilder) :
                                              "[D+ ->  pi+ ^pi+  pi-]CC"  : "TrackIsoBDTpi2",
                                              "[D+ ->  pi+  pi+ ^pi-]CC"  : "TrackIsoBDTpi3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        ) # closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        ) # closes Strippingline
 
 #############################################################################
 
         self.registerLine(self.D23Mu_Line)
         self.registerLine(self.D2Muee_Line)
-        self.registerLine(self.D23Pi_Line)        
-       
+        self.registerLine(self.D23Pi_Line)
+
 #############################################################################
 
     def makeD23Mu(self,name):
-    
+
         D23Mu = DaVinci__N3BodyDecays("Combine"+name)
         D23Mu.DecayDescriptors = [ "[D+ -> mu+ mu+ mu-]cc","[D+ -> mu+ mu+ mu+]cc" ]
         D23Mu.DaughtersCuts = { "mu+" : self.TrackCuts }
-        
+
         D23Mu.Combination12Cut = self.Combination12Cuts
         D23Mu.CombinationCut   = self.CombinationCutsLoose
         D23Mu.MotherCut        = self.MotherCuts
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-   
+
         return Selection (name, Algorithm = D23Mu, RequiredSelections = [ _myMuons ])
 
 #############################################################################
 
     def makeD2Muee(self,name):
-    
+
         D2Muee = DaVinci__N3BodyDecays("Combine"+name)
         D2Muee.DecayDescriptors = [ "[D+ -> mu+ e+ e-]cc","[D+ -> mu- e+ e+]cc","[D+ -> mu+ e+ e+]cc" ]
         D2Muee.DaughtersCuts = { "mu+" : self.TrackCuts, "e+" : self.TrackCuts }
-        
+
         D2Muee.Combination12Cut = self.Combination12Cuts
         D2Muee.CombinationCut   = self.CombinationCutsLoose
         D2Muee.MotherCut        = self.MotherCuts
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
         _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
-    
+
         return Selection (name, Algorithm = D2Muee, RequiredSelections = [ _myMuons, _myElectrons ])
 
 #############################################################################
 
     def makeD23Pi(self,name):
-    
+
         D23Pi = DaVinci__N3BodyDecays("Combine"+name)
         D23Pi.DecayDescriptors = [ "[D+ -> pi+ pi+ pi-]cc" ]
         D23Pi.DaughtersCuts = { "pi+" : self.TrackCuts }
-        
+
         D23Pi.Combination12Cut = self.Combination12Cuts
         D23Pi.CombinationCut   = self.CombinationCutsTight
         D23Pi.MotherCut        = self.MotherCuts
 
         _myPions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-    
+
         return Selection (name, Algorithm = D23Pi, RequiredSelections = [ _myPions ])
 
 #############################################################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py
index 536db561b7df7f9d324f82f865692a0c55c232cf..d7543942a68f3cf747c2913ddd6c6ac0752616d6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py
@@ -938,4 +938,3 @@ def makeB(name,decays,inputs,default_config):
                      RequiredSelections=inputs)
 
 #\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py
index a5dcf14b4d14c7b4b658aa057dc09d50108ce45b..484f41a572f9acdedfce337453ac7de5ea7769f3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py
@@ -28,11 +28,11 @@ default_config = {
     'BUILDERTYPE' : 'DoubleSLForRXConf',
     'CONFIG'      :
     {
-    "BMassLow"          : 1000.0, 
+    "BMassLow"          : 1000.0,
     "BMassUpp"          : 5400.0,
     "DMassLow"          : 500.0 ,
     "DMassUpp"          : 2000.0,
-    "DstarDeltaMass"    : 300,  
+    "DstarDeltaMass"    : 300,
     "BDIRA"             : 0.995,
     "DDIRA"             : 0.995,
     "BDOCA"             : 10,
@@ -49,17 +49,17 @@ default_config = {
     "ElectronProbNN"    : 0.10,
     "KaonProbNN"        : 0.10,
     "DVertexChisq"      : 10,
-    "DSeparation"       : -10, 
-    "DPT"               : 800., 
-    "TrackGhostProb"    : 0.5, 
-    "HLT1_FILTER"       : None, 
+    "DSeparation"       : -10,
+    "DPT"               : 800.,
+    "TrackGhostProb"    : 0.5,
+    "HLT1_FILTER"       : None,
     "HLT2_FILTER"       : None,
     "L0DU_FILTER"       : None,
-    "SpdMult"           : 600, 
+    "SpdMult"           : 600,
     "UseNoPIDParticles" : False,
     },
     'WGs'     : [ 'RD' ],
-    'STREAMS' : ['Leptonic'] 
+    'STREAMS' : ['Leptonic']
     }
 
 #
@@ -80,26 +80,26 @@ from StrippingUtils.Utils import LineBuilder
 
 
 #
-#  LineBuiler 
+#  LineBuiler
 #
 
 class DoubleSLForRXConf(LineBuilder) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config) :
-        
+
         LineBuilder.__init__(self, name, config)
         self.name = name
-        
-        # Selection objects for particles 
+
+        # Selection objects for particles
         self.Leptons = self.__makeLeptons__( config )
         self.Kaons   = self.__makeKaons__( config )
         self.Pions   = self.__makePions__( config )
         self.D       = self.__makeD__( self.Kaons, self.Leptons, config )
         self.B       = self.__makeB__( self.D, self.Pions, self.Leptons, config )
-        
-        # GEC filter on SPD multiplicty 
+
+        # GEC filter on SPD multiplicty
         self.Filter = {
             'Code'      : " ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(SpdMult)s )" % config ,
             'Preambulo' : [
@@ -107,8 +107,8 @@ class DoubleSLForRXConf(LineBuilder) :
             "from LoKiCore.basic import LHCb"
             ]
             }
-        
-        # Define stripping line 
+
+        # Define stripping line
         self.Line = StrippingLine(
             self.name + "_Line",
             prescale = 1,
@@ -120,7 +120,7 @@ class DoubleSLForRXConf(LineBuilder) :
             algos    = [ self.B ],
             MDSTFlag = False
             )
-        
+
         self.registerLine( self.Line )
 
     def __ElectronCuts__( self, conf ):
@@ -128,8 +128,8 @@ class DoubleSLForRXConf(LineBuilder) :
                "(MIPCHI2DV(PRIMARY) > %(LeptonIPChisq)s)" % conf
         if conf['UseNoPIDParticles']:
             return cuts
-        return cuts + " & (HASRICH) & (PROBNNe > %(ElectronProbNN)s)" % conf  
-        
+        return cuts + " & (HASRICH) & (PROBNNe > %(ElectronProbNN)s)" % conf
+
     def __MuonCuts__( self, conf ):
         cuts = "(PT > %(LeptonPT)s) & " \
                "(MIPCHI2DV(PRIMARY) > %(LeptonIPChisq)s) & " \
@@ -144,36 +144,36 @@ class DoubleSLForRXConf(LineBuilder) :
                "(TRGHP < %(TrackGhostProb)s)" % conf
         if conf['UseNoPIDParticles']:
             return cuts
-        return cuts + " & (HASRICH) & (PROBNNk > %(KaonProbNN)s)" % conf 
+        return cuts + " & (HASRICH) & (PROBNNk > %(KaonProbNN)s)" % conf
 
     def __PionCuts__( self, conf ):
         return "(MIPCHI2DV(PRIMARY) > %(PionIPChisq)s) & " \
-               "(TRGHP < %(TrackGhostProb)s)" % conf 
-    
+               "(TRGHP < %(TrackGhostProb)s)" % conf
+
     def __DCuts__( self, conf ):
         return "(PT > %(DPT)s) & " \
                "(MIPCHI2DV(PRIMARY) > %(DIPChisq)s) & " \
                "(VFASPF(VCHI2PDOF) < %(DVertexChisq)s) & " \
-               "(BPVVDCHI2 > %(DFDChisq)s)" % conf 
-    
+               "(BPVVDCHI2 > %(DFDChisq)s)" % conf
+
     def __DCombinationCuts__( self, conf ):
-        return "(AM > %(DMassLow)s) & (AM < %(DMassUpp)s)" % conf 
+        return "(AM > %(DMassLow)s) & (AM < %(DMassUpp)s)" % conf
 
     def __DstarCuts__( self, conf ):
-        return "(M-MAXTREE('D0'==ABSID,M) < %(DstarDeltaMass)s) " % conf 
-    
+        return "(M-MAXTREE('D0'==ABSID,M) < %(DstarDeltaMass)s) " % conf
+
     def __BCuts__( self, conf ):
         return "(PT > %(BPT)s) & " \
                "(VFASPF(VCHI2) < %(BVCHI2)s) & " \
                "((MINTREE(ABSID=='D0', VFASPF(VZ))-VFASPF(VZ)) > %(DSeparation)s) & " \
-               "(BPVDIRA > %(BDIRA)s)" % conf 
+               "(BPVDIRA > %(BDIRA)s)" % conf
 
     def __BCombinationCuts__( self, conf ):
-        return "(AM > %(BMassLow)s) & (AM < %(BMassUpp)s)" % conf 
-    
+        return "(AM > %(BMassLow)s) & (AM < %(BMassUpp)s)" % conf
+
     def __makeLeptons__( self, conf ):
         '''
-        Create muons/electrons 
+        Create muons/electrons
         '''
         from StandardParticles import ( StdAllLooseMuons,
                                         StdAllNoPIDsMuons,
@@ -181,7 +181,7 @@ class DoubleSLForRXConf(LineBuilder) :
                                         StdAllNoPIDsElectrons )
         muons     = None
         electrons = None
-        
+
         if conf['UseNoPIDParticles']:
             muons     = StdAllNoPIDsMuons
             electrons = StdAllNoPIDsElectrons
@@ -192,7 +192,7 @@ class DoubleSLForRXConf(LineBuilder) :
         # Filter electrons/muons
         filterElectrons = FilterDesktop( Code = self.__ElectronCuts__( conf ) )
         filterMuons     = FilterDesktop( Code = self.__MuonCuts__( conf ) )
-                 
+
         selElectrons    = Selection( self.name + "_Electrons",
                                      Algorithm = filterElectrons,
                                      RequiredSelections = [ electrons ] )
@@ -206,18 +206,18 @@ class DoubleSLForRXConf(LineBuilder) :
         return selLeptons
 
 
-    
+
     def __makeKaons__(self, conf):
         '''
         Create Kaons
         '''
-        from StandardParticles import ( StdAllLooseKaons, 
+        from StandardParticles import ( StdAllLooseKaons,
                                         StdAllNoPIDsKaons )
 
         # Filter kaons
-        
-        kaons = StdAllNoPIDsKaons if conf['UseNoPIDParticles'] else StdAllLooseKaons 
-        
+
+        kaons = StdAllNoPIDsKaons if conf['UseNoPIDParticles'] else StdAllLooseKaons
+
         filterKaons = FilterDesktop( Code = self.__KaonCuts__( conf ) )
 
         selKaons    = Selection( self.name + "_Kaons",
@@ -231,7 +231,7 @@ class DoubleSLForRXConf(LineBuilder) :
         Make slow pions
         """
         from StandardParticles import ( StdAllNoPIDsPions )
-        
+
         filterPions = FilterDesktop( Code = self.__PionCuts__( conf ) )
 
         selPions    = Selection( self.name + "_Pions",
@@ -241,15 +241,15 @@ class DoubleSLForRXConf(LineBuilder) :
 
     def __makeD__( self, kaons = None , leptons = None , conf = {} ):
         """
-        Make D --> K l 
+        Make D --> K l
         """
         # CombineParticles for the SL D decay
 
         combineD = CombineParticles()
-        combineD.DecayDescriptors = [ "[D0 -> K- mu+]cc", "[D0 -> K- e+]cc" ] 
+        combineD.DecayDescriptors = [ "[D0 -> K- mu+]cc", "[D0 -> K- e+]cc" ]
         combineD.CombinationCut   = self.__DCombinationCuts__( conf )
         combineD.MotherCut        = self.__DCuts__( conf )
-        
+
         selD = Selection( self.name + "_D",
                           Algorithm = combineD,
                           RequiredSelections = [ kaons, leptons ] )
@@ -257,21 +257,21 @@ class DoubleSLForRXConf(LineBuilder) :
 
     def __makeB__( self, dmesons = None, pions = None, leptons = None, conf  = {} ):
         """
-        Make B --> D pi l 
+        Make B --> D pi l
         """
-        
+
         combineB = DaVinci__N3BodyDecays()
-        
+
         combineB.DecayDescriptors = [ "[B0 -> D~0 pi- mu+]cc", "[B0 -> D~0 pi- e+]cc" ]
 
         combineB.Combination12Cut = "((AM - AM1) < %(DstarDeltaMass)s)" % conf
 
         combineB.CombinationCut   = "(AM > %(BMassLow)s) & " \
                                     "(AM < %(BMassUpp)s) & " \
-                                    "(ACHI2DOCA(2,3) < %(BDOCA)s)" % conf 
+                                    "(ACHI2DOCA(2,3) < %(BDOCA)s)" % conf
 
         combineB.MotherCut        = self.__BCuts__( conf )
-        
+
         selB = Selection( self.name + "_B",
                           Algorithm = combineB,
                           RequiredSelections = [ dmesons, pions, leptons ] )
@@ -282,34 +282,34 @@ class DoubleSLForRXConf(LineBuilder) :
 
 #  def __makeDstar__( self, dmesons = None, pions = None,  conf = {} ):
 #        """
-#        Make D* --> D pi 
+#        Make D* --> D pi
 #       """
-#     
+#
 #       # CombineParticles for the D* decay
 #
 #       combineDstar = CombineParticles()
 #       combineDstar.DecayDescriptor = "[D*(2010)+ -> D0 pi+]cc"
 #       combineDstar.CombinationCut  = "(AM < 2100*MeV)"
 #       combineDstar.MotherCut       = self.__DstarCuts__( conf )
-#       
+#
 #       selDstar = Selection( self.name + "_Dstar",
 #                             Algorithm = combineDstar,
 #                             RequiredSelections = [ dmesons, pions ] )
-#       
+#
 #       return selDstar
 
 #    def __makeB__( self, dstars = None , leptons = None , conf = {} ):
 #        """
-#        Make B --> D l 
+#        Make B --> D l
 #        """
 #
 #       # CombineParticles for the B decay
-#       
+#
 #       combineB = CombineParticles()
-#       combineB.DecayDescriptors = [ "[B0 -> D*(2010)- mu+]cc", "[B0 -> D*(2010)- e+]cc" ] 
+#       combineB.DecayDescriptors = [ "[B0 -> D*(2010)- mu+]cc", "[B0 -> D*(2010)- e+]cc" ]
 #       combineB.CombinationCut   = self.__BCombinationCuts__( conf )
 #       combineB.MotherCut        = self.__BCuts__( conf )
-#       
+#
 #       selB = Selection( self.name + "_B",
 #                         Algorithm = combineB,
 #                         RequiredSelections = [ dstars, leptons ] )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py
index df29a89f7da85cba8f3e0e58b0cf79eba0c6abb6..21ccc516962e74715d45fa640543c3fa5beec129 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py
@@ -14,7 +14,7 @@ __version__ = '1.0'
 __description__ = '[Xi_b- -> (Xi- -> (Lambda0 -> p+ pi-) pi-) gamma], [Omega_b- -> (Omega- -> (Lambda0 -> p+ pi-) K-) gamma]'
 __all__ = ('Hypb2L0HGammaConf',
      'default_config', )
-       
+
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
 from PhysSelPython.Wrappers      import Selection, MergedSelection, DataOnDemand
@@ -63,7 +63,7 @@ default_config = {
            'CombMassWinOmegab'    : 1000.,
            'MinPTOb'              : 1000.,
            'MinPOb'               : 15000.,
-           
+
            'TISTOSLinesDict': {'L0Photon.*Decision%TOS':0,
                    'L0Electron.*Decision%TOS':0#,
                    #'L0Photon.*Decision%TIS':0,
@@ -74,16 +74,16 @@ default_config = {
   }
 
 #######################################################################
-    
+
 class Hypb2L0HGammaConf(LineBuilder):
-	
+
 	__configuration_keys__ = default_config['CONFIG'].keys()
-	
+
 	def __init__(self, name, config):
-		
+
 		LineBuilder.__init__(self, name, config)
-		
-		PionsL =DataOnDemand('Phys/StdLoosePions/Particles') 
+
+		PionsL =DataOnDemand('Phys/StdLoosePions/Particles')
 		PionsD =DataOnDemand('Phys/StdNoPIDsDownPions/Particles')
 
 ##############################################################
@@ -98,21 +98,21 @@ class Hypb2L0HGammaConf(LineBuilder):
 		Lambda_cuts = """(PT>%(L0_PT_Min)s*MeV) &
 				             (VFASPF(VCHI2/VDOF)<%(L0_VCHI2)s)"""
 		Lambda_code = (Lambda_cuts + " & " + tracks_cuts) % config
-		Lambda_filter = FilterDesktop(name = 'Lambda_filter', 
+		Lambda_filter = FilterDesktop(name = 'Lambda_filter',
 		                              Code = Lambda_code)
 
-#		Lambda_ll_dod = DataOnDemand('Phys/StdLooseLambdaLL/Particles')       
-		Lambda_ll_dod = DataOnDemand('Phys/StdVeryLooseLambdaLL/Particles')       
+#		Lambda_ll_dod = DataOnDemand('Phys/StdLooseLambdaLL/Particles')
+		Lambda_ll_dod = DataOnDemand('Phys/StdVeryLooseLambdaLL/Particles')
 		Lambda_ll = Selection("LooseLambda0LL_for_Hypb2L0HGamma",
 				               Algorithm=Lambda_filter,
-				               RequiredSelections=[Lambda_ll_dod]) 
+				               RequiredSelections=[Lambda_ll_dod])
 
 
 		Lambda_dd_dod = DataOnDemand('Phys/StdLooseLambdaDD/Particles')
 		Lambda_dd = Selection("LooseLambda0DD_for_Hypb2L0HGamma",
 				               Algorithm=Lambda_filter,
-				               RequiredSelections=[Lambda_dd_dod]) 
-		
+				               RequiredSelections=[Lambda_dd_dod])
+
 
 
 ##############################################################
@@ -123,52 +123,52 @@ class Hypb2L0HGammaConf(LineBuilder):
 		Photons = Selection("Photons"+name,
 				    Algorithm=photons_filter,
 				    RequiredSelections=[StdLooseAllPhotons])
-		
-#############		Making all Xi		#######################		
+
+#############		Making all Xi		#######################
 		self.selXi_LLL = makeXi2L0pi(name 	= "Xi2L0pi_LLL" + name,
 					     pions 	= PionsL,
 					     lambdas = Lambda_ll,
 					     params = config
-					     ) 
-							
+					     )
+
 		self.selXi_DDD = makeXi2L0pi(name 	= "Xi2L0pi_DDD" + name,
 					     pions 	= PionsD,
 					     lambdas = Lambda_dd,
 					     params = config
-					     ) 
-							
+					     )
+
 		self.selXi_DDL = makeXi2L0pi(name 	= "Xi2L0pi_DDL" + name,
 					     pions 	= PionsL,
 					     lambdas = Lambda_dd,
 					     params = config
-					     ) 
-							
+					     )
+
 		#		self.mergedXi = MergedSelection("Xi_minus",
 #										RequiredSelections=[self.selXi_LLL, self.selXi_DDD, self.selXi_DDL])
-		
-#############		Making  Xi_b LLL	#######################						
+
+#############		Making  Xi_b LLL	#######################
 		children_Xib = {'Xi': '[Xi_b- -> ^Xi- gamma]CC',
                        'gamma': '[Xi_b- -> Xi- ^gamma]CC'}
-                       
+
 		self.SelXib_LLL = makeXib2XiGamma(name	=	"Xib2XiGamma_LLL",
 						  xiSel	=	self.selXi_LLL,
 						  photons=	Photons,
 						  params = config
 						  )
-								
+
 		self.lineXib2XiGamma_LLL = StrippingLine("StripXib2XiGamma_LLL",
 							 prescale = config['Prescale'],
 							 algos = [tisTosSelection(self.SelXib_LLL, config['TISTOSLinesDict'])],
 							 postselalg = makevelotracks("StripXib2XiGamma_LLL"),
 							 MDSTFlag = False,
 							 RelatedInfoTools = [
-###		Track Match Xib					 
+###		Track Match Xib
 							 {'Type' : 'RelInfoVeloTrackMatch',
 									      'InputTracks' : "Rec/Track/Velo"+"StripXib2XiGamma_LLL",
 									      'Location' : 'P2VELOTRACKMATCH',
 									      'ConeAroundMomentum' : 'True'
 									      },
-#									      
+#
 ### Photon Isolation
 							 {"Type": "RelInfoGammaIso",
 			                 "DaughterLocations": {"[Xi_b- -> Xi- ^gamma]CC": "GammaIsolation"}},
@@ -185,29 +185,29 @@ class Hypb2L0HGammaConf(LineBuilder):
 						get_neutral_cone_relinfo(0.4, children=children_Xib)
 						]
 							 )
-#		
+#
 		self.registerLine(self.lineXib2XiGamma_LLL)
-		
-#############		Making  Xi_b DDD   #######################						
+
+#############		Making  Xi_b DDD   #######################
 		self.SelXib_DDD = makeXib2XiGamma(name	=	"Xib2XiGamma_DDD",
 						  xiSel	=	self.selXi_DDD,
 						  photons=	Photons,
 						  params = config
 						  )
-		
+
 		self.lineXib2XiGamma_DDD = StrippingLine("StripXib2XiGamma_DDD",
 							 prescale = config['Prescale'],
                              algos = [tisTosSelection(self.SelXib_DDD, config['TISTOSLinesDict'])],
 							 postselalg = makevelotracks("StripXib2XiGamma_DDD"),
 							 MDSTFlag = False,
 							 RelatedInfoTools = [
-###		Track Match Xib					 
+###		Track Match Xib
 							 {'Type' : 'RelInfoVeloTrackMatch',
 									      'InputTracks' : "Rec/Track/Velo"+"StripXib2XiGamma_DDD",
 									      'Location' : 'P2VELOTRACKMATCH',
 									      'ConeAroundMomentum' : 'True'
 									      },
-#									      
+#
 ### Photon Isolation
 							 {"Type": "RelInfoGammaIso",
 			                 "DaughterLocations": {"[Xi_b- -> Xi- ^gamma]CC": "GammaIsolation"}},
@@ -225,29 +225,29 @@ class Hypb2L0HGammaConf(LineBuilder):
 						]
 							 )
 #
-		
+
 		self.registerLine(self.lineXib2XiGamma_DDD)
-		
-#############		Making  Xi_b DDL	#######################						
+
+#############		Making  Xi_b DDL	#######################
 		self.SelXib_DDL = makeXib2XiGamma(name	=	"Xib2XiGamma_DDL",
 						  xiSel	=	self.selXi_DDL,
 						  photons=	Photons,
 						  params = config
 						  )
-								
+
 		self.lineXib2XiGamma_DDL = StrippingLine("StripXib2XiGamma_DDL",
 							 prescale = config['Prescale'],
                              algos = [tisTosSelection(self.SelXib_DDL, config['TISTOSLinesDict'])],
 							 postselalg = makevelotracks("StripXib2XiGamma_DDL"),
 							 MDSTFlag = False,
 							 RelatedInfoTools = [
-###		Track Match Xib					 
+###		Track Match Xib
 							 {'Type' : 'RelInfoVeloTrackMatch',
 									      'InputTracks' : "Rec/Track/Velo"+"StripXib2XiGamma_DDL",
 									      'Location' : 'P2VELOTRACKMATCH',
 									      'ConeAroundMomentum' : 'True'
 									      },
-#									      
+#
 ### Photon Isolation
 							 {"Type": "RelInfoGammaIso",
 			                 "DaughterLocations": {"[Xi_b- -> Xi- ^gamma]CC": "GammaIsolation"}},
@@ -265,46 +265,46 @@ class Hypb2L0HGammaConf(LineBuilder):
 						]
 							 )
 #
-		
+
 		self.registerLine(self.lineXib2XiGamma_DDL)
-		
+
 	##################################################################################
 	##############################	Omega	##########################################
 	##################################################################################
-		
-		KaonsL =DataOnDemand('Phys/StdLooseKaons/Particles') 
-		KaonsD =DataOnDemand('Phys/StdLooseDownKaons/Particles') 
-	
-	#############		Making all Omegas		#######################		
+
+		KaonsL =DataOnDemand('Phys/StdLooseKaons/Particles')
+		KaonsD =DataOnDemand('Phys/StdLooseDownKaons/Particles')
+
+	#############		Making all Omegas		#######################
 		self.selO_LLL = makeO2L0K(name 	= "O2L0K_LLL" + name,
 					  kaons 	= KaonsL,
 					  lambdas = Lambda_ll,
 					  params = config
-					  ) 
-							
+					  )
+
 		self.selO_DDD = makeO2L0K(name 	= "O2L0K_DDD" + name,
 					  kaons 	= KaonsD,
 					  lambdas = Lambda_dd,
 					  params = config
-					  ) 
-							
+					  )
+
 		self.selO_DDL = makeO2L0K(name 	= "O2L0K_DDL" + name,
 					  kaons 	= KaonsL,
 					  lambdas = Lambda_dd,
 					  params = config
-					  ) 
-							
+					  )
+
 		#		self.mergedO = MergedSelection("O_minus",
 	#										RequiredSelections=[self.selO_LLL, self.selO_DDD, self.selO_DDL])
-	
-#############		Making  Omega_b		#######################						
+
+#############		Making  Omega_b		#######################
 		self.SelOb_LLL = makeOb2OGamma(name	=	"Ob2OGamma_LLL",
 					       oSel	=	self.selO_LLL,
 					       photons=	Photons,
 					       params = config
 					       )
-	
-	
+
+
 		self.lineOb2OGamma_LLL = StrippingLine("StripOb2OGamma_LLL",
 						       prescale = config['Prescale'],
 						       algos = [tisTosSelection(self.SelOb_LLL, config['TISTOSLinesDict'])],
@@ -316,17 +316,17 @@ class Hypb2L0HGammaConf(LineBuilder):
 									     'ConeAroundMomentum' : 'True'
 									    }]
 						       )
-											 
+
 		self.registerLine(self.lineOb2OGamma_LLL)
-	
-#############		Making  Omega_b		#######################						
+
+#############		Making  Omega_b		#######################
 		self.SelOb_DDD = makeOb2OGamma(name	=	"Ob2OGamma_DDD",
 					       oSel	=	self.selO_DDD,
 					       photons=	Photons,
 					       params = config
 					       )
-	
-		
+
+
 		self.lineOb2OGamma_DDD = StrippingLine("StripOb2OGamma_DDD",
 						       prescale = config['Prescale'],
 						       #selection = tisTosSelection(self.SelOb_DDD, config['TISTOSLinesDict']),
@@ -339,18 +339,18 @@ class Hypb2L0HGammaConf(LineBuilder):
 									     'ConeAroundMomentum' : 'True'
 									    }]
 						       )
-	
+
 		self.registerLine(self.lineOb2OGamma_DDD)
-							
-		
-#############		Making  Omega_b		#######################						
+
+
+#############		Making  Omega_b		#######################
 		self.SelOb_DDL = makeOb2OGamma(name	=	"Ob2OGamma_DDL",
 					       oSel	=	self.selO_DDL,
 					       photons=	Photons,
 					       params = config
 					       )
-	
-	
+
+
 		self.lineOb2OGamma_DDL = StrippingLine("StripOb2OGamma_DDL",
 						       prescale = config['Prescale'],
 						       algos = [tisTosSelection(self.SelOb_DDL, config['TISTOSLinesDict'])],
@@ -363,10 +363,10 @@ class Hypb2L0HGammaConf(LineBuilder):
 									     'ConeAroundMomentum' : 'True'
 									    }]
 						       )
-	
+
 		self.registerLine(self.lineOb2OGamma_DDL)
-							
-	
+
+
 
 
 
@@ -379,31 +379,31 @@ class Hypb2L0HGammaConf(LineBuilder):
 
 def makeXi2L0pi(name, pions, lambdas, params):
   _name = name
-  _daughter_cut = {'Lambda0' : 'ALL' , 
-       'pi-'     : '(MIPCHI2DV(PRIMARY) > %(TRACK_IPCHI2_MIN)s) & (TRCHI2DOF < %(TRCHI2DOF_MAX)s) & (PT > %(pi_Xi_PT_Min)s * MeV)' %params } 
+  _daughter_cut = {'Lambda0' : 'ALL' ,
+       'pi-'     : '(MIPCHI2DV(PRIMARY) > %(TRACK_IPCHI2_MIN)s) & (TRCHI2DOF < %(TRCHI2DOF_MAX)s) & (PT > %(pi_Xi_PT_Min)s * MeV)' %params }
   _combcut = "(ADAMASS('Xi-') < %(CombMassWinXib)s * MeV)" %params
-  
+
   _mothercut = "(ADMASS('Xi-') < %(MassWinXi)s * MeV) & (PT > %(MinPTXi)s * MeV) & (P > %(MinPXi)s*MeV) & (MAXTREE(TRGHOSTPROB, HASTRACK) < %(Ghost_Prob)s) & (VFASPF(VCHI2/VDOF)<%(Xi_VCHI2)s)" %params
-  
+
   _Combine = CombineParticles(name = _name,
             DecayDescriptor = "[Xi- -> Lambda0 pi-]cc",
             CombinationCut = _combcut,
             MotherCut = _mothercut
             )
-                 
+
   return Selection(name + 'L0pi',
        Algorithm = _Combine,
        RequiredSelections = [pions, lambdas]
        )
-           
+
 #################################################################################################
 def makeXib2XiGamma(name, xiSel, photons, params):
   _name = name
-  
+
   _combcut = "(ADAMASS('Xi_b-') < %(CombMassWinXib)s * MeV)" %params
-  
+
   _mothercut = "(PT > %(MinPTXib)s * MeV) & (P > %(MinPXib)s*MeV) & (MTDOCACHI2(1) < %(MTDOCACHI2_MAX)s)" %params
-  
+
   _Combine = CombineParticles(name = _name,
                 DecayDescriptor = "[Xi_b- -> Xi- gamma]cc",
                 CombinationCut = _combcut,
@@ -411,12 +411,12 @@ def makeXib2XiGamma(name, xiSel, photons, params):
                 )
   _Combine.ParticleCombiners = {'' : 'ParticleAdder'}
 #  _Combine.ParticleCombiners = {'' : 'MomentumCombiner:PUBLIC'}
-  
+
   return Selection(name + 'XiGamma',
            Algorithm = _Combine,
            RequiredSelections = [xiSel, photons]
            )
-  
+
 
 
 #################################################################################
@@ -424,7 +424,7 @@ def makeXib2XiGamma(name, xiSel, photons, params):
 def makeO2L0K(name, kaons, lambdas, params):
   _name = name
   _daughter_cut = {'Lambda0' : 'ALL' ,
-       'K-'     : '(MIPCHI2DV(PRIMARY) > %(TRACK_IPCHI2_MIN)s) & (TRCHI2DOF < %(TRCHI2DOF_MAX)s)' %params } 
+       'K-'     : '(MIPCHI2DV(PRIMARY) > %(TRACK_IPCHI2_MIN)s) & (TRCHI2DOF < %(TRCHI2DOF_MAX)s)' %params }
   _combcut = "(ADAMASS('Omega-') < %(CombMassWinOmega)s * MeV)" %params
   _mothercut = "(ADMASS('Omega-') < %(MassWinOmega)s * MeV) & (PT > %(MinPTO)s * MeV) & (P > %(MinPO)s*MeV) & (MAXTREE(TRGHOSTPROB, HASTRACK) < %(Ghost_Prob)s)" %params
   _Combine = CombineParticles(name = _name,
@@ -436,7 +436,7 @@ def makeO2L0K(name, kaons, lambdas, params):
        Algorithm = _Combine,
        RequiredSelections = [kaons, lambdas]
        )
-           
+
 ###################################################################################
 def makeOb2OGamma(name, oSel, photons, params):
   _name = name
@@ -452,7 +452,7 @@ def makeOb2OGamma(name, oSel, photons, params):
        Algorithm = _Combine,
        RequiredSelections = [oSel, photons]
        )
-          
+
 def makeTISTOSFilter(name,dict_TISTOS):
   specs = dict_TISTOS
   from Configurables import TisTosParticleTagger
@@ -463,12 +463,12 @@ def makeTISTOSFilter(name,dict_TISTOS):
 def tisTosSelection(sel,TISTOSdict):
   tisTosFilter = makeTISTOSFilter(sel.name(),TISTOSdict)
   return Selection(sel.name()+'TISTOS', Algorithm=tisTosFilter, RequiredSelections=[sel])
-  
+
 
 def makevelotracks(name):
     from Configurables import  FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
-    
+
     MyFastVeloTracking = FastVeloTracking("For%sFastVelo"%name,OutputTracksName="Rec/Track/MyVeloFor%s"%name)
     MyFastVeloTracking.OnlyForward = True
     MyFastVeloTracking.ResetUsedFlags = True
@@ -483,11 +483,11 @@ def makevelotracks(name):
 #              TracksOutContainer="Rec/Track/Velo"+name,
               SimplifiedGeometry = True)
     maketracks = GaudiSequencer('For%sMakeVeloTracksGS'%name)
-    maketracks.Members += [ MyFastVeloTracking ] 
-    maketracks.Members += [ preve ] 
-    maketracks.Members += [ copyVelo ] 
-    maketracks.Members += [ MyVeloFit ] 
-    
+    maketracks.Members += [ MyFastVeloTracking ]
+    maketracks.Members += [ preve ]
+    maketracks.Members += [ copyVelo ]
+    maketracks.Members += [ MyVeloFit ]
+
     return maketracks
 
 ######################################################################################
@@ -505,8 +505,8 @@ def get_cone_relinfo(angle, head=None, children=None):
         tool.update({'DaughterLocations': dict([(sel_string, base_location % name)
                                                 for name, sel_string in children.items()])})
     return tool
-    
-#############################################################################################    
+
+#############################################################################################
 def get_neutral_cone_relinfo(size, head=None, children=None):
     tool = {'Type'       : 'RelInfoConeIsolation',
             'FillCharged': False,
@@ -521,5 +521,3 @@ def get_neutral_cone_relinfo(size, head=None, children=None):
         tool.update({'DaughterLocations': dict([(sel_string, base_location % name)
                                                 for name, sel_string in children.items()])})
     return tool
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py
index ded10aca6986e57da50bfc877740829c93888a17..4aab69367ec26b0ec67282539a2470bd1c22ec05 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py
@@ -55,19 +55,19 @@ default_config = {
         'MaxSVchi2pdof'          : 50,
         'MaxSVZ'                 : 650*mm,
         'MinVDZ'                 : 0*mm,
-        
+
         'K0s2pi2mu2PreScale'     : 1,
         'K0s2pi2mu2PostScale'    : 1,
-        
+
         'K0s2pi2mu2LFVPreScale'  : 1,
         'K0s2pi2mu2LFVPostScale' : 1,
-        
+
         'K0s2pi2mu2SSPreScale'   : 0.25,
         'K0s2pi2mu2SSPostScale'  : 1,
-        
+
         'K0s2mu4PreScale'        : 1,
         'K0s2mu4PostScale'       : 1,
-        
+
         'K0s2mu4SSPreScale'      : 0.4,
         'K0s2mu4SSPostScale'     : 1
         }
@@ -77,7 +77,7 @@ class K0s2XXMuMuConf(LineBuilder):
     """
     Builder for KS0 -> X X mu mu processes
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__( self, name, config ):
@@ -89,7 +89,7 @@ class K0s2XXMuMuConf(LineBuilder):
         - PT (> {MinPT})
         The constructor automatically changes the value in the dictionary
         so the part between parentheses is saved.
-        
+
         Example:
         code = '(PT {MinPT}) & (MIPDV(PRIMARY) {MaxIP})'
         """
@@ -100,7 +100,7 @@ class K0s2XXMuMuConf(LineBuilder):
         for k, c in config.iteritems():
 
             l = k.lower()
-            
+
             if 'min' in l:
                 cut = '> {}'.format(c)
             elif 'max' in l:
@@ -109,10 +109,10 @@ class K0s2XXMuMuConf(LineBuilder):
                 cut = c
 
             self.config[k] = cut
-            
+
         self.SelMuons = self._filterMuons(name = 'MuonsFor' + name, sel = StdAllLooseMuons)
         self.SelPions = self._filterPions(name = 'PionsFor' + name, sel = StdAllLoosePions)
-        
+
         #
         # K0s2PiPiMuMu
         #
@@ -162,7 +162,7 @@ class K0s2XXMuMuConf(LineBuilder):
                                                                                                 '[KS0 -> pi+ [pi-]cc ^mu+ [mu-]cc]CC' : 'Muon3BDT',
                                                                                                 '[KS0 -> pi+ [pi-]cc mu+ ^[mu-]cc]CC' : 'Muon4BDT' }
                                                                         } ] )
-        
+
         #
         # K0s2MuMuMuMu
         #
@@ -195,7 +195,7 @@ class K0s2XXMuMuConf(LineBuilder):
                                                                                                 '[KS0 -> mu+ [mu-]cc ^mu+ mu+]CC' : 'Muon3BDT',
                                                                                                 '[KS0 -> mu+ [mu-]cc mu+ ^mu+]CC' : 'Muon4BDT' }
                                                                         } ] )
-        
+
         #
         # Register lines
         #
@@ -206,7 +206,7 @@ class K0s2XXMuMuConf(LineBuilder):
                       self.K0s2MuMuMuMuSSLine,
                       ):
             self.registerLine(line)
-            
+
     def _filterMuons( self, name, sel ):
         """
         Make the muon filter
@@ -225,20 +225,20 @@ class K0s2XXMuMuConf(LineBuilder):
         code = '(MIPDV(PRIMARY) {PiMinIP}) & '\
             '(TRCHI2DOF {PiMaxTrChi2pdof}) & '\
             '(TRGHOSTPROB {PiMaxGP})'.format(**self.config)
-        
+
         fltr = FilterDesktop('Filter' + name, Code = code)
 
         return Selection(name, Algorithm = fltr, RequiredSelections = [sel])
-        
+
     def _makeK0s2X4( self, name, decays ):
         """
         Define the decay of a KS0 to four daughters
         """
-        
+
         common_dc = "ALL".format(**self.config)
-        
+
         cc = "(AMAXDOCA('') {MaxDOCA})".format(**self.config)
-        
+
         mc = "(M {MaxMass}) & "\
             "(BPVVDZ {MinVDZ}) & "\
             "(BPVDIRA {MinDIRA}) & "\
@@ -247,18 +247,18 @@ class K0s2XXMuMuConf(LineBuilder):
             "(MIPDV(PRIMARY) {MaxIP}) & "\
             "(MIPCHI2DV(PRIMARY) {MaxIPchi2}) & "\
             "(VFASPF(VCHI2PDOF) {MaxSVchi2pdof})".format(**self.config)
-        
+
         inputs = []
         dc     = {}
-        
+
         if any(map(lambda s: 'mu' in s, decays)):
             inputs.append(self.SelMuons)
             dc['mu+'] = common_dc
-            
+
         if any(map(lambda s: 'pi' in s, decays)):
             inputs.append(self.SelPions)
             dc['pi+'] = common_dc
-            
+
         combiner = CombineParticles(DecayDescriptors = decays,
                                     DaughtersCuts    = dc,
                                     CombinationCut   = cc,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py
index 8a131c58cb601d222cfd184f8791fb7519b035da..623a1ce748a27050708815ca47c09c850987cc1e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-__author__ = ['Adrian Casais Vidal','Carla Marin', 'Xabier Cid Vidal']  
+__author__ = ['Adrian Casais Vidal','Carla Marin', 'Xabier Cid Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
 
@@ -21,15 +21,15 @@ default_config =  {
     'WGs'         : ['RD'],
     'BUILDERTYPE' : 'Kshort2LeptonsConf',
     'CONFIG'      : {
-                 "e":{    
-    
-    
-                           "L":{          'PT'                : 100.          ,#MeV                        
+                 "e":{
+
+
+                           "L":{          'PT'                : 100.          ,#MeV
                                          'MINIPCHI2'         : 50            ,#adimensional
                                          'PIDe'              : -1          ,#adimensional
                                          'GhostProb'         : 0.35          #adimensional
                                          },
-                  
+
                            "U":{       'PT'                : 50            ,#MeV
                                        'MINIPCHI2'         : 10            ,#adimensional
                                        'PIDe'              : -3.5          ,#adimensional
@@ -46,15 +46,15 @@ default_config =  {
                                          'GhostProb'    : 0.5            #adimensional
                                          },
                            },
-                 "mu":{    
-    
-                  
-                           "L":{'PT'                : 50.          ,#MeV                        
+                 "mu":{
+
+
+                           "L":{'PT'                : 50.          ,#MeV
                                          'MINIPCHI2'         : 20            ,#adimensional
                                          'PIDmu'              : -5,#adimensional
                                          'GhostProb'         : 0.5          #adimensional
                                          },
-                  
+
                            "U":{'PT'                : 50            ,#MeV
                                        'MINIPCHI2'         : 10            ,#adimensional
                                        'PIDmu'              : -3.5          ,#adimensional
@@ -66,15 +66,15 @@ default_config =  {
                                          'GhostProb'         : 0.35          #adimensional
                                          },
                            },
-                 "pi":{    
-    
-                  
-                           "L":{'PT'                : 100.          ,#MeV                        
+                 "pi":{
+
+
+                           "L":{'PT'                : 100.          ,#MeV
                                          'MINIPCHI2'         : 16            ,#adimensional
                                          'PIDK'              : 5          ,#adimensional
                                          'GhostProb'         : 0.5          #adimensional
                                          },
-                  
+
                            "U":{'PT'                : 50            ,#MeV
                                        'MINIPCHI2'         : 10            ,#adimensional
                                        'PIDK'              : -3.5          ,#adimensional
@@ -87,8 +87,8 @@ default_config =  {
                                          },
                            },
                   "2pi2e" : {
-                          
-                          
+
+
                            'LL':{
                                 'KsMAXDOCA'     : 1.            , #mm
                                 'KsLifetime'    : 0.01*89.53    , #0.01*10^-12s
@@ -98,7 +98,7 @@ default_config =  {
                                 'Prescale'      :  1,
                                 'Postscale'     :  1
                                 },
-                          
+
                           'UU':{'KsMAXDOCA'         : 1.            ,#mm
                                 'KsDisChi2'         : 2500          ,#adimensional
                                 'KsIP'              : 1             ,#mm
@@ -144,8 +144,8 @@ default_config =  {
 
                         },
                   "2mu2e" : {
-                          
-                          
+
+
                            'LL':{
                                 'KsMAXDOCA'     : 1.            , #mm
                                 'KsLifetime'    : 0.01*89.53    , #0.01*10^-12s
@@ -155,7 +155,7 @@ default_config =  {
                                 'Prescale'      :  1,
                                 'Postscale'     :  1
                                 },
-                          
+
                           'UU':{'KsMAXDOCA'         : 1.            ,#mm
                                 'KsDisChi2'         : 1500          ,#adimensional
                                 'KsIP'              : 1             ,#mm
@@ -200,10 +200,10 @@ default_config =  {
                                 }
 
                         },
-              
+
                  "3mue" : {
-                          
-                          
+
+
                            'LL':{
                                 'KsMAXDOCA'     : 1.            , #mm
                                 'KsDisChi2'    : 50    , #0.01*10^-12s
@@ -213,7 +213,7 @@ default_config =  {
                                 'Prescale'      :  1,
                                 'Postscale'     :  1
                                 },
-                          
+
                           'UU':{'KsMAXDOCA'         : 1.            ,#mm
                                 'KsDisChi2'         : 2500          ,#adimensional
                                 'KsIP'              : 1             ,#mm
@@ -259,8 +259,8 @@ default_config =  {
 
                         },
                  "3emu" : {
-                          
-                          
+
+
                            'LL':{
                                 'KsMAXDOCA'     : 1.            , #mm
                                 'KsDisChi2'    : 2500    , #0.01*10^-12s
@@ -270,7 +270,7 @@ default_config =  {
                                 'Prescale'      :  1,
                                 'Postscale'     :  1
                                 },
-                          
+
                           'UU':{'KsMAXDOCA'         : 1.            ,#mm
                                 'KsDisChi2'         : 2500          ,#adimensional
                                 'KsIP'              : 1             ,#mm
@@ -316,8 +316,8 @@ default_config =  {
 
                         },
                   "2mu2pi" : {
-                          
-                          
+
+
                            'LL':{
                                 'KsMAXDOCA'     : 3.            , #mm
                                 'KsDisChi2'     : 1500    , #0.01*10^-12s
@@ -327,7 +327,7 @@ default_config =  {
                                 'Prescale'      :  1,
                                 'Postscale'     :  1
                                 },
-                          
+
                           'UU':{'KsMAXDOCA'         : 1.            ,#mm
                                 'KsDisChi2'         : 2500          ,#adimensional
                                 'KsIP'              : 1             ,#mm
@@ -373,7 +373,7 @@ default_config =  {
 
                         },
 
-                  
+
                   "4mu" : {
                           'LL':{
                                 'KsMAXDOCA'         : 1.            , #mm
@@ -495,13 +495,13 @@ default_config =  {
                                 },
 
                           },
-                        
 
-                  
 
 
-                  
-                                                
+
+
+
+
                         'TISTOSDict'     : {'Hlt2RareStrangeKsLeptonsTOSDecision%TOS': 0,
                                             },
 
@@ -513,7 +513,7 @@ default_config =  {
 __all__ = ('Kshort2Leptons',
            'default_config'
            )
- 
+
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
@@ -537,7 +537,7 @@ from itertools import product
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
@@ -552,9 +552,9 @@ class Kshort2LeptonsConf(LineBuilder) :
     """
     Builder for Kshort --> Leptons
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-                              
+
     def __init__(self, name, config):
 
         self.name = name
@@ -570,8 +570,8 @@ class Kshort2LeptonsConf(LineBuilder) :
         self.makeparts_up = ChargedProtoParticleMaker(name = "MyProtoParticlesUp"+self.name,
                                                    Inputs = ["Rec/Track/Best"],
                                                    Output = "Rec/ProtoP/MyProtosUp"+self.name)
-        
-                
+
+
         self.makeparts_velo.addTool( DelegatingTrackSelector, name="TrackSelector" )
         self.makeparts_velo.TrackSelector.TrackTypes = ["Velo"]
 
@@ -579,7 +579,7 @@ class Kshort2LeptonsConf(LineBuilder) :
         self.makeparts_up.addTool( DelegatingTrackSelector, name="TrackSelector" )
         self.makeparts_up.TrackSelector.TrackTypes = ["Upstream"]
 
-        
+
 
         self.myprotos_velo = GSWrapper(name = "MyProtosVelo"+self.name,
                                       sequencer = self.makeparts_velo,
@@ -593,8 +593,8 @@ class Kshort2LeptonsConf(LineBuilder) :
 
 
 
-        
-        
+
+
         #Making NoPIDs containers for the now available particles
         self.veloElectrons =  NoPIDsParticleMaker ( name = "StdNoPIDsVeloElectronsLocal"+self.name,
                                                     DecayDescriptor = 'Electron' ,
@@ -611,12 +611,12 @@ class Kshort2LeptonsConf(LineBuilder) :
                                               DecayDescriptor = 'Muon' ,
                                               Particle = 'muon',
                                               AddBremPhotonTo = [],
-                                              Input = self.myprotos_velo.outputLocation()) 
+                                              Input = self.myprotos_velo.outputLocation())
         self.veloPions =  NoPIDsParticleMaker ( name = "StdNoPIDsVeloPionsLocal"+self.name,
                                               DecayDescriptor = 'Pion' ,
                                               Particle = 'pion',
                                               AddBremPhotonTo = [],
-                                              Input = self.myprotos_velo.outputLocation()) 
+                                              Input = self.myprotos_velo.outputLocation())
 
 
 
@@ -624,26 +624,26 @@ class Kshort2LeptonsConf(LineBuilder) :
 
 
         self.StdNoPIDsVeloElectrons = Selection('StdNoPIDsVeloElectrons'+self.name,
-                                                Algorithm = self.veloElectrons, 
+                                                Algorithm = self.veloElectrons,
                                                 RequiredSelections = [self.myprotos_velo],
                                                 InputDataSetter=None)
-        
+
         self.StdNoPIDsUpMuons = Selection('StdNoPIDsUpMuons'+self.name,
-                                                Algorithm = self.upMuons, 
+                                                Algorithm = self.upMuons,
                                                 RequiredSelections = [self.myprotos_up],
                                                 InputDataSetter=None)
 
         self.StdNoPIDsVeloMuons = Selection('StdNoPIDsVeloMuons'+self.name,
-                                          Algorithm = self.veloMuons, 
+                                          Algorithm = self.veloMuons,
                                           RequiredSelections = [self.myprotos_velo],
                                           InputDataSetter=None)
         self.StdNoPIDsVeloPions = Selection('StdNoPIDsVeloPions'+self.name,
-                                          Algorithm = self.veloPions, 
+                                          Algorithm = self.veloPions,
                                           RequiredSelections = [self.myprotos_velo],
                                           InputDataSetter=None)
-        
+
         #Handy dictionaries to access the different categories of particles.
-        
+
         StandardParticles = {"mu":{"L":StdAllLooseMuons,
                                 "U":self.StdNoPIDsUpMuons,
                                 "V":self.StdNoPIDsVeloMuons
@@ -653,19 +653,19 @@ class Kshort2LeptonsConf(LineBuilder) :
                                "U":StdNoPIDsUpElectrons,
                                "Di":StdDiElectronFromTracks
                                },
-                          
+
                           "pi":{"L":StdAllNoPIDsPions,
                                 "U":StdNoPIDsUpPions,
                                 "V":self.StdNoPIDsVeloPions
                                       }
-                          
+
                           }
 
-        
+
 
 
         # Applying cuts to particles
-        
+
         particles ={"mu":{},"pi":{},"e":{}}
 
         for cat in ["L","U","V"]:
@@ -673,84 +673,84 @@ class Kshort2LeptonsConf(LineBuilder) :
             particles["mu"][cat]=self.makeMuons(self.name+"Muons"+cat,StandardParticles["mu"][cat],default_config["CONFIG"]["mu"][cat])
             particles["pi"][cat]=self.makePions(self.name+"Pions"+cat,StandardParticles["pi"][cat],default_config["CONFIG"]["pi"][cat])
             particles["e"][cat]= self.makeElecs(self.name+"Electrons"+cat,StandardParticles["e"][cat],default_config["CONFIG"]["e"][cat])
-            
+
         particles["e"]["Di"] = self.makeElecsFromTracks(self.name+"DiElectrons"+cat, StandardParticles["e"]["Di"],default_config["CONFIG"]["e"]["Di"])
 
-        
-        
+
+
         ########################
         ## 1: Make combinations for the different decays and different tracks combinations and building the Lines
 
         #KS0 -> mumuee
         diLongmumuee = particles["mu"]["L"]
-        
+
         parSelsmumuee = {"LL":[diLongmumuee,particles["e"]["Di"]],
                          "LU":[diLongmumuee,particles["e"]["L"],particles["e"]["U"]],
                          "LV":[diLongmumuee,particles["e"]["L"],particles["e"]["V"]],
                          "UU":[diLongmumuee,particles["e"]["U"]],
                          "UV":[diLongmumuee,particles["e"]["U"],particles["e"]["V"]],
                          "VV":[diLongmumuee,particles["e"]["V"]],}
-                         
+
         KS0mumuee = self.buildCategories(["mu+","mu-","e+","e-"],True,parSelsmumuee,default_config["CONFIG"]["2mu2e"])
         KS0mumueeLFV1 = self.buildCategories(["mu+","mu+","e-","e-"],True,parSelsmumuee,default_config["CONFIG"]["2mu2e"],cc=True)
 
-        
+
         self.buildLines(self.name,"2mu2e",KS0mumuee)
         self.buildLines(self.name,"2mu2e",KS0mumueeLFV1,LFVLabel="LFV1")
 
 
         #KS0 -> 3mue
         diLong3mue = particles["mu"]["L"]
-        
+
         parSels3mue = {"LL":[diLong3mue,particles["e"]["L"]],
                          "LU":[diLong3mue,particles["e"]["U"]],
                          "LV":[diLong3mue,particles["e"]["V"]],
                          "UU":[diLong3mue,particles["mu"]["U"],particles["e"]["U"]],
                          "UV":[diLong3mue,particles["mu"]["U"],particles["e"]["V"]],
                          "VV":[diLong3mue,particles["e"]["V"],particles["mu"]["V"]]}
-                         
+
         KS03mue = self.buildCategories(["mu+","mu-","mu+","e-"],False,parSels3mue,default_config["CONFIG"]["3mue"],cc=True)
-        
-        
+
+
         self.buildLines(self.name,"3mue",KS03mue)
 
-       
+
         #KS0 -> 3emu
         diLong3emu = particles["e"]["L"]
-        
+
         parSels3emu = {"LL":[diLong3emu,particles["mu"]["L"]],
                          "LU":[diLong3emu,particles["mu"]["U"]],
                          "LV":[diLong3emu,particles["mu"]["L"],particles["e"]["V"]],
                          "UU":[diLong3emu,particles["mu"]["U"],particles["e"]["U"]],
                          "UV":[diLong3emu,particles["mu"]["U"],particles["e"]["V"]],
                          "VV":[diLong3emu,particles["e"]["V"],particles["mu"]["V"]]}
-                         
+
         KS03emu = self.buildCategories(["e+","e-","mu+","e-"],False,parSels3emu,default_config["CONFIG"]["3emu"],cc=True)
-        
-        
+
+
         self.buildLines(self.name,"3emu",KS03emu)
 
-        
+
 
 
 
         #KS0 -> pipiee
         diLongpipiee = particles["pi"]["L"]
-        
+
         parSelspipiee = {"LL":[diLongpipiee,particles["e"]["Di"]],
                          "LU":[diLongpipiee,particles["e"]["L"],particles["e"]["U"]],
                          "LV":[diLongpipiee,particles["e"]["L"],particles["e"]["V"]],
                          "UU":[diLongpipiee,particles["e"]["U"]],
                          "UV":[diLongpipiee,particles["e"]["U"],particles["e"]["V"]],
                          "VV":[diLongpipiee,particles["e"]["V"]],}
-                         
+
         KS0pipiee = self.buildCategories(["pi+","pi-","e+","e-"],True,parSelspipiee,default_config["CONFIG"]["2pi2e"])
 
         self.buildLines(self.name,"2pi2e",KS0pipiee)
 
         #KS0 -> mumupipi
         diLongmumupipi = particles["mu"]["L"]
-        
+
         parSelsmumupipi = {"LL":[diLongmumupipi,particles["pi"]["L"]],
                            "LU":[diLongmumupipi,particles["pi"]["L"],particles["pi"]["U"]],
                            "LV":[diLongmumupipi,particles["pi"]["L"],particles["pi"]["V"]],
@@ -758,47 +758,47 @@ class Kshort2LeptonsConf(LineBuilder) :
                            "UV":[diLongmumupipi,particles["pi"]["U"],particles["pi"]["V"]],
                            "VV":[diLongmumupipi,particles["pi"]["V"]],}
 
-                              
-                         
+
+
 
         KS0mumupipi = self.buildCategories(["mu+","mu-","pi+","pi-"],False,parSelsmumupipi,default_config["CONFIG"]["2mu2pi"])
         KS0mumupipiLFV1 = self.buildCategories(["mu+","mu+","pi-","pi-"],False,parSelsmumupipi,default_config["CONFIG"]["2mu2pi"],cc=True)
 
-        
+
         self.buildLines(self.name,"2mu2pi",KS0mumupipi)
         self.buildLines(self.name,"2mu2pi",KS0mumupipiLFV1,LFVLabel="LFV1")
         #KS0 -> 4mu
         diLong4mu = particles["mu"]["L"]
-        
+
         parSels4mu = {"LL":[diLong4mu],
                          "LU":[diLong4mu,particles["mu"]["U"]],
                          "LV":[diLong4mu,particles["mu"]["V"]],
                          "UU":[diLong4mu,particles["mu"]["U"]],
                          "UV":[diLong4mu,particles["mu"]["U"],particles["mu"]["V"]],
                          "VV":[diLong4mu,particles["mu"]["V"]],}
-                         
+
         KS04mu = self.buildCategories(["mu+","mu-","mu+","mu-"],False,parSels4mu,default_config["CONFIG"]["4mu"])
 
-                
+
         self.buildLines(self.name,"4mu",KS04mu)
 
         #KS0 -> 4e
         diLong4e = particles["e"]["Di"]
-        
+
         parSels4e = {"LL":[diLong4e],
                          "LU":[diLong4e,particles["e"]["U"],particles["e"]["L"]],
                          "LV":[diLong4e,particles["e"]["V"],particles["e"]["L"]],
                          "UU":[diLong4e,particles["e"]["U"]],
                          "UV":[diLong4e,particles["e"]["U"],particles["e"]["V"]],
                          "VV":[diLong4e,particles["e"]["V"]],}
-                         
+
 
         KS04e = self.buildCategories(["e+","e-","e+","e-"],True,parSels4e,default_config["CONFIG"]["4e"],onlyLL=False,is4e=True)
 
-                
+
         self.buildLines(self.name,"4e",KS04e)
 
-        
+
 
 
     def buildLines(self,name,dec,categories,LFVLabel=""):
@@ -822,11 +822,11 @@ class Kshort2LeptonsConf(LineBuilder) :
                                          selection=categories[cat],
                                          MDSTFlag=False)
 
-                
+
 
         for line in lines:
             self.registerLine(lines[line])
-            
+
     def makePions(self,name,inputPions,pionCuts):
         """
         Pion selection.
@@ -837,9 +837,9 @@ class Kshort2LeptonsConf(LineBuilder) :
                 "(MIPCHI2DV(PRIMARY) > %(MINIPCHI2)s) &"\
                 "(TRGHOSTPROB < %(GhostProb)s) &"\
                 "(PIDK < %(PIDK)s)" % pionCuts
-        
+
         _Filter = FilterDesktop(Code = _code)
-        
+
         return Selection(name,
                          Algorithm = _Filter,
                          RequiredSelections = [ inputPions ]
@@ -854,12 +854,12 @@ class Kshort2LeptonsConf(LineBuilder) :
                 "(MIPCHI2DV(PRIMARY) > %(MINIPCHI2)s) &"\
                 "(TRGHOSTPROB < %(GhostProb)s) &"\
                 "(PIDmu > %(PIDmu)s)" % muonCuts
-    
+
         _Filter = FilterDesktop(Code = _code)
-        
+
         return Selection(name,
                          Algorithm = _Filter,
-                         RequiredSelections = [inputMuons] 
+                         RequiredSelections = [inputMuons]
                          )
 
 
@@ -876,17 +876,17 @@ class Kshort2LeptonsConf(LineBuilder) :
                 "( PT > %(PT)s ) &"\
                 "( TRGHOSTPROB < %(GhostProb)s ) & "\
                 "( PIDe > %(PIDe)s )"  % electronCuts
-            
-            
+
+
         _Filter = FilterDesktop(Code = _code)
-        
+
         return Selection(name,
                          Algorithm = _Filter,
                          RequiredSelections = [inputElecs]
                          )
 
 
-    
+
     def makeElecsFromTracks(self,name, inputElecs,electronCuts):
         """
         Electron selection from StdDiElectronFromTracks
@@ -898,9 +898,9 @@ class Kshort2LeptonsConf(LineBuilder) :
                 "(MINTREE(ABSID<14,MIPCHI2DV(PRIMARY)) > %(MINIPCHI2)s) &"\
                 "(MAXTREE(ABSID<14,TRGHOSTPROB) < %(GhostProb)s) &"\
                 "(MINTREE(ABSID<14,PIDe) > %(PIDe)s)"  % electronCuts
-            
+
         _Filter = FilterDesktop(Code = _code)
-        
+
         return Selection(name,
                          Algorithm = _Filter,
                          RequiredSelections = [inputElecs]
@@ -911,13 +911,13 @@ class Kshort2LeptonsConf(LineBuilder) :
 
     def buildCategories(self,pars,hasDielectron,parSels,motherCuts,cc=False,onlyLL=False,is4e=False):
         '''
-        Builds the different cobinations of tracks using the class KshortTo4bodies. 
+        Builds the different cobinations of tracks using the class KshortTo4bodies.
         '''
         combCuts = self.makeCombCuts(pars)
-        
+
         dec = "".join(pars)
-        
-        
+
+
         LL = KshortTo4Bodies(self.name+dec+"LL",pars,parSels["LL"],motherCuts["LL"],combCuts["LL"],hasDielectronLong=hasDielectron,hasVELO=False,CC=cc,is4e=is4e) #0: LL
         if not onlyLL:
             LV = KshortTo4Bodies(self.name+dec+"LV",pars,parSels["LV"],motherCuts["LV"],combCuts["LV"],hasDielectronLong=False,hasVELO=True,CC=cc,is4e=is4e)          #1: LV
@@ -926,27 +926,27 @@ class Kshort2LeptonsConf(LineBuilder) :
             UV = KshortTo4Bodies(self.name+dec+"UV",pars,parSels["UV"],motherCuts["UV"],combCuts["UV"],hasDielectronLong=False,hasVELO=True,CC=cc,is4e=is4e)          #4: UV
             VV = KshortTo4Bodies(self.name+dec+"VV",pars,parSels["VV"],motherCuts["VV"],combCuts["VV"],hasDielectronLong=False,hasVELO=True,CC=cc,is4e=is4e)          #5: VV
 
-    
-        
-            return {"LL": LL.KS0, "LV":LV.KS0, "LU":LU.KS0, "UU":UU.KS0, "UV":UV.KS0, "VV":VV.KS0} 
+
+
+            return {"LL": LL.KS0, "LV":LV.KS0, "LU":LU.KS0, "UU":UU.KS0, "UV":UV.KS0, "VV":VV.KS0}
         else:
-            
+
             return {"LL":LL.KS0}
-        
-        
-    
+
+
+
     def makeCombCuts(self,pars):
         '''
         Function aimed no to write by hand every single combination cut needed when using Upstream/VELO tracks.
         '''
         cuts = {}
         pars_ = [par.replace('+','').replace('-','') for par in pars]
-        
+
         cut = " ( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == '{0}' ) ) == 2 ) ) &".format(*pars)
         cuts["LV"] = cut + " ( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == '{2}' ) ) == 1 ) )  & ( ( ANUM( ( TRTYPE == 1 ) &  ( ABSID == '{3}' ) ) == 1 ) )".format(*pars)
         cuts["LU"] = cut + " ( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == '{2}' ) ) == 1 ) )  & ( ( ANUM( ( TRTYPE == 4 ) &  ( ABSID == '{3}' ) ) == 1 ) )".format(*pars)
         cuts["UV"] = cut + " ( ( ANUM( ( TRTYPE == 4 ) &  ( ABSID == '{2}' ) ) == 1 ) )  & ( ( ANUM( ( TRTYPE == 1 ) &  ( ABSID == '{3}' ) ) == 1 ) )".format(*pars)
-        
+
         if pars_[2]==pars_[3]:
             cuts["UU"] = cut + " ( ( ANUM( ( TRTYPE == 4 ) &  ( ABSID == '{2}' ) ) == 2 ) )".format(*pars)
             cuts["VV"] = cut + " ( ( ANUM( ( TRTYPE == 1 ) &  ( ABSID == '{2}' ) ) == 2 ) )".format(*pars)
@@ -969,12 +969,12 @@ class Kshort2LeptonsConf(LineBuilder) :
 
         if pars_[0]+pars_[1]+pars_[2]+pars_[3]=="eemue":
 
-        
+
             cuts["LL"] = "( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == 'e-' ) ) == 3 ) ) &  ( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == 'mu-' ) ) == 1 ) ) "
-            
+
         if pars_[0]+pars_[1]+pars_[2]+pars_[3]=="mumumumu":
 
-        
+
             cuts["LL"] = "( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == 'mu-' ) ) == 4 ) ) "
             cuts["LV"] = "( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == 'mu-' ) ) == 3 ) ) & ( ( ANUM( ( TRTYPE == 1 ) &  ( ABSID == 'mu-' ) ) == 1 ) ) "
             cuts["LU"] = "( ( ANUM( ( TRTYPE == 3 ) &  ( ABSID == 'mu-' ) ) == 4 ) ) & ( ( ANUM( ( TRTYPE == 1 ) &  ( ABSID == 'mu-' ) ) == 1 ) ) "
@@ -992,7 +992,7 @@ class Kshort2LeptonsConf(LineBuilder) :
         #for cut in cuts:
             #print cut+ "  "+cuts[cut]
         return cuts
-            
+
 #####################################################
 
 
@@ -1000,32 +1000,32 @@ class KshortTo4Bodies():
     '''
     Class to aimed to output the selection using the different track combinations for Kshort -> 4 bodies (as the name suggests).
     '''
-    
-    def __init__(self,name,pars,parSels,motherCuts,combCuts,hasDielectronLong,hasVELO,CC=False,is4e=False): 
 
-        
+    def __init__(self,name,pars,parSels,motherCuts,combCuts,hasDielectronLong,hasVELO,CC=False,is4e=False):
+
+
         decay = self.makeDecayDescriptor(pars,CC,is4e)
-        
+
         #We apply different cuts deppending on the configuration of tracks. We also have a special case when having 4 electrons in the final state.
-            
+
         if hasDielectronLong:
             decay = self.makeDecayDescriptorDiElectron(pars)
-            
+
             self.KS0=self.combineWithDiElectron(name,decay,parSels,motherCuts,is4e=is4e)
-            
+
         elif hasVELO:
-            
+
             decay = self.makeDecayDescriptorVELO(pars,CC,is4e)
-            
-            self.KS0=self.combineWithVELO(name,decay,parSels,motherCuts,combCuts)            
+
+            self.KS0=self.combineWithVELO(name,decay,parSels,motherCuts,combCuts)
 
         else:
-            
+
             self.KS0=self.combine(name,decay,parSels,motherCuts,combCuts)
 
     def makeDecayDescriptor(self,pars,CC,is4e=False):
-        
-        
+
+
         descriptor = "KS0 -> {0} {1} {2} {3}".format(*pars)
         if is4e:
             descriptor = "KS0 -> J/psi(1S) e+ e-".format(*pars)
@@ -1033,13 +1033,13 @@ class KshortTo4Bodies():
             descriptor = "[" + descriptor + "]cc"
         #print descriptor
         return descriptor
-    
+
     def makeDecayDescriptorDiElectron(self,pars):
-        
+
         descriptor = "KS0 -> {0} {1} J/psi(1S)".format(*pars)
         #print descriptor
         return descriptor
-                            
+
     def makeDecayDescriptorVELO(self,pars,CC,is4e=False):
         '''
         VELO tracks cannot distinguish the charge of particles so we neeed to take into account all combinations
@@ -1051,30 +1051,30 @@ class KshortTo4Bodies():
         descriptors = []
         par3 = pars[2].replace("+","");par3=par3.replace("-","")
         par4 = pars[3].replace("+","");par4=par4.replace("-","")
-        
+
         for iter in product("+-",repeat=2):
             descriptor_ = descriptor+par3+iter[0] + " "+par4+iter[1]
             if CC:
                 descriptor_ = "[" + descriptor_ + "]cc"
             #print descriptor_
             descriptors.append(descriptor_)
-            
+
         return descriptors
-            
-        
-        
+
+
+
 
     def combineWithDiElectron(self,name,decay,parSels,motherCuts,is4e=False):
         """
         Makes the KS0 -> X (J/psi(1S) -> e+ e-)
         """
-        
+
         _comb12cut =    "(AMAXDOCA('') < %(KsMAXDOCA)s *mm)" % motherCuts
-        
+
         _combcut =      "(AM < %(MaxKsMass)s *MeV) & "\
                         "(AMAXDOCA('') < %(KsMAXDOCA)s *mm)" % motherCuts
-        
-    
+
+
         _mothercut =    "(M < %(MaxKsMass)s *MeV) &"\
                         "(MIPDV(PRIMARY) < %(KsIP)s *mm) & "\
                         "((BPVVDSIGN*M/P) > %(KsLifetime)s*2.9979e-01) & "\
@@ -1100,21 +1100,21 @@ class KshortTo4Bodies():
                                          )
             #print name,is4e
 
-    
+
         return Selection(name+decay,
                          Algorithm=_Combine,
                          RequiredSelections=parSels
                          )
-    
+
     def combineWithVELO(self,name, decay, parSels,motherCuts, combCuts):
         """
         Makes the KS0 -> Leptons applying LoKi VertexFitter.
-        """        
-        
+        """
+
         _combcut =      "(AM < %(MaxKsMass)s *MeV) & "\
                         "(AMAXDOCA('') < %(KsMAXDOCA)s *mm) &" % motherCuts
         _combcut += combCuts
-        
+
         _mothercut =    "( M < %(MaxKsMass)s *MeV) &"\
                         "( MIPDV(PRIMARY) < %(KsIP)s *mm) & "\
                         "( BPVVDCHI2 > %(KsDisChi2)s) & "\
@@ -1137,11 +1137,11 @@ class KshortTo4Bodies():
         """
         Makes the KS0 -> Leptons
         """
-                
+
         _combcut =      "(AM < %(MaxKsMass)s *MeV) & "\
                         "(AMAXDOCA('') < %(KsMAXDOCA)s *mm) &" % motherCuts
         _combcut += combCuts
-    
+
         _mothercut =    "( M < %(MaxKsMass)s *MeV) &"\
                         "( MIPDV(PRIMARY) < %(KsIP)s *mm) & "\
                         "( BPVVDCHI2 > %(KsDisChi2)s) & "\
@@ -1152,14 +1152,14 @@ class KshortTo4Bodies():
                                     CombinationCut=_combcut,
                                     MotherCut=_mothercut
                                     )
-    
-    
+
+
         return Selection(name,
                         Algorithm=_Combine,
                         RequiredSelections=parSels
                         )
-        
-        
+
+
 
     def getKS0(self):
         return self.KS0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py
index 803102e43a43ab972e1caa732fa542fa5724e93d..62a530da27b00222bf1561c71117f08bb26350b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -174,10 +174,10 @@ def makeKshort2MuMuMuMu(name, muonSel, DMAXDOCA, DPT,  KsDauMAXIPCHI2, DFDCHI2,
                    "(BPVDIRA > %(DDIRA)s)" % locals()
 
 ##      muonMass = 105.658*MeV
-     
-    c12          =  "( AM < (%(MaxKsMass)s *MeV - 211.316 *MeV) )" %locals()  
-    c123         =  "( AM < (%(MaxKsMass)s *MeV - 105.658 *MeV) )" %locals()  
-    
+
+    c12          =  "( AM < (%(MaxKsMass)s *MeV - 211.316 *MeV) )" %locals()
+    c123         =  "( AM < (%(MaxKsMass)s *MeV - 105.658 *MeV) )" %locals()
+
     _Combine = DaVinci__N4BodyDecays(
                                 DecayDescriptor = "KS0 -> mu+ mu+  mu- mu-",
                                 CombinationCut = _combcut,
@@ -230,4 +230,3 @@ def makeDownstreamMuonsForMuMuMuMu(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI
                      RequiredSelections = [ StdLooseDownMuons ] )
 
 #####################################################
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py
index 26d345bd9785fa21cc3f5cca20efb7f9f31a8f86..e467cfbdef6647f5477b65cd0d4db425ad00140a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -28,30 +28,30 @@ default_config =  {
           'MuonPT'        : 500.  ,    #MeV
           'MuonMINIPCHI2' : 2     ,    #adminensional
           'MuonTRCHI2'    : 5     ,    #adminensional
-          
+
           'PionP'         : 2000. ,    #MeV
           'PionPT'        : 300.  ,    #MeV
           'PionMINIPCHI2' : 2     ,    #adminensional
           'PionTRCHI2'    : 5     ,    #adminensional
-          
-          
+
+
           #4body
           'MINIPCHI2_hhmumu' : 4. ,  #adminensional --  for the individual pions
           'PT_hhmumu'        : 300 , #MeV
           'MuonPIDmu_hhmumu' : -1,   #adimensional
           'DPT_hhmumu'           : 300., # was 2500    #MeV
-          'DVCHI2DOF_hhmumu'     : 8     ,    #adminensional         
+          'DVCHI2DOF_hhmumu'     : 8     ,    #adminensional
           'DMAXDOCA_hhmumu'      : 0.2  ,    #mm
           'KsDauMAXIPCHI2_hhmumu' : 15    ,    #adimensinal
           'DFDCHI2_hhmumu'       : 9     ,   #adimensional
           'DIPCHI2_hhmumu'       : 20    ,    #adimensional
-          
-          
+
+
           'DDIRA'         : 0.9999,    #adimensional
           'MaxDimuonMass'    : 260.  ,    #MeV
           'MaxKsMass'                   : 550.  ,    #MeV, comb mass window
           'KsMotherMassCut'             : 540.  ,    # MeV, mother mass cut
-          
+
           'Kshort2PiPiMuMuLinePrescale'    : 1 ,
           'Kshort2PiPiMuMuLinePostscale'   : 1
           },
@@ -78,23 +78,23 @@ default_name = "Ks2PiPiMuMu"
 
 class Kshort2PiPiMuMuConf(LineBuilder) :
     """
-    Builder for Kshort --> pi,pi,mu,mu 
+    Builder for Kshort --> pi,pi,mu,mu
     """
-    
+
     LongLine = None
 
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
-        
+
 
         LongLine_name = name+"_Long"
         DownstreamLine_name = name+"_Down"
-        
-        
-        
-        # 5 : Make Muons for Kshort2PiPiMuMu 
+
+
+
+        # 5 : Make Muons for Kshort2PiPiMuMu
         selLongMuonsForPiPiMuMu = makeLongMuonsForPiPiMuMu(name="LongMuonsFor"+name
                                                , MuonP = config['MuonP']
                                                , MuonPT = config['PT_hhmumu']
@@ -109,7 +109,7 @@ class Kshort2PiPiMuMuConf(LineBuilder) :
                                                , MuonTRCHI2 = config['MuonTRCHI2']
                                                , MuonPIDmu_CS_hhmumu = config['MuonPIDmu_hhmumu'])
 
-        # 7 : Make Pions for Kshort2PiPiMuMu 
+        # 7 : Make Pions for Kshort2PiPiMuMu
         selLongPionsForPiPiMuMu = makeLongPionsForPiPiMuMu(name="LongPionsFor"+name
                              , PionP = config['PionP']
                              , PionPT = config['PT_hhmumu']
@@ -125,35 +125,35 @@ class Kshort2PiPiMuMuConf(LineBuilder) :
 
 
 
-                                        
+
         # 7 : Combine
-        
+
         selLongKshort2PiPiMuMu = self._makeKshort2PiPiMuMu(name=LongLine_name,
                                            pionSel = selLongPionsForPiPiMuMu,
                                            muonSel = selLongMuonsForPiPiMuMu,
                                            config = config)
-        
+
         selDownstreamKshort2PiPiMuMu = self._makeKshort2PiPiMuMu(name=DownstreamLine_name,
                                            pionSel = selDownstreamPionsForPiPiMuMu,
                                            muonSel = selDownstreamMuonsForPiPiMuMu,
                                            config = config)
-        
+
         # 8 : Declare Lines
-        
+
         self.LongLine = StrippingLine(LongLine_name+"Line",
                                     prescale = config['Kshort2PiPiMuMuLinePrescale'],
                                     postscale = config['Kshort2PiPiMuMuLinePostscale'],
                                     selection = selLongKshort2PiPiMuMu
                                     )
-        
+
         self.DownstreamLine = StrippingLine(DownstreamLine_name+"Line",
                                     prescale = config['Kshort2PiPiMuMuLinePrescale'],
                                     postscale = config['Kshort2PiPiMuMuLinePostscale'],
                                     selection = selDownstreamKshort2PiPiMuMu
                                     )
-        
-        
-        
+
+
+
 
         # 9 : register Line
 
@@ -223,8 +223,8 @@ def makeKshort2PiPiMuMu(name, pionSel, muonSel, DMAXDOCA, DPT,  KsDauMAXIPCHI2,
     _Combine.ReFitPVs = True
     return Selection(name,
                      Algorithm = _Combine,
-                     RequiredSelections = [ muonSel, pionSel] )                    
-                    
+                     RequiredSelections = [ muonSel, pionSel] )
+
 #####################################################
 def makeLongMuonsForPiPiMuMu(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2, MuonPIDmu_CS_hhmumu):
     """
@@ -237,7 +237,7 @@ def makeLongMuonsForPiPiMuMu(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI2, Muo
             "(MIPCHI2DV(PRIMARY) > %(MuonMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllLooseMuons ] )
@@ -253,7 +253,7 @@ def makeDownstreamMuonsForPiPiMuMu(name, MuonP, MuonPT, MuonMINIPCHI2, MuonTRCHI
             "(MIPCHI2DV(PRIMARY) > %(MuonMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdLooseDownMuons ] )
@@ -269,7 +269,7 @@ def makeLongPionsForPiPiMuMu(name, PionP, PionPT, PionMINIPCHI2, PionTRCHI2):
             "(MIPCHI2DV(PRIMARY) > %(PionMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdAllLoosePions ] )
@@ -285,11 +285,7 @@ def makeDownstreamPionsForPiPiMuMu(name, PionP, PionPT, PionMINIPCHI2, PionTRCHI
             "(MIPCHI2DV(PRIMARY) > %(PionMINIPCHI2)s)" % locals()
 
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ StdNoPIDsDownPions ] )
-
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py
index 5dcdd5c7befe7db5ca83b58a7a6ac7000fbff895..1e4475da54212154ba488b3035bdb99b251f12cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py
@@ -35,7 +35,7 @@ default_config =  {
                         'Kshort2eePiPi_LVLinePostscale'               : 1 ,
                         'Kshort2eePiPi_UVLinePrescale'                : 1 ,
                         'Kshort2eePiPi_UVLinePostscale'               : 1 ,
-                        
+
                         'ePT'           : 100.          , #MeV
                         'eMINIPCHI2'    : 16            , #adimensional
                         'ePIDe'         : -4            , #adimensional
@@ -43,7 +43,7 @@ default_config =  {
                         'PionPT'        : 100           , #MeV
                         'PionMINIPCHI2' : 16            , #adimensional
                         'PionPIDK'      : 5             , #adimensional
-                        'PionGhostProb' : 0.5           , #adimensional    
+                        'PionGhostProb' : 0.5           , #adimensional
                         'KsMAXDOCA'     : 1.            , #mm
                         'KsLifetime'    : 0.01*89.53    , #0.01*10^-12s
                         'KsIP'          : 1             , #mm
@@ -67,21 +67,21 @@ default_config =  {
                         'KsVtxChi2_soft'       : 25.           , # 16 at Hlt2
 
                         ## LONG tracks
-                        'ePT_L'                : 100.          ,#MeV                        
+                        'ePT_L'                : 100.          ,#MeV
                         'eMINIPCHI2_L'         : 50            ,#adimensional
                         'ePIDe_L'              : -3.5          ,#adimensional
                         'eGhostProb_L'         : 0.35          ,#adimensional
-                        
+
                         ## UPSTREAM tracks
                         'ePT_U'                : 50            ,#MeV
                         'eMINIPCHI2_U'         : 10            ,#adimensional
                         'ePIDe_U'              : -3.5          ,#adimensional
                         'eGhostProb_U'         : 0.35          ,#adimensional
-                        
+
                         ## VELO tracks
                         'eMINIPCHI2_V'         : 40            ,#adimensional
-                        'eGhostProb_V'         : 0.5           ,#adimensional                      
-                        
+                        'eGhostProb_V'         : 0.5           ,#adimensional
+
                         ## UU line
                         'KsMAXDOCA_UU'         : 1.            ,#mm
                         'KsDisChi2_UU'         : 2500          ,#adimensional
@@ -102,21 +102,21 @@ default_config =  {
                         'KsIP_LU'              : 5             ,#mm
                         'MaxKsMass_LU'         : 800.          ,#MeV, comb mass high limit
                         'KsVtxChi2_LU'         : 25            ,#adimensional
-                        
+
                         ## LV line
                         'KsMAXDOCA_LV'         : .5            ,#mm
                         'KsDisChi2_LV'         : 2500          ,#adimensional
                         'KsIP_LV'              : 10            ,#mm
                         'MaxKsMass_LV'         : 900.          ,#MeV, comb mass high limit
                         'KsVtxChi2_LV'         : 37            ,#adimensional
-                        
+
                         ## UV line
                         'KsMAXDOCA_UV'         : 0.8           ,#mm
                         'KsDisChi2_UV'         : 2000          ,#adimensional
                         'KsIP_UV'              : 15            ,#mm
                         'MaxKsMass_UV'         : 878.          ,#MeV, comb mass high limit
                         'KsVtxChi2_UV'         : 19            ,#adimensional
-                                                
+
                         'TISTOSDict'     : {'Hlt2RareStrangeKsPiPiEETOSDecision%TOS': 0,
                                             },
 
@@ -147,7 +147,7 @@ from SelPy.utils import ( UniquelyNamedObject,
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
@@ -155,16 +155,16 @@ class GSWrapper(UniquelyNamedObject,
                                algorithm = sequencer,
                                outputLocation = output,
                                requiredSelections = requiredSelections )
-    
+
 ##############################
 
 class Kshort2eePiPiConf(LineBuilder) :
     """
     Builder for Kshort --> pi,pi,e,e
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-                              
+
     def __init__(self, name, config):
 
         self.name = name
@@ -177,10 +177,10 @@ class Kshort2eePiPiConf(LineBuilder) :
         self.makeparts = ChargedProtoParticleMaker(name = "MyVeloProtoParticles"+self.name,
                                                    Inputs = ["Rec/Track/Best"],
                                                    Output = "Rec/ProtoP/MyVeloProtoParticles")
-        
+
         self.makeparts.addTool( DelegatingTrackSelector, name="TrackSelector" )
         self.makeparts.TrackSelector.TrackTypes = ["Velo"]
-        
+
         self.myveloprotos = GSWrapper(name = "MyVeloProtos"+self.name,
                                       sequencer = self.makeparts,
                                       output = "Rec/ProtoP/MyVeloProtoParticles",
@@ -192,14 +192,14 @@ class Kshort2eePiPiConf(LineBuilder) :
                                                     Particle = 'electron',
                                                     AddBremPhotonTo = [],
                                                     Input = self.myveloprotos.outputLocation())
-        
-        
+
+
         self.StdNoPIDsVeloElectrons = Selection('StdNoPIDsVeloElectrons'+self.name,
-                                                Algorithm = self.particleMaker, 
+                                                Algorithm = self.particleMaker,
                                                 RequiredSelections = [self.myveloprotos],
                                                 InputDataSetter=None)
-        
-        
+
+
         # 1 : Make e's for Kshort2eePiPi
         selElecsFromTracksForeePiPi = makeElecsFromTracksForeePiPi("ElecsFromTracksFor"+self.name,
                                                                    StdDiElectronFromTracks,
@@ -225,21 +225,21 @@ class Kshort2eePiPiConf(LineBuilder) :
                                                                      config["eGhostProb_L"],
                                                                      config["ePIDe_L"]
                                                                      )
-        
+
         selElecsFromUpForeePiPi = makeElecsFromVeloUpLongForeePiPi("ElecsFromUpFor"+self.name,
                                                                    StdNoPIDsUpElectrons,
                                                                    config["ePT_U"],
                                                                    config["eMINIPCHI2_U"],
                                                                    config["eGhostProb_U"],
                                                                    config["ePIDe_U"])
-        
+
         selElecsFromVeloForeePiPi = makeElecsFromVeloUpLongForeePiPi("ElecsFromVeloFor"+self.name,
                                                                      self.StdNoPIDsVeloElectrons,
                                                                      0, ## PT
                                                                      config["eMINIPCHI2_V"],
                                                                      config["eGhostProb_V"],
                                                                      -100000.) ## PID
-        
+
 
         # 2 : Make Pions for Kshort2eePiPi
         selPionsForeePiPi = makePionsForeePiPi("PionsFor"+self.name,
@@ -257,7 +257,7 @@ class Kshort2eePiPiConf(LineBuilder) :
                                                    config["PionGhostProb_soft"],
                                                    config["PionPIDK_soft"]
                                                )
-        
+
         # 3 : Combine
         selKshort2eePiPiFromTracks = self._makeKshort2eePiPi(self.name+"_eeFromTracks",
                                                              "KS0 -> pi+ pi- J/psi(1S)",
@@ -269,7 +269,7 @@ class Kshort2eePiPiConf(LineBuilder) :
                                                              config["KsLifetime"],
                                                              config["KsVtxChi2"]
                                                              )
- 
+
         selKshort2eePiPiFromTracks_forTOS = self._makeKshort2eePiPi(self.name+"_eeFromTracks"+"_forTOS",
                                                                     "KS0 -> pi+ pi- J/psi(1S)",
                                                                     selPionsForeePiPiSoft,
@@ -306,7 +306,7 @@ class Kshort2eePiPiConf(LineBuilder) :
                                                      config["KsVtxChi2_VV"],
                                                      "( ANUM( ( TRTYPE == 1 ) & ( ABSID == 'e-' ) ) == 2 )" # 2 VELO
                                                      )
-        
+
         selKshort2eePiPiLU = self._makeKshort2eePiPi(self.name+"_eeLU",
                                                      decay_Ks,
                                                      selPionsForeePiPi,
@@ -390,7 +390,7 @@ class Kshort2eePiPiConf(LineBuilder) :
                                            selection = selKshort2eePiPiLV,
                                            MDSTFlag  = False
                                            )
-        
+
         self.eePiPi_UVLine = StrippingLine(self.name+"_UV"+"Line",
                                            prescale  = config['Kshort2eePiPi_UVLinePrescale'],
                                            postscale = config['Kshort2eePiPi_UVLinePostscale'],
@@ -438,7 +438,7 @@ class Kshort2eePiPiConf(LineBuilder) :
                                      KsVtxChi2
                                      )
 
-            
+
 #####################################################
 def makeKshort2eePiPi(name, decay, pionSel, elecSel, MaxKsMass, KsMAXDOCA, KsIP, KsLifetime, KsVtxChi2):
     """
@@ -446,11 +446,11 @@ def makeKshort2eePiPi(name, decay, pionSel, elecSel, MaxKsMass, KsMAXDOCA, KsIP,
     """
 
     _comb12cut =    "(AMAXDOCA('') < %(KsMAXDOCA)s *mm)" % locals()
-    
+
     _combcut =      "(AM < %(MaxKsMass)s *MeV) & "\
                     "(AMAXDOCA('') < %(KsMAXDOCA)s *mm)" % locals()
-    
-    
+
+
     _mothercut =    "(M < %(MaxKsMass)s *MeV) &"\
                     "(MIPDV(PRIMARY) < %(KsIP)s *mm) & "\
                     "((BPVVDSIGN*M/P) > %(KsLifetime)s*2.9979e-01) & "\
@@ -472,11 +472,11 @@ def makeKshort2eePiPiUpVelo(name, decay, pionSel, elecSel, MaxKsMass, KsMAXDOCA,
     """
     Makes the KS0 -> pi+ pi- e+ e-)
     """
-    
+
     _combcut =      "(AM < %(MaxKsMass)s *MeV) & "\
                     "(AMAXDOCA('') < %(KsMAXDOCA)s *mm) &" % locals()
     _combcut += trackComb
-    
+
     _mothercut =    "( M < %(MaxKsMass)s *MeV) &"\
                     "( MIPDV(PRIMARY) < %(KsIP)s *mm) & "\
                     "( BPVVDCHI2 > %(KsDisChi2)s) & "\
@@ -491,14 +491,14 @@ def makeKshort2eePiPiUpVelo(name, decay, pionSel, elecSel, MaxKsMass, KsMAXDOCA,
                                     )
         _Combine.ParticleCombiners = {"" : "LoKi::VertexFitter"}
         _Combine.addTool( LoKi__VertexFitter, name="LoKi::VertexFitter" )
-    
+
     else:
         _Combine = CombineParticles(name = "Combine"+name,
                                     DecayDescriptor=decay,
                                     CombinationCut=_combcut,
                                     MotherCut=_mothercut
                                     )
-    
+
     if type(elecSel)==list:
         mysels = elecSel
         mysels.append(pionSel)
@@ -532,7 +532,7 @@ def makeElecsFromVeloUpLongForeePiPi(name, elecs, ePT, eMINIPCHI2, eGhostProb ,
         """
         Electron selection from ElectronFromTracks
         """
-        
+
         _code = "( MIPCHI2DV(PRIMARY) > %(eMINIPCHI2)s ) &"\
                 "( PT > %(ePT)s ) &"\
                 "( TRGHOSTPROB < %(eGhostProb)s ) & "\
@@ -540,12 +540,12 @@ def makeElecsFromVeloUpLongForeePiPi(name, elecs, ePT, eMINIPCHI2, eGhostProb ,
 
 
         _Filter = FilterDesktop(Code = _code)
-        
+
         return Selection(name,
                          Algorithm = _Filter,
                          RequiredSelections = [ elecs ]
                          )
-                
+
 
 #####################################################
 def makePionsForeePiPi(name, pions, PionPT, PionMINIPCHI2, PionGhostProb, PionPIDK):
@@ -556,9 +556,9 @@ def makePionsForeePiPi(name, pions, PionPT, PionMINIPCHI2, PionGhostProb, PionPI
             "(MIPCHI2DV(PRIMARY) > %(PionMINIPCHI2)s) &"\
             "(TRGHOSTPROB < %(PionGhostProb)s) &"\
             "(PIDK < %(PionPIDK)s)" % locals()
-    
+
     _Filter = FilterDesktop(Code = _code)
-    
+
     return Selection(name,
                      Algorithm = _Filter,
                      RequiredSelections = [ pions ]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py
index 23a0787ae86b6b9f4c8292259961325c8e929bce..80f0aabc6923772fff1039c7abc30a312a4ba313 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py
@@ -12,7 +12,7 @@
 Module for construction of lepton flavor violation stripping selections and lines
 
 Exported symbols (use python help!):
-    
+
 '''
 
 __author__ = ['Johannes Albrecht']
@@ -35,7 +35,7 @@ from copy import deepcopy
 #
 # Configure related info tools
 # some of these tools are used several times:
-# eg the related_info_Jpsi2eMu tool can be used for both 
+# eg the related_info_Jpsi2eMu tool can be used for both
 # the prompt and the detached Jpsi line.
 #
 
@@ -61,7 +61,7 @@ related_info_tools_B2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             '[B_s0 -> e+ ^[mu-]cc]CC' :  'Muon_ISO',
                             '[B_s0 -> ^e+ [mu-]cc]CC' :  'Electron_ISO',
                             },
-    
+
                             'tracktype'  : 3,
                             'angle'      : 0.27,
                             'fc'         : 0.60,
@@ -74,19 +74,19 @@ related_info_tools_B2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'makeTrackCuts' : False,
                             'IsoTwoBody' : True
                             },
-                            
+
                             {'Type': 'RelInfoVertexIsolation',
                             'Location':'VtxIsoInfo',
                             },
-                            
+
                             {'Type': 'RelInfoConeVariables',
                              'Location':'ConeIsoInfo',
                             },
-                            
+
                             {'Type': 'RelInfoVertexIsolationBDT',
                              'Location':'VtxIsoInfoBDT',
                             },
-                            
+
                             {'Type': 'RelInfoTrackIsolationBDT',
                              'Variables' : 0,
                              'DaughterLocations': {
@@ -101,9 +101,9 @@ related_info_tools_B2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
 
 related_info_tools_JPsi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
-                                            'BSMUMUCDFISO', 
+                                            'BSMUMUCDFISO',
                                             'BSMUMUOTHERBMAG',
-                                            'BSMUMUOTHERBANGLE', 
+                                            'BSMUMUOTHERBANGLE',
                                             'BSMUMUOTHERBBOOSTMAG',
                                             'BSMUMUOTHERBBOOSTANGLE',
                                             'BSMUMUOTHERBTRACKS'
@@ -115,18 +115,18 @@ related_info_tools_JPsi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                               'Type' : 'RelInfoBs2MuMuTrackIsolations',
                               'Variables' : [
-                                              'BSMUMUTRACKPLUSISO', 
+                                              'BSMUMUTRACKPLUSISO',
                                               'BSMUMUTRACKPLUSISOTWO',
-                                              'ISOTWOBODYQPLUS', 
+                                              'ISOTWOBODYQPLUS',
                                               'ISOTWOBODYMASSISOPLUS',
-                                              'ISOTWOBODYCHI2ISOPLUS', 
+                                              'ISOTWOBODYCHI2ISOPLUS',
                                               'ISOTWOBODYISO5PLUS'
                                             ],
                               'DaughterLocations' : {
                                 '[J/psi(1S) -> e+ ^[mu-]cc]CC' :  'Muon_ISO',
                                 '[J/psi(1S) -> ^e+ [mu-]cc]CC' :  'Electron_ISO',
                               },
-    
+
                               'tracktype'  : 3,
                               'angle'      : 0.27,
                               'fc'         : 0.60,
@@ -139,7 +139,7 @@ related_info_tools_JPsi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               'makeTrackCuts' : False,
                               'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
                               "DaughterLocations" : {
@@ -148,7 +148,7 @@ related_info_tools_JPsi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
                               "DaughterLocations" : {
@@ -157,7 +157,7 @@ related_info_tools_JPsi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -178,9 +178,9 @@ related_info_tools_JPsi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
 
 related_info_tools_JPsi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
-                                            'BSMUMUCDFISO', 
+                                            'BSMUMUCDFISO',
                                             'BSMUMUOTHERBMAG',
-                                            'BSMUMUOTHERBANGLE', 
+                                            'BSMUMUOTHERBANGLE',
                                             'BSMUMUOTHERBBOOSTMAG',
                                             'BSMUMUOTHERBBOOSTANGLE',
                                             'BSMUMUOTHERBTRACKS'
@@ -192,18 +192,18 @@ related_info_tools_JPsi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                               'Type' : 'RelInfoBs2MuMuTrackIsolations',
                               'Variables' : [
-                                              'BSMUMUTRACKPLUSISO', 
+                                              'BSMUMUTRACKPLUSISO',
                                               'BSMUMUTRACKPLUSISOTWO',
-                                              'ISOTWOBODYQPLUS', 
+                                              'ISOTWOBODYQPLUS',
                                               'ISOTWOBODYMASSISOPLUS',
-                                              'ISOTWOBODYCHI2ISOPLUS', 
+                                              'ISOTWOBODYCHI2ISOPLUS',
                                               'ISOTWOBODYISO5PLUS'
                                             ],
                               'DaughterLocations' : {
                                 '[J/psi(1S) -> mu+ ^[mu-]cc]CC' :  'Muon_ISO',
                                 '[J/psi(1S) -> ^mu+ [mu-]cc]CC' :  'Electron_ISO',
                               },
-    
+
                               'tracktype'  : 3,
                               'angle'      : 0.27,
                               'fc'         : 0.60,
@@ -216,7 +216,7 @@ related_info_tools_JPsi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               'makeTrackCuts' : False,
                               'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
                               "DaughterLocations" : {
@@ -225,7 +225,7 @@ related_info_tools_JPsi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
                               "DaughterLocations" : {
@@ -234,7 +234,7 @@ related_info_tools_JPsi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -255,9 +255,9 @@ related_info_tools_JPsi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
 
 related_info_tools_JPsi2eeControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
-                                            'BSMUMUCDFISO', 
+                                            'BSMUMUCDFISO',
                                             'BSMUMUOTHERBMAG',
-                                            'BSMUMUOTHERBANGLE', 
+                                            'BSMUMUOTHERBANGLE',
                                             'BSMUMUOTHERBBOOSTMAG',
                                             'BSMUMUOTHERBBOOSTANGLE',
                                             'BSMUMUOTHERBTRACKS'
@@ -269,18 +269,18 @@ related_info_tools_JPsi2eeControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                               'Type' : 'RelInfoBs2MuMuTrackIsolations',
                               'Variables' : [
-                                              'BSMUMUTRACKPLUSISO', 
+                                              'BSMUMUTRACKPLUSISO',
                                               'BSMUMUTRACKPLUSISOTWO',
-                                              'ISOTWOBODYQPLUS', 
+                                              'ISOTWOBODYQPLUS',
                                               'ISOTWOBODYMASSISOPLUS',
-                                              'ISOTWOBODYCHI2ISOPLUS', 
+                                              'ISOTWOBODYCHI2ISOPLUS',
                                               'ISOTWOBODYISO5PLUS'
                                             ],
                               'DaughterLocations' : {
                                 '[J/psi(1S) -> e+ ^[e-]cc]CC' :  'Muon_ISO',
                                 '[J/psi(1S) -> ^e+ [e-]cc]CC' :  'Electron_ISO',
                               },
-    
+
                               'tracktype'  : 3,
                               'angle'      : 0.27,
                               'fc'         : 0.60,
@@ -293,7 +293,7 @@ related_info_tools_JPsi2eeControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               'makeTrackCuts' : False,
                               'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
                               "DaughterLocations" : {
@@ -302,7 +302,7 @@ related_info_tools_JPsi2eeControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
                               "DaughterLocations" : {
@@ -311,7 +311,7 @@ related_info_tools_JPsi2eeControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -328,13 +328,13 @@ related_info_tools_JPsi2eeControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                 "Type" : "RelInfoTrackIsolationBDT2",
                                 "Location" : "TrackIsolationBDT2",
                             }
-                            ] ## matches 'RelatedInfoTools' 
+                            ] ## matches 'RelatedInfoTools'
 
 related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
-                                            'BSMUMUCDFISO', 
+                                            'BSMUMUCDFISO',
                                             'BSMUMUOTHERBMAG',
-                                            'BSMUMUOTHERBANGLE', 
+                                            'BSMUMUOTHERBANGLE',
                                             'BSMUMUOTHERBBOOSTMAG',
                                             'BSMUMUOTHERBBOOSTANGLE',
                                             'BSMUMUOTHERBTRACKS'
@@ -346,11 +346,11 @@ related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                               'Type' : 'RelInfoBs2MuMuTrackIsolations',
                               'Variables' : [
-                                              'BSMUMUTRACKPLUSISO', 
+                                              'BSMUMUTRACKPLUSISO',
                                               'BSMUMUTRACKPLUSISOTWO',
-                                              'ISOTWOBODYQPLUS', 
+                                              'ISOTWOBODYQPLUS',
                                               'ISOTWOBODYMASSISOPLUS',
-                                              'ISOTWOBODYCHI2ISOPLUS', 
+                                              'ISOTWOBODYCHI2ISOPLUS',
                                               'ISOTWOBODYISO5PLUS'
                                             ],
                               'DaughterLocations' : {
@@ -358,7 +358,7 @@ related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                 '[[B+]cc -> X [e+]cc ^[mu-]cc]CC' :  'Muon_ISO',
                                 '[[B+]cc -> X ^[e+]cc [mu-]cc]CC' :  'Electron_ISO'
                               },
-    
+
                               'tracktype'  : 3,
                               'angle'      : 0.27,
                               'fc'         : 0.60,
@@ -371,7 +371,7 @@ related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               'makeTrackCuts' : False,
                               'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
                               "DaughterLocations" : {
@@ -381,7 +381,7 @@ related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
                               "DaughterLocations" : {
@@ -391,7 +391,7 @@ related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -409,15 +409,15 @@ related_info_tools_B2hemu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               "Location" : "TrackIsolationBDT2",
                               "Particles" : [1,2]
                             }
-                            ] ## matches 'RelatedInfoTools'                           
+                            ] ## matches 'RelatedInfoTools'
 
 related_info_tools_Phi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
                                            'BSMUMUCDFISO',
                                            'BSMUMUOTHERBMAG',
-                                           'BSMUMUOTHERBANGLE', 
+                                           'BSMUMUOTHERBANGLE',
                                            'BSMUMUOTHERBBOOSTMAG',
-                                           'BSMUMUOTHERBBOOSTANGLE', 
+                                           'BSMUMUOTHERBBOOSTANGLE',
                                            'BSMUMUOTHERBTRACKS'
                                           ],
                             'Location'  : 'BSMUMUVARIABLES',  ## For the B
@@ -427,18 +427,18 @@ related_info_tools_Phi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                             'Type' : 'RelInfoBs2MuMuTrackIsolations',
                             'Variables' : [
-                                           'BSMUMUTRACKPLUSISO', 
+                                           'BSMUMUTRACKPLUSISO',
                                            'BSMUMUTRACKPLUSISOTWO',
-                                           'ISOTWOBODYQPLUS', 
+                                           'ISOTWOBODYQPLUS',
                                            'ISOTWOBODYMASSISOPLUS',
-                                           'ISOTWOBODYCHI2ISOPLUS', 
+                                           'ISOTWOBODYCHI2ISOPLUS',
                                            'ISOTWOBODYISO5PLUS'
                                           ],
                             'DaughterLocations' : {
                             '[phi(1020) -> e+ ^[mu-]cc]CC' :  'Muon_ISO',
                             '[phi(1020) -> ^e+ [mu-]cc]CC' :  'Electron_ISO',
                             },
-    
+
                             'tracktype'  : 3,
                             'angle'      : 0.27,
                             'fc'         : 0.60,
@@ -451,7 +451,7 @@ related_info_tools_Phi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'makeTrackCuts' : False,
                             'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
                               "DaughterLocations" : {
@@ -460,7 +460,7 @@ related_info_tools_Phi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
                               "DaughterLocations" : {
@@ -469,7 +469,7 @@ related_info_tools_Phi2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -492,9 +492,9 @@ related_info_tools_Phi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
                                            'BSMUMUCDFISO',
                                            'BSMUMUOTHERBMAG',
-                                           'BSMUMUOTHERBANGLE', 
+                                           'BSMUMUOTHERBANGLE',
                                            'BSMUMUOTHERBBOOSTMAG',
-                                           'BSMUMUOTHERBBOOSTANGLE', 
+                                           'BSMUMUOTHERBBOOSTANGLE',
                                            'BSMUMUOTHERBTRACKS'
                                           ],
                             'Location'  : 'BSMUMUVARIABLES',  ## For the B
@@ -504,18 +504,18 @@ related_info_tools_Phi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                             'Type' : 'RelInfoBs2MuMuTrackIsolations',
                             'Variables' : [
-                                           'BSMUMUTRACKPLUSISO', 
+                                           'BSMUMUTRACKPLUSISO',
                                            'BSMUMUTRACKPLUSISOTWO',
-                                           'ISOTWOBODYQPLUS', 
+                                           'ISOTWOBODYQPLUS',
                                            'ISOTWOBODYMASSISOPLUS',
-                                           'ISOTWOBODYCHI2ISOPLUS', 
+                                           'ISOTWOBODYCHI2ISOPLUS',
                                            'ISOTWOBODYISO5PLUS'
                                           ],
                             'DaughterLocations' : {
                             '[phi(1020) -> mu+ ^[mu-]cc]CC' :  'Muon_ISO',
                             '[phi(1020) -> ^mu+ [mu-]cc]CC' :  'Electron_ISO',
                             },
-    
+
                             'tracktype'  : 3,
                             'angle'      : 0.27,
                             'fc'         : 0.60,
@@ -528,7 +528,7 @@ related_info_tools_Phi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'makeTrackCuts' : False,
                             'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
                               "DaughterLocations" : {
@@ -537,7 +537,7 @@ related_info_tools_Phi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
                               "DaughterLocations" : {
@@ -546,7 +546,7 @@ related_info_tools_Phi2MuMuControl = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -602,7 +602,7 @@ related_info_tools_B2ee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                            '[B_s0 -> ^e+ [e-]cc]CC' :  'Electron1_ISO',
                            '[B_s0 -> e+ ^[e-]cc]CC' :  'Electron2_ISO',
                            },
-                           
+
                            'tracktype' : 3,
                            'angle'      : 0.27,
                            'fc'         : 0.60,
@@ -615,15 +615,15 @@ related_info_tools_B2ee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                            'makeTrackCuts' : False,
                            'IsoTwoBody' : True
                            },
-                           
+
                            {'Type': 'RelInfoVertexIsolation',
                            'Location':'VtxIsoInfo',
                            },
-                           
+
                            {'Type': 'RelInfoConeVariables',
                            'Location':'ConeIsoInfo',
                            },
-                           
+
                            {'Type': 'RelInfoVertexIsolationBDT',
                            'Location':'VtxIsoInfoBDT',
                            },
@@ -642,7 +642,7 @@ related_info_tools_B2ee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
 related_info_tools_Tau2MuEtaPrime = [{'Type': 'RelInfoVertexIsolation',
                            'Location':'VtxIsoInfo',
                            },
-                           
+
                            {'Type': 'RelInfoVertexIsolationBDT',
                            'Location':'VtxIsoInfoBDT',
                            },
@@ -657,7 +657,7 @@ related_info_tools_Tau2PhiMu = [{ 'Type' : 'RelInfoConeVariables', 'ConeAngle' :
                                 '[tau+ -> (phi(1020)->^K+ K-) mu+]CC' : 'coneInfoKplus05',
                                 '[tau+ -> (phi(1020)->K+ ^K-) mu+]CC': 'coneInfoKminus05'
                                 }},
-                                
+
                                 { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.8,
                                 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                                 'Location'  : 'coneInfoTau08',  ## For the tau
@@ -676,7 +676,7 @@ related_info_tools_Tau2PhiMu = [{ 'Type' : 'RelInfoConeVariables', 'ConeAngle' :
                                 '[tau+ -> (phi(1020)->^K+ K-) mu+]CC' : 'coneInfoKplus10',
                                 '[tau+ -> (phi(1020)->K+ ^K-) mu+]CC' : 'coneInfoKminus10'
                                 }},
-                                
+
                                 { 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.2,
                                 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                                 'Location'  : 'coneInfoTau12',  ## For the tau
@@ -686,7 +686,7 @@ related_info_tools_Tau2PhiMu = [{ 'Type' : 'RelInfoConeVariables', 'ConeAngle' :
                                 '[tau+ -> (phi(1020)->^K+ K-) mu+]CC' : 'coneInfoKplus12',
                                 '[tau+ -> (phi(1020)->K+ ^K-) mu+]CC' : 'coneInfoKminus12'
                                 }},
-                                
+
                                 {'Type': 'RelInfoVertexIsolation',
                                 'Location':'VtxIsoInfo',
                                 'Variables'  : [ 'VTXISONUMVTX',
@@ -726,7 +726,7 @@ related_info_tools_Bu2KJPsiee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                            '[B+ -> (J/psi(1S) -> e+ ^e-) K+]CC' :  'Electron2_ISO',
                            '[B+ -> (J/psi(1S) -> e+ e-) ^K+]CC' :  'Kplus_ISO',
                            },
-                           
+
                            'tracktype' : 3,
                            'angle'      : 0.27,
                            'fc'         : 0.60,
@@ -739,15 +739,15 @@ related_info_tools_Bu2KJPsiee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                            'makeTrackCuts' : False,
                            'IsoTwoBody' : True
                            },
-                           
+
                            {'Type': 'RelInfoVertexIsolation',
                            'Location':'VtxIsoInfo',
                            },
-                           
+
                            {'Type': 'RelInfoConeVariables',
                            'Location':'ConeIsoInfo',
                            },
-                                 
+
                             {'Type': 'RelInfoVertexIsolationBDT',
                             'Location':'VtxIsoInfoBDT',
                             },
@@ -787,7 +787,7 @@ related_info_tools_Upsilon2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                   '[Upsilon(1S) -> e+ ^[mu-]cc]CC' :  'Muon_ISO',
                                   '[Upsilon(1S) -> ^e+ [mu-]cc]CC' :  'Electron_ISO',
                                   },
-                                  
+
                                   'tracktype'  : 3,
                                   'angle'      : 0.27,
                                   'fc'         : 0.60,
@@ -800,19 +800,19 @@ related_info_tools_Upsilon2eMu = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                   'makeTrackCuts' : False,
                                   'IsoTwoBody' : True
                                   },
-                                  
+
                                   {'Type': 'RelInfoVertexIsolation',
                                   'Location':'VtxIsoInfo',
                                   },
-                                  
+
                                   {'Type': 'RelInfoConeVariables',
                                   'Location':'ConeIsoInfo',
                                   },
-                                  
+
                                   {'Type': 'RelInfoVertexIsolationBDT',
                                   'Location':'VtxIsoInfoBDT',
                                   },
-                                  
+
                                   {'Type': 'RelInfoTrackIsolationBDT',
                                   'Variables' : 0,
                                   'DaughterLocations': {
@@ -848,7 +848,7 @@ related_info_tools_Upsilon2ee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                  '[Upsilon(1S) -> e+ ^[e-]cc]CC' :  'Electron2_ISO',
                                  '[Upsilon(1S) -> ^e+ [e-]cc]CC' :  'Electron1_ISO',
                                  },
-                                 
+
                                  'tracktype'  : 3,
                                  'angle'      : 0.27,
                                  'fc'         : 0.60,
@@ -861,19 +861,19 @@ related_info_tools_Upsilon2ee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                  'makeTrackCuts' : False,
                                  'IsoTwoBody' : True
                                  },
-                                 
+
                                  {'Type': 'RelInfoVertexIsolation',
                                  'Location':'VtxIsoInfo',
                                  },
-                                 
+
                                  {'Type': 'RelInfoConeVariables',
                                  'Location':'ConeIsoInfo',
                                  },
-                                 
+
                                  {'Type': 'RelInfoVertexIsolationBDT',
                                  'Location':'VtxIsoInfoBDT',
                                  },
-                                 
+
                                  {'Type': 'RelInfoTrackIsolationBDT',
                                  'Variables' : 0,
                                  'DaughterLocations': {
@@ -887,13 +887,13 @@ related_info_tools_Upsilon2ee = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                                  ] ## matches 'RelatedInfoTools'
 
 
-related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations', 
+related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'Variables' : [
                                            'BSMUMUCDFISO',
                                            'BSMUMUOTHERBMAG',
-                                           'BSMUMUOTHERBANGLE', 
+                                           'BSMUMUOTHERBANGLE',
                                            'BSMUMUOTHERBBOOSTMAG',
-                                           'BSMUMUOTHERBBOOSTANGLE', 
+                                           'BSMUMUOTHERBBOOSTANGLE',
                                            'BSMUMUOTHERBTRACKS'
                                           ],
                             'Location'  : 'BSMUMUVARIABLES',  ## For the B
@@ -903,21 +903,21 @@ related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             {
                             'Type' : 'RelInfoBs2MuMuTrackIsolations',
                             'Variables' : [
-                                           'BSMUMUTRACKPLUSISO', 
+                                           'BSMUMUTRACKPLUSISO',
                                            'BSMUMUTRACKPLUSISOTWO',
-                                           'ISOTWOBODYQPLUS', 
+                                           'ISOTWOBODYQPLUS',
                                            'ISOTWOBODYMASSISOPLUS',
-                                           'ISOTWOBODYCHI2ISOPLUS', 
+                                           'ISOTWOBODYCHI2ISOPLUS',
                                            'ISOTWOBODYISO5PLUS'
                                           ],
-                            'IgnoreUnmatchedDescriptors': True, 
+                            'IgnoreUnmatchedDescriptors': True,
                             'DaughterLocations' : {
                             '[Charm -> [^(phi(1020) -> l+ [l-]CC)]CC pi+ ]CC' :  'phi_ISO',
                             '[Charm -> [(phi(1020) -> l+ [l-]CC)]CC ^pi+ ]CC' :  'pi_ISO',
                             '[Charm -> [(phi(1020) -> ^l+ [l-]CC)]CC pi+ ]CC' :  'lplus_ISO',
                             '[Charm -> [(phi(1020) -> l+ [^l-]CC)]CC pi+ ]CC' :  'lminus_ISO',
                             },
-    
+
                             'tracktype'  : 3,
                             'angle'      : 0.27,
                             'fc'         : 0.60,
@@ -930,10 +930,10 @@ related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                             'makeTrackCuts' : False,
                             'IsoTwoBody' : True
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 1,
-                              'IgnoreUnmatchedDescriptors': True, 
+                              'IgnoreUnmatchedDescriptors': True,
                               "DaughterLocations" : {
                                 '[Charm -> [^(phi(1020) -> l+ [l-]CC)]CC pi+ ]CC' :  'phi_TrackIso_BDT6vars',
                                 '[Charm -> [(phi(1020) -> l+ [l-]CC)]CC ^pi+ ]CC' :  'pi_TrackIso_BDT6vars',
@@ -942,10 +942,10 @@ related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT6varsB_v1r4.xml"
                             },
-                            { 
+                            {
                               "Type" : "RelInfoTrackIsolationBDT",
                               "Variables" : 2,
-                              'IgnoreUnmatchedDescriptors': True, 
+                              'IgnoreUnmatchedDescriptors': True,
                               "DaughterLocations" : {
                                 '[Charm -> [^(phi(1020) -> l+ [l-]CC)]CC pi+ ]CC' :  'phi_TrackIso_BDT9vars',
                                 '[Charm -> [(phi(1020) -> l+ [l-]CC)]CC ^pi+ ]CC' :  'pi_TrackIso_BDT9vars',
@@ -954,7 +954,7 @@ related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations',
                               },
                               "WeightsFile"  :  "BsMuMu_TrackIsolationBDT9vars_v1r4.xml"
                             },
-                            { 
+                            {
                               'Type' : 'RelInfoConeVariables',
                               'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                               'Location'  : 'coneInfo'
@@ -976,7 +976,7 @@ related_info_tools_D2piphi = [{'Type' : 'RelInfoBs2MuMuBIsolations',
 default_config = {
     'NAME' : 'LFV',
     'BUILDERTYPE' : 'LFVLinesConf' ,
-    'STREAMS' : {    
+    'STREAMS' : {
         'Leptonic' : [
           'StrippingLFVTau2PhiMuLine',
           'StrippingLFVTau2eMuMuLine',
@@ -1002,12 +1002,12 @@ default_config = {
           'StrippingLFVTau2MuEtaP2pipipiLine',
           'StrippingLFVupsilon2eMuLine',
           'StrippingLFVupsilon2eeLine',
-          'StrippingLFVD2piphi2eeLine', 
-          'StrippingLFVD2piphi2eMuLine', 
-          'StrippingLFVD2piphi2MuMuLine', 
-          'StrippingLFVD2piphi2eePromptLine', 
-          'StrippingLFVD2piphi2eMuPromptLine', 
-          'StrippingLFVD2piphi2MuMuPromptLine', 
+          'StrippingLFVD2piphi2eeLine',
+          'StrippingLFVD2piphi2eMuLine',
+          'StrippingLFVD2piphi2MuMuLine',
+          'StrippingLFVD2piphi2eePromptLine',
+          'StrippingLFVD2piphi2eMuPromptLine',
+          'StrippingLFVD2piphi2MuMuPromptLine',
         ]
     },
     'WGs'     : [ 'RD' ],
@@ -1120,7 +1120,7 @@ default_config = {
         'tau_mass_window'   : "(ADAMASS('tau+')<150*MeV)",
         'tau_cuts'          : "(BPVIPCHI2()< 100) & (VFASPF(VCHI2/VDOF)<6.) & (BPVLTIME()*c_light > 50.*micrometer) & (BPVLTIME()*c_light < 400.*micrometer) & (PT>500*MeV)"\
         " & (D2DVVD(2) < 80*micrometer)", #maybe PT 1000
-        
+
         'config_EtaPrime2pipigamma'   : {
             'gamma_cuts'        :   '(PT > 300*MeV) & (CL > 0.1)',  #CL might exclude pi0?
             'piplus_cuts'       :   "(PROBNNpi > 0.1) & (PT > 250*MeV) & (TRGHOSTPROB < 0.3) & (TRCHI2DOF < 3.0) & (MIPCHI2DV(PRIMARY) > 9.)",
@@ -1129,7 +1129,7 @@ default_config = {
             'etap_cuts'          :  '(PT > 500*MeV) & (VFASPF(VCHI2/VDOF) < 6.0)',# & (MIPCHI2DV(PRIMARY)> 9)',
             'pipi_cuts'          :  '(ACHI2DOCA(1,2)<16)',
         }, #matches config_EtaPrime2pipigamma
-    
+
         'config_EtaPrime2pipipi'   : {
             'pi0_cuts'        :     "(PT > 250*MeV)",
             'piplus_cuts'       :   "(PROBNNpi > 0.1) & (PT > 250*MeV) & (TRGHOSTPROB < 0.3) & (TRCHI2DOF < 3.0) & (MIPCHI2DV(PRIMARY) > 9.)",
@@ -1157,14 +1157,14 @@ default_config = {
 
             'comb_cuts' : "in_range(1300, AM, 2400) & (AMAXDOCA('') < .3*mm)",
             'comb_cuts_prompt' : "in_range(1300, AM, 2400) & (AMAXDOCA('') < .3*mm)",
-            
+
             'mother_cuts_prompt' :  "(VFASPF(VCHI2/VDOF) < 2.5) "\
                              "& (MM > 1300) & (MM < 2400)"\
                              "& (BPVDIRA > 0) & (BPVVD > 0.3)",
             'mother_cuts' :  "(VFASPF(VCHI2/VDOF) < 3) "\
                              "& (MM > 1300) & (MM < 2400)"\
                              "& (BPVDIRA > 0)",
-            
+
             'pi_cuts' : "(PT>250*MeV) & (TRCHI2DOF < 3.) & (TRGHOSTPROB<.3)",
             'pi_cuts_prompt' : "(PT>250*MeV) & (TRCHI2DOF < 2.5) & (TRGHOSTPROB<.2) & (MIPDV(PRIMARY)>0.025) & (MIPCHI2DV(PRIMARY) < 9)",
     },
@@ -1192,13 +1192,13 @@ default_config = {
 }
 
 class LFVLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-        
+
     def __init__(self,
                  name = 'LFV',
                  config = None) :
-            
+
             LineBuilder.__init__(self, name, config)
 
             tau_name = name+'Tau2PhiMu'
@@ -1286,13 +1286,13 @@ class LFVLinesConf(LineBuilder) :
                                                selection=self.selTau2PhiMu,
                                                RelatedInfoTools = config['RelatedInfoTools_Tau2PhiMu'],
                                                )
-                                               
+
             self.tau2eMuMuLine = StrippingLine(mme_name+'Line',
                                                prescale = config['Tau2MuMuePrescale'],
                                                postscale = config['Postscale'],
                                                algos = [ self.selTau2eMuMu ]
                                                )
-                                               
+
             self.b2eMuLine = StrippingLine(emu_name+'Line',
                                            prescale = config['B2eMuPrescale'],
                                            postscale = config['Postscale'],
@@ -1357,7 +1357,7 @@ class LFVLinesConf(LineBuilder) :
                                                   #RequiredRawEvents = ['Calo'],
                                                   algos = [ self.selPromptJPsi2eeControl ],
                                                   L0DU="(L0_DATA('Spd(Mult)') < {})".format(config['config_PromptJPsi2eMu']['max_SPD'])
-                                                  )            
+                                                  )
             #================ Phi LFV lines
             self.phi2eMuLine = StrippingLine(Phiemu_name+'Line',
                                            prescale = config['Phi2eMuPrescale'],
@@ -1376,7 +1376,7 @@ class LFVLinesConf(LineBuilder) :
                                            #RequiredRawEvents = ['Velo', 'Muon', 'Calo'],
                                            algos = [ self.selPromptPhi2eMu ],
                                            L0DU = "(L0_DATA('Spd(Mult)') < {})".format(config['config_PromptJPsi2eMu']['max_SPD'])
-                                           )                      
+                                           )
             #================ Phi LFV control lines
             self.phi2MuMuControlLine = StrippingLine(PhimumuControl_name+'Line',
                                            prescale = config['Phi2MuMuControlPrescale'],
@@ -1404,7 +1404,7 @@ class LFVLinesConf(LineBuilder) :
                                            #RequiredRawEvents = ['Velo', 'Muon', 'Calo'],
                                            algos = [ self.selPromptPhi2MuMuControl ],
                                            L0DU = "(L0_DATA('Spd(Mult)') < {})".format(config['config_PromptJPsi2eMu']['max_SPD'])
-                                           )  
+                                           )
 
             self.promptphi2eeControlLine = StrippingLine(PromptPhieeControl_name+'Line',
                                            prescale = config['PromptPhi2eeControlPrescale'],
@@ -1414,7 +1414,7 @@ class LFVLinesConf(LineBuilder) :
                                            #RequiredRawEvents = ['Velo', 'Muon', 'Calo'],
                                            algos = [ self.selPromptPhi2eeControl ],
                                            L0DU = "(L0_DATA('Spd(Mult)') < {})".format(config['config_PromptJPsi2eMu']['max_SPD'])
-                                           )    
+                                           )
             '''
             self.b2TauMuLine = StrippingLine(taumu_name+'Line',
                                             prescale = config['B2TauMuPrescale'],
@@ -1423,41 +1423,41 @@ class LFVLinesConf(LineBuilder) :
                                             )
             '''
 
-                                           
+
             self.b2eeLine = StrippingLine(ee_name+'Line',
                                           prescale = config['B2eePrescale'],
                                           postscale = config['Postscale'],
                                           RelatedInfoTools = config['RelatedInfoTools_B2ee'],
                                           algos = [ self.selB2ee ]
                                           )
-                                       
+
             self.b2hTauMuLine = StrippingLine(htaumu_name+'Line',
                                               prescale = config['B2hTauMuPrescale'],
                                               postscale = config['Postscale'],
                                               algos = [ self.selB2hTauMu ]
                                               )
-                                       
+
             self.b2heMuLine = StrippingLine(hemu_name+'Line',
                                             prescale = config['B2heMuPrescale'],
                                             postscale = config['Postscale'],
                                             RelatedInfoTools = config['RelatedInfoTools_B2hemu'],
                                             algos = [ self.selB2heMu ]
                                             )
-                
-                                       
+
+
             self.b2pMuLine = StrippingLine(pmu_name+'Line',
                                            prescale = config['B2pMuPrescale'],
                                            postscale = config['Postscale'],
                                            algos = [ self.selB2pMu ]
                                            )
-                
+
             self.buLine = StrippingLine(bu_name+'Line',
                                         prescale = config['Bu2KJPsieePrescale'],
                                         postscale = config['Postscale'],
                                         algos = [ self.selBu ],
                                         RelatedInfoTools = config['RelatedInfoTools_Bu2KJPsiee']
                                         )
-                                        
+
             self.Tau2MuEtaPrime_gamma = StrippingLine(muetap_gamma_name+'Line',
                                         prescale = config['Tau2MuEtaPrimePrescale'],
                                         postscale = config['Postscale'],
@@ -1466,7 +1466,7 @@ class LFVLinesConf(LineBuilder) :
                                         RelatedInfoTools = config['RelatedInfoTools_Tau2MuEtaPrime'],
                                         #RequiredRawEvents = ['Calo'],
                                         )
-                                        
+
             self.Tau2MuEtaPrime_pi = StrippingLine(muetap_pi_name+'Line',
                                                 prescale = config['Tau2MuEtaPrimePrescale'],
                                                 postscale = config['Postscale'],
@@ -1475,8 +1475,8 @@ class LFVLinesConf(LineBuilder) :
                                                 RelatedInfoTools = config['RelatedInfoTools_Tau2MuEtaPrime'],
                                                 #RequiredRawEvents = ['Calo'],
                                                 )
-                                                
-                                                
+
+
             self.Upsilon2eMuLine = StrippingLine(upsilon2eMu_name+'Line',
                                                  prescale = config['Upsilon2eMuPrescale'],
                                                  postscale = config['Postscale'],
@@ -1484,7 +1484,7 @@ class LFVLinesConf(LineBuilder) :
                                                  RelatedInfoTools = config['RelatedInfoTools_Upsilon2eMu'],
                                                  #RequiredRawEvents = ['Velo', 'Muon', 'Calo'],
                                                  )
-                                                
+
             self.Upsilon2eeLine = StrippingLine(upsilon2ee_name+'Line',
                                                 prescale = config['Upsilon2eePrescale'],
                                                 postscale = config['Postscale'],
@@ -1492,7 +1492,7 @@ class LFVLinesConf(LineBuilder) :
                                                 RelatedInfoTools = config['RelatedInfoTools_Upsilon2ee'],
                                                 #RequiredRawEvents = ['Velo', 'Muon', 'Calo'],
                                                 )
-                                        
+
             self.D2piphi2eeLine = StrippingLine(    D2piphi2ee_name+'Line',
                                                 prescale = config['D2piphi2eePrescale'],
                                                 postscale = config['Postscale'],
@@ -1566,7 +1566,7 @@ class LFVLinesConf(LineBuilder) :
             self.registerLine(self.Tau2MuEtaPrime_pi)
             self.registerLine(self.Upsilon2eMuLine)
             self.registerLine(self.Upsilon2eeLine)
-            #D2phiX 
+            #D2phiX
             self.registerLine(self.D2piphi2eeLine)
             self.registerLine(self.D2piphi2eMuLine)
             self.registerLine(self.D2piphi2MuMuLine)
@@ -1580,7 +1580,7 @@ class LFVLinesConf(LineBuilder) :
 def makeTau2PhiMu(name):
     """
     Please contact Giulio Dujany if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -1592,9 +1592,9 @@ def makeTau2PhiMu(name):
     makePhi.DecayDescriptor =  "phi(1020) -> K+ K-"
     makePhi.DaughtersCuts = {"K+": "(ISLONG) & (TRCHI2DOF < 3 ) & (TRGHOSTPROB<0.3) & (PT>300*MeV) & (PIDK > 0) & ( BPVIPCHI2 () >  9 )",
                              "K-": "(ISLONG) & (TRCHI2DOF < 3 ) & (TRGHOSTPROB<0.3) & (PT>300*MeV) & (PIDK > 0) & ( BPVIPCHI2 () >  9 )"}
-    
+
     _kaons = DataOnDemand(Location='Phys/StdLooseKaons/Particles')
-    
+
     makePhi.CombinationCut =  "(ADAMASS('phi(1020)')<30*MeV)"
     makePhi.MotherCut = " ( VFASPF(VCHI2) < 25 ) & (MIPCHI2DV(PRIMARY)> 9)"
 
@@ -1607,21 +1607,21 @@ def makeTau2PhiMu(name):
     Tau2PhiMu.CombinationCut = "(ADAMASS('tau-')<150*MeV)"
 
     Tau2PhiMu.MotherCut = "( VFASPF(VCHI2) < 25 ) &  ( (BPVLTIME () * c_light)   > 50 * micrometer ) &  ( BPVIPCHI2() < 100 ) "
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
 
     SelTau = Selection (name+"makeTau",
                         Algorithm = Tau2PhiMu,
                         RequiredSelections = [ SelPhi, _stdLooseMuons ])
-    
-    
+
+
     return SelTau
 
-    
+
 def makeTau2eMuMu(name):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -1641,24 +1641,24 @@ def makeTau2eMuMu(name):
             ( VFASPF(VCHI2) < 15 ) &
             ( (BPVLTIME () * c_light)   > 100 * micrometer ) &
             ( BPVIPCHI2() < 100 )
-            """ 
-                             
+            """
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseElectrons= DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
 
     return Selection (name,
                       Algorithm = Tau2eMuMu,
-                      RequiredSelections = [ _stdLooseMuons,_stdLooseElectrons]) 
+                      RequiredSelections = [ _stdLooseMuons,_stdLooseElectrons])
 
 
 def makeB2TauMu(name):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Bs2TauMu = CombineParticles()
     Bs2TauMu.DecayDescriptors = ["[B_s0 -> tau+ mu-]cc","[B_s0 -> tau+ mu+]cc"]
@@ -1677,7 +1677,7 @@ def makeB2TauMu(name):
                               "& (BPVDIRA > 0) "\
                               "& (BPVVDCHI2> 225)"\
                               "& (BPVIPCHI2()< 25) "
-    
+
     from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus= DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
@@ -1690,14 +1690,14 @@ def makeB2TauMu(name):
 def makeB2eMu(name, myconfig):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Bs2eMu = CombineParticles(
-    
+
         DecayDescriptors = ["[B_s0 -> e+ mu-]cc","[B_s0 -> e+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY)> {min_MIPCHI2DV}) & (TRCHI2DOF < {max_TRCHI2DV}) & (TRGHOSTPROB< {max_TRGHOSTPROB})".format(**myconfig) ,
@@ -1713,7 +1713,7 @@ def makeB2eMu(name, myconfig):
                               "& (BPVVDCHI2 > {min_BPVVDCHI2})"\
                               "& (BPVIPCHI2() < {max_BPVIPCHI2}) ".format(**myconfig),
     )
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseElectrons= DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
 
@@ -1725,14 +1725,14 @@ def makeB2eMu(name, myconfig):
 def makeJPsi2eMu(name, myconfig):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     JPsi2eMu = CombineParticles(
-    
+
         DecayDescriptors = ["[J/psi(1S) -> e+ mu-]cc","[J/psi(1S) -> e+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY)> {min_MIPCHI2DV})"\
@@ -1752,7 +1752,7 @@ def makeJPsi2eMu(name, myconfig):
                      "& (BPVDIRA > {min_BPVDIRA}) "\
                      "& (BPVVDCHI2 > {min_BPVVDCHI2})".format(**myconfig)
     )
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseElectrons= DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
 
@@ -1763,17 +1763,17 @@ def makeJPsi2eMu(name, myconfig):
 
 def makeJPsi2MuMuControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if any issues 
-    occur with this line. 
+    Please contact Maximilian Schlupp or Johannes Albrecht if any issues
+    occur with this line.
     Cloned from JPsi2eMu Line except for the PID criteria
 
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     JPsi2MuMuControl = CombineParticles(
-    
+
         DecayDescriptors = ["J/psi(1S) -> mu+ mu-","[J/psi(1S) -> mu+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY)> {min_MIPCHI2DV}) &"\
@@ -1793,9 +1793,9 @@ def makeJPsi2MuMuControl(name, myconfig):
                     " & (BPVDIRA > {min_BPVDIRA}) "\
                     " & (BPVVDCHI2 > {min_BPVVDCHI2})".format(**myconfig)
     )
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
     return Selection (name,
                       Algorithm = JPsi2MuMuControl,
                       RequiredSelections = [ _stdLooseMuons])
@@ -1803,17 +1803,17 @@ def makeJPsi2MuMuControl(name, myconfig):
 
 def makeJPsi2eeControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if any issues 
-    occur with this line. 
+    Please contact Maximilian Schlupp or Johannes Albrecht if any issues
+    occur with this line.
     Cloned from JPsi2eMu Line except for the PID criteria
 
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     JPsi2eeControl = CombineParticles(
-    
+
         DecayDescriptors = ["J/psi(1S) -> e+ e-","[J/psi(1S) -> e+ e+]cc"],
         DaughtersCuts = {
           "e+" : "(MIPCHI2DV(PRIMARY)> {min_MIPCHI2DV}) & (TRCHI2DOF < {max_TRCHI2DV}) & "\
@@ -1832,9 +1832,9 @@ def makeJPsi2eeControl(name, myconfig):
                     "& (BPVDIRA > {min_BPVDIRA}) "\
                     "& (BPVVDCHI2 > {min_BPVVDCHI2})".format(**myconfig)
     )
-    
+
     _stdLooseElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
-    
+
     return Selection (name,
                       Algorithm = JPsi2eeControl,
                       RequiredSelections = [ _stdLooseElectrons])
@@ -1843,14 +1843,14 @@ def makeJPsi2eeControl(name, myconfig):
 def makePromptJPsi2eMu(name, myconfig):
     """
     Please contact Maximilian Schlupp or Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
 
     #from Configurables import OfflineVertexFitter
     PromptJPsi2eMu = CombineParticles(
-    
+
         DecayDescriptors = ["[J/psi(1S) -> e+ mu-]cc","[J/psi(1S) -> e+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY) < {max_MIPCHI2DV}) &"\
@@ -1871,7 +1871,7 @@ def makePromptJPsi2eMu(name, myconfig):
                     "& (BPVVDCHI2 < {max_BPVVDCHI2})"\
                     "& (BPVIPCHI2() < {max_BPVIPCHI2})".format(**myconfig),
     )
-    
+
     _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     _stdAllLooseElectrons= DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
 
@@ -1882,16 +1882,16 @@ def makePromptJPsi2eMu(name, myconfig):
 
 def makePromptJPsi2MuMuControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if 
-    this line has issues. 
-    
+    Please contact Maximilian Schlupp or Johannes Albrecht if
+    this line has issues.
+
     Arguments:
     name        : name of the Selection.
     """
 
     #from Configurables import OfflineVertexFitter
     PromptJPsi2MuMuControl = CombineParticles(
-    
+
         DecayDescriptors = ["J/psi(1S) -> mu+ mu-","[J/psi(1S) -> mu+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY) < {max_MIPCHI2DV}) &"\
@@ -1912,7 +1912,7 @@ def makePromptJPsi2MuMuControl(name, myconfig):
                     "& (BPVVDCHI2 < {max_BPVVDCHI2})"\
                     "& (BPVIPCHI2() < {max_BPVIPCHI2})".format(**myconfig),
     )
-    
+
     _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
 
     return Selection (name,
@@ -1922,16 +1922,16 @@ def makePromptJPsi2MuMuControl(name, myconfig):
 
 def makePromptJPsi2eeControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if 
-    this line has issues. 
-    
+    Please contact Maximilian Schlupp or Johannes Albrecht if
+    this line has issues.
+
     Arguments:
     name        : name of the Selection.
     """
 
     #from Configurables import OfflineVertexFitter
     PromptJPsi2eeControl = CombineParticles(
-    
+
         DecayDescriptors = ["J/psi(1S) -> e+ e-","[J/psi(1S) -> e+ e+]cc"],
         DaughtersCuts = {
           "e+" : "(MIPCHI2DV(PRIMARY) < {max_MIPCHI2DV}) &"\
@@ -1952,7 +1952,7 @@ def makePromptJPsi2eeControl(name, myconfig):
                     "& (BPVVDCHI2 < {max_BPVVDCHI2})"\
                     "& (BPVIPCHI2() < {max_BPVIPCHI2})".format(**myconfig),
     )
-    
+
     _stdAllLooseElectrons = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
 
     return Selection (name,
@@ -1963,14 +1963,14 @@ def makePromptJPsi2eeControl(name, myconfig):
 def makePhi2eMu(name, myconfig):
     """
     Please contact Maximilian Schlupp or Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Phi2eMu = CombineParticles(
-    
+
         DecayDescriptors = ["[phi(1020) -> e+ mu-]cc","[phi(1020) -> e+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY)> {min_MIPCHI2DV_phi}) & "\
@@ -1993,7 +1993,7 @@ def makePhi2eMu(name, myconfig):
                               "& (BPVDIRA > {min_BPVDIRA}) "\
                               "& (BPVVDCHI2 > {min_BPVVDCHI2_phi})".format(**myconfig)
     )
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseElectrons= DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
 
@@ -2004,16 +2004,16 @@ def makePhi2eMu(name, myconfig):
 
 def makePhi2MuMuControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if experience 
+    Please contact Maximilian Schlupp or Johannes Albrecht if experience
     issues with this line
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Phi2MuMuControl = CombineParticles(
-    
+
         DecayDescriptors = ["phi(1020) -> mu+ mu-","[phi(1020) -> mu+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY) > {min_MIPCHI2DV_phi}) & "\
@@ -2036,7 +2036,7 @@ def makePhi2MuMuControl(name, myconfig):
                               "& (BPVDIRA > {min_BPVDIRA}) "\
                               "& (BPVVDCHI2 > {min_BPVVDCHI2_phi})".format(**myconfig)
     )
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
 
     return Selection (name,
@@ -2046,16 +2046,16 @@ def makePhi2MuMuControl(name, myconfig):
 
 def makePhi2eeControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if experience 
+    Please contact Maximilian Schlupp or Johannes Albrecht if experience
     issues with this line
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Phi2eeControl = CombineParticles(
-    
+
         DecayDescriptors = ["phi(1020) -> e+ e-","[phi(1020) -> e+ e+]cc"],
         DaughtersCuts = {
           "e+" : "(MIPCHI2DV(PRIMARY) > {min_MIPCHI2DV_phi}) & "\
@@ -2078,7 +2078,7 @@ def makePhi2eeControl(name, myconfig):
                               "& (BPVDIRA > {min_BPVDIRA}) "\
                               "& (BPVVDCHI2 > {min_BPVVDCHI2_phi})".format(**myconfig)
     )
-    
+
     _stdLooseElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
 
     return Selection (name,
@@ -2089,14 +2089,14 @@ def makePhi2eeControl(name, myconfig):
 def makePromptPhi2eMu(name, myconfig):
     """
     Please contact Maximilian Schlupp or Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
 
     #from Configurables import OfflineVertexFitter
     PromptPhi2eMu = CombineParticles(
-    
+
         DecayDescriptors = ["[phi(1020) -> e+ mu-]cc","[phi(1020) -> e+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY) < {max_MIPCHI2DV}) &"\
@@ -2120,7 +2120,7 @@ def makePromptPhi2eMu(name, myconfig):
                     "& (BPVVDCHI2 < {max_BPVVDCHI2})"\
                     "& (BPVIPCHI2() < {max_BPVIPCHI2})".format(**myconfig),
     )
-    
+
     _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     _stdAllLooseElectrons= DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
 
@@ -2131,16 +2131,16 @@ def makePromptPhi2eMu(name, myconfig):
 
 def makePromptPhi2MuMuControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if you see 
+    Please contact Maximilian Schlupp or Johannes Albrecht if you see
     issues with this line.
-    
+
     Arguments:
     name        : name of the Selection.
     """
 
     #from Configurables import OfflineVertexFitter
     PromptPhi2MuMuControl = CombineParticles(
-    
+
         DecayDescriptors = ["phi(1020) -> mu+ mu-","[phi(1020) -> mu+ mu+]cc"],
         DaughtersCuts = {
           "mu+" : "(MIPCHI2DV(PRIMARY) < {max_MIPCHI2DV}) &"\
@@ -2164,7 +2164,7 @@ def makePromptPhi2MuMuControl(name, myconfig):
                     "& (BPVVDCHI2 < {max_BPVVDCHI2})"\
                     "& (BPVIPCHI2() < {max_BPVIPCHI2})".format(**myconfig),
     )
-    
+
     _stdAllLooseMuons = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
 
     return Selection (name,
@@ -2173,16 +2173,16 @@ def makePromptPhi2MuMuControl(name, myconfig):
 
 def makePromptPhi2eeControl(name, myconfig):
     """
-    Please contact Maximilian Schlupp or Johannes Albrecht if you see 
+    Please contact Maximilian Schlupp or Johannes Albrecht if you see
     issues with this line.
-    
+
     Arguments:
     name        : name of the Selection.
     """
 
     #from Configurables import OfflineVertexFitter
     PromptPhi2eeControl = CombineParticles(
-    
+
         DecayDescriptors = ["phi(1020) -> e+ e-","[phi(1020) -> e+ e+]cc"],
         DaughtersCuts = {
           "e+" : "(MIPCHI2DV(PRIMARY) < {max_MIPCHI2DV}) &"\
@@ -2206,7 +2206,7 @@ def makePromptPhi2eeControl(name, myconfig):
                     "& (BPVVDCHI2 < {max_BPVVDCHI2})"\
                     "& (BPVIPCHI2() < {max_BPVIPCHI2})".format(**myconfig),
     )
-    
+
     _stdAllLooseElectrons = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
 
     return Selection (name,
@@ -2217,11 +2217,11 @@ def makePromptPhi2eeControl(name, myconfig):
 def makeB2ee(name):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Bs2ee = CombineParticles()
     Bs2ee.DecayDescriptors = ["B_s0 -> e+ e-","[B_s0 -> e+ e+]cc"]
@@ -2240,7 +2240,7 @@ def makeB2ee(name):
                               "& (BPVDIRA > 0) "\
                               "& (BPVVDCHI2> 225)"\
                               "& (BPVIPCHI2()< 25) "
-                             
+
     _stdLooseElectrons= DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
 
     return Selection (name,
@@ -2251,11 +2251,11 @@ def makeB2ee(name):
 def makeB2hTauMu(name):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     #Bs2hTauMu = CombineParticles()
     Bs2hTauMu = DaVinci__N3BodyDecays()
@@ -2284,30 +2284,30 @@ def makeB2hTauMu(name):
                           "& (BPVDIRA > 0) "\
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "#maybe 16
-    
+
     from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus= DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
     _stdNoPIDsPions= DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
     _stdNoPIDsKaons= DataOnDemand(Location = "Phys/StdNoPIDsKaons/Particles")
     _stdNoPIDsProtons= DataOnDemand(Location = "Phys/StdNoPIDsProtons/Particles")
-    
+
 
     return Selection (name,
                       Algorithm = Bs2hTauMu,
                       RequiredSelections = [ _stdLooseMuons,_stdLooseDetachedTaus,
                                              _stdNoPIDsPions, _stdNoPIDsKaons,
                                              _stdNoPIDsProtons ])
-                      
+
 
 def makeB2heMu(name):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     #Bs2heMu = CombineParticles()
     Bs2heMu = DaVinci__N3BodyDecays()
@@ -2342,7 +2342,7 @@ def makeB2heMu(name):
     _stdNoPIDsPions= DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
     _stdNoPIDsKaons= DataOnDemand(Location = "Phys/StdNoPIDsKaons/Particles")
     _stdNoPIDsProtons= DataOnDemand(Location = "Phys/StdNoPIDsProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = Bs2heMu,
                       RequiredSelections = [ _stdLooseMuons,_stdLooseElectrons,
@@ -2353,11 +2353,11 @@ def makeB2heMu(name):
 def makeB2pMu(name):
     """
     Please contact Johannes Albrecht if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     #from Configurables import OfflineVertexFitter
     Bs2pMu = CombineParticles()
     Bs2pMu.DecayDescriptors = [ "[B_s0 -> p+ mu-]cc","[B_s0 -> p+ mu+]cc",
@@ -2374,7 +2374,7 @@ def makeB2pMu(name):
 
     Bs2pMu.CombinationCut = "(ADAMASS('B_s0')<300*MeV)"\
                             "& (AMAXDOCA('')<0.1*mm)"
-    
+
     Bs2pMu.MotherCut = "(VFASPF(VCHI2/VDOF)<9) "\
                        "& (ADMASS('B_s0') < 600*MeV )"\
                        "& (BPVDIRA > 0) "\
@@ -2385,7 +2385,7 @@ def makeB2pMu(name):
     _stdNoPIDsPions= DataOnDemand(Location = "Phys/StdNoPIDsPions/Particles")
     _stdNoPIDsKaons= DataOnDemand(Location = "Phys/StdNoPIDsKaons/Particles")
     _stdNoPIDsProtons= DataOnDemand(Location = "Phys/StdNoPIDsProtons/Particles")
-    
+
 
 
     return Selection (name,
@@ -2404,9 +2404,9 @@ def makeBu(name) :
     name        : name of the Selection.
     """
 
-    
+
     #from Configurables import OfflineVertexFitter
-   
+
     SelDJPsi = makeDetachedJPsi(name)
 
     PreselBu2JPsiKCommon = CombineParticles()
@@ -2429,7 +2429,7 @@ def makeBu(name) :
 def makeDetachedJPsi(name) :
     """
     detached JPsi selection for B--> JPsi X calibration and
-    normalization channels. 
+    normalization channels.
 
     Please contact Flavio Archilli if you think of prescaling this line!
 
@@ -2446,7 +2446,7 @@ def makeDetachedJPsi(name) :
     DetachedJPsi.DaughtersCuts = { "e+" : "(TRCHI2DOF < 3 ) "\
                                    "& (MIPCHI2DV(PRIMARY)> 25.) "\
                                    "& (PIDe > 2) "}
-                                 
+
     DetachedJPsi.CombinationCut = "(ADAMASS('J/psi(1S)')<1000*MeV) "\
                                    "& (AMAXDOCA('')<0.3*mm)"
 
@@ -2463,19 +2463,19 @@ def makeDetachedJPsi(name) :
 
 
 def makeTau2MuEtaPrime(self, name, config, setEtaPrime) :
-    
+
     """
     tau -> mu eta' selection
-        
+
     Please contact Guido Andreassi if you think of prescaling this line!
-        
+
     Arguments:
     name        : name of the Selection, configuration dictionary.
     """
-            
+
     if setEtaPrime == 'gamma':
         self.SelEtaPrime = makeEtaPrime2pipigamma("selEtap_gamma", config['config_EtaPrime2pipigamma'])
-    
+
     if setEtaPrime == 'pi0':
         self.SelEtaPrime = makeEtaPrime2pipipi("selEtap_pi0", config['config_EtaPrime2pipipi'])
 
@@ -2486,9 +2486,9 @@ def makeTau2MuEtaPrime(self, name, config, setEtaPrime) :
     Tau2MuEtaPrime.DaughtersCuts = { "mu+" : "{muplus_cuts}".format(**config)}
     Tau2MuEtaPrime.CombinationCut = "{tau_mass_window}".format(**config)
     Tau2MuEtaPrime.MotherCut = "{tau_cuts}".format(**config)
-                
+
     _muons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
-                    
+
     return Selection( name,
                         Algorithm = Tau2MuEtaPrime,
                         RequiredSelections=[self.SelEtaPrime,_muons] )
@@ -2498,7 +2498,7 @@ def makeEtaPrime2pipigamma(name, config) :
     """
         eta' selection for tau -> mu eta'
         Please contact Guido Andreassi if you think of prescaling this line!
-        
+
         Arguments:
         name        : name of the Selection , config:  configuration dictionary.
         """
@@ -2509,13 +2509,13 @@ def makeEtaPrime2pipigamma(name, config) :
     EtaPrime2pipigamma.DaughtersCuts = {"pi+"     : "{piplus_cuts}".format(**config),
                               "pi-"     : "{piminus_cuts}".format(**config),
                               "gamma"   : "{gamma_cuts}".format(**config)}
-                                    
+
     EtaPrime2pipigamma.CombinationCut = "{etap_mass_window}".format(**config)
     EtaPrime2pipigamma.MotherCut = "{etap_cuts}".format(**config)
-                                            
+
     _stdLoosePions = DataOnDemand (Location = "Phys/StdLoosePions/Particles")
     _stdLooseAllPhotons = DataOnDemand (Location = "Phys/StdLooseAllPhotons/Particles")
-    
+
     return Selection (name,
                         Algorithm = EtaPrime2pipigamma,
                         RequiredSelections = [ _stdLoosePions, _stdLooseAllPhotons ])
@@ -2525,7 +2525,7 @@ def makeEtaPrime2pipipi(name, config) :
     """
         eta' selection for tau -> mu eta'
         Please contact Guido Andreassi if you think of prescaling this line!
-        
+
         Arguments:
         name        : name of the Selection , config:  configuration dictionary.
         """
@@ -2539,7 +2539,7 @@ def makeEtaPrime2pipipi(name, config) :
 
     EtaPrime2pipipi.CombinationCut = "{etap_mass_window}".format(**config)
     EtaPrime2pipipi.MotherCut = "{etap_cuts}".format(**config)
-    
+
     _stdLoosePions = DataOnDemand (Location = "Phys/StdLoosePions/Particles")
     _stdLooseResolvedPi0 = DataOnDemand (Location = "Phys/StdLooseResolvedPi0/Particles")
     _stdLooseMergedPi0 = DataOnDemand (Location = "Phys/StdLooseMergedPi0/Particles")
@@ -2557,11 +2557,11 @@ def makeUpsilon2eMu(self, name, config):
     """
         eta' selection for upsilon -> e mu
         Please contact Guido Andreassi if you think of modifying this line!
-        
+
         Arguments:
         name        : name of the Selection , config:  configuration dictionary.
         """
-    
+
     Upsilon2eMu = CombineParticles(
                                    DecayDescriptors = ["[Upsilon(1S) -> e+ mu-]cc","[Upsilon(1S) -> e+ mu+]cc"],
                                    DaughtersCuts = {
@@ -2571,10 +2571,10 @@ def makeUpsilon2eMu(self, name, config):
                                    CombinationCut = "{comb_cuts}".format(**config),
                                    MotherCut = "{upsilon_cuts}".format(**config)
                                    )
-        
+
     _stdTightMuons = DataOnDemand(Location = "Phys/StdTightMuons/Particles")
     _stdTightElectrons = DataOnDemand(Location = "Phys/StdTightElectrons/Particles")
-                                   
+
     return Selection(name,
                      Algorithm = Upsilon2eMu,
                      RequiredSelections = [ _stdTightMuons, _stdTightElectrons])
@@ -2584,20 +2584,20 @@ def makeUpsilon2ee(self, name, config):
     """
         eta' selection for upsilon -> e e
         Please contact Guido Andreassi if you think of modifying this line!
-        
+
         Arguments:
         name        : name of the Selection , config:  configuration dictionary.
         """
-    
+
     Upsilon2ee = CombineParticles(
                                   DecayDescriptors = ["Upsilon(1S) -> e+ e-","[Upsilon(1S) -> e+ e+]cc"],
                                   DaughtersCuts = {"e+"  : "{e_cuts}".format(**config)},
                                   CombinationCut = "{comb_cuts}".format(**config),
                                   MotherCut = "{upsilon_cuts}".format(**config)
                                   )
-        
+
     _stdTightElectrons = DataOnDemand(Location = "Phys/StdTightElectrons/Particles")
-                                  
+
     return Selection(name,
                      Algorithm = Upsilon2ee,
                      RequiredSelections = [_stdTightElectrons])
@@ -2609,10 +2609,10 @@ def makeD2piphi(self, name, phis, detachedflag, myconfig):
     D(s) -> (phi-> l+ l-) pi+ selection
     Please contact Niklas Nolte or Stefanie Reichert if you think of modifying this line.
     """
-    
+
     if detachedflag == 1:
         D2piphiGrimReaper = CombineParticles(
-            
+
             DecayDescriptors = [ "[D_s+ -> phi(1020) pi+]cc"
                                 ,"[D+ -> phi(1020) pi+]cc"
                                 ],
@@ -2622,7 +2622,7 @@ def makeD2piphi(self, name, phis, detachedflag, myconfig):
             )
     elif detachedflag == 0:
         D2piphiGrimReaper = CombineParticles(
-            
+
             DecayDescriptors = [ "[D_s+ -> phi(1020) pi+]cc"
                                 ,"[D+ -> phi(1020) pi+]cc"
                                 ],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py
index 5934c77205c9446f12866a2683c9e0658993719d..2969ce14cd252916f80997521601663cf02cf358 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py
@@ -161,7 +161,7 @@ class StrippingLb2L0GammaConf(LineBuilder):
         Kst_ll = Selection("LooseKstLL",
                            Algorithm=Kst_ll_filter,
                            RequiredSelections=[Kst_ll_dod])
-        
+
         #################################################################################
         # Filter photons
         #################################################################################
@@ -327,7 +327,7 @@ class StrippingLb2L0GammaConf(LineBuilder):
                                                            self.get_neutral_cone_relinfo(1.0, children=children_B0_Jpsi),
                                                            self.get_neutral_cone_relinfo(0.4, children=children_B0_Jpsi),
                                                            ],
-                                         RequiredRawEvents=[], 
+                                         RequiredRawEvents=[],
                                          MDSTFlag = False,
                                          selection=b0_jpsi)
         self.registerLine(self.line_b0_jpsi)
@@ -402,6 +402,5 @@ class StrippingLb2L0GammaConf(LineBuilder):
                                  'NEWVTXISOTRKDCHI2','NEWVTXISODCHI2MASS'],
                 'Location'    : 'VertexIsolInfoRadiative',
                 'TopSelection': selection}
-    
-# EOF
 
+# EOF
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py
index 423647f9ed368bdf85234178fc4535df161531c9..ad6f7268295651844f7b28cd1801dbd776098933 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py
@@ -26,34 +26,34 @@ StrippingReport                                                INFO Event 100000
  |!StrippingLc23MuLc2pmumuLine_TIMING                          |  0.0036|        36|  1.028|   0.102|
  |!StrippingLc23MuLc2peeLine_TIMING                            |  0.0075|        75|  1.027|   0.109|
  |!StrippingLc23MuLc2pKpiLine_TIMING                           |  0.0019|        19|  1.158|   0.025|
-              
+
 MC: Lc -> 3mu (25113002)
 ########################
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
- |!StrippingLc23MuLc23muLine                                   |  2.0770|      2077|  1.025|   5.726|                 
+ |!StrippingLc23MuLc23muLine                                   |  2.0770|      2077|  1.025|   5.726|
 
 MC: Lc -> p+ mu+ mu- (25113000)
 ###############################
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
  |!StrippingLc23MuLc2pmumuLine                                 |  1.0300|      1030|  1.042|   1.736|
-     
+
 
 MC: Lc -> p~- mu+ mu+ (25113001)
 ################################
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
- |!StrippingLc23MuLc2pmumuLine                                 |  0.9420|       942|  1.041|   1.720| 
+ |!StrippingLc23MuLc2pmumuLine                                 |  0.9420|       942|  1.041|   1.720|
 
 MC: Lc -> p+ K- pi+ (25103000)
 ##############################
 StrippingReport                                                INFO Event 100000, Good event 100000
  |                                              *Decision name*|*Rate,%*|*Accepted*| *Mult*|*ms/evt*|
- |!StrippingLc23MuLc2pKpiLine                                  |  0.0080|         8|  1.000|   0.061|              
+ |!StrippingLc23MuLc2pKpiLine                                  |  0.0080|         8|  1.000|   0.061|
 
 Exported symbols (use python help!):
-   - 
+   -
 """
 
 __author__ = ["Oliver Gruenberg, Jolanta Brodzicka"]
@@ -68,8 +68,8 @@ __all__ = ( "Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays 
-#from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays 
+from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+#from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
@@ -94,7 +94,7 @@ default_config = {
     "MinPi0M_PT"          : 500, # (MeV) #StdLooseMergedPi0 (start at PT>2GeV really)
     "Pi0R_DMASS"          : 25,  #30,  # (MeV) #StdLooseResolvedPi0 30MeV
     "Pi0M_DMASS"          : 60,  # (MeV) #StdLooseMergedPi0 60MeV
-    "MinPhotonCL"         : 0.2, #0.1, 
+    "MinPhotonCL"         : 0.2, #0.1,
     # CombinationCuts
     "MaxDoca"             : 0.3, # (mm)
     "MaxDocaChi2"         : 10., # for Pi0-track distance
@@ -114,8 +114,8 @@ default_config = {
     "Lc23muPrescale"      : 1,
     "Lc2mueePrescale"     : 1,
     "Lc2pmumuPrescale"    : 1,
-    "Lc2peePrescale"      : 1,        
-    "Lc2pemuPrescale"     : 1,        
+    "Lc2peePrescale"      : 1,
+    "Lc2pemuPrescale"     : 1,
     "Lc2pKpiPrescale"     : 0.01,
 #
     "Lc2pmumupi0RPrescale": 1,
@@ -140,7 +140,7 @@ default_config = {
                                 "Location"  : "BsMuMuBIsolation",
                                 "tracktype" : 3,
                                 "makeTrackCuts" : False, },
-                              ] # closes CommonRelInfoTools    
+                              ] # closes CommonRelInfoTools
     } # closes CONFIG
     } # closes default_config
 
@@ -156,7 +156,7 @@ class Lc23MuLinesConf(LineBuilder) :
         LineBuilder.__init__(self, name, config)
 
 
-#######################################################################################################        
+#######################################################################################################
 
         self.TrackCuts = """
                          (PT > %(MinTrPT)s*MeV)
@@ -166,16 +166,16 @@ class Lc23MuLinesConf(LineBuilder) :
                          """ %config
 
         self.Pi0RCuts = """
-                        (PT > %(MinPi0R_PT)s*MeV) 
+                        (PT > %(MinPi0R_PT)s*MeV)
                         & (M > 135 - %(Pi0R_DMASS)s *MeV) & (M < 135 + %(Pi0R_DMASS)s *MeV)
                         & ( CHILDCUT( (CL > %(MinPhotonCL)s) ,1) )
                         & ( CHILDCUT( (CL > %(MinPhotonCL)s) ,2) )
-                        """ %config 
+                        """ %config
 
         self.Pi0MCuts = """
                         ( PT > %(MinPi0M_PT)s*MeV )
                         & (M > 135 - %(Pi0M_DMASS)s *MeV) & (M < 135 + %(Pi0M_DMASS)s *MeV)
-                        """ %config 
+                        """ %config
 
         self.Combination12Cuts = "(ADOCA(1,2) < %(MaxDoca)s*mm)" %config
 
@@ -184,7 +184,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                  & (ADOCA(1,3) < %(MaxDoca)s*mm)
                                  & (ADOCA(2,3) < %(MaxDoca)s*mm)
                                  """ %config
-        
+
 
         self.CombinationCutsTight = """
                                  (ADAMASS('Lambda_c+') < %(mDiffLcTight)s*MeV)
@@ -194,7 +194,7 @@ class Lc23MuLinesConf(LineBuilder) :
 
         self.MotherCuts = """
                           ( VFASPF(VCHI2) < %(MaxVtxChi2)s )
-                          & ( (BPVLTIME()*c_light) > %(MinVD)s*micrometer )                         
+                          & ( (BPVLTIME()*c_light) > %(MinVD)s*micrometer )
                           & ( BPVIPCHI2() < %(MaxIPChi2)s )
                           """ %config
 
@@ -213,26 +213,26 @@ class Lc23MuLinesConf(LineBuilder) :
 
         self.Mother4BodyCuts = """
                           ( VFASPF(VCHI2) < %(MaxVtxChi2)s )
-                          & ( (BPVLTIME()*c_light) > %(MinVD)s*micrometer )                         
+                          & ( (BPVLTIME()*c_light) > %(MinVD)s*micrometer )
                           & ( BPVIPCHI2() < %(MaxIPChi2)s )
                           & ( BPVDIRA > %(MinBPVDira)s )
-                          """ %config 
-      
+                          """ %config
+
 #tagged
         self.SigmacCombinationCuts = """
                           ( (AM - AM1) < %(Sigmac_AMDiff_MAX)s*MeV )
-                          """ %config 
+                          """ %config
 
         self.SigmacMotherCuts = """
                           ( VFASPF(VCHI2/VDOF) < %(Sigmac_VCHI2VDOF_MAX)s )
-                          """ %config 
-                   
+                          """ %config
+
 #######################################################################################################
         # Decay descriptors for tagged lines
         Sigmacz2LambdacPi  = ['[Sigma_c0 -> Lambda_c+ pi-]cc']
         Sigmacpp2LambdacPi = ['[Sigma_c++ -> Lambda_c+ pi+]cc']
 
-        # Names       
+        # Names
         Lc23mu_name   = name+"Lc23mu"
         Lc2muee_name  = name+"Lc2muee"
         Lc2pmumu_name = name+"Lc2pmumu"
@@ -257,7 +257,7 @@ class Lc23MuLinesConf(LineBuilder) :
         SigmacppLc2pemu_name = name+"SigmacppLc2pemu"
         SigmaczLc2pKpi_name = name+"SigmaczLc2pKpi"
         SigmacppLc2pKpi_name = name+"SigmacppLc2pKpi"
-# 
+#
         SigmaczLc2pmumupi0R_name = name+"SigmaczLc2pmumupi0R"
         SigmacppLc2pmumupi0R_name = name+"SigmacppLc2pmumupi0R"
         SigmaczLc2pmumupi0M_name = name+"SigmaczLc2pmumupi0M"
@@ -285,7 +285,7 @@ class Lc23MuLinesConf(LineBuilder) :
         self.selLc2pmumu  = self.makeLc2pmumu(Lc2pmumu_name)
         self.selLc2pee    = self.makeLc2pee(Lc2pee_name)
         self.selLc2pemu   = self.makeLc2pemu(Lc2pemu_name)
-        self.selLc2pKpi   = self.makeLc2pKpi(Lc2pKpi_name)        
+        self.selLc2pKpi   = self.makeLc2pKpi(Lc2pKpi_name)
 #4-body
         self.selLc2pmumupi0R  = self.makeLc2pmumupi0R(Lc2pmumupi0R_name)
         self.selLc2pmumupi0M  = self.makeLc2pmumupi0M(Lc2pmumupi0M_name)
@@ -293,8 +293,8 @@ class Lc23MuLinesConf(LineBuilder) :
         self.selLc2peepi0M    = self.makeLc2peepi0M(Lc2peepi0M_name)
         self.selLc2pemupi0R   = self.makeLc2pemupi0R(Lc2pemupi0R_name)
         self.selLc2pemupi0M   = self.makeLc2pemupi0M(Lc2pemupi0M_name)
-        self.selLc2pKpipi0R   = self.makeLc2pKpipi0R(Lc2pKpipi0R_name)        
-        self.selLc2pKpipi0M   = self.makeLc2pKpipi0M(Lc2pKpipi0M_name)        
+        self.selLc2pKpipi0R   = self.makeLc2pKpipi0R(Lc2pKpipi0R_name)
+        self.selLc2pKpipi0M   = self.makeLc2pKpipi0M(Lc2pKpipi0M_name)
 
 #tagged
         self.selSigmaczLc2pmumu = self.makeSigmac2Lcpi(SigmaczLc2pmumu_name,
@@ -399,14 +399,14 @@ class Lc23MuLinesConf(LineBuilder) :
         )
 
 
-#######################################################################################################        
+#######################################################################################################
 
         self.Lc23mu_Line = StrippingLine(Lc23mu_name+"Line",
                                          prescale = config["Lc23muPrescale"],
                                          postscale = config["Postscale"],
                                          MDSTFlag = config["MDSTflag"],
                                          selection = self.selLc23mu,
-                                         RelatedInfoTools = [ 
+                                         RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -449,9 +449,9 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  mu+ ^mu+  l]CC"  : "BsMuMuTrackIsomu2",
                                              "[Lambda_c+ ->  mu+  mu+ ^l]CC"  : "BsMuMuTrackIsomu3",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
-                                         
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
+
 
 
         self.Lc2muee_Line = StrippingLine(Lc2muee_name+"Line",
@@ -459,7 +459,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                           postscale = config["Postscale"],
                                           MDSTFlag = config["MDSTflag"],
                                           selection = self.selLc2muee,
-                                          RelatedInfoTools = [ 
+                                          RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -502,7 +502,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  l ^l  l]CC"  : "BsMuMuTrackIsoe1",
                                              "[Lambda_c+ ->  l  l ^l]CC"  : "BsMuMuTrackIsoe2",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
                                          ) # closes Strippingline
 
 
@@ -511,7 +511,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2pmumu,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -554,8 +554,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  X ^l  l]CC"  : "BsMuMuTrackIsomu1",
                                              "[Lambda_c+ ->  X  l ^l]CC"  : "BsMuMuTrackIsomu2",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pee_Line = StrippingLine(Lc2pee_name+"Line",
                                          prescale = config["Lc2peePrescale"],
@@ -605,8 +605,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  X ^l  l]CC"  : "BsMuMuTrackIsoe1",
                                              "[Lambda_c+ ->  X  l ^l]CC"  : "BsMuMuTrackIsoe2",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline                                          
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pKpi_Line = StrippingLine(Lc2pKpi_name+"Line",
                                           prescale = config["Lc2pKpiPrescale"],
@@ -656,8 +656,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+ ^K-  pi+]CC"  : "BsMuMuTrackIsoK",
                                              "[Lambda_c+ ->  p+  K- ^pi+]CC"  : "BsMuMuTrackIsopi",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pemu_Line = StrippingLine(Lc2pemu_name+"Line",
                                          prescale = config["Lc2pemuPrescale"],
@@ -707,8 +707,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  X ^l  l]CC"  : "BsMuMuTrackIsoe",
                                              "[Lambda_c+ ->  X  l ^l]CC"  : "BsMuMuTrackIsomu",
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline                                          
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
 ##4-bodies##
         self.Lc2pmumupi0R_Line = StrippingLine(Lc2pmumupi0R_name+"Line",
@@ -716,7 +716,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2pmumupi0R,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -764,8 +764,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+  mu+ ^mu-  pi0]CC"  : "BsMuMuTrackIsomu2",
                                              #"[Lambda_c+ ->  p+  mu+  mu- ^pi0]CC"  : "BsMuMuTrackIsopi", #?
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
 
         self.Lc2pmumupi0M_Line = StrippingLine(Lc2pmumupi0M_name+"Line",
@@ -773,7 +773,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2pmumupi0M,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -821,15 +821,15 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+  mu+ ^mu-  pi0]CC"  : "BsMuMuTrackIsomu2",
                                              #"[Lambda_c+ ->  p+  mu+  mu- ^pi0]CC"  : "BsMuMuTrackIsopi", #?
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2peepi0R_Line = StrippingLine(Lc2peepi0R_name+"Line",
                                            prescale = config["Lc2peepi0RPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2peepi0R,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -877,8 +877,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+  e+ ^e-  pi0]CC"  : "BsMuMuTrackIsoe2",
                                              #"[Lambda_c+ ->  p+  e+  e- ^pi0]CC"  : "BsMuMuTrackIsopi", #?
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
 
         self.Lc2peepi0M_Line = StrippingLine(Lc2peepi0M_name+"Line",
@@ -886,7 +886,7 @@ class Lc23MuLinesConf(LineBuilder) :
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2peepi0M,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -934,15 +934,15 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+  e+ ^e-  pi0]CC"  : "BsMuMuTrackIsoe2",
                                              #"[Lambda_c+ ->  p+  e+  e- ^pi0]CC"  : "BsMuMuTrackIsopi", #?
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pemupi0R_Line = StrippingLine(Lc2pemupi0R_name+"Line",
                                            prescale = config["Lc2pemupi0RPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2pemupi0R,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -990,15 +990,15 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  X  l ^l  pi0]CC"  : "BsMuMuTrackIsomu",
                                              #[Lambda_c+ ->  X  l  l ^pi0]CC"  : "BsMuMuTrackIsopi", #?
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pemupi0M_Line = StrippingLine(Lc2pemupi0M_name+"Line",
                                            prescale = config["Lc2pemupi0MPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selLc2pemupi0M,
-                                           RelatedInfoTools = [ 
+                                           RelatedInfoTools = [
                                            { "Type" : "RelInfoConeVariables",
                                              "ConeAngle" : 0.5,
                                              "Variables" : [],
@@ -1046,8 +1046,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  X  l ^l  pi0]CC"  : "BsMuMuTrackIsomu",
                                              #"[Lambda_c+ ->  X  l  l ^pi0]CC"  : "BsMuMuTrackIsopi", #?
                                              }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pKpipi0R_Line = StrippingLine(Lc2pKpipi0R_name+"Line",
                                           prescale = config["Lc2pKpipi0RPrescale"],
@@ -1102,8 +1102,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+  K- ^pi+  pi0]CC"  : "BsMuMuTrackIsopi",
                                              #"[Lambda_c+ ->  p+  K- ^pi+ ^pi0]CC"  : "BsMuMuTrackIsopi0",
                                             }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
         self.Lc2pKpipi0M_Line = StrippingLine(Lc2pKpipi0M_name+"Line",
                                           prescale = config["Lc2pKpipi0MPrescale"],
@@ -1158,8 +1158,8 @@ class Lc23MuLinesConf(LineBuilder) :
                                              "[Lambda_c+ ->  p+  K- ^pi+  pi0]CC"  : "BsMuMuTrackIsopi",
                                              #"[Lambda_c+ ->  p+  K- ^pi+ ^pi0]CC"  : "BsMuMuTrackIsopi0",
                                             }, },
-                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools 
-                                        )# closes Strippingline 
+                                           ] + config["CommonRelInfoTools"] # end of RelatedInfoTools
+                                        )# closes Strippingline
 
 #Tagged
         self.SigmaczLc2pmumu_Line = StrippingLine(SigmaczLc2pmumu_name+"Line",
@@ -1167,163 +1167,163 @@ class Lc23MuLinesConf(LineBuilder) :
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pmumu
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmacppLc2pmumu_Line = StrippingLine(SigmacppLc2pmumu_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pmumu
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmaczLc2pee_Line = StrippingLine(SigmaczLc2pee_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pee
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmacppLc2pee_Line = StrippingLine(SigmacppLc2pee_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pee
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmaczLc2pemu_Line = StrippingLine(SigmaczLc2pemu_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pemu
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmacppLc2pemu_Line = StrippingLine(SigmacppLc2pemu_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pemu
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmaczLc2pKpi_Line = StrippingLine(SigmaczLc2pKpi_name+"Line",
                                            prescale = config["SigmaczRefPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pKpi
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmacppLc2pKpi_Line = StrippingLine(SigmacppLc2pKpi_name+"Line",
                                            prescale = config["SigmacppRefPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pKpi
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 #4-body tagged
         self.SigmaczLc2pmumupi0R_Line = StrippingLine(SigmaczLc2pmumupi0R_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pmumupi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2pmumupi0R_Line = StrippingLine(SigmacppLc2pmumupi0R_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pmumupi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmaczLc2pmumupi0M_Line = StrippingLine(SigmaczLc2pmumupi0M_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pmumupi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2pmumupi0M_Line = StrippingLine(SigmacppLc2pmumupi0M_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pmumupi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmaczLc2peepi0R_Line = StrippingLine(SigmaczLc2peepi0R_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2peepi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2peepi0R_Line = StrippingLine(SigmacppLc2peepi0R_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2peepi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmaczLc2peepi0M_Line = StrippingLine(SigmaczLc2peepi0M_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2peepi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2peepi0M_Line = StrippingLine(SigmacppLc2peepi0M_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2peepi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmaczLc2pemupi0R_Line = StrippingLine(SigmaczLc2pemupi0R_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pemupi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2pemupi0R_Line = StrippingLine(SigmacppLc2pemupi0R_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pemupi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmaczLc2pemupi0M_Line = StrippingLine(SigmaczLc2pemupi0M_name+"Line",
                                            prescale = config["SigmaczSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pemupi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2pemupi0M_Line = StrippingLine(SigmacppLc2pemupi0M_name+"Line",
                                            prescale = config["SigmacppSignalPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pemupi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
         self.SigmaczLc2pKpipi0R_Line = StrippingLine(SigmaczLc2pKpipi0R_name+"Line",
                                            prescale = config["SigmaczRefPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pKpipi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2pKpipi0R_Line = StrippingLine(SigmacppLc2pKpipi0R_name+"Line",
                                            prescale = config["SigmacppRefPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pKpipi0R
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmaczLc2pKpipi0M_Line = StrippingLine(SigmaczLc2pKpipi0M_name+"Line",
                                            prescale = config["SigmaczRefPi0MPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmaczLc2pKpipi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
         self.SigmacppLc2pKpipi0M_Line = StrippingLine(SigmacppLc2pKpipi0M_name+"Line",
                                            prescale = config["SigmacppRefPi0MPrescale"],
                                            postscale = config["Postscale"],
                                            MDSTFlag = config["MDSTflag"],
                                            selection = self.selSigmacppLc2pKpipi0M
-                                        )# closes Strippingline 
+                                        )# closes Strippingline
 
-#######################################################################################################        
+#######################################################################################################
 
         ### Signal ch.
         self.registerLine(self.Lc23mu_Line)
         self.registerLine(self.Lc2muee_Line)
-        self.registerLine(self.Lc2pmumu_Line)        
+        self.registerLine(self.Lc2pmumu_Line)
         self.registerLine(self.Lc2pee_Line)
         self.registerLine(self.Lc2pemu_Line)
 #
@@ -1335,9 +1335,9 @@ class Lc23MuLinesConf(LineBuilder) :
         self.registerLine(self.Lc2pemupi0M_Line)
 
         ### Control ch.
-        self.registerLine(self.Lc2pKpi_Line)        
-        self.registerLine(self.Lc2pKpipi0R_Line)        
-        self.registerLine(self.Lc2pKpipi0M_Line)        
+        self.registerLine(self.Lc2pKpi_Line)
+        self.registerLine(self.Lc2pKpipi0R_Line)
+        self.registerLine(self.Lc2pKpipi0M_Line)
 
         ### Tagged signal ch.
         self.registerLine(self.SigmaczLc2pmumu_Line)
@@ -1378,96 +1378,96 @@ class Lc23MuLinesConf(LineBuilder) :
 #######################################################################################################
 
     def makeLc23mu(self,name):
-    
+
         Lc23mu = DaVinci__N3BodyDecays("Combine"+name)
         Lc23mu.DecayDescriptors = [ "[Lambda_c+ -> mu+ mu+ mu-]cc","[Lambda_c+ -> mu+ mu+ mu+]cc" ]
 
         Lc23mu.DaughtersCuts = { "mu+" : self.TrackCuts }
-    
+
         Lc23mu.Combination12Cut = self.Combination12Cuts
         Lc23mu.CombinationCut   = self.CombinationCutsLoose
-     
+
         Lc23mu.MotherCut = self.MotherCuts
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
         return Selection (name, Algorithm = Lc23mu, RequiredSelections = [ _myMuons ])
 
 #######################################################################################################
 
     def makeLc2muee(self,name):
-    
+
         Lc2muee = DaVinci__N3BodyDecays("Combine"+name)
         Lc2muee.DecayDescriptors = [ "[Lambda_c+ -> mu+ e+ e-]cc",
                                      "[Lambda_c+ -> mu- e+ e+]cc",
                                      "[Lambda_c+ -> mu+ e+ e+]cc"]
-    
+
         Lc2muee.DaughtersCuts = { "mu+" : self.TrackCuts,
                                   "e+"  : self.TrackCuts + " & ((PIDe-PIDpi)>2)" }
-    
+
         Lc2muee.Combination12Cut = self.Combination12Cuts
-        Lc2muee.CombinationCut   = self.CombinationCutsLoose     
+        Lc2muee.CombinationCut   = self.CombinationCutsLoose
         Lc2muee.MotherCut        = self.MotherCuts
 
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-        _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")    
-    
+        _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
+
         return Selection (name, Algorithm = Lc2muee, RequiredSelections = [ _myMuons, _myElectrons ])
 
 
 #######################################################################################################
 
     def makeLc2pmumu(self,name):
-    
+
         Lc2pmumu = DaVinci__N3BodyDecays("Combine"+name)
         Lc2pmumu.DecayDescriptors = [ "[Lambda_c+ -> p+ mu+ mu-]cc",
                                       "[Lambda_c+ -> p~- mu+ mu+]cc",
                                       "[Lambda_c+ -> p+ mu+ mu+]cc"]
-    
+
         Lc2pmumu.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                    "mu+" : self.TrackCuts + " & ((PIDmu-PIDpi)>-5)" + " & ((PIDmu-PIDK)>-5)" }
-    
+
         Lc2pmumu.Combination12Cut = self.Combination12Cuts
-        Lc2pmumu.CombinationCut   = self.CombinationCutsLoose     
+        Lc2pmumu.CombinationCut   = self.CombinationCutsLoose
         Lc2pmumu.MotherCut        = self.MotherCuts
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
         return Selection (name, Algorithm = Lc2pmumu, RequiredSelections = [ _myProtons, _myMuons ])
 
 #######################################################################################################
 
     def makeLc2pee(self,name):
-    
+
         Lc2pee = DaVinci__N3BodyDecays("Combine"+name)
         Lc2pee.DecayDescriptors = [ "[Lambda_c+ -> p+ e+ e-]cc",
                                 "[Lambda_c+ -> p~- e+ e+]cc",
                                 "[Lambda_c+ -> p+ e+ e+]cc"]
-    
+
         Lc2pee.DaughtersCuts = { "p+" : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                  "e+" : self.TrackCuts + " & ((PIDe-PIDpi)>2)" }
-    
+
         Lc2pee.Combination12Cut = self.Combination12Cuts
         Lc2pee.CombinationCut   = self.CombinationCutsLoose
         Lc2pee.MotherCut        = self.MotherCuts
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-        _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")    
-    
+        _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
+
         return Selection (name, Algorithm = Lc2pee, RequiredSelections = [ _myProtons, _myElectrons ])
 
 #######################################################################################################
 
     def makeLc2pKpi(self,name):
-    
+
         Lc2pKpi = DaVinci__N3BodyDecays("Combine"+name)
         Lc2pKpi.DecayDescriptors = [ "[Lambda_c+ -> p+ K- pi+]cc" ]
-    
+
         Lc2pKpi.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                   "K-"  : self.TrackCuts + " & ((PIDK-PIDpi)>5)" + " & ((PIDK-PIDp)>0)",
                                   "pi+" : self.TrackCuts }
-    
+
         Lc2pKpi.Combination12Cut = self.Combination12Cuts
         Lc2pKpi.CombinationCut   = self.CombinationCutsTight
         Lc2pKpi.MotherCut        = self.MotherCuts
@@ -1475,18 +1475,18 @@ class Lc23MuLinesConf(LineBuilder) :
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
         _myPions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-    
+
         return Selection (name, Algorithm = Lc2pKpi, RequiredSelections = [ _myProtons, _myKaons, _myPions ])
 
 #######################################################################################################
 
     def makeLc2pemu(self,name):
-    
+
         Lc2pemu = DaVinci__N3BodyDecays("Combine"+name)
         Lc2pemu.DecayDescriptors = [ "[Lambda_c+ -> p+ e+ mu-]cc", "[Lambda_c+ -> p+ e- mu+]cc",
                                 "[Lambda_c+ -> p~- e+ mu+]cc",
                                 "[Lambda_c+ -> p+ e+ mu+]cc"]
-    
+
         Lc2pemu.DaughtersCuts = { "p+" : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                   "e+" : self.TrackCuts + " & ((PIDe-PIDpi)>2)",
                                   "mu-" : self.TrackCuts + " & ((PIDmu-PIDpi)>-5)" + " & ((PIDmu-PIDK)>-5)" }
@@ -1496,193 +1496,193 @@ class Lc23MuLinesConf(LineBuilder) :
         Lc2pemu.MotherCut        = self.MotherCuts
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-        _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")    
+        _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
+
         return Selection (name, Algorithm = Lc2pemu, RequiredSelections = [ _myProtons, _myElectrons, _myMuons ])
 
 ###4-body###
 #######################################################################################################
 
     def makeLc2pmumupi0R(self,name):
-    
+
         Lc2pmumupi0R = DaVinci__N4BodyDecays("Combine"+name)
         Lc2pmumupi0R.DecayDescriptors = [ "[Lambda_c+ -> p+ mu+ mu- pi0]cc" ]
-    
+
         Lc2pmumupi0R.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "mu+" : self.TrackCuts + " & ((PIDmu-PIDpi)>-5)" + " & ((PIDmu-PIDK)>-5)",
                                     "pi0" : self.Pi0RCuts }
-    
+
         Lc2pmumupi0R.Combination12Cut  = self.Combination12Cuts
         Lc2pmumupi0R.Combination123Cut = self.Combination123Cuts
-        Lc2pmumupi0R.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2pmumupi0R.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2pmumupi0R.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")   
+        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2pmumupi0R, RequiredSelections = [ _myProtons, _myMuons, _myPi0R ])
 
 #######################################################################################################
 
     def makeLc2pmumupi0M(self,name):
-    
+
         Lc2pmumupi0M = DaVinci__N4BodyDecays("Combine"+name)
         Lc2pmumupi0M.DecayDescriptors = [ "[Lambda_c+ -> p+ mu+ mu- pi0]cc"]
-    
+
         Lc2pmumupi0M.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "mu+" : self.TrackCuts + " & ((PIDmu-PIDpi)>-5)" + " & ((PIDmu-PIDK)>-5)",
                                     "pi0" : self.Pi0MCuts }
-    
+
         Lc2pmumupi0M.Combination12Cut = self.Combination12Cuts
         Lc2pmumupi0M.Combination123Cut = self.Combination123Cuts
-        Lc2pmumupi0M.CombinationCut   = self.Combination4BodyCutsLoose     
+        Lc2pmumupi0M.CombinationCut   = self.Combination4BodyCutsLoose
         Lc2pmumupi0M.MotherCut        = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")   
+        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2pmumupi0M, RequiredSelections = [ _myProtons, _myMuons, _myPi0M ])
 
 #######################################################################################################
 
     def makeLc2peepi0R(self,name):
-    
+
         Lc2peepi0R = DaVinci__N4BodyDecays("Combine"+name)
         Lc2peepi0R.DecayDescriptors = [ "[Lambda_c+ -> p+ e+ e- pi0]cc" ]
-    
+
         Lc2peepi0R.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "e+" : self.TrackCuts + " & ((PIDe-PIDpi)>2)",
                                     "pi0" : self.Pi0RCuts }
-    
+
         Lc2peepi0R.Combination12Cut  = self.Combination12Cuts
         Lc2peepi0R.Combination123Cut = self.Combination123Cuts
-        Lc2peepi0R.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2peepi0R.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2peepi0R.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
-        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")   
+        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2peepi0R, RequiredSelections = [ _myProtons, _myElectrons, _myPi0R ])
 
 #######################################################################################################
 
     def makeLc2peepi0M(self,name):
-    
+
         Lc2peepi0M = DaVinci__N4BodyDecays("Combine"+name)
         Lc2peepi0M.DecayDescriptors = [ "[Lambda_c+ -> p+ e+ e- pi0]cc" ]
-    
+
         Lc2peepi0M.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "e+" : self.TrackCuts + " & ((PIDe-PIDpi)>2)",
                                     "pi0" : self.Pi0MCuts }
-    
+
         Lc2peepi0M.Combination12Cut  = self.Combination12Cuts
         Lc2peepi0M.Combination123Cut = self.Combination123Cuts
-        Lc2peepi0M.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2peepi0M.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2peepi0M.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
-        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")   
+        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2peepi0M, RequiredSelections = [ _myProtons, _myElectrons, _myPi0M ])
 
 #######################################################################################################
 
     def makeLc2pemupi0R(self,name):
-    
+
         Lc2pemupi0R = DaVinci__N4BodyDecays("Combine"+name)
         Lc2pemupi0R.DecayDescriptors = [ "[Lambda_c+ -> p+ e+ mu- pi0]cc", "[Lambda_c+ -> p+ e- mu+ pi0]cc" ]
-    
+
         Lc2pemupi0R.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "e+" : self.TrackCuts + " & ((PIDe-PIDpi)>2)",
                                     "mu-" : self.TrackCuts + " & ((PIDmu-PIDpi)>-5)" + " & ((PIDmu-PIDK)>-5)",
                                     "pi0" : self.Pi0RCuts }
-    
+
         Lc2pemupi0R.Combination12Cut  = self.Combination12Cuts
         Lc2pemupi0R.Combination123Cut = self.Combination123Cuts
-        Lc2pemupi0R.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2pemupi0R.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2pemupi0R.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")   
+        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2pemupi0R, RequiredSelections = [ _myProtons, _myElectrons, _myMuons, _myPi0R ])
 
 #######################################################################################################
 
     def makeLc2pemupi0M(self,name):
-    
+
         Lc2pemupi0M = DaVinci__N4BodyDecays("Combine"+name)
         Lc2pemupi0M.DecayDescriptors = [ "[Lambda_c+ -> p+ e+ mu- pi0]cc", "[Lambda_c+ -> p+ e- mu+ pi0]cc" ]
-    
+
         Lc2pemupi0M.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "e+" : self.TrackCuts + " & ((PIDe-PIDpi)>2)",
                                     "mu-" : self.TrackCuts + " & ((PIDmu-PIDpi)>-5)" + " & ((PIDmu-PIDK)>-5)",
                                     "pi0" : self.Pi0MCuts }
-    
+
         Lc2pemupi0M.Combination12Cut  = self.Combination12Cuts
         Lc2pemupi0M.Combination123Cut = self.Combination123Cuts
-        Lc2pemupi0M.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2pemupi0M.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2pemupi0M.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myElectrons = DataOnDemand(Location = "Phys/StdLooseElectrons/Particles")
         _myMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")   
+        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2pemupi0M, RequiredSelections = [ _myProtons, _myElectrons, _myMuons, _myPi0M ])
 
 #######################################################################################################
 
     def makeLc2pKpipi0R(self,name):
-    
+
         Lc2pKpipi0R = DaVinci__N4BodyDecays("Combine"+name)
         Lc2pKpipi0R.DecayDescriptors = [ "[Lambda_c+ -> p+ K- pi+ pi0]cc" ]
-    
+
         Lc2pKpipi0R.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "K-"  : self.TrackCuts + " & ((PIDK-PIDpi)>5)" + " & ((PIDK-PIDp)>0)",
                                     "pi+" : self.TrackCuts,
                                     "pi0" : self.Pi0RCuts }
-    
+
         Lc2pKpipi0R.Combination12Cut  = self.Combination12Cuts
         Lc2pKpipi0R.Combination123Cut = self.Combination123Cuts
-        Lc2pKpipi0R.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2pKpipi0R.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2pKpipi0R.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
         _myPions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")   
+        _myPi0R = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2pKpipi0R, RequiredSelections = [ _myProtons, _myKaons, _myPions, _myPi0R ])
 
 #######################################################################################################
 
     def makeLc2pKpipi0M(self,name):
-    
+
         Lc2pKpipi0M = DaVinci__N4BodyDecays("Combine"+name)
         Lc2pKpipi0M.DecayDescriptors = [ "[Lambda_c+ -> p+ K- pi+ pi0]cc" ]
-    
+
         Lc2pKpipi0M.DaughtersCuts = { "p+"  : self.TrackCuts + " & ((PIDp-PIDpi)>5)" + " & ((PIDp-PIDK)>0)",
                                     "K-"  : self.TrackCuts + " & ((PIDK-PIDpi)>5)" + " & ((PIDK-PIDp)>0)",
                                     "pi+" : self.TrackCuts,
                                     "pi0" : self.Pi0MCuts }
-    
+
         Lc2pKpipi0M.Combination12Cut  = self.Combination12Cuts
         Lc2pKpipi0M.Combination123Cut = self.Combination123Cuts
-        Lc2pKpipi0M.CombinationCut    = self.Combination4BodyCutsLoose     
+        Lc2pKpipi0M.CombinationCut    = self.Combination4BodyCutsLoose
         Lc2pKpipi0M.MotherCut         = self.Mother4BodyCuts #or MotherCuts enough?
 
         _myProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         _myKaons = DataOnDemand(Location = "Phys/StdLooseKaons/Particles")
         _myPions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
-        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")   
+        _myPi0M = DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
 
         return Selection (name, Algorithm = Lc2pKpipi0M, RequiredSelections = [ _myProtons, _myKaons, _myPions, _myPi0M ])
 
@@ -1705,4 +1705,3 @@ class Lc23MuLinesConf(LineBuilder) :
         return Selection(name, Algorithm = Sigmac2Lcpi, RequiredSelections = [inputSel, _mySoftPions])
 
 #######################################################################################################
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py
index 7c8a5a69f4f1c6a4b2d23c000cdd4e98cedfa6bc..9669dd35b30699b8fe0bc1ee851d2b21dcf9e7d8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py
@@ -38,40 +38,40 @@ confdict = {
     "prescale_JPsiToKsKs" : 1.0,
     "prescale_D0ToKsKs" : 0.25,
     "prescale_EtaCToLL" : 1.0,
-    
+
     "GEC_nLongTrk" : 250,
     "DoDTF" : True,
     "GHOSTPROB_MAX" : 0.35, #adimensional
-    
+
     "K_PTMIN" : 200, #MeV
     "K_PIDK_MIN" : 7, #adimensional
     "K_IPCHI2_MAX" : 9, #adimensional
-    
+
     "Mu_PTMIN" : 200, #MeV
     "Mu_PIDmu_MIN" : 0, #adimensional
     "Mu_IPCHI2_MAX" : 9, #adimensional
-    
+
     "KS_LL_PTMIN" : 400, #MeV
     "KS_LL_MASS_WINDOW" : 20, #MeV
     "KS_LL_FD_MIN" : 10.0, #mm
     "KS_LL_FDCHI2_MIN" : 100, #adimensional
     "KS_LL_VCHI2NDOF_MAX" : 4,#adimensional
     "KS_LL_DIRA_MIN" : 0.9999, #adimensional
-    
+
     "KS_DD_PTMIN" : 400, #MeV
     "KS_DD_MASS_WINDOW" : 20, #MeV
     "KS_DD_FD_MIN" : 10.0, #mm
     "KS_DD_FDCHI2_MIN" : 100, #adimensional
     "KS_DD_VCHI2NDOF_MAX" : 4,#adimensional
     "KS_DD_DIRA_MIN" : 0.999, #adimensional
-    
+
     "Lambda_PTMIN" : 400, #MeV
     "Lambda_MASS_WINDOW" : 50, #MeV
     "Lambda_FD_MIN" : 10.0, #mm
     "Lambda_FDCHI2_MIN" : 100, #adimensional
     "Lambda_VCHI2NDOF_MAX" : 4,#adimensional
     "Lambda_DIRA_MIN" : 0.999, #adimensional
-    
+
     "Phi_MASS_MAX" : 1100, # MeV
     "Phi_PT_MIN" : 800, # MeV
     "Phi_DOCACHI2_MAX" : 20, #adimensional
@@ -89,13 +89,13 @@ confdict = {
     "JPsi_DOCACHI2_MAX" : 20, #adimensional
     "JPsi_VCHI2NDOF_MAX" : 6, #adimensional
     "JPsi_IPCHI2_MAX" : 9, #adimensional
-    
+
     "etaC_MASS_WIN" : 200, # MeV
     "etaC_PT_MIN" : 400, # MeV
     "etaC_DOCACHI2_MAX" : 20, #adimensional
     "etaC_VCHI2NDOF_MAX" : 6, #adimensional
     "etaC_IPCHI2_MAX" : 9 #adimensional
-    }   
+    }
 
 default_config = {
     'NAME'              : 'PhiToKSKS',
@@ -105,18 +105,18 @@ default_config = {
     'STREAMS' : ['Charm'] }
 
 class PhiToKSKSAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-    
+
     def __init__(self, _name, config) :
 
         LineBuilder.__init__(self, _name, config)
-        
+
         GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" %config ,
                  "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         self.KsLLCuts = " (PT> %(KS_LL_PTMIN)s *MeV)" \
             " & (ADMASS('KS0') < %(KS_LL_MASS_WINDOW)s *MeV)"\
             " & (BPVVD > %(KS_LL_FD_MIN)s *mm)" \
@@ -125,7 +125,7 @@ class PhiToKSKSAllLinesConf(LineBuilder) :
             " & CHILDCUT((TRGHOSTPROB < %(GHOSTPROB_MAX)s),2)" \
             " & (VFASPF(VCHI2PDOF) < %(KS_LL_VCHI2NDOF_MAX)s)" \
             " & (BPVDIRA > %(KS_LL_DIRA_MIN)s)" %config
-        
+
         self.KsDDCuts = " (PT> %(KS_DD_PTMIN)s *MeV)" \
             " & (ADMASS('KS0') < %(KS_DD_MASS_WINDOW)s *MeV)"\
             " & (BPVVD > %(KS_DD_FD_MIN)s *mm)" \
@@ -137,12 +137,12 @@ class PhiToKSKSAllLinesConf(LineBuilder) :
             " & (PIDK > %(K_PIDK_MIN)s)"\
             " & (MIPCHI2DV(PRIMARY) < %(K_IPCHI2_MAX)s)"\
             " & (TRGHOSTPROB < %(GHOSTPROB_MAX)s)" %config
-        
+
         self.MuonCuts = " (PT> %(Mu_PTMIN)s *MeV)" \
             " & (PIDmu > %(Mu_PIDmu_MIN)s)"\
             " & (MIPCHI2DV(PRIMARY) < %(Mu_IPCHI2_MAX)s)"\
             " & (TRGHOSTPROB < %(GHOSTPROB_MAX)s)" %config
-        
+
         self.LambdaCuts = " (PT> %(Lambda_PTMIN)s *MeV)" \
             " & (ADMASS('Lambda0') < %(Lambda_MASS_WINDOW)s *MeV)"\
             " & (BPVVD > %(Lambda_FD_MIN)s *mm)" \
@@ -151,66 +151,66 @@ class PhiToKSKSAllLinesConf(LineBuilder) :
             " & CHILDCUT((TRGHOSTPROB < %(GHOSTPROB_MAX)s),2)" \
             " & (VFASPF(VCHI2PDOF) < %(Lambda_VCHI2NDOF_MAX)s)" \
             " & (BPVDIRA > %(Lambda_DIRA_MIN)s)" %config
-        
+
         self.KsLL = Selection( "KsLLFor" + _name,
                                Algorithm = FilterDesktop(name = "KsLLFilterFor"+_name, Code = self.KsLLCuts ),
                                RequiredSelections = [DataOnDemand(Location = 'Phys/StdLooseKsLL/Particles')])
-        
+
         self.KsDD = Selection( "KsDDFor" + _name,
                                Algorithm = FilterDesktop(name = "KsDDFilterFor"+_name, Code = self.KsDDCuts ),
                                RequiredSelections = [DataOnDemand(Location = 'Phys/StdLooseKsDD/Particles')])
-        
+
         self.Ks = MergedSelection("KsFor"+_name, RequiredSelections = [ self.KsLL, self.KsDD] )
-        
+
         self.Kaons = Selection( "KaonsFor" + _name,
                                 Algorithm = FilterDesktop(name = "KaonFilterFor"+_name, Code = self.KaonCuts ),
                                 RequiredSelections = [StdAllLooseKaons])
-        
+
         self.Muons = Selection( "MuonsFor" + _name,
                                 Algorithm = FilterDesktop(name = "MuonFilterFor"+_name, Code = self.MuonCuts ),
                                 RequiredSelections = [StdAllLooseMuons])
-        
+
         self.LambdaDD = Selection( "LambdaDDFor" + _name,
                                 Algorithm = FilterDesktop(name = "LambdaDDFilterFor"+_name, Code = self.LambdaCuts ),
                                 RequiredSelections = [DataOnDemand(Location = 'Phys/StdLooseLambdaDD/Particles')])
-	
+
         self.LambdaLL = Selection( "LambdaLLFor" + _name,
                                 Algorithm = FilterDesktop(name = "LambdaLLFilterFor"+_name, Code = self.LambdaCuts ),
                                 RequiredSelections = [DataOnDemand(Location = 'Phys/StdLooseLambdaLL/Particles')])
-        
+
         self.Lambdas = MergedSelection("LambdasFor"+_name, RequiredSelections = [ self.LambdaLL, self.LambdaDD] )
-        
+
         ####### phi(1020) #############
 
         self.PhiToKK_Line = VMaker(_name+"_PhiToKK",[self.Kaons],"phi(1020) -> K+ K-",GECs,config,config["prescale_PhiToKK"])
-        self.registerLine(self.PhiToKK_Line)        
-        
+        self.registerLine(self.PhiToKK_Line)
+
         self.PhiToMuMu_Line = VMaker(_name+"_PhiToMuMu",[self.Muons],"phi(1020) -> mu+ mu-",GECs,config,config["prescale_PhiToMuMu"])
-        self.registerLine(self.PhiToMuMu_Line)        
-        
+        self.registerLine(self.PhiToMuMu_Line)
+
         self.PhiToKsKs_Line = VMaker(_name+"_PhiToKsKs",[self.Ks],"phi(1020) -> KS0 KS0",GECs,config,config["prescale_PhiToKsKs"])
-        #self.registerLine(self.PhiToKsKs_Line)        
-        
+        #self.registerLine(self.PhiToKsKs_Line)
+
         ########### J/psi(1S)  ################
-        
+
         self.JPsiToKK_Line = VMaker(_name+"_JPsiToKK",[self.Kaons],"J/psi(1S) -> K+ K-",GECs,config,config["prescale_JPsiToKK"])
-        self.registerLine(self.JPsiToKK_Line)        
-        
+        self.registerLine(self.JPsiToKK_Line)
+
         self.JPsiToKsKs_Line = VMaker(_name+"_JPsiToKsKs",[self.Ks],"J/psi(1S) -> KS0 KS0",GECs,config,config["prescale_JPsiToKsKs"])
-        self.registerLine(self.JPsiToKsKs_Line)        
-        
+        self.registerLine(self.JPsiToKsKs_Line)
+
 	########### D0  ################
-        
+
         self.D0ToKsKs_Line = VMaker(_name+"_D0ToKsKs",[self.Ks],"D0 -> KS0 KS0",GECs,config,config["prescale_D0ToKsKs"])
-        self.registerLine(self.D0ToKsKs_Line)        
-        
+        self.registerLine(self.D0ToKsKs_Line)
+
 	########### eta_c  ################
-        
+
         self.EtaCToLL_Line = VMaker(_name+"_EtaCToLL",[self.Lambdas],"eta_c(1S) -> Lambda0 Lambda~0",GECs,config,config["prescale_EtaCToLL"])
-        self.registerLine(self.EtaCToLL_Line)        
+        self.registerLine(self.EtaCToLL_Line)
 
 def VMaker(_name,_RequiredSelections,_DecayDescriptor,_Filter,conf,_prescale):
-    
+
     _CombiCut = ""
     if 'KS0' in _DecayDescriptor:
         _CombiCut = "( (ACHILDCUT(CHILDCUT(ISLONG,1),1)) | (ACHILDCUT(CHILDCUT(ISLONG,1),2)) ) & "
@@ -236,8 +236,8 @@ def VMaker(_name,_RequiredSelections,_DecayDescriptor,_Filter,conf,_prescale):
         _MotherCut = "(DMASS('eta_c(1S)') < %(etaC_MASS_WIN)s + 20*MeV) & (VFASPF(VCHI2/VDOF) < %(etaC_VCHI2NDOF_MAX)s) & (MIPCHI2DV(PRIMARY) < %(etaC_IPCHI2_MAX)s)" %conf
         _MassFilter = FilterDesktop(name = "MassFilter_"+_name,Code = "(DMASS('eta_c(1S)') < %(etaC_MASS_WIN)s *MeV)" %conf)
         _MassFilterDTF = FilterDesktop(name = "MassFilterDTF_"+_name,Code = "(abs(DTF_FUN(M,True,'eta_c(1S)') - 2978) < %(etaC_MASS_WIN)s *MeV)" %conf)
-    
-        
+
+
     Comb = CombineParticles( name = "Comb_"+_name,
                              DecayDescriptor = _DecayDescriptor,
                              CombinationCut = _CombiCut,
@@ -246,15 +246,15 @@ def VMaker(_name,_RequiredSelections,_DecayDescriptor,_Filter,conf,_prescale):
     Sel = Selection(name = "Sel_"+_name,
                     Algorithm = Comb,
                     RequiredSelections = _RequiredSelections)
-        
+
     if conf['DoDTF'] == True:
         MASS_FILTER = Selection("MASS_FILTER_"+_name,Algorithm = _MassFilterDTF,RequiredSelections = [Sel])
     else:
         MASS_FILTER = Selection("MASS_FILTER_"+_name,Algorithm = _MassFilter,RequiredSelections = [Sel])
-        
+
     Line = StrippingLine(_name+'Line',
                          prescale = _prescale,
                          FILTER=_Filter,
                          selection = MASS_FILTER)
-        
+
     return Line
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py
index 936e03ddd1ab390888fa2135f42b9fe0704adeb9..be7b88d5cbe29dcbcc686ae91f37c35c6b9a915d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py
@@ -12,7 +12,7 @@ __author__  = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisci
 __date__    = '08/05/2015'
 __version__ = '$Revision: Not sure $'
 
-__all__ = ( 'RnSConf', 'default_config' ) 
+__all__ = ( 'RnSConf', 'default_config' )
 
 """
 Selections for Rare&strange decays (other than those already existing), eg:
@@ -31,7 +31,7 @@ Selections for Rare&strange decays (other than those already existing), eg:
 'lpimuee': '[Lambda0 ==> pi+ mu- e+ e-]CC',
 'lpi3e': '[Lambda0 ==> pi+ e- e+ e-]CC',
 
-           
+
 """
 
 default_config = {
@@ -81,11 +81,11 @@ default_config = {
      'cosAngle'   :0.999998
 
               },
-   
+
     'WGs'                       : [ 'RD' ],
     'STREAMS'                   : [ 'Dimuon' ]
     }
-    
+
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
@@ -96,44 +96,44 @@ from StrippingUtils.Utils import LineBuilder
 
 class RnSConf(LineBuilder) :
     """
-    Builder for some Rare & strange measurements 
+    Builder for some Rare & strange measurements
     """
-        
+
     # now just define keys. Default values are fixed later
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
-       
+
         LineBuilder.__init__(self, name, config)
-        
+
         from StandardParticles import StdAllLooseMuons as Muons
         from StandardParticles import StdLooseElectrons as Electrons
-        
+
         from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdLoosePions as Pions
         self._name = name
         self.config = config
         self.name = name
-       
+
         self.SelMuons  = self._filterMuons( name   = "MuonsFor" + self._name,
-                                        sel    = Muons 
+                                        sel    = Muons
                                         )
         self.SelElectrons  = self._filterElectrons( name   = "ElectronsFor" + self._name,
                                         sel    = Electrons
                                         )
         self.SelPions  = self._filterPions( name   = "PionsFor" + self._name,
-                                        sel    = Pions 
+                                        sel    = Pions
                                         )
         self.SelProtons  = self._filterProtons( name   = "ProtonsFor" + self._name,
-                                        sel    = Protons 
+                                        sel    = Protons
                                         )
-        
+
         self.SelDiMuons = self._makePseudoJPsi("SelDiMuonsFor" + self._name)
         self.SelTrigLikeDiMuons = self._makeTrigLikeDiMuons("SelTrigLikeDiMuonsFor" + self._name)
-        
-        self.SelDiElectrons = self._makePseudoPhi("SelDiElectronsFor" + self._name) 
-        self.SelEMu = self._makePseudoKstar("SelEMuFor" + self._name) 
-       
+
+        self.SelDiElectrons = self._makePseudoPhi("SelDiElectronsFor" + self._name)
+        self.SelEMu = self._makePseudoKstar("SelEMuFor" + self._name)
+
         self.Ks2Pi0MuMuSignal = self._makePi0MuMu_Signal("Ks2Pi0MuMuSignal")
         self.Ks2Pi0MuMuSB = self._makePi0MuMu_SB("Ks2Pi0MuMuSB")
 
@@ -170,7 +170,7 @@ class RnSConf(LineBuilder) :
                                           RequiredRawEvents = ["Muon","Calo"],
                                           MDSTFlag = False
                                                )
-       
+
         self.K0s2PiPiLine = StrippingLine("Ks2PiPiForRnSLine",
                                         prescale = self.config['NoMuIDLinePrescale'],
                                         postscale = self.config['NoMuIDLinePostscale'],
@@ -237,8 +237,8 @@ class RnSConf(LineBuilder) :
                                       #RequiredRawEvents = ["Muon"],
                                       MDSTFlag = False
                                             )
-       
-       
+
+
         self.K0s24ProngLFVLine = StrippingLine("K0s24ProngLFVLine",
                                       prescale = config['K0s2mmLinePrescale'],
                                       postscale = config['K0s2mmLinePostscale'],
@@ -267,7 +267,7 @@ class RnSConf(LineBuilder) :
                                              },
                                            ]
                                       )
-        
+
         self.K0s24eLine = StrippingLine("K0s24eLine",
                                       prescale = config['K0s2mmLinePrescale'],
                                       postscale = config['K0s2mmLinePostscale'],
@@ -282,7 +282,7 @@ class RnSConf(LineBuilder) :
                                       algos = [ self.L02PiMuMuE ],
                                       #RequiredRawEvents = ["Muon"],
                                       MDSTFlag = False
-                                            )       
+                                            )
 
         self.K0s2eMuLine = StrippingLine("K0s2eMuLine",
                                       prescale = config['K0s2mmLinePrescale'],
@@ -312,12 +312,12 @@ class RnSConf(LineBuilder) :
                                       algos = [ self.SelTrigLikeDiMuons ],
                                       RequiredRawEvents = ["Muon"],
                                       MDSTFlag = False,
-                                      RelatedInfoTools = [ 
+                                      RelatedInfoTools = [
                                            { "Type" : "RelInfoMuonIDPlus",
                                              "Variables" : ["MU_BDT"],
                                              "DaughterLocations"  : {
                                                      "[J/psi(1S) -> ^mu+ [mu-]cc]CC" : "Muon1BDT",
-                                                     "[J/psi(1S) -> mu+ ^[mu-]cc]CC" : "Muon2BDT" } 
+                                                     "[J/psi(1S) -> mu+ ^[mu-]cc]CC" : "Muon2BDT" }
                                              },
                                            ]
                                              )
@@ -328,15 +328,15 @@ class RnSConf(LineBuilder) :
 ##                                       #RequiredRawEvents = ["Muon"],
 ##                                       MDSTFlag = False
 ##                                                  )
-        
-        
+
+
           # 5 : register Line
 
     ## Add some fake lines to eat the timing of particle containers
         #self.registerLine(self._Pi0MMsignalLine)
         #self.registerLine(self._K0s24ProngLFVLine)
         #self.registerLine(self._Lambda02PiMuLine)
-        
+
 
         #self.registerLine(self.Pi0MMsignalLine)
         #self.registerLine(self.Pi0MMsidebandLine)
@@ -354,7 +354,7 @@ class RnSConf(LineBuilder) :
         #self.registerLine(self.Lambda02pPiLine)
         #self.registerLine(self.Lambda02PiELine)
         self.registerLine(self.TriggerTestLine)
-        
+
 #####################################################
     def _filterMuons( self, name, sel):
         """
@@ -395,7 +395,7 @@ class RnSConf(LineBuilder) :
         _Filter = FilterDesktop(Code = _Code)
 
         return Selection( name, Algorithm = _Filter, RequiredSelections = [  sel ] )
-    
+
 ##################################################
     def _filterProtons( self, name, sel):
         """
@@ -417,12 +417,12 @@ class RnSConf(LineBuilder) :
         Arguments:
         name : name of the selection
         """
-        
+
         PseudoJPsi = CombineParticles(DecayDescriptor = "J/psi(1S) -> mu+ mu-")
         PseudoJPsi.DecayDescriptor = "J/psi(1S) -> mu+ mu-"
         PseudoJPsi.CombinationCut = "(AMAXDOCA('')<%(DiDOCA)s*mm)" %self.config
         PseudoJPsi.MotherCut = "ALL"
-       
+
         return Selection (name,
                           Algorithm = PseudoJPsi,
                           RequiredSelections = [self.SelMuons])
@@ -434,8 +434,8 @@ class RnSConf(LineBuilder) :
         Arguments:
         name : name of the selection
         """
-        
-        PseudoJPsi = CombineParticles(DecayDescriptors = ["J/psi(1S) -> mu+ mu-","[J/psi(1S) -> mu+ mu+]cc"]) 
+
+        PseudoJPsi = CombineParticles(DecayDescriptors = ["J/psi(1S) -> mu+ mu-","[J/psi(1S) -> mu+ mu+]cc"])
         PseudoJPsi.CombinationCut = "(AMAXDOCA('')<%(DiDOCA)s*mm)" %self.config
         PseudoJPsi.MotherCut = ("(MINTREE('mu-' == ABSID, MIPDV(PRIMARY)) > %(IP)s)"
         + " & (CHILDCUT((TRGHOSTPROB < %(TRACK_TRGHOSTPROB_MAX)s),1))"
@@ -449,15 +449,15 @@ class RnSConf(LineBuilder) :
         + " & (VFASPF(VCHI2PDOF)<%(VertexChi2)s )"
         + " & (DOCAMAX < %(DiDOCA)s)"
         + " & (BPVVDZ > %(MinVDZ)s) "
-        + " &  (BPVDIRA > %(MinBPVDira)s) " 
+        + " &  (BPVDIRA > %(MinBPVDira)s) "
         #+ " & (PCUTA (ALV (1,2) < %(cosAngle)s))"
                                 ) % self.config
         return Selection (name,
                           Algorithm = PseudoJPsi,
                           RequiredSelections = [self.SelMuons])
-    
-                
-    
+
+
+
     def _makePseudoPhi(self,name) :
         """
         Make PseudoPhi (combination of two detached electrons)
@@ -467,11 +467,11 @@ class RnSConf(LineBuilder) :
         PseudoPhi = CombineParticles(DecayDescriptor = "phi(1020) -> e+ e-")
         PseudoPhi.CombinationCut = "(AMAXDOCA('')<1000*mm) "#%(DiDOCA)s*mm)" %self.config
         PseudoPhi.MotherCut = "ALL"
-        
+
         return Selection (name,
                           Algorithm = PseudoPhi,
                           RequiredSelections = [self.SelElectrons])
-    
+
     def _makePseudoKstar(self,name) :
         """
         Make PseudoKst (combination of a detached e-mu pair)
@@ -481,7 +481,7 @@ class RnSConf(LineBuilder) :
         PseudoKst = CombineParticles(DecayDescriptor = "[K*(892)0  -> mu+ e-]cc")
         PseudoKst.CombinationCut = "(AMAXDOCA('')< 1000*mm)"#%(DiDOCA)s*mm)" %self.config
         PseudoKst.MotherCut = "ALL"
-        
+
         return Selection (name,
                           Algorithm = PseudoKst,
                           RequiredSelections = [self.SelElectrons, self.SelMuons])
@@ -496,7 +496,7 @@ class RnSConf(LineBuilder) :
         from StandardParticles import StdLooseResolvedPi0 as Pi0s
         #from Configurables import OfflineVertexFitter
         K0s2Pi0MuMu1 = CombineParticles(DecayDescriptor = "KS0 -> pi0 J/psi(1S)")
-        
+
         #K0s2Pi0MuMu1.addTool( OfflineVertexFitter )
         #K0s2Pi0MuMu1.ParticleCombiners.update( { "" : "OfflineVertexFitter"} )
         #K0s2Pi0MuMu1.OfflineVertexFitter.useResonanceVertex = False
@@ -520,7 +520,7 @@ class RnSConf(LineBuilder) :
         Arguments:
         name        : name of the Selection
         """
-        
+
 
         return self._makePi0MuMu( name, combcut ="  (AM > %(KSsignalminMass)s * MeV)"\
                                       "& (AM < %(KSsignalmaxMass)s * MeV)" %self.config )
@@ -532,7 +532,7 @@ class RnSConf(LineBuilder) :
         Arguments:
         name        : name of the Selection
         """
-        
+
 
         return self._makePi0MuMu( name, combcut = "  (AM > %(KSsidebminMass)s * MeV)"\
                                       "& (AM < %(KSsidebmaxMass)s * MeV)" %self.config)
@@ -546,7 +546,7 @@ class RnSConf(LineBuilder) :
         starts from Phys/StdLooseMuons
 
         Please contact Diego Martinez Santos if you think of prescaling this line!
-    
+
         Arguments:
         name        : name of the Selection.
         """
@@ -555,14 +555,14 @@ class RnSConf(LineBuilder) :
             daughters = self.SelMuons
         else:
             dname = "pi+"
-            daughters = self.SelPions 
+            daughters = self.SelPions
         K0s2MuMu = CombineParticles(DecayDescriptor = decay_descriptor)
-    
+
         K0s2MuMu.DaughtersCuts = { dname : "(MIPCHI2DV(PRIMARY)> 100.)"}
         K0s2MuMu.CombinationCut = combcut + "& (AMAXDOCA('')<%(DiDOCA)s*mm)"% self.config
 
         K0s2MuMu.MotherCut = "("+ masscut + "& (BPVDIRA>0) & ((BPVVDSIGN*M/P) > %(KSlife)s) & (MIPDV(PRIMARY)<0.4*mm))" %self.config
-    
+
         return Selection (name,
                           Algorithm = K0s2MuMu,
                           RequiredSelections = [ daughters])
@@ -575,23 +575,23 @@ class RnSConf(LineBuilder) :
         starts from Phys/StdLooseMuons
 
         Please contact Diego Martinez Santos if you think of prescaling this line!
-    
+
         Arguments:
         name        : name of the Selection.
         """
         if "mu+" in decay_descriptor: daughter1 = self.SelMuons
-        else: daughter1 = self.SelProtons 
+        else: daughter1 = self.SelProtons
         Lambda2TwoProngs = CombineParticles(DecayDescriptor = decay_descriptor)
-    
+
         Lambda2TwoProngs.CombinationCut = combcut + "& (AMAXDOCA('')<%(DiDOCA)s*mm)"% self.config
 
         Lambda2TwoProngs.MotherCut = "("+ masscut + "& (BPVDIRA>0) & ((BPVVDSIGN*M/P) > %(L0life)s) & (MIPDV(PRIMARY)<0.4*mm))" %self.config
-    
+
         return Selection (name,
                           Algorithm = Lambda2TwoProngs,
                           RequiredSelections = [ daughter1, self.SelPions])
 
-    
+
     def _makeMultibody(self, name,decay_descriptor, combcut, masscut) :
         """
         K0s2mumu selection object
@@ -599,7 +599,7 @@ class RnSConf(LineBuilder) :
         starts from Phys/StdLooseMuons
 
         Please contact Diego Martinez Santos if you think of prescaling this line!
-    
+
         Arguments:
         name        : name of the Selection.
         """
@@ -613,21 +613,21 @@ class RnSConf(LineBuilder) :
         if "phi(1020)" in decay_descriptor:
             if not "SelDiElectrons" in dir(self): self.SelDiElectrons = self._makePseudoPhi("SelDiElectronsFor" + self._name)
             daughters += [self.SelDiElectrons]
-                
+
         if "J/psi(1S)" in decay_descriptor:
             if not "SelDiMuons" in dir(self): self.SelDiMuons = self._makePseudoJpsi("SelDiMuonsFor" + self._name)
             daughters += [self.SelDiMuons]
-            
+
         if "KS0" in decay_descriptor : lifecut = "%(KSlife)s" %self.config
         elif "Lambda0" in decay_descriptor: lifecut= "%(L0life)s" %self.config
-        
+
         Multibody = CombineParticles(DecayDescriptor = decay_descriptor)
-    
-       
+
+
         Multibody.CombinationCut = combcut #+ "& (AMAXDOCA('')<%(DiDOCA)s*mm)"% self.config
 
         Multibody.MotherCut = "("+ masscut + "& (BPVDIRA>0) & ((BPVVDSIGN*M/P) >"+ lifecut +") & (MIPDV(PRIMARY)< %(MultibodyIP)s *mm) & (VFASPF(VCHI2/VDOF)<%(MultibodyChi2dof)s))" %self.config
-    
+
         return Selection (name,
                           Algorithm = Multibody,
                           RequiredSelections = daughters)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py
index fb99c1eeb2b64bbd00f8a2c6a2207ddd3f796cc3..9ccc64f7950fd8c95cfc36d7705d248879af1f49 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py
@@ -34,7 +34,7 @@ __all__ = ('RareStrangeLinesConf',
            'makeSigmaPEEDown',
            'makeSigmaPMuMuLFVDown',
            'makeSigmaMuMuMu',
-           'makeSigmaMuMuMuDown',           
+           'makeSigmaMuMuMuDown',
            'makeKPiMuMu',
            'makeKPiMuMuLFV',
            'makeKPiPiPi',
@@ -68,9 +68,9 @@ from GaudiKernel.PhysicalConstants import c_light
 from StandardParticles import ( StdAllNoPIDsPions, StdNoPIDsDownPions,
                                 StdLoosePions, StdLooseDownMuons,
                                 StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
-                                
+
 #from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
-                                
+
 _monitor = False
 
 default_config = {
@@ -92,7 +92,7 @@ default_config = {
         'SigmaPMuMuLFVPrescale' :1,
         'SigmaPMuMuLFVDownPrescale' :0.1,
         'SigmaMuMuMuPrescale' : 1,
-        'SigmaMuMuMuDownPrescale' :1,   
+        'SigmaMuMuMuDownPrescale' :1,
         'KPiPiPiPrescale' : 0.01,
         'KPiPiPiMassMeasPrescale' :1,
         'KPiMuMuPrescale' :1,
@@ -147,7 +147,7 @@ default_config = {
         'DiElectronMaxMass' : 1000,
         'DiElectronVtxChi2'  : 36,
         'DiElectronMinIpChi2'   : 9,
-        'DiElectronPIDe' : 2, 
+        'DiElectronPIDe' : 2,
         'SigmaDetVtxChi2'   : 25,
         'Sigma3MinTauPs' : 3,
         'Sigma3MinPt' : 0.,
@@ -166,7 +166,7 @@ default_config = {
         'Sigma3DauTrChi2Down': 9.,
         'muon3MinIpChi2' : 5.,
         'muon3MinIpChi2Down' : 5.,
-        # Kaons 
+        # Kaons
         'KMaxDOCA' : 3.,
         'KMinPT' : 100. ,
         'KMassWin' : 100.,
@@ -193,7 +193,7 @@ default_config = {
         'KMaxIpChi2MassMeas' : 25.,
         'KVtxChi2MassMeas': 10.,
         'KMinVDChi2MassMeas' : 100.,
-        'KDauMinIpChi2MassMeas' : 8., 
+        'KDauMinIpChi2MassMeas' : 8.,
         #Kaons stuff downstream
         'KMaxDOCAMassMeasDown' : 2.,
         'KMinPTMassMeasDown' : 250. ,
@@ -201,7 +201,7 @@ default_config = {
         'KMinDIRAMassMeasDown' : 0.999,
         'KVtxChi2MassMeasDown': 20.,
         'KMinVDChi2MassMeasDown' : 64.,
-        'KDauMinIpChi2MassMeasDown' : 4., 
+        'KDauMinIpChi2MassMeasDown' : 4.,
         'KVDPVMinMassMeasDown' : 900.,
         'KVDPVMaxMassMeasDown' : 2200.,
         # Phi lines
@@ -213,7 +213,7 @@ default_config = {
         'PhiMinPT'   : 700,
         'PhiVtxChi2' : 9 ,
         'PhiProbNNk' : 0.3,
-        #Lambda lines 
+        #Lambda lines
         'LambdaMinTauPs' : 6.,
         'LambdaMinPt' : 500.,
         'LambdaMaxDOCA' : 2.,
@@ -224,28 +224,28 @@ default_config = {
         'LambdaVtxChi2' : 25.,
         'pionMinIpChi2' : 9.,
         'protonMinIpChi2' : 9.,
-        
+
         }
   }
-  
+
 
 
 
 #============================================================
-# Line builder 
+# Line builder
 class RareStrangeLinesConf(LineBuilder) :
     """
-    Builder 
+    Builder
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, 
+
+    def __init__(self,
                  name = 'RareStrange',
                  config = None) :
 
         LineBuilder.__init__(self, name, config)
-        
+
 
         spmumu_name=name+'SigmaPMuMu'
         spmumudown_name=name+'SigmaPMuMuDown'
@@ -261,7 +261,7 @@ class RareStrangeLinesConf(LineBuilder) :
         spmumulfv_name=name+'SigmaPMuMuLFV'
         spmumulfvdown_name=name+'SigmaPMuMuLFVDown'
         smumumu_name=name+'SigmaMuMuMu'
-        smumumudown_name=name+'SigmaMuMuMuDown'                        
+        smumumudown_name=name+'SigmaMuMuMuDown'
         kpimumu_name=name+'KPiMuMu'
         kpimumulfv_name=name+'KPiMuMuLFV'
         kpiee_name=name+'KPiEE'
@@ -287,7 +287,7 @@ class RareStrangeLinesConf(LineBuilder) :
         self._myDiElectrons = makeDiElectronDetached(dielectrondet_name, config)
         self._stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         self._stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
-        
+
         self.selSigmaPMuMu = makeSigmaPMuMu(spmumu_name, config)
         self.selSigmaPMuMuDown = makeSigmaPMuMuDown(spmumudown_name, config)
         self.selSigmaPMuMuDet = makeSigmaPMuMuDet(spmumudet_name, config, [self._myDiMuons, self._stdLooseProtons])
@@ -321,7 +321,7 @@ class RareStrangeLinesConf(LineBuilder) :
         self.selLambdaPPi = makeLambdaPPi(lambdappi_name, config)
         self.selLambdaPPiEE = makeLambdaPPiEE(lambdappiee_name, config, [self._myDiElectrons, self._stdLooseProtons, self._stdAllLoosePions])
 
-               
+
         self.SigmaPMuMuLine = StrippingLine(spmumu_name+"Line",
                                             prescale = config['SigmaPMuMuPrescale'],
                                             postscale = config['Postscale'],
@@ -331,28 +331,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu09_1', 
+                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu09_1',
                                                             "[Sigma+ -> p+ mu+ ^mu-]CC" : 'P2CVMu09_2',
                                                             "[Sigma+ -> ^p+ mu+ mu-]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu10_1', 
+                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu10_1',
                                                             "[Sigma+ -> p+ mu+ ^mu-]CC" : 'P2CVMu10_2',
                                                             "[Sigma+ -> ^p+ mu+ mu-]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu11_1', 
+                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu11_1',
                                                             "[Sigma+ -> p+ mu+ ^mu-]CC" : 'P2CVMu11_2',
                                                             "[Sigma+ -> ^p+ mu+ mu-]CC" : 'P2CVProton11'
                                                 }
@@ -360,7 +360,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spmumu_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -373,36 +373,36 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu09_1', 
+                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu09_1',
                                                             "[Sigma+ -> p+ mu+ ^mu-]CC" : 'P2CVMu09_2',
                                                             "[Sigma+ -> ^p+ mu+ mu-]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu10_1', 
+                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu10_1',
                                                             "[Sigma+ -> p+ mu+ ^mu-]CC" : 'P2CVMu10_2',
                                                             "[Sigma+ -> ^p+ mu+ mu-]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu11_1', 
+                                                            "[Sigma+ -> p+ ^mu+ mu-]CC" : 'P2CVMu11_1',
                                                             "[Sigma+ -> p+ mu+ ^mu-]CC" : 'P2CVMu11_2',
                                                             "[Sigma+ -> ^p+ mu+ mu-]CC" : 'P2CVProton11'
                                                 }
                                               },
                                             {
-                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spmumudown_name,#'InputTracks':'/Event/Rec/Track/Best',# 
+                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spmumudown_name,#'InputTracks':'/Event/Rec/Track/Best',#
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
@@ -416,29 +416,29 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ (KS0 -> ^mu+ mu-)]CC" : 'P2CVMu09_1', 
+                                                            "[Sigma+ -> p+ (KS0 -> ^mu+ mu-)]CC" : 'P2CVMu09_1',
                                                             "[Sigma+ -> p+ (KS0 -> mu+ ^mu-)]CC" : 'P2CVMu09_2',
                                                             "[Sigma+ -> ^p+ (KS0 -> mu+ mu-)]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ (KS0 -> ^mu+ mu-)]CC" : 'P2CVMu10_1',  
+                                                            "[Sigma+ -> p+ (KS0 -> ^mu+ mu-)]CC" : 'P2CVMu10_1',
                                                             "[Sigma+ -> p+ (KS0 -> mu+ ^mu-)]CC" : 'P2CVMu10_2',
                                                             "[Sigma+ -> ^p+ (KS0 -> mu+ mu-)]CC" : 'P2CVProton10'
 
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                          "[Sigma+ -> p+ (KS0 -> ^mu+ mu-)]CC" : 'P2CVMu11_1',  
+                                                          "[Sigma+ -> p+ (KS0 -> ^mu+ mu-)]CC" : 'P2CVMu11_1',
                                                             "[Sigma+ -> p+ (KS0 -> mu+ ^mu-)]CC" : 'P2CVMu11_2',
                                                             "[Sigma+ -> ^p+ (KS0 -> mu+ mu-)]CC" : 'P2CVProton11'
 
@@ -447,7 +447,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spmumudet_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -460,24 +460,24 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[[Sigma+ -> p+ ^e+ mu-]CC, [Sigma+ -> p+ ^e- mu+]CC] " : 'P2CVE09', 
+                                                            "[[Sigma+ -> p+ ^e+ mu-]CC, [Sigma+ -> p+ ^e- mu+]CC] " : 'P2CVE09',
                                                             "[[Sigma+ -> p+ e+ ^mu-]CC, [Sigma+ -> p+ e- ^mu+]CC]" : 'P2CVMu09',
                                                             "[[Sigma+ -> ^p+ e+ mu-]CC, [Sigma+ -> ^p+ e- mu+]CC]" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
-                                                'DaughterLocations' : { "[[Sigma+ -> p+ ^e+ mu-]CC, [Sigma+ -> p+ ^e- mu+]CC] " : 'P2CVE10', 
+                                                'DaughterLocations' : { "[[Sigma+ -> p+ ^e+ mu-]CC, [Sigma+ -> p+ ^e- mu+]CC] " : 'P2CVE10',
                                                                         "[[Sigma+ -> p+ e+ ^mu-]CC, [Sigma+ -> p+ e- ^mu+]CC]" : 'P2CVMu10',
                                                                         "[[Sigma+ -> ^p+ e+ mu-]CC, [Sigma+ -> ^p+ e- mu+]CC]" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : { "[[Sigma+ -> p+ ^e+ mu-]CC, [Sigma+ -> p+ ^e- mu+]CC] " : 'P2CVE10',
                                                                         "[[Sigma+ -> p+ e+ ^mu-]CC, [Sigma+ -> p+ e- ^mu+]CC]" : 'P2CVMu10',
@@ -488,7 +488,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spemu_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -502,28 +502,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE09_1', 
+                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE09_1',
                                                             "[Sigma+ -> p+ e+ ^e-]CC" : 'P2CVE09_2',
                                                             "[Sigma+ -> ^p+ e+ e-]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE10_1', 
+                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE10_1',
                                                             "[Sigma+ -> p+ e+ ^e-]CC" : 'P2CVE10_2',
                                                             "[Sigma+ -> ^p+ e+ e-]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE11_1', 
+                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE11_1',
                                                             "[Sigma+ -> p+ e+ ^e-]CC" : 'P2CVE11_2',
                                                             "[Sigma+ -> ^p+ e+ e-]CC" : 'P2CVProton11'
                                                 }
@@ -531,7 +531,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spee_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                           )
@@ -545,28 +545,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ (KS0 -> ^e+ e-)]CC" : 'P2CVE09_1', 
+                                                            "[Sigma+ -> p+ (KS0 -> ^e+ e-)]CC" : 'P2CVE09_1',
                                                             "[Sigma+ -> p+ (KS0 -> e+ ^e-)]CC" : 'P2CVE09_2',
                                                             "[Sigma+ -> ^p+ (KS0 -> e+ e-)]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                           "[Sigma+ -> p+ (KS0 -> ^e+ e-)]CC" : 'P2CVE10_1', 
+                                                           "[Sigma+ -> p+ (KS0 -> ^e+ e-)]CC" : 'P2CVE10_1',
                                                            "[Sigma+ -> p+ (KS0 -> e+ ^e-)]CC" : 'P2CVE10_2',
                                                            "[Sigma+ -> ^p+ (KS0 -> e+ e-)]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                           "[Sigma+ -> p+ (KS0 -> ^e+ e-)]CC" : 'P2CVE11_1', 
+                                                           "[Sigma+ -> p+ (KS0 -> ^e+ e-)]CC" : 'P2CVE11_1',
                                                            "[Sigma+ -> p+ (KS0 -> e+ ^e-)]CC" : 'P2CVE11_2',
                                                            "[Sigma+ -> ^p+ (KS0 -> e+ e-)]CC" : 'P2CVProton11'
                                                 }
@@ -574,7 +574,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+speedet_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                           )
@@ -587,33 +587,33 @@ class RareStrangeLinesConf(LineBuilder) :
                                            MDSTFlag=False,
                                            RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi009', 
+                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi009',
                                                             "[Sigma+ -> ^p+ pi0]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi010', 
+                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi010',
                                                             "[Sigma+ -> ^p+ pi0]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi011', 
+                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi011',
                                                             "[Sigma+ -> ^p+ pi0]CC" : 'P2CVProton11'
                                                 }
                                               },
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+sppi0_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -626,33 +626,33 @@ class RareStrangeLinesConf(LineBuilder) :
                                            MDSTFlag=False,
                                            RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi009', 
+                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi009',
                                                             "[Sigma+ -> ^p+ pi0]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi010', 
+                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi010',
                                                             "[Sigma+ -> ^p+ pi0]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi011', 
+                                                            "[Sigma+ -> p+ ^pi0]CC" : 'P2CVPi011',
                                                             "[Sigma+ -> ^p+ pi0]CC" : 'P2CVProton11'
                                                 }
                                               },
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+sppi0cal_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -667,28 +667,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                              RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE09_1', 
+                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE09_1',
                                                             "[Sigma+ -> p+ e+ ^e-]CC" : 'P2CVE09_2',
                                                             "[Sigma+ -> ^p+ e+ e-]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE10_1', 
+                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE10_1',
                                                             "[Sigma+ -> p+ e+ ^e-]CC" : 'P2CVE10_2',
                                                             "[Sigma+ -> ^p+ e+ e-]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE11_1', 
+                                                            "[Sigma+ -> p+ ^e+ e-]CC" : 'P2CVE11_1',
                                                             "[Sigma+ -> p+ e+ ^e-]CC" : 'P2CVE11_2',
                                                             "[Sigma+ -> ^p+ e+ e-]CC" : 'P2CVProton11'
                                                 }
@@ -696,7 +696,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+speedown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
@@ -709,28 +709,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu09_1', 
+                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu09_1',
                                                             "[Sigma+ -> p~- mu+ ^mu+]CC" : 'P2CVMu09_2',
                                                             "[Sigma+ -> ^p~- mu+ mu+]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu10_1', 
+                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu10_1',
                                                             "[Sigma+ -> p~- mu+ ^mu+]CC" : 'P2CVMu10_2',
                                                             "[Sigma+ -> ^p~- mu+ mu+]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu11_1', 
+                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu11_1',
                                                             "[Sigma+ -> p~- mu+ ^mu+]CC" : 'P2CVMu11_2',
                                                             "[Sigma+ -> ^p~- mu+ mu+]CC" : 'P2CVProton11'
                                                 }
@@ -738,7 +738,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spmumulfv_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -752,28 +752,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu09_1', 
+                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu09_1',
                                                             "[Sigma+ -> p~- mu+ ^mu+]CC" : 'P2CVMu09_2',
                                                             "[Sigma+ -> ^p~- mu+ mu+]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu10_1', 
+                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu10_1',
                                                             "[Sigma+ -> p~- mu+ ^mu+]CC" : 'P2CVMu10_2',
                                                             "[Sigma+ -> ^p~- mu+ mu+]CC" : 'P2CVProton10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu11_1', 
+                                                            "[Sigma+ -> p~- ^mu+ mu+]CC" : 'P2CVMu11_1',
                                                             "[Sigma+ -> p~- mu+ ^mu+]CC" : 'P2CVMu11_2',
                                                             "[Sigma+ -> ^p~- mu+ mu+]CC" : 'P2CVProton11'
                                                 }
@@ -781,7 +781,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+spmumulfvdown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
@@ -813,10 +813,10 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+smumumu_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                               ])
-                                              
+
         self.SigmaMuMuMuDownLine = StrippingLine(smumumudown_name+"Line",
                                                  prescale = config['SigmaMuMuMuDownPrescale'],
                                                  postscale = config['Postscale'],
@@ -843,40 +843,40 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+smumumudown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }])
-        
+
         self.KPiEELine = StrippingLine(kpiee_name+"Line",
                                              prescale = config['KPiEEPrescale'],
                                             postscale = config['Postscale'],
                                             algos = [ self.selKPiEE ],
                                             #postselalg = makevelotracks(kpiee_name),
                                             RequiredRawEvents = [],
-                                            MDSTFlag=False, 
+                                            MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE09_1', 
+                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE09_1',
                                                             "[K+ -> pi+ e+ ^e-]CC" : 'P2CVE09_2',
                                                             "[K+ -> ^pi+ e+ e-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE10_1', 
+                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE10_1',
                                                             "[K+ -> pi+ e+ ^e-]CC" : 'P2CVE10_2',
                                                             "[K+ -> ^pi+ e+ e-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE11_1', 
+                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE11_1',
                                                             "[K+ -> pi+ e+ ^e-]CC" : 'P2CVE11_2',
                                                             "[K+ -> ^pi+ e+ e-]CC" : 'P2CVPi11'
                                                 }
@@ -884,7 +884,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpiee_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -895,31 +895,31 @@ class RareStrangeLinesConf(LineBuilder) :
                                             algos = [ self.selKPiMuMu ],
                                             #postselalg = makevelotracks(kpimumu_name),
                                             RequiredRawEvents = [],
-                                            MDSTFlag=False, 
+                                            MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu09_1', 
+                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu09_1',
                                                             "[K+ -> pi+ mu+ ^mu-]CC" : 'P2CVMu09_2',
                                                             "[K+ -> ^pi+ mu+ mu-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu10_1', 
+                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu10_1',
                                                             "[K+ -> pi+ mu+ ^mu-]CC" : 'P2CVMu10_2',
                                                             "[K+ -> ^pi+ mu+ mu-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu11_1', 
+                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu11_1',
                                                             "[K+ -> pi+ mu+ ^mu-]CC" : 'P2CVMu11_2',
                                                             "[K+ -> ^pi+ mu+ mu-]CC" : 'P2CVPi11'
                                                 }
@@ -927,7 +927,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpimumu_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -940,28 +940,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu09_1', 
+                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu09_1',
                                                             "[K+ -> pi- mu+ ^mu+]CC" : 'P2CVMu09_2',
                                                             "[K+ -> ^pi- mu+ mu+]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu10_1', 
+                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu10_1',
                                                             "[K+ -> pi- mu+ ^mu+]CC" : 'P2CVMu10_2',
                                                             "[K+ -> ^pi- mu+ mu+]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu11_1', 
+                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu11_1',
                                                             "[K+ -> pi- mu+ ^mu+]CC" : 'P2CVMu11_2',
                                                             "[K+ -> ^pi- mu+ mu+]CC" : 'P2CVPi11'
                                                 }
@@ -969,7 +969,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpimumulfv_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                          )
@@ -983,28 +983,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE09_1', 
+                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE09_1',
                                                             "[K+ -> pi- e+ ^e+]CC" : 'P2CVE09_2',
                                                             "[K+ -> ^pi- e+ e+]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE10_1', 
+                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE10_1',
                                                             "[K+ -> pi- e+ ^e+]CC" : 'P2CVE10_2',
                                                             "[K+ -> ^pi- e+ e+]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE11_1', 
+                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE11_1',
                                                             "[K+ -> pi- e+ ^e+]CC" : 'P2CVE11_2',
                                                             "[K+ -> ^pi- e+ e+]CC" : 'P2CVPi11'
                                                 }
@@ -1012,7 +1012,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpieelfv_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                          )
@@ -1025,28 +1025,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE09', 
+                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE09',
                                                             "[K+ -> pi+ e+ ^mu-]CC" : 'P2CVMu09',
                                                             "[K+ -> ^pi+ e+ mu-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE10', 
+                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE10',
                                                             "[K+ -> pi+ e+ ^mu-]CC" : 'P2CVMu10',
                                                             "[K+ -> ^pi+ e+ mu-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE11', 
+                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE11',
                                                             "[K+ -> pi+ e+ ^mu-]CC" : 'P2CVMu11',
                                                             "[K+ -> ^pi+ e+ mu-]CC" : 'P2CVPi11'
                                                 }
@@ -1054,7 +1054,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpiemulfv_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                          )
@@ -1067,28 +1067,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVEMu09', 
+                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVEMu09',
                                                             "[K+ -> pi- e+ ^mu+]CC" : 'P2CVMu09',
                                                             "[K+ -> ^pi- e+ mu+]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE10', 
+                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE10',
                                                             "[K+ -> pi- e+ ^mu+]CC" : 'P2CVMu10',
                                                             "[K+ -> ^pi- e+ mu+]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE11', 
+                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE11',
                                                             "[K+ -> pi- e+ ^mu+]CC" : 'P2CVMu11',
                                                             "[K+ -> ^pi- e+ mu+]CC" : 'P2CVPi11'
                                                 }
@@ -1096,11 +1096,11 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpiemulfv_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                          )
-        
+
         self.KPiPiPiLine = StrippingLine(kpipipi_name+"Line",
                                              prescale = config['KPiPiPiPrescale'],
                                             postscale = config['Postscale'],
@@ -1110,28 +1110,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi09_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi10_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi11_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi11'
                                                 }
@@ -1139,7 +1139,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpipipi_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -1152,28 +1152,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi09_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi10_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi11_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi11'
                                                 }
@@ -1181,7 +1181,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpipipimassmeas_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -1194,28 +1194,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu09_1', 
+                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu09_1',
                                                             "[K+ -> pi+ mu+ ^mu-]CC" : 'P2CVMu09_2',
                                                             "[K+ -> ^pi+ mu+ mu-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu10_1', 
+                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu10_1',
                                                             "[K+ -> pi+ mu+ ^mu-]CC" : 'P2CVMu10_2',
                                                             "[K+ -> ^pi+ mu+ mu-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu11_1', 
+                                                            "[K+ -> pi+ ^mu+ mu-]CC" : 'P2CVMu11_1',
                                                             "[K+ -> pi+ mu+ ^mu-]CC" : 'P2CVMu11_2',
                                                             "[K+ -> ^pi+ mu+ mu-]CC" : 'P2CVPi11'
                                                 }
@@ -1223,7 +1223,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpimumudown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
@@ -1236,28 +1236,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE09_1', 
+                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE09_1',
                                                             "[K+ -> pi+ e+ ^e-]CC" : 'P2CVE09_2',
                                                             "[K+ -> ^pi+ e+ e-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE10_1', 
+                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE10_1',
                                                             "[K+ -> pi+ e+ ^e-]CC" : 'P2CVE10_2',
                                                             "[K+ -> ^pi+ e+ e-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE11_1', 
+                                                            "[K+ -> pi+ ^e+ e-]CC" : 'P2CVE11_1',
                                                             "[K+ -> pi+ e+ ^e-]CC" : 'P2CVE11_2',
                                                             "[K+ -> ^pi+ e+ e-]CC" : 'P2CVPi11'
                                                 }
@@ -1265,7 +1265,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpieedown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
@@ -1278,28 +1278,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi09_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi10_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi11_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi11'
                                                 }
@@ -1307,7 +1307,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpipipidown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
@@ -1320,28 +1320,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi09_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi09_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi10_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi10_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1', 
+                                                            "[K+ -> ^pi+ pi+ pi-]CC" : 'P2CVPi11_1',
                                                             "[K+ -> pi+ ^pi+ pi-]CC" : 'P2CVPi11_2',
                                                             "[K+ -> pi+ pi+ ^pi-]CC" : 'P2CVPi11'
                                                 }
@@ -1349,11 +1349,11 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpipipimassmeasdown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                      )
-     
+
         self.KPiMuMuLFVDownLine = StrippingLine(kpimumulfvdown_name+"Line",
                                          prescale = config['KPiMuMuLFVDownPrescale'],
                                          postscale = config['Postscale'],
@@ -1363,28 +1363,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu09_1', 
+                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu09_1',
                                                             "[K+ -> pi- mu+ ^mu+]CC" : 'P2CVMu09_2',
                                                             "[K+ -> ^pi- mu+ mu+]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu10_1', 
+                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu10_1',
                                                             "[K+ -> pi- mu+ ^mu+]CC" : 'P2CVMu10_2',
                                                             "[K+ -> ^pi- mu+ mu+]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu11_1', 
+                                                            "[K+ -> pi- ^mu+ mu+]CC" : 'P2CVMu11_1',
                                                             "[K+ -> pi- mu+ ^mu+]CC" : 'P2CVMu11_2',
                                                             "[K+ -> ^pi- mu+ mu+]CC" : 'P2CVPi11'
                                                 }
@@ -1392,7 +1392,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpimumulfvdown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                          )
@@ -1406,28 +1406,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE09', 
+                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE09',
                                                             "[K+ -> pi+ e+ ^mu-]CC" : 'P2CVMu09',
                                                             "[K+ -> ^pi+ e+ mu-]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE10', 
+                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE10',
                                                             "[K+ -> pi+ e+ ^mu-]CC" : 'P2CVMu10',
                                                             "[K+ -> ^pi+ e+ mu-]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE11', 
+                                                            "[K+ -> pi+ ^e+ mu-]CC" : 'P2CVE11',
                                                             "[K+ -> pi+ e+ ^mu-]CC" : 'P2CVMu11',
                                                             "[K+ -> ^pi+ e+ mu-]CC" : 'P2CVPi11'
                                                 }
@@ -1435,7 +1435,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpiemulfvdown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                          )
@@ -1448,28 +1448,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE09', 
+                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE09',
                                                             "[K+ -> pi- e+ ^mu+]CC" : 'P2CVMu09',
                                                             "[K+ -> ^pi- e+ mu+]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE10', 
+                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE10',
                                                             "[K+ -> pi- e+ ^mu+]CC" : 'P2CVMu10',
                                                             "[K+ -> ^pi- e+ mu+]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE11', 
+                                                            "[K+ -> pi- ^e+ mu+]CC" : 'P2CVE11',
                                                             "[K+ -> pi- e+ ^mu+]CC" : 'P2CVMu11',
                                                             "[K+ -> ^pi- e+ mu+]CC" : 'P2CVPi11'
                                                 }
@@ -1477,7 +1477,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpiemulfvssdown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                          )
@@ -1490,28 +1490,28 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK09',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE09_1', 
+                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE09_1',
                                                             "[K+ -> pi- e+ ^e+]CC" : 'P2CVE09_2',
                                                             "[K+ -> ^pi- e+ e+]CC" : 'P2CVPi09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK10',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE10_1', 
+                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE10_1',
                                                             "[K+ -> pi- e+ ^e+]CC" : 'P2CVE10_2',
                                                             "[K+ -> ^pi- e+ e+]CC" : 'P2CVPi10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVK11',
                                                 'DaughterLocations' : {
-                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE11_1', 
+                                                            "[K+ -> pi- ^e+ e+]CC" : 'P2CVE11_1',
                                                             "[K+ -> pi- e+ ^e+]CC" : 'P2CVE11_2',
                                                             "[K+ -> ^pi- e+ e+]CC" : 'P2CVPi11'
                                                 }
@@ -1519,7 +1519,7 @@ class RareStrangeLinesConf(LineBuilder) :
                                               {
                                                'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+kpieelfvdown_name,
                                                 'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               }
                                             ]
                                          )
@@ -1532,33 +1532,33 @@ class RareStrangeLinesConf(LineBuilder) :
                                         MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVPhi09',
                                                 'DaughterLocations' : {
-                                                            "[phi(1020) -> K+ ^mu-]CC" : 'P2CVMu09', 
+                                                            "[phi(1020) -> K+ ^mu-]CC" : 'P2CVMu09',
                                                             "[phi(1020) -> ^K+ mu-]CC" : 'P2CVK09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVPhi10',
                                                 'DaughterLocations' : {
-                                                            "[phi(1020) -> K+ ^mu-]CC" : 'P2CVMu10', 
+                                                            "[phi(1020) -> K+ ^mu-]CC" : 'P2CVMu10',
                                                             "[phi(1020) -> ^K+ mu-]CC" : 'P2CVK10'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVPhi11',
                                                 'DaughterLocations' : {
-                                                            "[phi(1020) -> K+ ^mu-]CC" : 'P2CVMu11', 
+                                                            "[phi(1020) -> K+ ^mu-]CC" : 'P2CVMu11',
                                                             "[phi(1020) -> ^K+ mu-]CC" : 'P2CVK11'
                                                 }
                                               },
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+phikmu_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                          )
@@ -1572,34 +1572,34 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Lambda0 -> p+ ^pi-]CC" : 'P2CVPi09', 
+                                                            "[Lambda0 -> p+ ^pi-]CC" : 'P2CVPi09',
                                                             "[Lambda0 -> ^p+ pi-]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Lambda0 -> p+ ^pi-]CC" : 'P2CVPi10', 
+                                                            "[Lambda0 -> p+ ^pi-]CC" : 'P2CVPi10',
                                                             "[Lambda0 -> ^p+ pi-]CC" : 'P2CVProton10'
                                                 }
-                                                
+
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Lambda0 -> p+ ^pi-]CC" : 'P2CVPi11', 
+                                                            "[Lambda0 -> p+ ^pi-]CC" : 'P2CVPi11',
                                                             "[Lambda0 -> ^p+ pi-]CC" : 'P2CVProton11'
                                                 }
                                               },
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+lambdappi_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -1613,34 +1613,34 @@ class RareStrangeLinesConf(LineBuilder) :
                                             MDSTFlag=False,
                                             RelatedInfoTools = [
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 0.9, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma09',
                                                 'DaughterLocations' : {
-                                                            "[Lambda0 -> p+ ^pi- KS0]CC" : 'P2CVPi09', 
+                                                            "[Lambda0 -> p+ ^pi- KS0]CC" : 'P2CVPi09',
                                                             "[Lambda0 -> ^p+ pi- KS0]CC" : 'P2CVProton09'
                                                 }
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.0, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma10',
                                                 'DaughterLocations' : {
-                                                            "[Lambda0 -> p+ ^pi- KS0]CC" : 'P2CVPi10', 
+                                                            "[Lambda0 -> p+ ^pi- KS0]CC" : 'P2CVPi10',
                                                             "[Lambda0 -> ^p+ pi- KS0]CC" : 'P2CVProton10'
                                                 }
-                                                
+
                                               },
                                               {
-                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'], 
+                                                'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.1, 'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPTASYM'],
                                                 'Location' : 'P2CVSigma11',
                                                 'DaughterLocations' : {
-                                                            "[Lambda0 -> p+ ^pi- KS0]CC" : 'P2CVPi11', 
+                                                            "[Lambda0 -> p+ ^pi- KS0]CC" : 'P2CVPi11',
                                                             "[Lambda0 -> ^p+ pi- KS0]CC" : 'P2CVProton11'
                                                 }
                                               },
                                               #{
                                                #'Type' : 'RelInfoVeloTrackMatch', 'InputTracks' : "Rec/Track/Velo"+lambdappiee_name,
                                                 #'Location' : 'P2VELOTRACKMATCH'
-                                                
+
                                               #}
                                             ]
                                      )
@@ -1672,7 +1672,7 @@ class RareStrangeLinesConf(LineBuilder) :
         self.registerLine(self.KPiEMuLFVSSLine)
         self.registerLine(self.KPiEMuLFVSSDownLine)
         self.registerLine(self.KPiPiPiLine)
-        self.registerLine(self.KPiPiPiMassMeasLine) 
+        self.registerLine(self.KPiPiPiMassMeasLine)
         self.registerLine(self.KPiMuMuDownLine)
         self.registerLine(self.KPiPiPiDownLine)
         self.registerLine(self.KPiPiPiMassMeasDownLine)
@@ -1683,20 +1683,20 @@ class RareStrangeLinesConf(LineBuilder) :
 
 
 #============================================================
-# Sigma+ -> p mu mu 
+# Sigma+ -> p mu mu
 def makeSigmaPMuMu(name, config):
     """
-    Line for the selection of Sigma+ -> p+ mu+ mu-,  
+    Line for the selection of Sigma+ -> p+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     #from Configurables import OfflineVertexFitter
     SigmaPMuMu = Combine3Particles(  DecayDescriptor = "[Sigma+ -> p+ mu+ mu-]cc",
-                                    DaughtersCuts = { "mu+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config, 
+                                    DaughtersCuts = { "mu+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config,
                                                      "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s)"%config},
                                     Combination12Cut = "( AM < 1500 * MeV  )",
                                     CombinationCut = "(ADAMASS('Sigma+')<%(SigmaMassWin)s *MeV) & (AMAXDOCA('')< %(SigmaMaxDOCA)s *mm)"%config,
@@ -1704,27 +1704,27 @@ def makeSigmaPMuMu(name, config):
                               "& (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV )"\
                               "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                               "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                              "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                              "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                 )
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaPMuMu,
                       RequiredSelections = [ _stdAllLooseMuons,
                                              _stdLooseProtons ])
 
 #============================================================
-# Sigma+ > p- mu+ mu+ 
+# Sigma+ > p- mu+ mu+
 def makeSigmaPMuMuLFV(name, config):
     """
-    Line for the selection of Sigma+ -> p- mu+ mu+ 
+    Line for the selection of Sigma+ -> p- mu+ mu+
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
     SigmaPMuMu = Combine3Particles(  DecayDescriptor = "[Sigma+ -> p~- mu+ mu+]cc",
                                     DaughtersCuts = { "mu+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config,
@@ -1735,14 +1735,14 @@ def makeSigmaPMuMuLFV(name, config):
                                                 "& (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV )"\
                                                 "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                                                 "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
 
                                 )
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
-    
+
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaPMuMu,
                       RequiredSelections = [ _stdAllLooseMuons,
@@ -1753,17 +1753,17 @@ def makeDiMuonDetached(name, config):
     """
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
 
     myDiMuon = CombineParticles(  DecayDescriptor = "KS0 -> mu+ mu-",
                                   DaughtersCuts = { "mu+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config },
                                   CombinationCut = "(AM <%(DiMuonMaxMass)s *MeV) & (AMAXDOCA('')< %(DiMuonMaxDOCA)s *mm)"%config,
-                                  MotherCut = "(VFASPF(VCHI2/VDOF)< %(DiMuonVtxChi2)s)  & (PT> %(DiMuonMinPt)s *MeV)" %config  
+                                  MotherCut = "(VFASPF(VCHI2/VDOF)< %(DiMuonVtxChi2)s)  & (PT> %(DiMuonMinPt)s *MeV)" %config
                                 )
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
-    
+
     return Selection (name,
                       Algorithm = myDiMuon,
                       RequiredSelections = [ _stdAllLooseMuons ])
@@ -1772,44 +1772,44 @@ def makeDiMuonDetached(name, config):
 
 def makeSigmaPMuMuDet(name, config, inputs):
     """
-    Line for the selection of Sigma+ -> p+ mu+ mu-,  
+    Line for the selection of Sigma+ -> p+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
 
     #from Configurables import OfflineVertexFitter
     SigmaPMuMuDet = CombineParticles(  DecayDescriptor = "[Sigma+ -> p+ KS0 ]cc",
-                                       DaughtersCuts = { "KS0" : "(MIPCHI2DV(PRIMARY)>%(DiMuonMinIpChi2)s)"%config, 
+                                       DaughtersCuts = { "KS0" : "(MIPCHI2DV(PRIMARY)>%(DiMuonMinIpChi2)s)"%config,
                                                          "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s)"%config},
                                        CombinationCut = "(ADAMASS('Sigma+')<%(SigmaMassWin)s *MeV)"%config,
                                        MotherCut = "(VFASPF(VCHI2/VDOF)< %(SigmaDetVtxChi2)s)  & (PT> %(SigmaMinPt)s *MeV)"\
                                        "& (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV )"\
                                        "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                                        "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                                       "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                                       "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                        )
-    
+
     return Selection (name,
                       Algorithm = SigmaPMuMuDet,
                       RequiredSelections = inputs )
 
 #============================================================
-#  Very soft Dielectron for Sigma-> p ee  and Lambda-> p pi e e 
+#  Very soft Dielectron for Sigma-> p ee  and Lambda-> p pi e e
 
 def makeDiElectronDetached(name, config):
-    from CommonParticles.Utils import trackSelector 
+    from CommonParticles.Utils import trackSelector
     from Configurables import DiElectronMaker,ProtoParticleCALOFilter
     from GaudiKernel.SystemOfUnits import MeV
     dieLL = DiElectronMaker('MyDiElectron')
     dieLL.Particle = "KS0"
-    selector = trackSelector ( dieLL , trackTypes = [ "Long"]) 
+    selector = trackSelector ( dieLL , trackTypes = [ "Long"])
     dieLL.addTool( ProtoParticleCALOFilter('Electron'))
 #    dieLL.Electron.Selection = ["RequiresDet='CALO' CombDLL(e-pi)>'%(DiElectronPIDe)s'"%config ]
     dieLL.Electron.Selection = ["RequiresDet='CALO' PROBNNe>'0.2'" ]
-    
+
     dieLL.DiElectronMassMax = 2000.*MeV
     dieLL.DiElectronMassMin = 0.*MeV
     dieLL.DiElectronPtMin =   0.*MeV
@@ -1819,27 +1819,27 @@ def makeDiElectronDetached(name, config):
                       )
 
 #============================================================
-#  Sigma+ -> p e e 
+#  Sigma+ -> p e e
 def makeSigmaPEEDetached(name, config, inputs):
     """
-    Line for the selection of Sigma+ -> p+ e+ e-, 
+    Line for the selection of Sigma+ -> p+ e+ e-,
     for normalisation purposes
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     SigmaPEE = CombineParticles(    DecayDescriptor = "[Sigma+ -> p+ KS0]cc",
-                                    DaughtersCuts = {  "KS0" : "(MIPCHI2DV(PRIMARY)>%(DiElectronMinIpChi2)s)"%config, 
+                                    DaughtersCuts = {  "KS0" : "(MIPCHI2DV(PRIMARY)>%(DiElectronMinIpChi2)s)"%config,
                                                        "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s)"%config},
                                     CombinationCut = "(ADAMASS('Sigma+')<%(SigmaMassWin)s *MeV) & (AMAXDOCA('')< %(SigmaMaxDOCA)s *mm)"%config,
                                     MotherCut = "(VFASPF(VCHI2/VDOF)< %(SigmaVtxChi2)s)  & (PT> %(SigmaMinPt)s *MeV)"\
                                                 "& (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV )"\
                                                 "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                                                 "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                 )
 
     return Selection (name,
@@ -1847,18 +1847,18 @@ def makeSigmaPEEDetached(name, config, inputs):
                       RequiredSelections = inputs )
 
 #============================================================
-#  Sigma+ -> p e e 
+#  Sigma+ -> p e e
 def makeSigmaPEE(name, config):
     """
-    Line for the selection of Sigma+ -> p+ e+ e- 
+    Line for the selection of Sigma+ -> p+ e+ e-
     for normalisation purposes
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     SigmaPEE = Combine3Particles(    DecayDescriptor = "[Sigma+ -> p+ e+ e-]cc",
                                     DaughtersCuts = { "e+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PIDe > %(electronPIDe)s ) &  (MIPCHI2DV(PRIMARY)>%(electronMinIpChi2)s)"%config,
                                                     "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s)"%config},
@@ -1868,35 +1868,35 @@ def makeSigmaPEE(name, config):
                                                 "& (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV )"\
                                                 "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                                                 "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                 )
     # AllLooseElectrons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _stdAllLooseElectrons   = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
-    
+
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
 
-    
+
     return Selection (name,
                       Algorithm = SigmaPEE,
                       RequiredSelections = [ _stdAllLooseElectrons,
                                              _stdLooseProtons ])
 
 #============================================================
-# Sigma+ -> p e mu 
+# Sigma+ -> p e mu
 def makeSigmaPEMu(name, config):
     """
-    Line for the selection of Sigma+ -> p+ e+ mu-,  
+    Line for the selection of Sigma+ -> p+ e+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     #from Configurables import OfflineVertexFitter
     SigmaPEMu = Combine3Particles(  DecayDescriptors = [ "[Sigma+ -> p+ e+ mu-]cc","[Sigma+ -> p+ mu+ e-]cc"],
                                     DaughtersCuts = { "mu+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config,
-                                                      "e+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config, 
+                                                      "e+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config,
                                                      "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s)"%config},
                                    Combination12Cut = "( AM < 1500 * MeV  )",
                                     CombinationCut = "(ADAMASS('Sigma+')<%(SigmaMassWin)s *MeV) & (AMAXDOCA('')< %(SigmaMaxDOCA)s *mm)"%config,
@@ -1904,7 +1904,7 @@ def makeSigmaPEMu(name, config):
                               "& (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV )"\
                               "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                               "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                              "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                              "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                 )
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
@@ -1919,22 +1919,22 @@ def makeSigmaPEMu(name, config):
 
 
 #============================================================
-#  Sigma+ -> p pi0 with Dalitz 
+#  Sigma+ -> p pi0 with Dalitz
 def makeSigmaPPi0(name, config):
     """
     Line for the selection of Sigma+ -> p+ pi0
     for normalisation purposes
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
     pi0sel = MergedSelection("Pi0For" + name, RequiredSelections = [  StdLooseDalitzPi0,
                                                                       #StdLoosePi024e, StdLoosePi02gee
-                                                                      ] ) 
+                                                                      ] )
+
 
-    
     SigmaPPi0 = CombineParticles(   DecayDescriptor = "[Sigma+ -> p+ pi0]cc",
                                     DaughtersCuts = { "pi0" : "(PT > %(pi0MinPt)s)"%config,
                                     "p+" : "(PT > %(pMinPt)s) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp > %(protonProbNNpTight)s )"%config},
@@ -1943,12 +1943,12 @@ def makeSigmaPPi0(name, config):
                                                 "& (ADMASS('Sigma+') < %(SigmaPPi0MassWin)s *MeV )"\
                                                 "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                                                 "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                                                "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                 )
 
 #    _stdPizeros   =  DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaPPi0,
                       RequiredSelections = [ pi0sel,
@@ -1961,14 +1961,14 @@ def makeSigmaPPi0Cal(name, config):
     Line for the selection of Sigma+ -> p+ pi0
     for normalisation purposes
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    pi0sel = MergedSelection("Pi0For" + name, RequiredSelections = [ StdLooseMergedPi0, StdLooseResolvedPi0 ] ) 
+    pi0sel = MergedSelection("Pi0For" + name, RequiredSelections = [ StdLooseMergedPi0, StdLooseResolvedPi0 ] )
+
 
-    
     SigmaPPi0 = CombineParticles(   DecayDescriptor = "[Sigma+ -> p+ pi0]cc",
                                     DaughtersCuts = { "pi0" : "(PT > %(pi0MinPt)s) & (CL > %(pi0CL)s)"%config,
                                     "p+" : "(PT > %(pMinPt)s) & (TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp > %(protonProbNNpTight)s )"%config},
@@ -1977,12 +1977,12 @@ def makeSigmaPPi0Cal(name, config):
                                     "& (ADMASS('Sigma+') < %(SigmaPPi0MassWin)s *MeV )"\
                                     "& (BPVDIRA > %(SigmaMinDIRA)s) "\
                                     "& (BPVIPCHI2()< %(SigmaMaxIpChi2)s)"\
-                                    "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config  
+                                    "& (BPVLTIME()> %(SigmaMinTauPs)s * ps)" %config
                                 )
 
 #    _stdPizeros   =  DataOnDemand(Location = "Phys/StdLooseMergedPi0/Particles")
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaPPi0,
                       RequiredSelections = [ pi0sel,
@@ -1998,12 +1998,12 @@ def makeSigmaMuMuMu(name, config):
     """
     Line for the selection of Sigma+ -> mu+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
     config      : dictionary of tunable cuts
     """
-    
+
     #from Configurables import OfflineVertexFitter
     SigmaMuMuMu = Combine3Particles(  DecayDescriptor = "[Sigma+ -> mu+ mu+ mu-]cc",
                                      DaughtersCuts = { "mu+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muon3MinIpChi2)s)"%config },
@@ -2015,11 +2015,11 @@ def makeSigmaMuMuMu(name, config):
                                      "& (BPVIPCHI2()< %(Sigma3MaxIpChi2)s)"\
                                      "& (BPVLTIME()> %(Sigma3MinTauPs)s * ps)" %config
                                      )
-    
-    
+
+
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaMuMuMu,
                       RequiredSelections = [ _stdAllLooseMuons])
@@ -2032,12 +2032,12 @@ def makeSigmaMuMuMuDown(name, config):
     """
     Line for the selection of Sigma+ -> mu+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
     config      : dictionary of tunable cuts
     """
-    
+
     #from Configurables import OfflineVertexFitter
     SigmaMuMuMu = Combine3Particles(  DecayDescriptor = "[Sigma+ -> mu+ mu+ mu-]cc",
                                      DaughtersCuts = { "mu+" : "(TRCHI2DOF< %(Sigma3DauTrChi2Down)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muon3MinIpChi2Down)s)"%config},
@@ -2049,29 +2049,29 @@ def makeSigmaMuMuMuDown(name, config):
                                      "& (BPVIPCHI2()< %(Sigma3MaxIpChi2Down)s)"\
                                      "& (BPVLTIME()> %(Sigma3MinTauPsDown)s * ps)" %config
                                      )
-                                     
-    
+
+
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaMuMuMu,
                       RequiredSelections = [ _Muons])
-        
+
 
 # ============================================================
 # K -> pi e e
 # Contact: Kristian Zarebski
 def makeKPiEE(name, config):
     """
-    Line for the selection of K+ -> pi+ e+ e-,  
+    Line for the selection of K+ -> pi+ e+ e-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEE = Combine3Particles( DecayDescriptor = "[K+ -> pi+ e+ e-]cc",
                                 DaughtersCuts = { "e+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
                                                     "pi+":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
@@ -2081,24 +2081,24 @@ def makeKPiEE(name, config):
                                     "& (VFASPF(VCHI2) < %(KVtxChi2)s) & (BPVVDCHI2 > %(KMinVDChi2)s) & (BPVIPCHI2()< %(KMaxIpChi2)s )"%config
                                 )
     _stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
-    _stdAllLooseElectrons   = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")    
+    _stdAllLooseElectrons   = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
     return Selection (name,
                       Algorithm = KPiEE,
                       RequiredSelections = [ _stdAllLooseElectrons,
                                              _stdAllLoosePions ])
 
 # ============================================================
-# K -> pi mu mu 
+# K -> pi mu mu
 def makeKPiMuMu(name, config):
     """
-    Line for the selection of K+ -> pi+ mu+ mu-,  
+    Line for the selection of K+ -> pi+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiMuMu = Combine3Particles( DecayDescriptor = "[K+ -> pi+ mu+ mu-]cc",
                                 DaughtersCuts = { "mu+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
                                                     "pi+":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
@@ -2108,7 +2108,7 @@ def makeKPiMuMu(name, config):
                                     "& (VFASPF(VCHI2) < %(KVtxChi2)s) & (BPVVDCHI2 > %(KMinVDChi2)s) & (BPVIPCHI2()< %(KMaxIpChi2)s )"%config
                                 )
     _stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
-    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")    
+    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     return Selection (name,
                       Algorithm = KPiMuMu,
                       RequiredSelections = [ _stdAllLooseMuons,
@@ -2119,17 +2119,17 @@ def makeKPiMuMu(name, config):
 # Contact: Kristian Zarebski
 def makeKPiEMuLFV(name, config):
     """
-    Line for the selection of K+ -> pi+ e+ mu-,  
+    Line for the selection of K+ -> pi+ e+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEMuLFV = Combine3Particles( DecayDescriptor = "[K+ -> pi+ e+ mu-]cc",
                                 DaughtersCuts = { "mu-" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
-                                                  "e+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,  
+                                                  "e+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
                                                   "pi+":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
                                  Combination12Cut = "( AM < 1500 * MeV  )",
                                 CombinationCut = "(ADAMASS('K+') < %(KMassWin)s *MeV) & (AMAXDOCA('')< %(KMaxDOCA)s *mm)"%config,
@@ -2138,7 +2138,7 @@ def makeKPiEMuLFV(name, config):
                                 )
     _stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
     _stdAllLooseElectrons = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
-    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")    
+    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     return Selection (name,
                       Algorithm = KPiEMuLFV,
                       RequiredSelections = [ _stdAllLooseMuons,
@@ -2149,17 +2149,17 @@ def makeKPiEMuLFV(name, config):
 # Contact: Kristian Zarebski
 def makeKPiEMuLFVSS(name, config):
     """
-    Line for the selection of K+ -> pi- e+ mu+,  
+    Line for the selection of K+ -> pi- e+ mu+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEMuLFVSS = Combine3Particles( DecayDescriptor = "[K+ -> pi- e+ mu+]cc",
                                 DaughtersCuts = { "mu+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
-                                                  "e+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,  
+                                                  "e+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
                                                   "pi-":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
                                  Combination12Cut = "( AM < 1500 * MeV  )",
                                 CombinationCut = "(ADAMASS('K+') < %(KMassWin)s *MeV) & (AMAXDOCA('')< %(KMaxDOCA)s *mm)"%config,
@@ -2168,7 +2168,7 @@ def makeKPiEMuLFVSS(name, config):
                                 )
     _stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
     _stdAllLooseElectrons = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
-    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")    
+    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     return Selection (name,
                       Algorithm = KPiEMuLFVSS,
                       RequiredSelections = [ _stdAllLooseMuons,
@@ -2178,24 +2178,24 @@ def makeKPiEMuLFVSS(name, config):
 # K -> pi mu mu LFV
 def makeKPiMuMuLFV(name, config):
     """
-    Line for the selection of K+ -> pi- mu+ mu+,  
+    Line for the selection of K+ -> pi- mu+ mu+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiMuMuLFV = Combine3Particles(  DecayDescriptor = "[K+ -> pi- mu+ mu+]cc",
                                     DaughtersCuts = { "mu+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
                                         "pi+":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
-                                     Combination12Cut = "( AM < 1500 * MeV  )",                                     
+                                     Combination12Cut = "( AM < 1500 * MeV  )",
                                     CombinationCut = "(ADAMASS('K+') < %(KMassWin)s *MeV) & (AMAXDOCA('')< %(KMaxDOCA)s *mm)"%config,
                                     MotherCut ="(PT> %(KMinPT)s) & (ADMASS('K+') < %(KMassWin)s *MeV) & ((BPVDIRA > %(KMinDIRA)s))"\
                                         "& (VFASPF(VCHI2) < %(KVtxChi2)s) & (BPVVDCHI2 > %(KMinVDChi2)s) & (BPVIPCHI2()< %(KMaxIpChi2)s )"%config
                                 )
     _stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
-    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")    
+    _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     return Selection (name,
                       Algorithm = KPiMuMuLFV,
                       RequiredSelections = [ _stdAllLooseMuons,
@@ -2207,24 +2207,24 @@ def makeKPiMuMuLFV(name, config):
 # Contact: Kristian Zarebski
 def makeKPiEELFV(name, config):
     """
-    Line for the selection of K+ -> pi- e+ e+,  
+    Line for the selection of K+ -> pi- e+ e+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEELFV = Combine3Particles(  DecayDescriptor = "[K+ -> pi- e+ e+]cc",
                                     DaughtersCuts = { "e+" : "(P>3000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config,
                                         "pi+":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
-                                     Combination12Cut = "( AM < 1500 * MeV  )",                                     
+                                     Combination12Cut = "( AM < 1500 * MeV  )",
                                     CombinationCut = "(ADAMASS('K+') < %(KMassWin)s *MeV) & (AMAXDOCA('')< %(KMaxDOCA)s *mm)"%config,
                                     MotherCut ="(PT> %(KMinPT)s) & (ADMASS('K+') < %(KMassWin)s *MeV) & ((BPVDIRA > %(KMinDIRA)s))"\
                                         "& (VFASPF(VCHI2) < %(KVtxChi2)s) & (BPVVDCHI2 > %(KMinVDChi2)s) & (BPVIPCHI2()< %(KMaxIpChi2)s )"%config
                                 )
     _stdAllLoosePions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
-    _stdAllLooseElectrons   = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")    
+    _stdAllLooseElectrons   = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
     return Selection (name,
                       Algorithm = KPiEELFV,
                       RequiredSelections = [ _stdAllLooseElectrons,
@@ -2234,14 +2234,14 @@ def makeKPiEELFV(name, config):
 # K-> pi pi pi loose selection
 def makeKPiPiPi(name, config):
     """
-    Line for the selection of K+ -> pi+ pi+ pi-,  
+    Line for the selection of K+ -> pi+ pi+ pi-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiPiPi = Combine3Particles( DecayDescriptor = "[K+ -> pi+ pi+ pi-]cc",
                                 DaughtersCuts = { "pi+":"(P>1000) & (TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2)s)"%config},
                                  CombinationCut = "(ADAMASS('K+') < %(KMassWin)s *MeV) & (AMAXDOCA('')< %(KMaxDOCA)s *mm)"%config,
@@ -2260,14 +2260,14 @@ def makeKPiPiPi(name, config):
 # K-> pi pi pi tight selection for mass measurement
 def makeKPiPiPiMassMeas(name, config):
     """
-    Line for the selection of K+ -> pi+ pi+ pi-,  
+    Line for the selection of K+ -> pi+ pi+ pi-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiPiPi = Combine3Particles( DecayDescriptor = "[K+ -> pi+ pi+ pi-]cc",
                                 DaughtersCuts = {   "pi+":"(P>1000) & (MIPCHI2DV(PRIMARY) > 25.0) & (TRCHI2DOF<5) & (TRGHOSTPROB < 0.4)"},
                                 Combination12Cut = "( AM < 1500 * MeV  )",
@@ -2285,19 +2285,19 @@ def makeKPiPiPiMassMeas(name, config):
 
 
 #============================================================
-# Downstream lines 
+# Downstream lines
 #============================================================
-# Sigma+ -> p mu mu 
+# Sigma+ -> p mu mu
 def makeSigmaPMuMuDown(name, config):
     """
-    Line for the selection of Sigma+ -> p+ mu+ mu-,  
+    Line for the selection of Sigma+ -> p+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     SigmaPMuMu = Combine3Particles(  DecayDescriptor = "[Sigma+ -> p+ mu+ mu-]cc",
                                     DaughtersCuts = { "mu+" : "(TRCHI2DOF< %(SigmaDauTrChi2Down)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2Down)s)"%config,
                                                 "p+" : "(TRCHI2DOF<%(SigmaDauTrChi2Down)s) & (TRGHOSTPROB<0.3)"%config},
@@ -2307,27 +2307,27 @@ def makeSigmaPMuMuDown(name, config):
                                         "& (ADMASS('Sigma+') < %(SigmaMassWinDown)s *MeV )"\
                                         "& (BPVDIRA > %(SigmaMinDIRADown)s) "\
                                         "& (BPVIPCHI2()< %(SigmaMaxIpChi2Down)s)"\
-                                        "& (BPVLTIME()> %(SigmaMinTauPsDown)s * ps)" %config  
+                                        "& (BPVLTIME()> %(SigmaMinTauPsDown)s * ps)" %config
                                     )
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
     _Protons = DataOnDemand(Location = "Phys/StdNoPIDsDownProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaPMuMu,
                       RequiredSelections = [ _Muons,
                                              _Protons ])
-                                             
+
 def makeSigmaPMuMuLFVDown(name, config):
     """
-    Line for the selection of Sigma+ -> p- mu+ mu+,  
+    Line for the selection of Sigma+ -> p- mu+ mu+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     SigmaPMuMu = Combine3Particles(  DecayDescriptor = "[Sigma+ -> p~- mu+ mu+]cc",
                                     DaughtersCuts = { "mu+" : "(TRCHI2DOF<%(SigmaDauTrChi2Down)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(muonMinIpChi2)s)"%config,
                                     "p~-" : "(TRCHI2DOF<%(SigmaDauTrChi2Down)s) & (TRGHOSTPROB<0.3)"%config},
@@ -2337,13 +2337,13 @@ def makeSigmaPMuMuLFVDown(name, config):
                                         "& (ADMASS('Sigma+') < %(SigmaMassWinDown)s *MeV )"\
                                         "& (BPVDIRA > %(SigmaMinDIRADown)s) "\
                                         "& (BPVIPCHI2()< %(SigmaMaxIpChi2Down)s)"\
-                                        "& (BPVLTIME()> %(SigmaMinTauPsDown)s * ps)" %config  
+                                        "& (BPVLTIME()> %(SigmaMinTauPsDown)s * ps)" %config
                                     )
 
     # AllLooseMuons are needed in order to avoid the pt and ip cuts used in StdLooseMuons: do not change this!
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
     _Protons = DataOnDemand(Location = "Phys/StdNoPIDsDownProtons/Particles")
-    
+
     return Selection (name,
                       Algorithm = SigmaPMuMu,
                       RequiredSelections = [ _Muons,
@@ -2355,12 +2355,12 @@ def makeSigmaPEEDown(name, config):
     Line for the selection of Sigma+ -> p+ e+ e- gamma,  (with photon undetected)
     for normalisation purposes
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     SigmaPEE = Combine3Particles(    DecayDescriptor = "[Sigma+ -> p+ e+ e-]cc",
                                     DaughtersCuts = { "e+" : "(TRCHI2DOF<%(SigmaDauTrChi2Down)s) & (TRGHOSTPROB<0.3)  &  (PIDe > %(electronPIDe)s ) & (MIPCHI2DV(PRIMARY)>%(electronMinIpChi2Down)s)"%config,
                                     "p+" : "(TRCHI2DOF<%(SigmaDauTrChi2Down)s) & (TRGHOSTPROB<0.3) "%config},
@@ -2373,10 +2373,10 @@ def makeSigmaPEEDown(name, config):
                                     "& (BPVLTIME()> %(SigmaMinTauPsDown)s * ps)" %config
                                 )
     _stdAllLooseElectrons   = DataOnDemand(Location = "Phys/StdNoPIDsDownElectrons/Particles")
-    
+
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdNoPIDsDownProtons/Particles")
 
-    
+
     return Selection (name,
                       Algorithm = SigmaPEE,
                       RequiredSelections = [ _stdAllLooseElectrons,
@@ -2384,17 +2384,17 @@ def makeSigmaPEEDown(name, config):
 
 
 
-# Kaon lines 
+# Kaon lines
 def makeKPiMuMuDown(name, config):
     """
-    Line for the selection of K+ -> pi+ mu+ mu-,  
+    Line for the selection of K+ -> pi+ mu+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiMuMu = Combine3Particles( DecayDescriptor = "[K+ -> pi+ mu+ mu-]cc",
                                 DaughtersCuts = {  "mu+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
                                                     "pi+":"(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config},
@@ -2403,27 +2403,27 @@ def makeKPiMuMuDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiMuMu,
                       RequiredSelections = [ _Muons,
                                              _Pions ])
-                                            
 
-# Contact: Kristian Zarebski 
+
+# Contact: Kristian Zarebski
 def makeKPiEEDown(name, config):
     """
-    Line for the selection of K+ -> pi+ e+ e-,  
+    Line for the selection of K+ -> pi+ e+ e-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEEDown = Combine3Particles( DecayDescriptor = "[K+ -> pi+ e+ e-]cc",
                                 DaughtersCuts = {  "e+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (PIDe > %(electronPIDe)s ) &(MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
                                                     "pi+":"(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config},
@@ -2432,25 +2432,25 @@ def makeKPiEEDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Electrons   = DataOnDemand(Location = "Phys/StdNoPIDsDownElectrons/Particles")
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiEEDown,
                       RequiredSelections = [ _Electrons,
                                              _Pions ])
-# Contact: Kristian Zarebski 
+# Contact: Kristian Zarebski
 def makeKPiEMuLFVDown(name, config):
     """
-    Line for the selection of K+ -> pi+ e+ mu-,  
+    Line for the selection of K+ -> pi+ e+ mu-,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEMuLFVDown = Combine3Particles( DecayDescriptor = "[K+ -> pi+ e+ mu-]cc",
                                 DaughtersCuts = {   "mu-" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
                                                     "e+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (PIDe > %(electronPIDe)s ) &(MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
@@ -2460,27 +2460,27 @@ def makeKPiEMuLFVDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Electrons   = DataOnDemand(Location = "Phys/StdNoPIDsDownElectrons/Particles")
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiEMuLFVDown,
                       RequiredSelections = [ _Electrons,
                                              _Muons,
                                              _Pions ])
-# Contact: Kristian Zarebski 
+# Contact: Kristian Zarebski
 def makeKPiEMuLFVSSDown(name, config):
     """
-    Line for the selection of K+ -> pi- e+ mu+,  
+    Line for the selection of K+ -> pi- e+ mu+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEMuLFVSSDown = Combine3Particles( DecayDescriptor = "[K+ -> pi- e+ mu+]cc",
                                 DaughtersCuts = {   "mu+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
                                                     "e+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (PIDe > %(electronPIDe)s ) &(MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
@@ -2490,11 +2490,11 @@ def makeKPiEMuLFVSSDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Electrons   = DataOnDemand(Location = "Phys/StdNoPIDsDownElectrons/Particles")
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiEMuLFVSSDown,
                       RequiredSelections = [ _Electrons,
@@ -2502,14 +2502,14 @@ def makeKPiEMuLFVSSDown(name, config):
                                              _Pions ])
 def makeKPiMuMuLFVDown(name, config):
     """
-    Line for the selection of K+ -> pi- mu+ mu+,  
+    Line for the selection of K+ -> pi- mu+ mu+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiMuMu = Combine3Particles( DecayDescriptor = "[K+ -> pi- mu+ mu+]cc",
                                 DaughtersCuts = { "mu+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
                                 "pi-":"(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config},
@@ -2518,10 +2518,10 @@ def makeKPiMuMuLFVDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Muons   = DataOnDemand(Location = "Phys/StdLooseDownMuons/Particles")
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiMuMu,
                       RequiredSelections = [ _Muons,
@@ -2530,14 +2530,14 @@ def makeKPiMuMuLFVDown(name, config):
 # Contact: Kristian Zarebski
 def makeKPiEELFVDown(name, config):
     """
-    Line for the selection of K+ -> pi- e+ e+,  
+    Line for the selection of K+ -> pi- e+ e+,
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiEE = Combine3Particles( DecayDescriptor = "[K+ -> pi- e+ e+]cc",
                                 DaughtersCuts = { "e+" : "(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB<0.3) & (PIDe > %(electronPIDe)s ) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config,
                                 "pi-":"(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config},
@@ -2546,10 +2546,10 @@ def makeKPiEELFVDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Electrons   = DataOnDemand(Location = "Phys/StdNoPIDsDownElectrons/Particles")
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiEE,
                       RequiredSelections = [ _Electrons,
@@ -2558,12 +2558,12 @@ def makeKPiPiPiDown(name, config):
     """
     Line for the selection of K+ -> pi+ pi+ pi-
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiPiPi = Combine3Particles( DecayDescriptor = "[K+ -> pi+ pi+ pi-]cc",
                                  DaughtersCuts = {  "pi+":"(TRCHI2DOF<%(KDauTrChi2)s) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2Down)s)"%config},
                                  Combination12Cut = "( AM < 500 * MeV  )",
@@ -2571,9 +2571,9 @@ def makeKPiPiPiDown(name, config):
                                 MotherCut ="(PT> %(KMinPTDown)s) & (ADMASS('K+') < %(KMassWinDown)s *MeV) & (BPVDIRA > %(KMinDIRADown)s)"\
                                     "& (VFASPF(VCHI2) < %(KVtxChi2Down)s) & (BPVVDCHI2 > %(KMinVDChi2Down)s) & (BPVVDZ > %(KVDPVMinDown)s*mm) & (BPVVDZ < %(KVDPVMaxDown)s*mm)"%config
                                 )
-    
+
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiPiPi,
                       RequiredSelections = [  _Pions ])
@@ -2583,12 +2583,12 @@ def makeKPiPiPiMassMeasDown(name, config):
     """
     Line for the selection of K+ -> pi+ pi+ pi-
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     KPiPiPi = Combine3Particles( DecayDescriptor = "[K+ -> pi+ pi+ pi-]cc",
                                 DaughtersCuts = {  "pi+":"(TRCHI2DOF<5) & (TRGHOSTPROB < 0.3) & (MIPCHI2DV(PRIMARY)>%(KDauMinIpChi2MassMeasDown)s)"%config},
                                  Combination12Cut = "( AM < 1500 * MeV  )",
@@ -2596,9 +2596,9 @@ def makeKPiPiPiMassMeasDown(name, config):
                                 MotherCut ="(PT> %(KMinPTMassMeasDown)s) & (ADMASS('K+') < %(KMassWinMassMeasDown)s *MeV) & (BPVDIRA > %(KMinDIRAMassMeasDown)s)"\
                                 "& (VFASPF(VCHI2) < %(KVtxChi2MassMeasDown)s) & (BPVVDCHI2 > %(KMinVDChi2MassMeasDown)s)  & (BPVVDZ > %(KVDPVMinMassMeasDown)s*mm) & (BPVVDZ < %(KVDPVMaxMassMeasDown)s*mm)"%config
                                 )
-    
+
     _Pions = DataOnDemand(Location = "Phys/StdNoPIDsDownPions/Particles")
-    
+
     return Selection (name,
                       Algorithm = KPiPiPi,
                       RequiredSelections = [  _Pions ])
@@ -2609,14 +2609,14 @@ def makeKPiPiPiMassMeasDown(name, config):
 # Contact: Vava Gligorov
 def makePhiKMu(name, config):
     """
-    Line for the selection of phi-> K K with K-> mu 
+    Line for the selection of phi-> K K with K-> mu
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     PhiKMu = CombineParticles( DecayDescriptor = "[phi(1020) -> K+ mu-]cc",
                                DaughtersCuts = {  "K+":"(TRCHI2DOF<5) & (TRGHOSTPROB < 0.3) & (PT>%(PhiDauMinPT)s) & (PROBNNk > %(PhiProbNNk)s)"%config,
                                                    "mu+":"(TRCHI2DOF<5) & (TRGHOSTPROB < 0.3) & (PT>%(PhiDauMinPT)s)"%config,
@@ -2625,7 +2625,7 @@ def makePhiKMu(name, config):
                                MotherCut ="(PT> %(PhiMinPT)s *  MeV) &  (BPVDIRA > %(PhiMinDIRA)s)"\
                                "& (VFASPF(VCHI2/VDOF) < %(PhiVtxChi2)s)"%config
                                 )
-    
+
     _stdAllLooseMuons   = DataOnDemand(Location = "Phys/StdAllLooseMuons/Particles")
     _stdAllLooseKaons   = DataOnDemand(Location = "Phys/StdAllLooseKaons/Particles")
     return Selection (name,
@@ -2639,14 +2639,14 @@ def makeLambdaPPi(name, config):
     """
     Line for the selection of Lambda-> p pi as control channel
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     LambdaPPi = CombineParticles( DecayDescriptor = "[Lambda0 -> p+ pi-]cc",
-                                  DaughtersCuts = { "pi+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(pionMinIpChi2)s)"%config, 
+                                  DaughtersCuts = { "pi+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(pionMinIpChi2)s)"%config,
                                                      "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s) & (MIPCHI2DV(PRIMARY)>%(protonMinIpChi2)s)"%config
                                                     },
                                   CombinationCut = "(ADAMASS('Lambda0')<%(LambdaMassWinTight)s *MeV) & (AMAXDOCA('')< %(LambdaMaxDOCA)s *mm)"%config,
@@ -2654,9 +2654,9 @@ def makeLambdaPPi(name, config):
                                   "& (ADMASS('Lambda0') < %(LambdaMassWinTight)s *MeV )"\
                                   "& (BPVDIRA > %(LambdaMinDIRA)s) "\
                                   "& (BPVIPCHI2()< %(LambdaMaxIpChi2)s)"\
-                                  "& (BPVLTIME()> %(LambdaMinTauPs)s * ps)" %config  
+                                  "& (BPVLTIME()> %(LambdaMinTauPs)s * ps)" %config
                                   )
-    if _monitor : 
+    if _monitor :
         LambdaPPi.Preambulo       = [
             ## define historam type (shortcut)
             "Histo  = Gaudi.Histo1DDef"  ,
@@ -2677,21 +2677,21 @@ def makeLambdaPPi(name, config):
                       RequiredSelections = [  _stdAllLoosePions, _stdLooseProtons ])
 
 #============================================================
-# Lambda-> p pi e e FCNC 
+# Lambda-> p pi e e FCNC
 def makeLambdaPPiEE(name, config, inputs):
     """
     Line for the selection of Lambda-> p pi e e  FCNC
     Before prescaling this line, please contact the authors listed above
-    
+
     Arguments:
     name        : name of the Selection.
-    config      : dictionary of tunable cuts 
+    config      : dictionary of tunable cuts
     """
-    
+
     LambdaPPi = Combine3Particles( DecayDescriptor = "[Lambda0 -> p+ pi- KS0]cc",
-                                  DaughtersCuts = { "pi+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(pionMinIpChi2)s)"%config, 
+                                  DaughtersCuts = { "pi+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (MIPCHI2DV(PRIMARY)>%(pionMinIpChi2)s)"%config,
                                                      "p+" : "(TRCHI2DOF<3) & (TRGHOSTPROB<0.3) & (PROBNNp> %(protonProbNNp)s) & (MIPCHI2DV(PRIMARY)>%(protonMinIpChi2)s)"%config,
-                                                    "KS0" : "(MIPCHI2DV(PRIMARY)>%(DiElectronMinIpChi2)s)"%config, 
+                                                    "KS0" : "(MIPCHI2DV(PRIMARY)>%(DiElectronMinIpChi2)s)"%config,
                                                     },
                                    Combination12Cut = "( AM < 1500 * MeV  )",
                                    CombinationCut = "(ADAMASS('Lambda0')<%(LambdaMassWin)s *MeV) & (AMAXDOCA('')< %(LambdaMaxDOCA)s *mm)"%config,
@@ -2699,19 +2699,19 @@ def makeLambdaPPiEE(name, config, inputs):
                                   "& (ADMASS('Lambda0') < %(LambdaMassWin)s *MeV )"\
                                   "& (BPVDIRA > %(LambdaMinDIRA)s) "\
                                   "& (BPVIPCHI2()< %(LambdaMaxIpChi2)s)"\
-                                  "& (BPVLTIME()> %(LambdaMinTauPs)s * ps)" %config  
+                                  "& (BPVLTIME()> %(LambdaMinTauPs)s * ps)" %config
                                   )
 
     return Selection (name,
                       Algorithm = LambdaPPi,
-                      RequiredSelections = inputs ) 
+                      RequiredSelections = inputs )
 
 
 
 def makevelotracks(name):
     from Configurables import  FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
-    
+
     MyFastVeloTracking = FastVeloTracking("For%sFastVelo"%name,OutputTracksName="Rec/Track/MyVeloFor%s"%name)
     MyFastVeloTracking.OnlyForward = True
     MyFastVeloTracking.ResetUsedFlags = True
@@ -2725,11 +2725,11 @@ def makevelotracks(name):
                                              TracksInContainer="Rec/Track/Velo"+name,
                                              SimplifiedGeometry = True)
     maketracks = GaudiSequencer('For%sMakeVeloTracksGS'+name)
-    maketracks.Members += [ MyFastVeloTracking ] 
-    maketracks.Members += [ preve ] 
-    maketracks.Members += [ copyVelo ] 
-    maketracks.Members += [ MyVeloFit ] 
-    
+    maketracks.Members += [ MyFastVeloTracking ]
+    maketracks.Members += [ preve ]
+    maketracks.Members += [ copyVelo ]
+    maketracks.Members += [ MyVeloFit ]
+
     return maketracks
 
     #storeExp = StoreExplorerAlg()
@@ -2748,4 +2748,4 @@ def makevelotracks(name):
                             #Members = [ DecodeVeloRawBuffer(name+"VeloDecoding",DecodeToVeloLiteClusters=True,DecodeToVeloClusters=True),
                                     #FastVeloTracking(name+"FastVelo",OutputTracksName="Rec/Track/Velo"+name),
                                     #preve])
-    #return alg
\ No newline at end of file
+    #return alg
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py
index f9dc71cbc634d332d7ea8d5f9c2ebe3bf5531d92..4ccaa91b6b97a770b2de173ba08239e2c21e454f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python # ============================================================================= 
+#!/usr/bin/env python # =============================================================================
 ###############################################################################
 # (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
@@ -9,12 +9,12 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-# @file   StrippintrangeHadrons.py 
-# @author Alexandre Brea (alexandre.brea.rodriguez@cern.ch) 
+# @file   StrippintrangeHadrons.py
+# @author Alexandre Brea (alexandre.brea.rodriguez@cern.ch)
 # @date   29.11.2018 # =============================================================================
 
 
-# Some extra Strange Hadron decays 
+# Some extra Strange Hadron decays
 #
 #Xi-2Sigma0munu
 #Xi-2ppipi-
@@ -54,7 +54,7 @@ from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons,
 from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
-                                
+
 default_config = {
   'NAME': 'StrangeHadrons',
   'WGs' : ['RD'],
@@ -62,12 +62,12 @@ default_config = {
   'STREAMS' : [ 'Leptonic' ],
   'CONFIG' : {
         'Postscale'           :1,
- 
+
         'Xi-2Sigma0munuPrescale' : 1,
         'Xi-2ppipiPrescale' :1,
         'Xi02ppiPrescale' :1,
         'Omega-2Lambda0piPrescale' :1,
-        
+
         #General
         'trchi2dof' : 3,
         'trghostprob' : 0.2,
@@ -76,7 +76,7 @@ default_config = {
         'muonProbNNmu' : 0.3,
         'muonMinIpChi2' : 60.,
         'muonMinIp' : 1,
-        
+
         #Protons
         'protonProbNNp' : 0.3,
         'protonMinIpChi2' : 16.,
@@ -90,10 +90,10 @@ default_config = {
         'electronProbNNe' : 0.3,
         'electronMinIpChi2' : 60.,
         'electronMinIp' : 1,
-        
+
 
         #GAMMAS
-        
+
 
         #Lambda
         'LambdaMassMax': (1116+400.) *MeV,
@@ -124,7 +124,7 @@ default_config = {
         'XiMassMax': (1320.+300.) *MeV,  #1315-1320
         'XiMassMin' : 0.,
         'XiMassWin': 300.,
-        'XiMassWinTight': 50., #from Heavy B&Q 
+        'XiMassWinTight': 50., #from Heavy B&Q
         'XiMinTauPs' :6.,  #lifetime Xi+:1.6e-10, Xi0:2.9e-10
         'XiVtxChi2' : 25.,
         'XiMinPt' : 500 * MeV,
@@ -147,45 +147,45 @@ default_config = {
         'TriDOCA': 3,
         }
   }
-  
+
 #============================================================
-# Line builder 
+# Line builder
 class StrangeHadronsConf(LineBuilder) :
     """
-    Builder 
- 
+    Builder
+
     """
 
-    __configuration_keys__ = default_config['CONFIG'].keys() 
-    
+    __configuration_keys__ = default_config['CONFIG'].keys()
+
     #### This is the dictionary of all tunable cuts ########
-    
-    
-    def __init__(self, name, config):         
-        self.name = name    
+
+
+    def __init__(self, name, config):
+        self.name = name
         LineBuilder.__init__(self, name, config)
 
         Xi2Sigma0munu_name=name+'Xi-2Sigma0munu'
         Xi2ppipi_name=name+'Xi-2ppipi'
         Xi02ppi_name=name+'Xi02ppi'
         Omega2Lambda0pi_name=name+'Omega-2Lambda0pi'
-        
+
 
         Muons = DataOnDemand(Location='Phys/StdAllLooseMuons/Particles')
-        Protons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")         
+        Protons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         Pions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
         Gammas = DataOnDemand(Location = "Phys/StdLooseAllPhotons/Particles")       # StdLooseAllPhotons is used in Bs->Phi Gamma
         Electrons = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
-       
+
         track_cuts = ''' (TRCHI2DOF< %(trchi2dof)s) & (TRGHOSTPROB<%(trghostprob)s)'''
         pion_cuts = '''(PROBNNpi> %(pionProbNNpi)s) & (MIPCHI2DV(PRIMARY)>%(pionMinIpChi2)s)  &  (~ISMUON) & (PROBNNmu<0.7)  & (PROBNNk<0.7) '''
         proton_cuts = ''' (PROBNNp> %(protonProbNNp)s) & (MIPCHI2DV(PRIMARY)>%(protonMinIpChi2)s) &  (PROBNNmu<0.7) & (PROBNNk<0.7) '''
         muon_cuts = ''' (PROBNNmu> %(muonProbNNmu)s) & (MIPCHI2DV(PRIMARY)> %(muonMinIpChi2)s) & (MIPDV(PRIMARY) > %(muonMinIp)s) &  (ISMUON)  & (PROBNNpi<0.7) & (PROBNNk<0.7)'''
-        electron_cuts = ''' (PROBNNe> %(electronProbNNe)s) & (MIPCHI2DV(PRIMARY)> %(electronMinIpChi2)s) & (PROBNNmu<0.7) & (PROBNNk<0.7) & (PROBNNpi<0.7)'''   # (HASRICH) 
-        
+        electron_cuts = ''' (PROBNNe> %(electronProbNNe)s) & (MIPCHI2DV(PRIMARY)> %(electronMinIpChi2)s) & (PROBNNmu<0.7) & (PROBNNk<0.7) & (PROBNNpi<0.7)'''   # (HASRICH)
+
+
+
 
-        
-        
 ##################### build L02PPi ###############################
         L02PPi = CombineSelection(
             'L02PPi_sel_for_StrangeHadrons',
@@ -196,7 +196,7 @@ class StrangeHadronsConf(LineBuilder) :
             CombinationCut= "(ADAMASS('Lambda0')<%(LambdaMassWinTight)s *MeV) & (AMAXDOCA('')< %(LambdaMaxDOCA)s *mm)"%config,
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(LambdaVtxChi2)s)  & (PT> %(LambdaMinPt)s *MeV) & (ADMASS('Lambda0') < %(LambdaMassWinTight)s *MeV )  & (BPVIPCHI2()> %(LambdaMinIpChi2)s) & (BPVLTIME()> %(LambdaMinTauPs)s * ps) &(BPVVDCHI2 > %(LambdaSecMinVDChi2)s) & (MIPDV(PRIMARY)>%(LambdaIPMin)s*mm)" %config
             )
-        
+
 
 
 ###################build Sigma02LambdaGamma#######################
@@ -210,11 +210,11 @@ class StrangeHadronsConf(LineBuilder) :
             MotherCut="(VFASPF(VCHI2/VDOF)< %(SigmaVtxChi2)s)  & (PT> %(SigmaMinPt)s *MeV) & (ADMASS('Sigma+') < %(SigmaMassWin)s *MeV ) & (MIPDV(PRIMARY)>%(SigmaIPMin)s*mm) & (BPVLTIME()> %(SigmaMinTauPs)s * ps)"%config
                                     )  #
 
-                
 
 
-#################### build Xi-2Sigma0munu ##############################  
-        
+
+#################### build Xi-2Sigma0munu ##############################
+
         Xi2Sigma0munu = CombineSelection(
             'Xi-2Sigma0munu_sel',
             [S02L0Gamma,Muons],
@@ -222,7 +222,7 @@ class StrangeHadronsConf(LineBuilder) :
             DaughtersCuts={"Sigma0": 'ALL',#(track_cuts + "&" + pion_cuts) %config,
                            "mu-": (track_cuts + "&" + muon_cuts) %config,
                 },
-            
+
             CombinationCut= "(AM< %(XiMassMax)s) & (AMAXDOCA('')< %(XiMaxDOCA)s *mm)"%config,
             MotherCut="(M< %(XiMassMax)s) & (BPVLTIME()> %(XiMinTauPs)s * ps) &  (VFASPF(VCHI2/VDOF)< %(XiVtxChi2)s)  & (BPVVDCHI2 > %(XiMinVDChi2)s) & (MIPDV(PRIMARY)>%(XiIPMin)s*mm) "%config
 
@@ -230,7 +230,7 @@ class StrangeHadronsConf(LineBuilder) :
             #MotherCut="(ADMASS('Xi-') < %(XiMassWin)s*MeV) & (VFASPF(VCHI2/VDOF)<%(XiVtxChi2)s) & (BPVLTIME()> %(XiMinTauPs)s * ps) & (PT>%(XiMinPt)s) &  (BPVVDCHI2 > %(XiMinVDChi2)s) "%config
             #Xi2LambdaPiControl = Selection('Xi2LambdaPiControl_sel', Algorithm = FilterDesktop('Xi2LambdaPiControlFD', Code='( (MIPCHI2DV(PRIMARY)<%(XiIpChi2)s))'%config) ,RequiredSelections=[Xi2LambdaPi])
              )
-                                
+
 #################### build Xi-2PPiPi ##############################
         Xi2ppipi = CombineSelection(
             'Xi-2ppipi_sel',
@@ -243,12 +243,12 @@ class StrangeHadronsConf(LineBuilder) :
             #MotherCut="(M< %(XiMassMax)s) & (BPVLTIME()> %(XiMinTauPs)s * ps) &  (VFASPF(VCHI2/VDOF)< %(XiVtxChi2)s)  & (BPVVDCHI2 > %(XiMinVDChi2)s) & (MIPDV(PRIMARY)>%(XiIPMin)s*mm) "%config
 
             CombinationCut= "(ADAMASS('Xi-') < %(XiMassWin)s*MeV) & (AMAXDOCA('')< %(XiMaxDOCA)s *mm)"%config,
-            MotherCut="(ADMASS('Xi-') < %(XiMassWin)s*MeV) & (VFASPF(VCHI2/VDOF)<%(XiVtxChi2)s) & (BPVLTIME()> %(XiMinTauPs)s * ps) & (PT>%(XiMinPt)s) &  (BPVVDCHI2 > %(XiMinVDChi2)s) "%config          
-                                            )   
-                                
+            MotherCut="(ADMASS('Xi-') < %(XiMassWin)s*MeV) & (VFASPF(VCHI2/VDOF)<%(XiVtxChi2)s) & (BPVLTIME()> %(XiMinTauPs)s * ps) & (PT>%(XiMinPt)s) &  (BPVVDCHI2 > %(XiMinVDChi2)s) "%config
+                                            )
+
 
 
-#################### build Xi02ppi ##############################  
+#################### build Xi02ppi ##############################
         Xi02ppi = CombineSelection(
             'Xi02ppi_sel',
             [Protons, Pions],
@@ -257,15 +257,15 @@ class StrangeHadronsConf(LineBuilder) :
                             "p+" : (track_cuts + "&" + proton_cuts ) %config},
            # CombinationCut= "(AM< %(XiMassMax)s) & (AMAXDOCA('')< %(XiMaxDOCA)s *mm)"%config,
            # MotherCut="(M< %(XiMassMax)s) & (BPVLTIME()> %(XiMinTauPs)s * ps) &  (VFASPF(VCHI2/VDOF)< %(XiVtxChi2)s) & (MIPDV(PRIMARY)>%(XiIPMin)s*mm)"%config
-            
+
             CombinationCut= "(ADAMASS('Xi0') < %(XiMassWin)s*MeV) & (AMAXDOCA('')< %(XiMaxDOCA)s *mm)"%config,
             MotherCut="(ADMASS('Xi0') < %(XiMassWinTight)s*MeV) & (BPVLTIME()> %(XiMinTauPs)s * ps) &  (VFASPF(VCHI2/VDOF)< %(XiVtxChi2)s) & (PT>%(XiMinPt)s) & (BPVIPCHI2()< %(XiIpChi2)s)"%config
             # Is this solution correct??
-            
+
             )
 
 
-###################build Omega2Lambda0pi################################ 
+###################build Omega2Lambda0pi################################
 
         Omega2Lambdapi = CombineSelection(
             'Omega2Lambdapi_sel',
@@ -290,13 +290,13 @@ class StrangeHadronsConf(LineBuilder) :
                #         MotherCut="(M< %(LambdaMassMax)s )  & (BPVLTIME()> %(LambdaMinTauPs)s * ps) & (VFASPF(VCHI2/VDOF)< %(LambdaVtxChi2)s) &  (BPVVDCHI2 > %(LambdaPrimMinVDChi2)s) & (MIPDV(PRIMARY)>%(LambdaIPMin)s*mm)"%config
 #                        )
 
-        
 
 
 
 
 
-#################### build Lines ############################## 
+
+#################### build Lines ##############################
 
         self.Xi2Sigma0MuNuLine = StrippingLine(Xi2Sigma0munu_name+"Line",
                                             prescale = config['Xi-2Sigma0munuPrescale'],
@@ -334,7 +334,7 @@ class StrangeHadronsConf(LineBuilder) :
                                            )
 
 
-    
+
  #       self.L02penuLine = StrippingLine(L02penu_name+"Line",
   #                                        prescale = config['L02penuPrescale'],
  #                                         postscale = config['Postscale'],
@@ -344,15 +344,11 @@ class StrangeHadronsConf(LineBuilder) :
      #                                     )
 
 
-        
 
-        
+
+
         self.registerLine(self.Xi2Sigma0MuNuLine)
         self.registerLine(self.Xi2ppipiLine)
         self.registerLine(self.Xi02ppiLine)
         self.registerLine(self.Omega2Lambda0piLine)
       #  self.registerLine(self.L02penuLine)
-        
-
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py
index 195c70e481f0514b1448420016705c7f4040362f..d6caaded6caebd7ab88366bc90617d2407bd2c8d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python # ============================================================================= 
+#!/usr/bin/env python # =============================================================================
 ###############################################################################
 # (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
@@ -9,19 +9,19 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-# @file   StrippingStrange.py 
-# @author Jessica Prisciandaro, Alexandre Brea Rodriguez (jessica.prisciandaro@cern.ch, alexandre.brea.rodriguez@usc.es) 
+# @file   StrippingStrange.py
+# @author Jessica Prisciandaro, Alexandre Brea Rodriguez (jessica.prisciandaro@cern.ch, alexandre.brea.rodriguez@usc.es)
 # @date   08.05.2017 # =============================================================================
 
 #Ks2pimunu
 #K+2pipimunu
 #Ks2pipi  C.C
 #L->penu
-#L->pmunu 
+#L->pmunu
 #L->p pi C.C.
 #Xi2Lmunu
-#Xi0 2 Sigma+munu  2 p pi0 mu nu 
-#Omega- 2 Xi*munu 2 Xi-pimunu 2 Lambdapipimunu 
+#Xi0 2 Sigma+munu  2 p pi0 mu nu
+#Omega- 2 Xi*munu 2 Xi-pimunu 2 Lambdapipimunu
 
 '''
 Module for construction of stripping selections for some rare strange decays
@@ -54,7 +54,7 @@ from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
 from StandardParticles import StdLooseMergedPi0,StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
-                                
+
 default_config = {
   'NAME': 'StrangeSL',
   'WGs' : ['RD'],
@@ -119,10 +119,10 @@ default_config = {
         'LambdaMinTauPs' : 9.,
         #'LambdaMinPt' : 500.,
         'LambdaMaxDOCA' : 1.0,
-        'LambdaPLeptonNuMaxDOCA' : 0.3,  #Before 1. That's a lot! 
+        'LambdaPLeptonNuMaxDOCA' : 0.3,  #Before 1. That's a lot!
         'LambdaMassWin' : 500.,
         'LambdaMassWinTight' : 30.,
-        'LambdaMinDIRA' : 0.9, 
+        'LambdaMinDIRA' : 0.9,
         'LambdaMaxIpChi2' : 36.,
         'LambdaMinIpChi2' : 16.,
         'LambdaVtxChi2' : 9.,
@@ -143,7 +143,7 @@ default_config = {
         'XiMassMax': (1320.+300.) *MeV,  #1315-1320
         'XiMassMin' : 0.,
         'XiMassWin': 300.,
-        'XiMassWinTight': 50., #from Heavy B&Q 
+        'XiMassWinTight': 50., #from Heavy B&Q
         'XiMinTauPs' :6.,  #lifetime Xi+:1.6e-10, Xi0:2.9e-10
         'XiVtxChi2' : 25.,
         'XiMinPt' : 500 * MeV,
@@ -169,22 +169,22 @@ default_config = {
         'TriDOCA': 3,
         }
   }
-  
+
 #============================================================
-# Line builder 
+# Line builder
 class StrangeSLConf(LineBuilder) :
     """
-    Builder 
- 
+    Builder
+
     """
 
-    __configuration_keys__ = default_config['CONFIG'].keys() 
-    
+    __configuration_keys__ = default_config['CONFIG'].keys()
+
     #### This is the dictionary of all tunable cuts ########
-    
-    
-    def __init__(self, name, config):         
-        self.name = name    
+
+
+    def __init__(self, name, config):
+        self.name = name
         LineBuilder.__init__(self, name, config)
 
         ks2PiMuNu_name=name+'Ks2PiMuNu'
@@ -195,18 +195,18 @@ class StrangeSLConf(LineBuilder) :
         xi2l0munu_name=name+'Xi2L0MuNu'
         xi02Sigmamunu_name=name+'Xi02Sigmamunu'
         omega2XiStarmunu_name=name+'Omega2XiStarmunu'
-        xi02Lambdapi0_name = name+'Xi02Lambdapi0' 
+        xi02Lambdapi0_name = name+'Xi02Lambdapi0'
         xi2LambdaPi_name = name+'Xi2LambdaPi'
         omega2Xi0Pi_name = name+'Omega2Xi0Pi'
         L02penu_name=name+'L02penu'
         L02ppi_name=name+'L02ppi'
-        
+
         Muons = DataOnDemand(Location='Phys/StdAllLooseMuons/Particles')
-        Protons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")         
+        Protons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
         Pions = DataOnDemand(Location = "Phys/StdAllLoosePions/Particles")
         Pi0 = DataOnDemand(Location = "Phys/StdLooseResolvedPi0/Particles")
         Electrons = DataOnDemand(Location = "Phys/StdAllLooseElectrons/Particles")
-        
+
         track_cuts = ''' (TRCHI2DOF< %(trchi2dof)s) & (TRGHOSTPROB<%(trghostprob)s)'''
         pion_cuts = '''(PROBNNpi> %(pionProbNNpi)s) & (MIPCHI2DV(PRIMARY)>%(pionMinIpChi2)s)  &  (~ISMUON) & (PROBNNmu<0.7)  & (PROBNNk<0.7) '''
         proton_cuts = ''' (PROBNNp> %(protonProbNNp)s) & (MIPCHI2DV(PRIMARY)>%(protonMinIpChi2)s) &  (PROBNNmu<0.7) & (PROBNNk<0.7) '''
@@ -225,7 +225,7 @@ class StrangeSLConf(LineBuilder) :
             CombinationCut= "(AM< %(LambdaPLeptonNuMassMax)s) & (AMAXDOCA('')< %(LambdaPLeptonNuMaxDOCA)s *mm)"%config,
             MotherCut="(M< %(LambdaPLeptonNuMassMax)s )  & (BPVLTIME()> %(LambdaMinTauPs)s * ps) & (VFASPF(VCHI2/VDOF)< %(LambdaVtxChi2)s) &  (BPVVDCHI2 > %(LambdaPrimMinVDChi2)s) & (MIPDV(PRIMARY)>%(LambdaIPMin)s*mm)"%config
             )
-        
+
 ##################### build L02PPi ###############################
         L02PPi = CombineSelection(
             'L02PPi_sel',
@@ -236,12 +236,12 @@ class StrangeSLConf(LineBuilder) :
             CombinationCut= "(ADAMASS('Lambda0')<%(LambdaMassWinTight)s *MeV) & (AMAXDOCA('')< %(LambdaMaxDOCA)s *mm)"%config,
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(LambdaVtxChi2)s)  & (PT> %(LambdaMinPt)s *MeV) & (ADMASS('Lambda0') < %(LambdaMassWinTight)s *MeV )  & (BPVIPCHI2()> %(LambdaMinIpChi2)s) & (BPVLTIME()> %(LambdaMinTauPs)s * ps) &(BPVVDCHI2 > %(LambdaSecMinVDChi2)s) & (MIPDV(PRIMARY)>%(LambdaIPMin)s*mm)" %config
             )
-        
 
 
 
-#################### build K+2PiPiMuNu ##############################  
-        
+
+#################### build K+2PiPiMuNu ##############################
+
         K2PiPiMuNu = CombineSelection(
             'K2PiPiMuNu_sel',
             [Pions,Muons],
@@ -270,8 +270,8 @@ class StrangeSLConf(LineBuilder) :
         Ks2PiMuNuHighMass = Selection('Ks2PiMuNuHighMass_sel', Algorithm = FilterDesktop('Ks2PiMuNuHighMassFD', Code='(M> %(KaonMassSeparation)s)'%config) ,RequiredSelections=[Ks2PiMuNuCommon])
         Ks2PiMuNuLowMass = Selection('Ks2PiMuNuLowMass_sel', Algorithm = FilterDesktop('Ks2PiMuNuLowMassFD', Code='(M< %(KaonMassSeparation)s)'%config) ,RequiredSelections=[Ks2PiMuNuCommon])
 
-        
-#################### build L02PMuNu ##############################  
+
+#################### build L02PMuNu ##############################
         L02PMuNu = CombineSelection(
             'L02PMuNu_sel',
             [Protons, Muons],
@@ -281,7 +281,7 @@ class StrangeSLConf(LineBuilder) :
             CombinationCut= "(AM< %(LambdaPLeptonNuMassMax)s) & (AMAXDOCA('')< %(LambdaPLeptonNuMaxDOCA)s *mm)"%config,
             MotherCut="(M< %(LambdaPLeptonNuMassMax)s )  & (BPVLTIME()> %(LambdaMinTauPs)s * ps) & (VFASPF(VCHI2/VDOF)< %(LambdaVtxChi2)s) &  (BPVVDCHI2 > %(LambdaPrimMinVDChi2)s) & (MIPDV(PRIMARY)>%(LambdaIPMin)s*mm)"%config
             )
-        
+
 #################### build L02penu ##############################
         L02penu = CombineSelection(
             'L02penu_sel',
@@ -292,9 +292,9 @@ class StrangeSLConf(LineBuilder) :
             CombinationCut= "(AM< %(LambdaPLeptonNuMassMax)s) & (AMAXDOCA('')< %(LambdaPLeptonNuMaxDOCA)s *mm)"%config,
             MotherCut="(M< %(LambdaPLeptonNuMassMax)s )  & (BPVLTIME()> %(LambdaMinTauPs)s * ps) & (VFASPF(VCHI2/VDOF)< %(LambdaVtxChi2)s) &  (BPVVDCHI2 > %(LambdaPrimMinVDChi2)s) & (MIPDV(PRIMARY)>%(LambdaIPMin)s*mm)"%config
             )
-                
 
-#################### build Xi2L0MuNu ##############################  
+
+#################### build Xi2L0MuNu ##############################
         Xi2L0MuNu = CombineSelection(
             'Xi2L0MuNu_sel',
             [L02PPi, Muons],
@@ -319,7 +319,7 @@ class StrangeSLConf(LineBuilder) :
             )
 
 
-###################build Xi02Sigmamunu################################ 
+###################build Xi02Sigmamunu################################
 
         Xi02Sigmamunu = CombineSelection(
             'Xi02Sigmamunu_sel',
@@ -332,7 +332,7 @@ class StrangeSLConf(LineBuilder) :
             )
 
 
-###################build Xi2LambdaPi################################ 
+###################build Xi2LambdaPi################################
 ####This is Xi-########
         Xi2LambdaPi = CombineSelection(
             'Xi2LambdaPi_sel',
@@ -346,7 +346,7 @@ class StrangeSLConf(LineBuilder) :
 
         Xi2LambdaPiControl = Selection('Xi2LambdaPiControl_sel', Algorithm = FilterDesktop('Xi2LambdaPiControlFD', Code='( (MIPCHI2DV(PRIMARY)<%(XiIpChi2)s))'%config) ,RequiredSelections=[Xi2LambdaPi])
 
-###################build XiStar2XiPi################################ 
+###################build XiStar2XiPi################################
 
         XiStar2XiPi = CombineSelection(
             'XiStar2XiPi_sel',
@@ -358,7 +358,7 @@ class StrangeSLConf(LineBuilder) :
             MotherCut="(M> %(XiStarMassMin)s) & (M< %(XiStarMassMax)s) &  (VFASPF(VCHI2/VDOF)< %(XiStarVtxChi2)s)"%config
             )
 
-###################build Omega2XiStarmunu################################ 
+###################build Omega2XiStarmunu################################
 
         Omega2XiStarmunu = CombineSelection(
             'Omega2XiStarmunu_sel',
@@ -371,7 +371,7 @@ class StrangeSLConf(LineBuilder) :
             )
 
 
-###################build Xi02LambdaPi0################################ 
+###################build Xi02LambdaPi0################################
 
         Xi02Lambdapi0 = CombineSelection(
             'Xi02Lambdapi0_sel',
@@ -385,7 +385,7 @@ class StrangeSLConf(LineBuilder) :
 
 
 
-###################build Xi-2LambdaPi-################################ 
+###################build Xi-2LambdaPi-################################
 
         #XiL0Pi = CombineSelection(
         #    'Xi2L0Pi_sel',
@@ -401,7 +401,7 @@ class StrangeSLConf(LineBuilder) :
 
 
 
-###################build Omega-2Xi0Pi-################################ 
+###################build Omega-2Xi0Pi-################################
 
 
         Omega2Xi0Pi = CombineSelection(
@@ -416,7 +416,7 @@ class StrangeSLConf(LineBuilder) :
 
 
 
-#################### build Lines ############################## 
+#################### build Lines ##############################
     #           Ks2PiMuNuCommon
 
 
@@ -492,7 +492,7 @@ class StrangeSLConf(LineBuilder) :
                                            RequiredRawEvents = [],
                                            MDSTFlag=False
                                            )
-        
+
         self.Omega2XiStarmunuLine = StrippingLine(omega2XiStarmunu_name+"Line",
                                               prescale = config['Omega2XiStarmunuPrescale'],
                                               postscale = config['Postscale'],
@@ -500,7 +500,7 @@ class StrangeSLConf(LineBuilder) :
                                               RequiredRawEvents = [],
                                               MDSTFlag=False
                                               )
-    
+
         self.Xi02Lambdapi0Line = StrippingLine(xi02Lambdapi0_name+"Line",
                                               prescale = config['Xi02Lambdapi0Prescale'],
                                               postscale = config['Postscale'],
@@ -508,7 +508,7 @@ class StrangeSLConf(LineBuilder) :
                                               RequiredRawEvents = [],
                                               MDSTFlag=False
                                               )
-        
+
         self.Xi2LambdaPiLine = StrippingLine(xi2LambdaPi_name+"Line",
                                                   prescale = config['Xi2LambdaPiPrescale'],
                                                   postscale = config['Postscale'],
@@ -539,5 +539,3 @@ class StrangeSLConf(LineBuilder) :
         self.registerLine(self.Xi2LambdaPiLine)
         self.registerLine(self.Omega2Xi0PiLine)
         self.registerLine(self.L02penuLine)
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py
index 7d1d0ddcf6a2483a0ea1325d0d14e0bd638b0b39..41aa1d34a84a73bbf0f9178ad530ab63ab023a9d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py
@@ -12,7 +12,7 @@
 Module for construction of tau -->MuMuMu stripping selections and lines
 
 Exported symbols (use python help!):
-   - 
+   -
 '''
 
 __author__ = ['Jon Harrison', 'Paul Seyfert', 'Marcin Chrzaszcz']
@@ -58,11 +58,11 @@ default_config = {
 
 class Tau23MuLinesConf(LineBuilder) :
     """
-    Builder 
+    Builder
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config):
         self.name = name
         self.__confdict__ = config
@@ -78,7 +78,7 @@ class Tau23MuLinesConf(LineBuilder) :
         tau25_name=name+'Tau25Mu'
         tau2pmm_name=name+'Tau2PMuMu'
 
-        
+
 
         self.selTau23Mu = makeTau23Mu(tau_name,config)
         #self.selDs23PiTIS = makeDs23PiTIS(self,ds23PiTIS_name)
@@ -97,14 +97,14 @@ class Tau23MuLinesConf(LineBuilder) :
                                      RelatedInfoTools = [{ 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.,
                                                                  'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                                                                  'Location':'ConeIsoInfo',
-							         'DaughterLocations':{'[tau+ -> ^mu+ mu+ mu-]CC' : 'MuonConeVarInfo1', '[tau+ -> mu+ ^mu+ mu-]CC' : 'MuonConeVarInfo2', '[tau+ -> mu+ mu+ ^mu-]CC' : 'MuonConeVarInfo3'} 
+							         'DaughterLocations':{'[tau+ -> ^mu+ mu+ mu-]CC' : 'MuonConeVarInfo1', '[tau+ -> mu+ ^mu+ mu-]CC' : 'MuonConeVarInfo2', '[tau+ -> mu+ mu+ ^mu-]CC' : 'MuonConeVarInfo3'}
 							       },
                                                                {'Type': 'RelInfoVertexIsolation',
                                                                 'Location':'VtxIsoInfo' },
                                                                { 'Type': 'RelInfoTrackIsolationBDT',
                                                                  'Variables' : 0,
                                                                  'Location':'TrackIsoInfo',
-							         'DaughterLocations':{'[tau+ -> ^mu+ mu+ mu-]CC' : 'MuonTrackIsoBDTInfo1', '[tau+ -> mu+ ^mu+ mu-]CC' : 'MuonTrackIsoBDTInfo2', '[tau+ -> mu+ mu+ ^mu-]CC' : 'MuonTrackIsoBDTInfo3'} 
+							         'DaughterLocations':{'[tau+ -> ^mu+ mu+ mu-]CC' : 'MuonTrackIsoBDTInfo1', '[tau+ -> mu+ ^mu+ mu-]CC' : 'MuonTrackIsoBDTInfo2', '[tau+ -> mu+ mu+ ^mu-]CC' : 'MuonTrackIsoBDTInfo3'}
 							       },
                                    { "Type" : "RelInfoTrackIsolationBDT2",
                                      "Location" : "TrackIsolationBDT2_01",
@@ -120,7 +120,7 @@ class Tau23MuLinesConf(LineBuilder) :
                                    }
                                                                ]
                                      )
-        
+
         #self.ds23PiTISLine = StrippingLine(ds23PiTIS_name+"Line",
         #                              prescale = config['Ds23PiTISPrescale'],
         #                              postscale = config['TauPostscale'],
@@ -134,7 +134,7 @@ class Tau23MuLinesConf(LineBuilder) :
                                       #RequiredRawEvents = [ ],
                                       algos = [ self.selDs23Pi ]
                                       )
-        
+
         self.ds2PhiPiLine = StrippingLine(ds2PhiPi_name+"Line",
                                       prescale = config['Ds2PhiPiPrescale'],
                                       postscale = config['TauPostscale'],
@@ -144,14 +144,14 @@ class Tau23MuLinesConf(LineBuilder) :
                                       RelatedInfoTools = [{ 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.,
                                                                  'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                                                                  'Location':'ConeIsoInfo',
-							         'DaughterLocations':{'[D_s+  -> ^pi+  mu+ mu-]CC' : 'PionConeVarInfo', '[D_s+  -> pi+  ^mu+ mu-]CC' : 'MuonConeVarInfo1', '[D_s+  -> pi+  mu+ ^mu-]CC' : 'MuonConeVarInfo2'} 
+							         'DaughterLocations':{'[D_s+  -> ^pi+  mu+ mu-]CC' : 'PionConeVarInfo', '[D_s+  -> pi+  ^mu+ mu-]CC' : 'MuonConeVarInfo1', '[D_s+  -> pi+  mu+ ^mu-]CC' : 'MuonConeVarInfo2'}
                                                                },
                                                                {'Type': 'RelInfoVertexIsolation',
                                                                 'Location':'VtxIsoInfo' },
                                                                { 'Type': 'RelInfoTrackIsolationBDT',
                                                                  'Variables' : 0,
                                                                  'Location':'TrackIsoInfo',
-							         'DaughterLocations':{'[D_s+  -> ^pi+  mu+ mu-]CC' : 'PionTrackIsoBDTInfo', '[D_s+  -> pi+  ^mu+ mu-]CC' : 'MuonTrackIsoBDTInfo1', '[D_s+  -> pi+  mu+ ^mu-]CC' : 'MuonTrackIsoBDT_mu_2'} 
+							         'DaughterLocations':{'[D_s+  -> ^pi+  mu+ mu-]CC' : 'PionTrackIsoBDTInfo', '[D_s+  -> pi+  ^mu+ mu-]CC' : 'MuonTrackIsoBDTInfo1', '[D_s+  -> pi+  mu+ ^mu-]CC' : 'MuonTrackIsoBDT_mu_2'}
 
                                                                 },
                                                                 { "Type" : "RelInfoTrackIsolationBDT2",
@@ -177,15 +177,15 @@ class Tau23MuLinesConf(LineBuilder) :
                                            RelatedInfoTools = [{ 'Type' : 'RelInfoConeVariables', 'ConeAngle' : 1.,
                                                                  'Variables' : ['CONEANGLE', 'CONEMULT', 'CONEPT', 'CONEPTASYM'],
                                                                  'Location':'ConeIsoInfo',
-							         'DaughterLocations':{"[[ tau+ -> ^p+ mu+ mu- ]CC, [ tau+ -> ^p~- mu+ mu+ ]CC, [ Lambda_c+ -> ^p+ mu+ mu- ]CC, [ Lambda_c+ -> ^p~- mu+ mu+ ]CC]" : 'ProtonConeVarInfo', "[[ tau+ -> p+ ^mu+ mu- ]CC, [ tau+ -> p~- ^mu+ mu+ ]CC, [ Lambda_c+ -> p+ ^mu+ mu- ]CC, [ Lambda_c+ -> p~- ^mu+ mu+ ]CC]" : 'MuonConeVarInfo1', "[[ tau+ -> p+ mu+ ^mu- ]CC, [ tau+ -> p~- mu+ ^mu+ ]CC, [ Lambda_c+ -> p+ mu+ ^mu- ]CC, [ Lambda_c+ -> p~- mu+ ^mu+ ]CC]" : 'MuonConeVarInfo2'} 
+							         'DaughterLocations':{"[[ tau+ -> ^p+ mu+ mu- ]CC, [ tau+ -> ^p~- mu+ mu+ ]CC, [ Lambda_c+ -> ^p+ mu+ mu- ]CC, [ Lambda_c+ -> ^p~- mu+ mu+ ]CC]" : 'ProtonConeVarInfo', "[[ tau+ -> p+ ^mu+ mu- ]CC, [ tau+ -> p~- ^mu+ mu+ ]CC, [ Lambda_c+ -> p+ ^mu+ mu- ]CC, [ Lambda_c+ -> p~- ^mu+ mu+ ]CC]" : 'MuonConeVarInfo1', "[[ tau+ -> p+ mu+ ^mu- ]CC, [ tau+ -> p~- mu+ ^mu+ ]CC, [ Lambda_c+ -> p+ mu+ ^mu- ]CC, [ Lambda_c+ -> p~- mu+ ^mu+ ]CC]" : 'MuonConeVarInfo2'}
                                                                },
-							         
+
 							       {'Type': 'RelInfoVertexIsolation',
                                                                 'Location':'VtxIsoInfo' },
                                                                { 'Type': 'RelInfoTrackIsolationBDT',
                                                                  'Variables' : 0,
                                                                  'Location':'TrackIsoInfo',
-							         'DaughterLocations':{"[[ tau+ -> ^p+ mu+ mu- ]CC, [ tau+ -> ^p~- mu+ mu+ ]CC, [ Lambda_c+ -> ^p+ mu+ mu- ]CC, [ Lambda_c+ -> ^p~- mu+ mu+ ]CC]" : 'ProtonTrackIsoBDTInfo', "[[ tau+ -> p+ ^mu+ mu- ]CC, [ tau+ -> p~- ^mu+ mu+ ]CC, [ Lambda_c+ -> p+ ^mu+ mu- ]CC, [ Lambda_c+ -> p~- ^mu+ mu+ ]CC]" : 'MuonTrackIsoBDTInfo1', "[[ tau+ -> p+ mu+ ^mu- ]CC, [ tau+ -> p~- mu+ ^mu+ ]CC, [ Lambda_c+ -> p+ mu+ ^mu- ]CC, [ Lambda_c+ -> p~- mu+ ^mu+ ]CC]" : 'MuonTrackIsoBDTInfo2'} 
+							         'DaughterLocations':{"[[ tau+ -> ^p+ mu+ mu- ]CC, [ tau+ -> ^p~- mu+ mu+ ]CC, [ Lambda_c+ -> ^p+ mu+ mu- ]CC, [ Lambda_c+ -> ^p~- mu+ mu+ ]CC]" : 'ProtonTrackIsoBDTInfo', "[[ tau+ -> p+ ^mu+ mu- ]CC, [ tau+ -> p~- ^mu+ mu+ ]CC, [ Lambda_c+ -> p+ ^mu+ mu- ]CC, [ Lambda_c+ -> p~- ^mu+ mu+ ]CC]" : 'MuonTrackIsoBDTInfo1', "[[ tau+ -> p+ mu+ ^mu- ]CC, [ tau+ -> p~- mu+ ^mu+ ]CC, [ Lambda_c+ -> p+ mu+ ^mu- ]CC, [ Lambda_c+ -> p~- mu+ ^mu+ ]CC]" : 'MuonTrackIsoBDTInfo2'}
                                                                 },
                                                                 { "Type" : "RelInfoTrackIsolationBDT2",
                                                                   "Location" : "TrackIsolationBDT2",
@@ -193,23 +193,23 @@ class Tau23MuLinesConf(LineBuilder) :
                                                                 }
                                                                ]
                                            )
-        
+
         self.registerLine(self.tau23MuLine)
         #self.registerLine(self.ds23PiTISLine)
         self.registerLine(self.ds23PiLine)
         self.registerLine(self.ds2PhiPiLine)
         self.registerLine(self.tau25MuLine)
         self.registerLine(self.tau2PMuMuLine)
-        
+
 
 def makeTau23Mu(name, config):
     """
     Please contact Marcin Chrzaszcz if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     Tau2MuMuMu = Combine3Particles(\
                DecayDescriptor = " [ tau+ -> mu+ mu+ mu- ]cc",
                DaughtersCuts = { "mu+" : " ( PT > 300 * MeV ) & ( TRGHOSTPROB < %(TrackGhostProb)s ) & ( TRCHI2DOF < 3  ) "\
@@ -220,12 +220,12 @@ def makeTau23Mu(name, config):
             ( VFASPF(VCHI2) < 15 ) &
             ( (BPVLTIME () * c_light)   > 100 * micrometer ) &
             ( BPVIPCHI2() < 225 )
-            """ 
+            """
             )
-    
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdNoPIDLooseMuons = DataOnDemand(Location = "Phys/StdAllNoPIDsMuons/Particles")
-    
+
     return Selection (name,
                       Algorithm = Tau2MuMuMu,
                       RequiredSelections = [ _stdNoPIDLooseMuons ])
@@ -233,11 +233,11 @@ def makeTau23Mu(name, config):
 def makeDs23Pi(name, config):
     """
     Please contact Marcin Chrzaszcz if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     Ds2PiPiPi = Combine3Particles(\
               DecayDescriptor = " [ D_s+  -> pi+ pi+ pi- ]cc " ,
               DaughtersCuts = { "pi+" : " ( PT > 300 * MeV ) & ( TRGHOSTPROB < %(TrackGhostProb)s ) & ( TRCHI2DOF < 3  ) & ( BPVIPCHI2 () >  9 ) " % config},
@@ -247,9 +247,9 @@ def makeDs23Pi(name, config):
             ( VFASPF(VCHI2) < 15 ) &
             ( (BPVLTIME () * c_light)   > 100 * micrometer ) &
             ( BPVIPCHI2() < 225 )
-            """ 
+            """
               )
-                             
+
     _stdLoosePions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
 
     return Selection (name,
@@ -259,7 +259,7 @@ def makeDs23Pi(name, config):
 def makeDs23PiTIS(self, name, config):
     """
     Please contact Marcin Chrzaszcz if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
@@ -274,7 +274,7 @@ def makeDs23PiTIS(self, name, config):
             return Selection( name
                               , Algorithm = _tisTosFilter
                               , RequiredSelections = [ _input ]
-                              )        
+                              )
 
     self.combDs2pipipi=makeDs23Pi(name, config)
 
@@ -286,7 +286,7 @@ def makeDs23PiTIS(self, name, config):
                                         , self.selDs23PiHlt1TIS
                                         , "Hlt2.*Decision%TIS"
                                         )
-       
+
     return self.selDs23PiHlt2TIS
 
 #    return Selection (name,
@@ -297,11 +297,11 @@ def makeDs23PiTIS(self, name, config):
 def makeDs2PhiPi(name, config):
     """
     Please contact Marcin Chrzaszcz if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     Ds2PhiPi = Combine3Particles(\
              DecayDescriptor =   " [ D_s+  -> mu+  mu- pi+ ]cc ",
              DaughtersCuts = { "pi+" : " ( PT > 300 * MeV ) & ( TRGHOSTPROB < %(TrackGhostProb)s ) & ( TRCHI2DOF < 3  ) & ( BPVIPCHI2 () >  9 ) " % config,
@@ -312,14 +312,14 @@ def makeDs2PhiPi(name, config):
             ( VFASPF(VCHI2) < 15 ) &
             ( (BPVLTIME () * c_light)   >100 * micrometer ) &
             ( BPVIPCHI2() < 225 )
-            """ 
+            """
             )
-                             
+
     _stdLoosePions = DataOnDemand(Location = "Phys/StdLoosePions/Particles")
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
-    
-    
-    
+
+
+
     return Selection (name,
                       Algorithm = Ds2PhiPi,
                       RequiredSelections = [ _stdLooseMuons, _stdLoosePions ])
@@ -329,11 +329,11 @@ def makeDs2PhiPi(name, config):
 def makeTau25Mu(name, config):
     """
     Please contact Marcin Chrzaszcz if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     Tau2MuMuMuMuMu = Combine5Particles(\
                    DecayDescriptor = " [ tau+ -> mu+ mu+ mu+ mu- mu-]cc",
                    DaughtersCuts = { "mu+" : " ( PT > 300 * MeV ) & ( TRGHOSTPROB < %(TrackGhostProb)s ) & ( TRCHI2DOF < 3  ) & ( BPVIPCHI2 () >  9 ) " % config },
@@ -345,9 +345,9 @@ def makeTau25Mu(name, config):
             ( VFASPF(VCHI2) < 30 ) &
             ( (BPVLTIME () * c_light)   > 100 * micrometer ) &
             ( BPVIPCHI2() < 225 )
-            """ 
+            """
                    )
-                             
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
 
     return Selection (name,
@@ -358,11 +358,11 @@ def makeTau25Mu(name, config):
 def makeTau2pmm(name, config):
     """
     Please contact Marcin Chrzaszcz if you think of prescaling this line!
-    
+
     Arguments:
     name        : name of the Selection.
     """
-    
+
     Tau2PMuMu = Combine3Particles(\
               DecayDescriptors = [" [ tau+ -> p+ mu+ mu- ]cc"," [ tau+ -> p~- mu+ mu+ ]cc",
                                   " [ Lambda_c+ -> p+ mu+ mu- ]cc"," [ Lambda_c+ -> p~- mu+ mu+ ]cc" ],
@@ -370,19 +370,18 @@ def makeTau2pmm(name, config):
                                   "& ( PIDmu > -5 ) & ( (PIDmu - PIDK) > 0 ) & ( TRGHOSTPROB < %(TrackGhostProb)s )"% config,
                                   "p+" :  " ( PT > 300 * MeV ) & ( TRCHI2DOF < 3  ) & ( BPVIPCHI2 () >  9 ) "\
                                   "& (PIDp>10) & ( TRGHOSTPROB < %(TrackGhostProb)s )" % config},
-              Combination12Cut = "AM<2340*MeV", # lambda_c mass + 150 - muon mass = 2290 + 150 -100 = 
+              Combination12Cut = "AM<2340*MeV", # lambda_c mass + 150 - muon mass = 2290 + 150 -100 =
               CombinationCut = "( (ADAMASS('tau+')<150*MeV) | (ADAMASS('Lambda_c+')<150*MeV) )",
               MotherCut = """
             ( VFASPF(VCHI2) < 15 ) &
             ( (BPVLTIME () * c_light)   > 100 * micrometer ) &
             ( BPVIPCHI2() < 225 )
-            """ 
+            """
               )
-                             
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     _stdLooseProtons = DataOnDemand(Location = "Phys/StdLooseProtons/Particles")
 
     return Selection (name,
                       Algorithm = Tau2PMuMu,
                       RequiredSelections = [ _stdLooseMuons, _stdLooseProtons ])
- 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py
index db26276c0a9f6631b2b0a00166198c3b564ca257..b8e44a1f7f608eff0055e0a40fc8f4bec99acd58 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -13,7 +13,7 @@ Module for construction of tau -->KKMu stripping selections and lines same sing
 
 
 Exported symbols (use python help!):
-   - 
+   -
 '''
 
 __author__ = ['Marcin Chrzaszcz']
@@ -37,7 +37,7 @@ default_config={
         },
     'STREAMS' : ['Leptonic']
     }
-    
+
 
 
 from Gaudi.Configuration import *
@@ -50,20 +50,20 @@ from GaudiKernel.PhysicalConstants import c_light
 
 class Tau2LambdaMuLinesConf(LineBuilder) :
     """
-    Builder  
+    Builder
     """
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
-    def __init__(self, 
+
+    def __init__(self,
                  name,
                  config) :
 
         LineBuilder.__init__(self, name, config)
 
         tau2LambdaMu_name = 'Tau2LambdaMu'
-      
-        
+
+
         self.selTau2LambdaMu = makeTau2LambdaMu(tau2LambdaMu_name)
      #   self.selTau2KKMuSS = makeTau2KKMuSS(tau2KKMuSS_name)
 
@@ -78,7 +78,7 @@ class Tau2LambdaMuLinesConf(LineBuilder) :
 
 
 def makeTau2LambdaMu(name):
-   
+
 
 
     makeLambda = CombineParticles("Lambda")
@@ -88,13 +88,13 @@ def makeTau2LambdaMu(name):
                               "p+" :  " ( PT > 250 * MeV ) & ( TRCHI2DOF < 4  ) & ( BPVIPCHI2 () >  5 ) "\
                                   "& (PIDp>3) & ( TRGHOSTPROB < 0.5 )"
                              }
-    
+
     _pions = DataOnDemand(Location='Phys/StdLoosePions/Particles')
-    _protons = DataOnDemand(Location='Phys/StdLooseProtons/Particles')   
-    
+    _protons = DataOnDemand(Location='Phys/StdLooseProtons/Particles')
+
     makeLambda.CombinationCut =  "(ADAMASS('Lambda0')<100*MeV)"
     makeLambda.MotherCut = " ( VFASPF(VCHI2) < 10 ) & (MIPCHI2DV(PRIMARY)> 16.) & (ADMASS('Lambda0')<90*MeV)"
-    
+
     SelLambda = Selection( name+"SelLambda",    Algorithm= makeLambda,
                         RequiredSelections=[_pions, _protons] )
 
@@ -103,7 +103,7 @@ def makeTau2LambdaMu(name):
 
 
 
-    
+
     Tau2LambdaMu = CombineParticles("Comine"+name)
     Tau2LambdaMu.DecayDescriptors = [" [ tau+ -> Lambda0 mu+ ]cc" ]
     Tau2LambdaMu.DaughtersCuts = { "mu+" : " ( PT > 300 * MeV ) & ( TRCHI2DOF < 3.  ) & ( BPVIPCHI2 () >  9 ) "\
@@ -116,15 +116,12 @@ def makeTau2LambdaMu(name):
             ( VFASPF(VCHI2) < 16 ) &
             ( (BPVLTIME () * c_light)   > 100 * micrometer ) &
             ( BPVIPCHI2() < 250 )
-            """ 
-                             
+            """
+
     _stdLooseMuons = DataOnDemand(Location = "Phys/StdLooseMuons/Particles")
     # _stdLooseLambda1 = DataOnDemand(Location = "Phys/StdLooseLambdaLL/Particles")
    # _stdLooseLambda2 = DataOnDemand(Location = "Phys/StdLooseLambdaDD/Particles")
-    
+
     return Selection (name,
                       Algorithm = Tau2LambdaMu,
                       RequiredSelections = [ _stdLooseMuons, SelLambda ])
- 
-
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py
index 9b9be86a59897300847acfd2354d77d9b7914bcf..d0f6b02cee4b930dbf501a32184cee1015f7222e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py
@@ -52,7 +52,7 @@ default_config = {
       'CORRM_MAX'       : 10000.0, # MeV
       # Track cuts
       'Track_CHI2nDOF'      :    3.0,
-      'Track_GhostProb'     :    0.35,  
+      'Track_GhostProb'     :    0.35,
 
       # Muon cuts
       'Muon_MinIPCHI2'   :    9.0,
@@ -65,7 +65,7 @@ default_config = {
 
       'MisIDPrescale'       : 0.01,
     },
-   'STREAMS'     : ['Semileptonic']   
+   'STREAMS'     : ['Semileptonic']
 }
 
 defaultName = "B23MuNu"
@@ -74,14 +74,14 @@ defaultName = "B23MuNu"
 class B23MuNuConf(LineBuilder) :
 
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     def __init__(self, name, config) :
 
 
         LineBuilder.__init__(self, name, config)
 
         self.name = name
-        
+
 
         self.TriMuCut = "(BPVCORRM > %(CORRM_MIN)s *MeV) & " \
                            "(BPVCORRM < %(CORRM_MAX)s *MeV) & " \
@@ -95,7 +95,7 @@ class B23MuNuConf(LineBuilder) :
         self.TrackCuts = "(TRCHI2DOF < %(Track_CHI2nDOF)s) & (TRGHP < %(Track_GhostProb)s)" \
                          " & (MIPCHI2DV(PRIMARY) > %(Muon_MinIPCHI2)s) " \
                          " & (PT > %(Muon_PT)s)" %config
-        
+
         self.MuonCut = self.TrackCuts + "& (PIDmu> %(Muon_PIDmu)s) & " \
                                         " (PIDmu-PIDK> %(Muon_PIDmuK)s)" %config
 
@@ -105,7 +105,7 @@ class B23MuNuConf(LineBuilder) :
         self.Trimu = self.__Trimu__(config)
         self.FakeTrimu = self.__FakeTrimu__(config)
 
-        
+
 
 
         # inclusive dimuon line
@@ -142,7 +142,7 @@ class B23MuNuConf(LineBuilder) :
     def __Muons__(self, conf):
         """
         Filter muons from StdLooseMuons
-        """  
+        """
         from StandardParticles import StdAllLooseMuons
         _muons = StdAllLooseMuons
         _filter = FilterDesktop(Code = self.MuonCut)
@@ -150,12 +150,12 @@ class B23MuNuConf(LineBuilder) :
                          RequiredSelections = [ _muons ] ,
                          Algorithm = _filter)
         return _sel
- 
-        
+
+
     def __FakeMuons__(self, conf):
         """
         Filter muons from StdLooseMuons
-        """  
+        """
         from StandardParticles import StdAllNoPIDsMuons
         _fakemuons = StdAllNoPIDsMuons
         _filter = FilterDesktop(Code = self.TrackCuts)
@@ -170,13 +170,13 @@ class B23MuNuConf(LineBuilder) :
         """
         from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
         from  GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        #from Configurables import CombineParticles 
+        #from Configurables import CombineParticles
 
-        CombineJpsi= CombineParticles(DecayDescriptors = ["J/psi(1S) -> mu+ mu-","[J/psi(1S) -> mu+ mu+]cc"],                       
+        CombineJpsi= CombineParticles(DecayDescriptors = ["J/psi(1S) -> mu+ mu-","[J/psi(1S) -> mu+ mu+]cc"],
                      MotherCut = "ALL")
-        
+
         sel_name = "Jpsi"
-        
+
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm = CombineJpsi,
                               RequiredSelections = [ self.Muons ] )
@@ -194,11 +194,11 @@ class B23MuNuConf(LineBuilder) :
         # choose
 
         from PhysSelPython.Wrappers import Selection
-        SelTriMuon = Selection("Sel_" + self.name + "_"+sel_name, 
+        SelTriMuon = Selection("Sel_" + self.name + "_"+sel_name,
                               Algorithm = CombineTriMuon,
                               RequiredSelections = [ self.Muons ] )
         return SelTriMuon
-   
+
 
     def __FakeTrimu__(self, conf):
         """
@@ -222,4 +222,3 @@ class B23MuNuConf(LineBuilder) :
 
 
         return SelTriMuon
- 
\ No newline at end of file
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py
index cf555ce39e747c1d0d6c9a28cd9d77548e1699d3..18e24b9f75ccb0503569c76cb8c150c118b2d6b5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py
@@ -32,9 +32,9 @@ default_config = {
     'NAME'        : 'B2DMuForTauMu',
     'WGs'         : ['Semileptonic'],
     'BUILDERTYPE' : 'B2DMuForTauMuconf',
-    'CONFIG'      : { 
-         "MINIPCHI2"     : 9.0    # adimensional 
-        ,"GhostProb"     : 0.5    # adimensional  
+    'CONFIG'      : {
+         "MINIPCHI2"     : 9.0    # adimensional
+        ,"GhostProb"     : 0.5    # adimensional
         ,"KaonPIDK"      : 4.0    # adimensional
         ,"ProtonPIDp"    : 0.0    # adimensional
         ,"PionPIDKTight" : 2.0    # adimensional
@@ -56,53 +56,53 @@ default_config = {
         ,"Hlt2Line"      : "HLT_PASS_RE('Hlt2XcMuXForTauB2XcMuDecision')"    # adimensiional
         ,"Hlt2LineFake"  : "HLT_PASS_RE('Hlt2XcMuXForTauB2XcFakeMuDecision')"    # adimensiional
     },
-    'STREAMS'     : ['Semileptonic']    
+    'STREAMS'     : ['Semileptonic']
 }
 
 class B2DMuForTauMuconf(LineBuilder) :
     """
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.config=config
 
-        
+
 
         ############### MUON SELECTIONS ###################
         self.selmuon = Selection( "Mufor" + name,
                                   Algorithm = self._muonFilter(),
                                   RequiredSelections = [StdAllLooseMuons])
-                                  
-                                  
+
+
         self.selFakemuon = Selection( "FakeMufor" + name,
                                   Algorithm = self._FakemuonFilter(),
-                                  RequiredSelections = [StdAllNoPIDsMuons])                                  
+                                  RequiredSelections = [StdAllNoPIDsMuons])
 
 
         ############### KAON AND PION SELECTIONS ################
-        
+
         self.selKaon = Selection( "Kfor" + name,
                                   Algorithm = self._kaonFilter(),
                                   RequiredSelections = [StdLooseKaons])
-        
+
         self.selPion = Selection( "Pifor" + name,
                                   Algorithm = self._pionFilter(),
                                   RequiredSelections = [StdLoosePions])
-                                  
-        
+
+
         self.selProton = Selection( "Pfor" + name,
                                   Algorithm = self._protonFilter(),
                                   RequiredSelections = [StdLooseProtons])
-                                                                          
+
 
         ################ D0 -> HH SELECTION ##########################
-        
+
         self.seld02kpi = Selection( "D02KPifor" + name,
                                     Algorithm = self._D02KPiFilter(),
                                     RequiredSelections = [self.selKaon, self.selPion] )
@@ -110,22 +110,22 @@ class B2DMuForTauMuconf(LineBuilder) :
         self.seld02k3pi = Selection( "D02K3Pifor" + name,
                                     Algorithm = self._D02K3PiFilter(),
                                     RequiredSelections = [self.selKaon, self.selPion] )
-                                    
+
         self.seldp2k2pi = Selection( "Dp2K2Pifor" + name,
                                     Algorithm = self._Dp2K2PiFilter(),
-                                    RequiredSelections = [self.selKaon, self.selPion] )                                    
-                                    
+                                    RequiredSelections = [self.selKaon, self.selPion] )
+
         self.selds2kkpi = Selection( "Ds2KKPifor" + name,
                                     Algorithm = self._Dsp2KKPiFilter(),
                                     RequiredSelections = [self.selKaon, self.selPion] )
-                                    
+
         self.sellc2pkpi = Selection( "Lc2pKPifor" + name,
                                     Algorithm = self._LcpKPiFilter(),
-                                    RequiredSelections = [self.selKaon, self.selPion, self.selProton] )                                    
+                                    RequiredSelections = [self.selKaon, self.selPion, self.selProton] )
 
         self.selb2D0MuX = makeb2DMuX('b2D0MuX' + name,
                                      DecayDescriptors = [ '[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
-                                     MuSel = self.selmuon, 
+                                     MuSel = self.selmuon,
                                      DSel = self.seld02kpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
@@ -134,7 +134,7 @@ class B2DMuForTauMuconf(LineBuilder) :
 
         self.selb2D03MuX = makeb2DMuX('b2D0K3piMuX' + name,
                                      DecayDescriptors = [ '[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
-                                     MuSel = self.selmuon, 
+                                     MuSel = self.selmuon,
                                      DSel = self.seld02k3pi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
@@ -142,40 +142,40 @@ class B2DMuForTauMuconf(LineBuilder) :
 
         self.selb2DpMuX = makeb2DMuX('b2DpMuX' + name,
                                      DecayDescriptors = [ '[B- -> D+ mu-]cc','[B+ -> D+ mu+]cc'],
-                                     MuSel = self.selmuon, 
+                                     MuSel = self.selmuon,
                                      DSel = self.seldp2k2pi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )                
+                                     )
 
         self.selb2DsMuX = makeb2DMuX('b2DsMuX' + name,
                                      DecayDescriptors = [ '[B- -> D_s+ mu-]cc','[B+ -> D_s+ mu+]cc'],
-                                     MuSel = self.selmuon, 
+                                     MuSel = self.selmuon,
                                      DSel = self.selds2kkpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )                                     
-                                     
+                                     )
+
         self.selb2LcMuX = makeb2DMuX('b2LcMuX' + name,
                                      DecayDescriptors = [ '[B- -> Lambda_c+ mu-]cc','[B+ -> Lambda_c+ mu+]cc'],
-                                     MuSel = self.selmuon, 
+                                     MuSel = self.selmuon,
                                      DSel = self.sellc2pkpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )                                     
-                                                                          
+                                     )
+
         self.selFakeb2D0MuX = makeFakeb2DMuX('b2D0MuXFake' + name,
                                      DecayDescriptors = [ '[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
-                                     FakeMuSel = self.selFakemuon, 
+                                     FakeMuSel = self.selFakemuon,
                                      DSel = self.seld02kpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )        
+                                     )
 
 
         self.selFakeb2D03MuX = makeFakeb2DMuX('b2D0K3piMuXFake' + name,
                                      DecayDescriptors = [ '[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
-                                     FakeMuSel = self.selFakemuon, 
+                                     FakeMuSel = self.selFakemuon,
                                      DSel = self.seld02k3pi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
@@ -183,29 +183,29 @@ class B2DMuForTauMuconf(LineBuilder) :
 
         self.selFakeb2DpMuX = makeFakeb2DMuX('b2DpMuXFake' + name,
                                      DecayDescriptors = [ '[B- -> D+ mu-]cc','[B+ -> D+ mu+]cc'],
-                                     FakeMuSel = self.selFakemuon, 
+                                     FakeMuSel = self.selFakemuon,
                                      DSel = self.seldp2k2pi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )                
+                                     )
 
         self.selFakeb2DsMuX = makeFakeb2DMuX('b2DsMuXFake' + name,
                                      DecayDescriptors = [ '[B- -> D_s+ mu-]cc','[B+ -> D_s+ mu+]cc'],
-                                     FakeMuSel = self.selFakemuon, 
+                                     FakeMuSel = self.selFakemuon,
                                      DSel = self.selds2kkpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )                                     
-                                     
+                                     )
+
         self.selFakeb2LcMuX = makeFakeb2DMuX('b2LcMuXFake' + name,
                                      DecayDescriptors = [ '[B- -> Lambda_c+ mu-]cc','[B+ -> Lambda_c+ mu+]cc'],
-                                     FakeMuSel = self.selFakemuon, 
+                                     FakeMuSel = self.selFakemuon,
                                      DSel = self.sellc2pkpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )                                     
+                                     )
+
 
-        
         ################# DECLARE THE STRIPPING LINES #################################
 
         GECs = { "Code":" ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(SPDmax)s )" % config,
@@ -214,44 +214,44 @@ class B2DMuForTauMuconf(LineBuilder) :
         ########## D0 -> HH ###########
         self.B2DMuForTauMu = StrippingLine('b2D0MuX' + name+ 'Line', prescale = 1, selection = self.selb2D0MuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
         self.registerLine(self.B2DMuForTauMu)
-        
+
         self.B2DK3piMuForTauMu = StrippingLine('b2D0K3piMuX' + name+ 'Line', prescale = 1, selection = self.selb2D03MuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
         self.registerLine(self.B2DK3piMuForTauMu)
-        
+
         self.B2DpMuForTauMu = StrippingLine('b2DpMuX' + name+ 'Line', prescale = 1, selection = self.selb2DpMuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
-        self.registerLine(self.B2DpMuForTauMu)        
+        self.registerLine(self.B2DpMuForTauMu)
 
         self.B2DsMuForTauMu = StrippingLine('b2DsMuX' + name+ 'Line', prescale = 1, selection = self.selb2DsMuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
-        self.registerLine(self.B2DsMuForTauMu) 
-        
+        self.registerLine(self.B2DsMuForTauMu)
+
         self.B2LcMuForTauMu = StrippingLine('b2LcMuX' + name+ 'Line', prescale = 1, selection = self.selb2LcMuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
-        self.registerLine(self.B2LcMuForTauMu)     
+        self.registerLine(self.B2LcMuForTauMu)
 
 
         self.FakeB2DMuForTauMu = StrippingLine('b2D0MuXFake' + name+ 'Line', prescale = config["FakePrescale"], selection = self.selFakeb2D0MuX, FILTER  = GECs,HLT2 = config["Hlt2LineFake"])
-        self.registerLine(self.FakeB2DMuForTauMu)   
+        self.registerLine(self.FakeB2DMuForTauMu)
 
         self.FakeB2DK3piMuForTauMu = StrippingLine('b2D0K3piMuXFake' + name+ 'Line', prescale = config["FakePrescale"], selection = self.selFakeb2D03MuX, FILTER  = GECs,HLT2 = config["Hlt2LineFake"])
         self.registerLine(self.FakeB2DK3piMuForTauMu)
-        
+
         self.FakeB2DpMuForTauMu = StrippingLine('b2DpMuXFake' + name+ 'Line', prescale = config["FakePrescale"], selection = self.selFakeb2DpMuX, FILTER  = GECs,HLT2 = config["Hlt2LineFake"])
-        self.registerLine(self.FakeB2DpMuForTauMu)        
+        self.registerLine(self.FakeB2DpMuForTauMu)
 
         self.FakeB2DsMuForTauMu = StrippingLine('b2DsMuXFake' + name+ 'Line', prescale = config["FakePrescale"], selection = self.selFakeb2DsMuX, FILTER  = GECs,HLT2 = config["Hlt2LineFake"])
-        self.registerLine(self.FakeB2DsMuForTauMu) 
-        
+        self.registerLine(self.FakeB2DsMuForTauMu)
+
         self.FakeB2LcMuForTauMu = StrippingLine('b2LcMuXFake' + name+ 'Line', prescale = config["FakePrescale"], selection = self.selFakeb2LcMuX, FILTER  = GECs,HLT2 = config["Hlt2LineFake"])
-        self.registerLine(self.FakeB2LcMuForTauMu)     
+        self.registerLine(self.FakeB2LcMuForTauMu)
 
     def _muonFilter( self ):
         _code = "(MIPCHI2DV(PRIMARY)> %(MuonIPCHI2)s) &(TRGHOSTPROB < %(GhostProb)s) & (PIDmu > %(PIDmu)s) & (P> 3.0*GeV)" % self.config
         _mu = FilterDesktop( Code = _code )
-        return _mu 
-        
+        return _mu
+
     def _FakemuonFilter( self ):
         _code = "(MIPCHI2DV(PRIMARY)> %(MuonIPCHI2)s) &(TRGHOSTPROB < %(GhostProb)s) & (P> 3.0*GeV) & (~ISMUON) & (INMUON)" % self.config
         _Fakemu = FilterDesktop( Code = _code )
-        return _Fakemu               
+        return _Fakemu
 
     def _pionFilter( self ):
         _code = "(P>2.0*GeV) & (PT > %(KPiPT)s *MeV)"\
@@ -263,14 +263,14 @@ class B2DMuForTauMuconf(LineBuilder) :
         _code = "(PIDK>%(KaonPIDK)s) & (MIPCHI2DV(PRIMARY)> %(MINIPCHI2)s) & (P>2.0*GeV) & (PT > %(KPiPT)s *MeV)"\
                    "    & (TRGHOSTPROB < %(GhostProb)s)" % self.config
         _ka = FilterDesktop( Code = _code )
-        return _ka     
+        return _ka
 
     def _protonFilter( self ):
         _code = "(PIDp> %(ProtonPIDp)s) & (MIPCHI2DV(PRIMARY)> %(MINIPCHI2)s) & (P>2.0*GeV) & (PT > %(KPiPT)s *MeV)"\
                    "    & (TRGHOSTPROB < %(GhostProb)s)" % self.config
         _pr = FilterDesktop( Code = _code )
-        return _pr 
-           
+        return _pr
+
     def _D02KPiFilter( self ):
         _decayDescriptors = [ '[D0 -> K- pi+]cc' ]
         _combinationCut = "(ADAMASS('D0') < %(DsAMassWin)s *MeV) & (ACHILD(PT,1)+ACHILD(PT,2) > %(DSumPT)s *MeV) " % self.config
@@ -278,10 +278,10 @@ class B2DMuForTauMuconf(LineBuilder) :
                             "& (BPVVDCHI2 > %(DsFDCHI2)s) &  (BPVDIRA> %(DsDIRA)s)"  % self.config
         _d02kpi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     CombinationCut = _combinationCut,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _d02kpi
-  
-    
+
+
     def _D02K3PiFilter( self ):
         _decayDescriptors = [ '[D0 -> K- pi+ pi- pi+]cc' ]
         _combinationCut = "(ADAMASS('D0') < %(DsAMassWin)s *MeV) & (ACHILD(PT,1)+ACHILD(PT,2)+ACHILD(PT,3)+ACHILD(PT,4) > %(DSumPT)s *MeV) " % self.config
@@ -289,7 +289,7 @@ class B2DMuForTauMuconf(LineBuilder) :
                             "& (BPVVDCHI2 > %(DsFDCHI2)s) &  (BPVDIRA> %(DsDIRA)s)"  % self.config
         _d02k3pi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     CombinationCut = _combinationCut,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _d02k3pi
 
     def _Dp2K2PiFilter( self ):
@@ -299,7 +299,7 @@ class B2DMuForTauMuconf(LineBuilder) :
                             "& (BPVVDCHI2 > %(DsFDCHI2)s) &  (BPVDIRA> %(DsDIRA)s)"  % self.config
         _dp2k2pi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     CombinationCut = _combinationCut,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _dp2k2pi
 
 
@@ -309,7 +309,7 @@ class B2DMuForTauMuconf(LineBuilder) :
         _motherCut = "(MM < %(M_MAX)s * MeV) & (MM > %(M_MIN)s * MeV) & (SUMTREE( PT,  ISBASIC )> %(DSumPT)s * MeV) &(ADMASS('D_s+') < %(DsMassWin)s *MeV) & (VFASPF(VCHI2/VDOF) < %(DsVCHI2DOF)s) & (BPVVDCHI2 > %(DsFDCHI2)s) &  (BPVDIRA> %(DsDIRA)s)"  % self.config
         _dsp2kkpi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     CombinationCut = _combinationCut,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _dsp2kkpi
 
     def _LcpKPiFilter( self ):
@@ -319,7 +319,7 @@ class B2DMuForTauMuconf(LineBuilder) :
                             "& (BPVVDCHI2 > %(DsFDCHI2)s) &  (BPVDIRA> %(DsDIRA)s)"  % self.config
         _lcpkpi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     CombinationCut = _combinationCut,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _lcpkpi
 
 
@@ -335,7 +335,7 @@ def makeb2DMuX(name,
                    " "  % locals()
     _B = CombineParticles(DecayDescriptors = DecayDescriptors,
                           CombinationCut = _combinationCut,
-                          MotherCut = _motherCut)                          
+                          MotherCut = _motherCut)
     return Selection (name,
                       Algorithm = _B,
                       RequiredSelections = [MuSel, DSel])
@@ -356,7 +356,7 @@ def makeFakeb2DMuX(name,
     _FakeB = CombineParticles(DecayDescriptors = DecayDescriptors,
                           CombinationCut = _combinationCut,
                           MotherCut = _motherCut)
-                          
+
     return Selection (name,
                       Algorithm = _FakeB,
                       RequiredSelections = [FakeMuSel, DSel])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py
index 2daf8b46bf0d24d1ecac23edd9c7b5f4dcc15ad4..cdf3ee18d8f96edaebd58b02746b63829275143c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py
@@ -32,41 +32,41 @@ default_config = {
         'CONFIG'      : {
             "prescaleFakes": 0.02
             ,"prescales":{'StrippingB2DMuNuX_D0_Electron':1.0}
-            ,"GEC_nLongTrk" : 250 
+            ,"GEC_nLongTrk" : 250
             ,"TTSpecs"      : {}
             ,"HLT1"   : "HLT_PASS_RE('Hlt1.*Decision')"
             ,"HLT2"   : "HLT_PASS_RE('Hlt2.*Decision')"
             ,"Monitor"      : False
             ,"UseNoPIDsInputs":False
-            ,"TRGHOSTPROB"   : 0.35 
-            ,"TRCHI2"        : 3.0  
-            ,"MuonPIDmu"     : 0.0  
+            ,"TRGHOSTPROB"   : 0.35
+            ,"TRCHI2"        : 3.0
+            ,"MuonPIDmu"     : 0.0
             ,"MuonPT"        : 1000*MeV
             ,"MuonIPCHI2"    : 9.00
-            ,"MuonP"         : 6.0*GeV 
+            ,"MuonP"         : 6.0*GeV
             ,"HadronPT"      : 250.0*MeV
             ,"HadronP"       : 2.0*GeV
-            ,"HadronIPCHI2"  : 4.0 
-            ,"ProtonPIDp"    : 0.0 
+            ,"HadronIPCHI2"  : 4.0
+            ,"ProtonPIDp"    : 0.0
             ,"ProtonPIDpK"   : 0.0
             ,"ProtonP"       : 8.0*GeV
             ,"KaonPIDK"      : -2.0
             ,"KaonP"         : 2.0*GeV
-            ,"PionPIDK"      : 10.0 
-            ,"ElectronPIDe"  : 3.0  
+            ,"PionPIDK"      : 10.0
+            ,"ElectronPIDe"  : 3.0
             ,"ElectronPT"    : 300*MeV
-            ,"D_BPVDIRA"     : 0.99 
-            ,"D_FDCHI2"      : 25.0 
-            ,"D_MassMax"     : 1700.*MeV 
-            ,"D_MassMin"     : 700.*MeV 
+            ,"D_BPVDIRA"     : 0.99
+            ,"D_FDCHI2"      : 25.0
+            ,"D_MassMax"     : 1700.*MeV
+            ,"D_MassMin"     : 700.*MeV
             ,"D_AMassWin"    : 90.*MeV ## this should be 10 MeV wider than the widest D_MassWin
             ,"D_MassWin"     : {"default":80*MeV,
                                 "Xic0": 60*MeV,
                                 "Omegac": 60*MeV}
-            ,"D_VCHI2DOF"    : 6.0 
-            ,"D_DocaChi2Max" : 20  
-            ,"B_DIRA"         : 0.999 
-            ,"B_VCHI2DOF"      : 9.0  
+            ,"D_VCHI2DOF"    : 6.0
+            ,"D_DocaChi2Max" : 20
+            ,"B_DIRA"         : 0.999
+            ,"B_VCHI2DOF"      : 9.0
             ,"B_D_DZ"         : -2.0*mm
             ,"B_MassMin"       : 2.2*GeV
             ,"B_MassMax"       : 8.0*GeV
@@ -80,7 +80,7 @@ default_config = {
                 'StrippingB2DMuNuX_D0_K3Pi',
                 'StrippingB2DMuNuX_Dp_Electron',
                 'StrippingB2DMuNuX_Dp',
-                'StrippingB2DMuNuX_Ds_Electron', 
+                'StrippingB2DMuNuX_Ds_Electron',
                 'StrippingB2DMuNuX_Ds',
                 'StrippingB2DMuNuX_Lc_Electron',
                 'StrippingB2DMuNuX_Lc',
@@ -102,35 +102,35 @@ default_config = {
 }
 
 class B2DMuNuXAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['B2DMuNuX']['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__=config
 
         ####################### BASIC FINAL STATE PARTICLE SELECTIONS ##########################
-        
+
         self.HadronCuts = "(P>%(HadronP)s) & (PT > %(HadronPT)s )"\
             "& (TRCHI2DOF < %(TRCHI2)s)"\
             "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
             "& (MIPCHI2DV(PRIMARY)> %(HadronIPCHI2)s)" % config
-      
+
         self.MuonTrackCuts = "(PT > %(MuonPT)s ) & (P> %(MuonP)s)"\
             "& (TRCHI2DOF < %(TRCHI2)s)"\
             "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
             "& (MIPCHI2DV(PRIMARY)> %(MuonIPCHI2)s)" %config
-        
+
         inputs = {"muons":StdLooseMuons,
                   "pions":StdLoosePions,
                   "kaons":StdLooseKaons,
                   "protons":StdLooseProtons,
                   "electrons":StdLooseElectrons,
                   "fakemuons":StdNoPIDsMuons}
-                          
+
         if config["UseNoPIDsInputs"] == True:
             inputs["muons"] = StdNoPIDsMuons
             inputs["pions"] = StdNoPIDsPions
@@ -138,39 +138,39 @@ class B2DMuNuXAllLinesConf(LineBuilder) :
             inputs["protons"] = StdNoPIDsProtons
 
         self.cuts = {"muons":self.MuonTrackCuts + " & (PIDmu > %(MuonPIDmu)s)" % config,
-                     "fakemuons":self.MuonTrackCuts + " & (INMUON) & (PIDmu < %(MuonPIDmu)s)" % config,  
+                     "fakemuons":self.MuonTrackCuts + " & (INMUON) & (PIDmu < %(MuonPIDmu)s)" % config,
                      "kaons":self.HadronCuts + " & (P>%(KaonP)s) & (PIDK> %(KaonPIDK)s)" % config,
                      "pions":self.HadronCuts + " & (PIDK< %(PionPIDK)s)" % config,
                      "protons":self.HadronCuts + "& (P>%(ProtonP)s)"\
                          "& (PIDp > %(ProtonPIDp)s) & (PIDp-PIDK > %(ProtonPIDpK)s)" % config,
                      "electrons":self.MuonTrackCuts + " & (PT> %(ElectronPT)s) & (PIDe > %(ElectronPIDe)s)" % config
                      }
-                
+
         self.selMuon = Selection("Mufor"+name,
                                  Algorithm=FilterDesktop(Code=self.cuts["muons"]),
                                  RequiredSelections = [inputs["muons"]])
-        
+
         self.selKaon = Selection( "Kfor" + name,
                                   Algorithm = FilterDesktop(Code=self.cuts["kaons"]),
                                   RequiredSelections = [inputs["kaons"]])
-        
+
         self.selPion = Selection( "Pifor" + name,
                                   Algorithm = FilterDesktop(Code=self.cuts["pions"]),
                                   RequiredSelections = [inputs["pions"]])
-        
+
         self.selProton = Selection( "ProtonsFor" + name,
                                     Algorithm = FilterDesktop(Code=self.cuts["protons"]),
                                     RequiredSelections = [inputs["protons"]])
-        
+
         self.selElectron = Selection("efor"+name,
                                      Algorithm=FilterDesktop(Code=self.cuts["electrons"]),
                                      RequiredSelections = [inputs["electrons"]])
-        
-                                     
+
+
         self.selMuonFakes = Selection( "FakeMuonsFor" + name,
                                        Algorithm = FilterDesktop(Code = self.cuts["fakemuons"]),
                                        RequiredSelections = [inputs["fakemuons"]])
-        
+
         ### Dictionary containing special cuts for each charm mode
         ### at this stage they are just the mass windows.
         ### All other cuts are the same for all charm species
@@ -178,31 +178,31 @@ class B2DMuNuXAllLinesConf(LineBuilder) :
         CharmCuts = {}
         for mode in ["D0","D0_partreco","Dp","Ds","Lc","Xic","Xic0","Omegac"]:
             CharmCuts[mode] = config.copy()
-        
+
         # the Dp (->Kpipi) and Ds (->KKpi) are special
-        # in that they each cover both the Ds and D+ mass peaks with the default sideband on either side.   
+        # in that they each cover both the Ds and D+ mass peaks with the default sideband on either side.
         CharmCuts["Dp"]["CharmComboCuts"] = "(DAMASS('D_s+') < %s )"\
             "& (DAMASS('D+')> -%s )" %(config["D_AMassWin"],config["D_AMassWin"])
         CharmCuts["Dp"]["CharmMotherCuts"] = "(DMASS('D_s+') < %s )"\
             "& (DMASS('D+')> -%s )" %(config["D_MassWin"]["default"],config["D_MassWin"]["default"])
         # and Ds and Dp are the same in this regard
         CharmCuts["Ds"] = CharmCuts["Dp"].copy()
-        
+
         CharmCuts['D0']["CharmComboCuts"]  = "(ADAMASS('D0') < %s)" % config["D_AMassWin"]
         CharmCuts['D0']["CharmMotherCuts"] = "(ADMASS('D0')  < %s)" % config["D_MassWin"]["default"]
-        
+
         CharmCuts['D0_partreco']["CharmComboCuts"]  = "((AM < %s) & (AM > %s))" % (config["D_MassMax"],config["D_MassMin"])
         CharmCuts['D0_partreco']["CharmMotherCuts"] = "((MM < %s) & (MM > %s))" % (config["D_MassMax"],config["D_MassMin"])
-       
+
         CharmCuts["Lc"]["CharmComboCuts"] = "(ADAMASS('Lambda_c+') < %s )" %config["D_AMassWin"]
         CharmCuts["Lc"]["CharmMotherCuts"] = "(ADMASS('Lambda_c+') < %s )" %config["D_MassWin"]["default"]
-        
+
         CharmCuts["Xic"]["CharmComboCuts"] = "(ADAMASS('Xi_c+') < %s )"  %config["D_AMassWin"]
         CharmCuts["Xic"]["CharmMotherCuts"] = "(ADMASS('Xi_c+') < %s )"  %config["D_MassWin"]["default"]
-        
+
         CharmCuts["Xic0"]["CharmComboCuts"] = "(ADAMASS('Xi_c0') < %s )" %config["D_AMassWin"]
         CharmCuts["Xic0"]["CharmMotherCuts"] = "(ADMASS('Xi_c0') < %s )" %config["D_MassWin"]["Xic0"]
-        
+
         CharmCuts["Omegac"]["CharmComboCuts"] = "(ADAMASS('Omega_c0') < %s )" %config["D_AMassWin"]
         CharmCuts["Omegac"]["CharmMotherCuts"] = "(ADMASS('Omega_c0') < %s )" %config["D_MassWin"]["Omegac"]
 
@@ -212,70 +212,70 @@ class B2DMuNuXAllLinesConf(LineBuilder) :
                                        ['[D0 -> K- pi+]cc'],
                                        CharmCuts["D0"],
                                        [self.selKaon, self.selPion],self.selMuon,self.selMuonFakes)
-        
+
         self.b2D0MuXKMuLine = BtoDlnuLine(name,
                                        'D0_KMuNu',
                                        ['[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
                                        ['[D0 -> K- mu+]cc'],
                                        CharmCuts["D0_partreco"],
                                        [self.selKaon, self.selMuon],self.selMuon)
-        
+
         self.b2D0MuXK3PiLine = BtoDlnuLine(name,
                                        'D0_K3Pi',
                                        ['[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
                                        ['[D0 -> K- pi+ pi- pi+]cc'],
                                        CharmCuts["D0"],
                                        [self.selKaon, self.selPion],self.selMuon,self.selMuonFakes)
-        
+
         self.b2D0eXLine = BtoDlnuLine(name,
                                       'D0_Electron',
                                       ['[B- -> D0 e-]cc', '[B+ -> D0 e+]cc'],
                                       ['[D0 -> K- pi+]cc'],
                                       CharmCuts["D0"],
                                       [self.selKaon, self.selPion],self.selElectron)
-        
+
         self.b2D0MuXKKLine = BtoDlnuLine(name,
                                          'D0_KK',
                                          ['[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
                                          ['D0 -> K- K+'],
                                          CharmCuts["D0"],
                                          [self.selKaon],self.selMuon)
-        
+
         self.b2D0MuXPiPiLine = BtoDlnuLine(name,
                                            'D0_PiPi',
                                            ['[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
                                            ['D0 -> pi- pi+'],
                                            CharmCuts["D0"],
                                            [self.selPion],self.selMuon)
-        
+
         self.b2DpMuXLine = BtoDlnuLine(name,
                                        'Dp',
                                        [ '[B0 -> D- mu+]cc', '[B0 -> D- mu-]cc' ],
                                        [ '[D+ -> K- pi+ pi+]cc' ],
                                        CharmCuts["Dp"],
                                        [self.selKaon, self.selPion],self.selMuon,self.selMuonFakes)
-       
+
         self.b2DpeXLine = BtoDlnuLine(name,
                                        'Dp_Electron',
                                        [ '[B0 -> D- e+]cc', '[B0 -> D- e-]cc' ],
                                        [ '[D+ -> K- pi+ pi+]cc' ],
                                        CharmCuts["Dp"],
                                        [self.selKaon, self.selPion],self.selElectron)
- 
+
         self.b2DsMuXLine = BtoDlnuLine(name,
                                        'Ds',
                                        [ '[B0 -> D- mu+]cc', '[B0 -> D- mu-]cc' ],
                                        [ '[D+ -> K+ K- pi+]cc' ],
                                        CharmCuts["Ds"],
                                        [self.selKaon, self.selPion],self.selMuon,self.selMuonFakes)
-        
+
         self.b2DseXLine = BtoDlnuLine(name,
                                        'Ds_Electron',
                                        [ '[B0 -> D- e+]cc', '[B0 -> D- e-]cc' ],
                                        [ '[D+ -> K+ K- pi+]cc' ],
                                        CharmCuts["Ds"],
                                        [self.selKaon, self.selPion],self.selElectron)
-        
+
         self.lb2LcMuXLine = BtoDlnuLine(name,
                                         "Lc",
                                         [ '[Lambda_b0 -> Lambda_c+ mu-]cc', '[Lambda_b0 -> Lambda_c+ mu+]cc'],
@@ -312,21 +312,19 @@ class B2DMuNuXAllLinesConf(LineBuilder) :
                                        [self.selProton,self.selKaon,self.selPion],self.selMuon,self.selMuonFakes)
 
         ##### line registration
-        self.registerLine(self.b2D0eXLine)  
+        self.registerLine(self.b2D0eXLine)
         self.registerLine(self.b2DpeXLine)
         self.registerLine(self.b2DseXLine)
-        self.registerLine(self.lb2LceXLine)      
-        self.registerLine(self.b2D0MuXKKLine)        
-        self.registerLine(self.b2D0MuXPiPiLine)        
-        self.registerLine(self.b2D0MuXKMuLine)        
+        self.registerLine(self.lb2LceXLine)
+        self.registerLine(self.b2D0MuXKKLine)
+        self.registerLine(self.b2D0MuXPiPiLine)
+        self.registerLine(self.b2D0MuXKMuLine)
         for Mu in ["RealMuon","FakeMuon"]:
-            self.registerLine(self.b2D0MuXLine[Mu])        
-            self.registerLine(self.b2D0MuXK3PiLine[Mu])        
-            self.registerLine(self.b2DpMuXLine[Mu])        
-            self.registerLine(self.b2DsMuXLine[Mu])        
-            self.registerLine(self.lb2LcMuXLine[Mu])        
-            self.registerLine(self.Omegac_Line[Mu])        
-            self.registerLine(self.Xic_Line[Mu])        
-            self.registerLine(self.Xic0_Line[Mu])        
-        
-
+            self.registerLine(self.b2D0MuXLine[Mu])
+            self.registerLine(self.b2D0MuXK3PiLine[Mu])
+            self.registerLine(self.b2DpMuXLine[Mu])
+            self.registerLine(self.b2DsMuXLine[Mu])
+            self.registerLine(self.lb2LcMuXLine[Mu])
+            self.registerLine(self.Omegac_Line[Mu])
+            self.registerLine(self.Xic_Line[Mu])
+            self.registerLine(self.Xic0_Line[Mu])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py
index 9a70e726cce892ccd2f738926585fde0f9d382b7..a09db4bae332f8df64a8646fd95900f7827e5edb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -27,24 +27,24 @@ def BtoDlnuLine(module_name,
                 CHARM_DAUGHTERS,
                 MUON,
                 FAKE_MUON = None):
-    
+
     DEFAULT_GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" %CONFIG,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
-    
+
     CHARM_DaugCuts = {}
     CHARM_ComboCuts = CONFIG["CharmComboCuts"]
     CHARM_MotherCuts = CONFIG["CharmMotherCuts"]
     CHARM_ComboCuts += " & (ADOCACHI2CUT( %(D_DocaChi2Max)s, ''))" % CONFIG
     CHARM_MotherCuts += "& (VFASPF(VCHI2/VDOF) < %(D_VCHI2DOF)s) " \
         "& (BPVVDCHI2 > %(D_FDCHI2)s) &  (BPVDIRA> %(D_BPVDIRA)s)"  % CONFIG
-    
+
     if "CharmDaugCuts" in CONFIG.keys():
         CHARM_DaugCuts = CONFIG["CharmDaugCuts"]
     if "CharmExtraComboCuts" in CONFIG.keys():
         CHARM_ComboCuts += CONFIG["CharmExtraComboCuts"]
     if "CharmExtraMotherCuts" in CONFIG.keys():
         CHARM_MotherCuts += CONFIG["CharmExtraMotherCuts"]
-    
+
     CHARM = Selection("CharmSelFor"+name+module_name,
                       Algorithm=CombineParticles(DecayDescriptors = DDecays,
                                                  DaughtersCuts = CHARM_DaugCuts,
@@ -66,7 +66,7 @@ def BtoDlnuLine(module_name,
         B_combinationCut += CONFIG["ExtraComboCuts"]
     if "ExtraMotherCuts" in CONFIG.keys():
         B_motherCut += CONFIG["ExtraMotherCuts"]
-        
+
     B_DaugCuts = {}
     if "ExtraMuonCuts" in CONFIG.keys():
         B_DaugCuts = {"mu+":CONFIG["ExtraMuonCuts"]}
@@ -76,28 +76,28 @@ def BtoDlnuLine(module_name,
                           DaughtersCuts = B_DaugCuts,
                           CombinationCut = B_combinationCut,
                           MotherCut = B_motherCut)
-    
+
     if CONFIG["Monitor"] == True :
         _B.Preambulo    = [
             "hdm1 = Gaudi.Histo1DDef ( 'D_M' , 1700 , 2800  , 200 )"
             ]
-        _B.Monitor      = True  
-        _B.MotherMonitor  = "process ( monitor ( CHILD(M,1) , hdm1 , 'D_M' ) )  >> ~EMPTY """                                                                   
-    
+        _B.Monitor      = True
+        _B.MotherMonitor  = "process ( monitor ( CHILD(M,1) , hdm1 , 'D_M' ) )  >> ~EMPTY """
+
     BSel = Selection ("BSelFor"+name+module_name,
                       Algorithm = _B,
                       RequiredSelections = [MUON,USED_CHARM])
-    
-    
+
+
     BSelTOS = TOSFilter( "BSelFor"+name+module_name+"TOS"
                          ,BSel
                          ,CONFIG["TTSpecs"])
-    
+
     LINE_NAME = module_name + "_"+name
     _prescale = 1.0
     if LINE_NAME in CONFIG["prescales"].keys():
         _prescale = CONFIG["prescales"][LINE_NAME]
-    main_line = StrippingLine(LINE_NAME, 
+    main_line = StrippingLine(LINE_NAME,
                               selection = BSelTOS,
                               HLT1 = CONFIG["HLT1"],
                               HLT2 = CONFIG["HLT2"],
@@ -110,7 +110,7 @@ def BtoDlnuLine(module_name,
         BSelFake = Selection ("BSelFakeFor"+name+module_name,
                               Algorithm = _B,
                               RequiredSelections = [FAKE_MUON,USED_CHARM])
-        
+
         BSelFakeTOS = TOSFilter( "BSelFakeFor"+name+module_name+"TOS"
                                  ,BSelFake
                                  ,CONFIG["TTSpecs"])
@@ -125,7 +125,7 @@ def BtoDlnuLine(module_name,
 
 
 ########### HELP WITH MAKING A DSTAR ########################
-def makeDstar(_name, inputD0,CONFIG) : 
+def makeDstar(_name, inputD0,CONFIG) :
     _softPi = DataOnDemand(Location = 'Phys/StdAllLoosePions/Particles')
     _inputD0_conj = Selection("SelConjugateD0For"+_name,
                              Algorithm = ConjugateNeutralPID('ConjugateD0For'+_name),
@@ -150,4 +150,3 @@ def TOSFilter( name = None, sel = None, trigger = None ):
     _filter.TisTosSpecs = trigger
     _sel = Selection("Sel" + name + "_TriggerTos", RequiredSelections = [ sel ], Algorithm = _filter )
     return _sel
-
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py
index 62dba02575806b19e65ed5617b1f2700474c5b46..5fe9a360528e3781027eeacf685c84b3cca6495e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py
@@ -32,8 +32,8 @@ default_config = {
     'WGs'         : ['Semileptonic'],
     'BUILDERTYPE' : 'B2DMuForLNuconf',
     'CONFIG'      : {
-             "MINIPCHI2"     : 16.0    # adimensional 
-            ,"GhostProb"     : 0.5    # adimensional  
+             "MINIPCHI2"     : 16.0    # adimensional
+            ,"GhostProb"     : 0.5    # adimensional
             ,"KaonPIDK"      : 4.0    # adimensional
             ,"PionPIDKTight" : 2.0    # adimensional
             ,"LeptonIPCHI2"  : 9.00  # adimensional
@@ -57,79 +57,79 @@ default_config = {
             ,"FakePrescale"  : 0.1     # adimensional
             ,"Hlt2Line"      : "HLT_PASS_RE('Hlt2Topo.*Decision')"    # adimensiional
     },
-    'STREAMS'     : ['Semileptonic']    
+    'STREAMS'     : ['Semileptonic']
 }
 
 class B2DMuForLNuconf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.config=config
 
-        
+
 
         ############### MUON SELECTIONS ###################
         self.selmuon = Selection( "Mufor" + name,
                                   Algorithm = self._muonFilter(),
                                   RequiredSelections = [StdLooseMuons])
-                                  
-                                  
+
+
         self.selelectron = Selection( "Efor" + name,
                                   Algorithm = self._electronFilter(),
                                   RequiredSelections = [StdLooseElectrons])
-                                  
-                                  
+
+
         self.selFakemuon = Selection( "FakeMufor" + name,
                                   Algorithm = self._FakemuonFilter(),
-                                  RequiredSelections = [StdAllNoPIDsMuons])                                  
+                                  RequiredSelections = [StdAllNoPIDsMuons])
 
 
         ############### KAON AND PION SELECTIONS ################
-        
+
         self.selKaon = Selection( "Kfor" + name,
                                   Algorithm = self._kaonFilter(),
                                   RequiredSelections = [StdLooseKaons])
-        
+
         self.selPion = Selection( "Pifor" + name,
                                   Algorithm = self._pionFilter(),
                                   RequiredSelections = [StdLoosePions])
-                                  
-                                                                          
+
+
         ################ D0 -> HH SELECTION ##########################
-        
+
         self.seld02kpi = Selection( "D02KPifor" + name,
                                     Algorithm = self._D02KPiFilter(),
                                     RequiredSelections = [self.selKaon, self.selPion] )
 
         self.selb2D0MuX = makeb2DMuX('b2D0MuX' + name,
                                      DecayDescriptors = [ '[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
-                                     MuSel = self.selmuon, 
+                                     MuSel = self.selmuon,
                                      DSel = self.seld02kpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
                                      )
-                                     
+
         self.selb2D0EX = makeb2DMuX('b2D0EX' + name,
                                      DecayDescriptors = [ '[B- -> D0 e-]cc','[B+ -> D0 e+]cc'],
-                                     MuSel = self.selelectron, 
+                                     MuSel = self.selelectron,
                                      DSel = self.seld02kpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
                                      )
-                                                                          
+
         self.selFakeb2D0MuX = makeFakeb2DMuX('b2D0MuXFake' + name,
                                      DecayDescriptors = [ '[B- -> D0 mu-]cc','[B+ -> D0 mu+]cc'],
-                                     FakeMuSel = self.selFakemuon, 
+                                     FakeMuSel = self.selFakemuon,
                                      DSel = self.seld02kpi,
                                      BVCHI2DOF = config['BVCHI2DOF'],
                                      BDIRA = config['BDIRA']
-                                     )        
-        
+                                     )
+
         ################# DECLARE THE STRIPPING LINES #################################
 
         GECs = { "Code":" ( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(SPDmax)s )" % config,
@@ -138,27 +138,27 @@ class B2DMuForLNuconf(LineBuilder) :
         ########## D0 -> HH ###########
         self.B2DMuForLNu = StrippingLine('b2D0MuX' + name+ 'Line', prescale = 1, selection = self.selb2D0MuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
         self.registerLine(self.B2DMuForLNu)
-        
+
         self.B2DEForLNu = StrippingLine('b2D0EX' + name+ 'Line', prescale = 1, selection = self.selb2D0EX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
         self.registerLine(self.B2DEForLNu)
 
         self.FakeB2DLForLNu = StrippingLine('b2D0LXFake' + name+ 'Line', prescale = config["FakePrescale"], selection = self.selFakeb2D0MuX, FILTER  = GECs,HLT2 = config["Hlt2Line"])
-        self.registerLine(self.FakeB2DLForLNu)   
+        self.registerLine(self.FakeB2DLForLNu)
 
     def _muonFilter( self ):
         _code = "(MIPCHI2DV(PRIMARY)> %(LeptonIPCHI2)s) &(TRGHOSTPROB < %(GhostProb)s) & (PIDmu> %(PIDmu)s )& (PIDmu-PIDp>  %(PIDmuP)s  )& (PIDmu-PIDK>  %(PIDmuK)s  ) & (P> 3.0*GeV) & (PT > %(LeptonPT)s *MeV)" % self.config
         _mu = FilterDesktop( Code = _code )
-        return _mu 
-        
+        return _mu
+
     def _electronFilter( self ):
         _code = "(MIPCHI2DV(PRIMARY)> %(LeptonIPCHI2)s) &(TRGHOSTPROB < %(GhostProb)s) & (PIDe > %(PIDe)s) & (P> 3.0*GeV) & (PT > %(LeptonPT)s *MeV)" % self.config
         _e = FilterDesktop( Code = _code )
-        return _e 
-        
+        return _e
+
     def _FakemuonFilter( self ):
         _code = "(MIPCHI2DV(PRIMARY)> %(LeptonIPCHI2)s) &(TRGHOSTPROB < %(GhostProb)s) & (P> 3.0*GeV) & (~ISMUON) & (PIDe < %(PIDe)s)" % self.config
         _Fakemu = FilterDesktop( Code = _code )
-        return _Fakemu               
+        return _Fakemu
 
     def _pionFilter( self ):
         _code = "(P>2.0*GeV) & (PT > %(KPiPT)s *MeV)"\
@@ -170,7 +170,7 @@ class B2DMuForLNuconf(LineBuilder) :
         _code = "(PIDK>%(KaonPIDK)s) & (MIPCHI2DV(PRIMARY)> %(MINIPCHI2)s) & (P>2.0*GeV) & (PT > %(KPiPT)s *MeV)"\
                    "    & (TRGHOSTPROB < %(GhostProb)s)" % self.config
         _ka = FilterDesktop( Code = _code )
-        return _ka     
+        return _ka
 
     def _D02KPiFilter( self ):
         _decayDescriptors = [ '[D0 -> K- pi+]cc' ]
@@ -179,10 +179,10 @@ class B2DMuForLNuconf(LineBuilder) :
                             "& (BPVVDCHI2 > %(DsFDCHI2)s) &  (BPVDIRA> %(DsDIRA)s)"  % self.config
         _d02kpi = CombineParticles( DecayDescriptors = _decayDescriptors,
                                     CombinationCut = _combinationCut,
-                                    MotherCut = _motherCut)                            
+                                    MotherCut = _motherCut)
         return _d02kpi
-  
-   
+
+
 def makeb2DMuX(name,
                DecayDescriptors,
                MuSel,
@@ -195,7 +195,7 @@ def makeb2DMuX(name,
                    " "  % locals()
     _B = CombineParticles(DecayDescriptors = DecayDescriptors,
                           CombinationCut = _combinationCut,
-                          MotherCut = _motherCut)                          
+                          MotherCut = _motherCut)
     return Selection (name,
                       Algorithm = _B,
                       RequiredSelections = [MuSel, DSel])
@@ -216,7 +216,7 @@ def makeFakeb2DMuX(name,
     _FakeB = CombineParticles(DecayDescriptors = DecayDescriptors,
                           CombinationCut = _combinationCut,
                           MotherCut = _motherCut)
-                          
+
     return Selection (name,
                       Algorithm = _FakeB,
                       RequiredSelections = [FakeMuSel, DSel])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py
index 7a387b611b35e2f7389ed244012c59523fb75a81..57e359cf2bcd86f43923d6e8d7569e96947344be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py
@@ -28,23 +28,23 @@ default_config = {
     'WGs'         : ['Semileptonic'],
     'BUILDERTYPE' : 'B2Dst0MuNuAllLinesConf',
     'CONFIG'      : {
-            "TTSpecs"      : {}#{'Hlt1.*Track.*Decision%TOS':0,'Hlt2TopoMu(2|3|4)Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0} 
+            "TTSpecs"      : {}#{'Hlt1.*Track.*Decision%TOS':0,'Hlt2TopoMu(2|3|4)Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0}
             ,"HLT_FILTER"   : ""#"HLT_PASS_RE('Hlt2.*SingleMuon.*Decision') | HLT_PASS_RE('Hlt2TopoMu(2|3|4)Body.*Decision')"
             },
     'STREAMS'     : ['Semileptonic'],
 }
 
 class B2Dst0MuNuAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__=config
-        
+
         # The D0
         self.D0 = Selection("D0For"+name,
                             Algorithm=CombineParticles(DecayDescriptors = ["[D0 -> K- pi+]cc"],
@@ -53,7 +53,7 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                        CombinationCut = "(AM > 1700*MeV) & (AM < 2000*MeV) & (ADOCACHI2CUT(10, ''))",
                                                        MotherCut =    "(VFASPF(VCHI2/VDOF) < 4) & (BPVVDCHI2 > 100.) & (BPVDIRA> 0.99) & (ADMASS('D0') < 100*MeV)"),
                             RequiredSelections = [StdLooseKaons,StdLoosePions])
-        
+
         # The Dielectron, detached (called gamma)
         self.gamma = Selection("GammaFor"+name,
                                Algorithm=CombineParticles(DecayDescriptor = "gamma -> e+ e-",
@@ -87,7 +87,7 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                              CombinationCut = "(AM < 350*MeV)",
                                                              MotherCut =    "(VFASPF(VCHI2/VDOF) < 5) & (M < 300)"),
                                   RequiredSelections = [StdAllLooseElectrons])
-        
+
         # The Dst with detached dielectron
         self.DstD0Gamma = Selection("DstD0GammaFor"+name,
                                     Algorithm=CombineParticles(DecayDescriptors = ["[D*(2007)0 -> D0 gamma]cc"],
@@ -105,7 +105,7 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                                  CombinationCut = "(AM - ACHILD(1,M) < 350*MeV)",
                                                                  MotherCut =    "(VFASPF(VCHI2/VDOF) < 6)"),
                                       RequiredSelections = [self.D0,self.gammaSS])
-        
+
         # The Dst with prompt dielectron
         self.DstD0Aprime = Selection("DstD0AprimeFor"+name,
                                      Algorithm=CombineParticles(DecayDescriptors = ["[D*(2007)0 -> D0 J/psi(1S)]cc"],
@@ -114,7 +114,7 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                                CombinationCut = "(AM - ACHILD(1,M) < 350*MeV)",
                                                                MotherCut =    "(VFASPF(VCHI2/VDOF) < 6)"),
                                      RequiredSelections = [self.D0,self.Aprime])
-        
+
         # The Dst with prompt dielectron, same-sign
         self.DstD0AprimeSS = Selection("DstD0AprimeSSFor"+name,
                                        Algorithm=CombineParticles(DecayDescriptors = ["[D*(2007)0 -> D0 J/psi(1S)]cc"],
@@ -123,7 +123,7 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                                   CombinationCut = "(AM - ACHILD(1,M) < 350*MeV)",
                                                                   MotherCut =    "(VFASPF(VCHI2/VDOF) < 6)"),
                                        RequiredSelections = [self.D0,self.AprimeSS])
-        
+
         # The Dst with pi0
         self.DstD0Pi0 = Selection("DstD0Pi0For"+name,
                                   Algorithm=CombineParticles(DecayDescriptors = ["[D*(2007)0 -> D0 pi0]cc"],
@@ -181,7 +181,7 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                               CombinationCut = "(AM > 2200*MeV) & (AM < 6000*MeV)",
                                                               MotherCut =    "(VFASPF(VCHI2/VDOF) < 6) & (BPVVDCHI2 > 25.) & (BPVDIRA> 0.99)"),
                                    RequiredSelections = [self.DstD0Pi0,StdLooseMuons])
-        
+
         # The B- with pi0 (Dalitz)
         self.BDstD0Pi0Dalitz = Selection("BDstD0Pi0DalitzFor"+name,
                                          Algorithm=CombineParticles(DecayDescriptors = ["[B- -> D*(2007)0 mu-]cc"],
@@ -190,45 +190,45 @@ class B2Dst0MuNuAllLinesConf(LineBuilder) :
                                                                     MotherCut =    "(VFASPF(VCHI2/VDOF) < 6) & (BPVVDCHI2 > 25.) & (BPVDIRA> 0.99)"),
                                          RequiredSelections = [self.DstD0Pi0Dalitz,StdLooseMuons])
 
-        
+
         # Registering the lines
-        self.lineDstD0Gamma    =  StrippingLine(name+'Dst0D0GammaLine', 
+        self.lineDstD0Gamma    =  StrippingLine(name+'Dst0D0GammaLine',
                                                 #HLT = config["HLT_FILTER"],
                                                 prescale = 1.0,
                                                 selection = self.BDstD0Gamma)
-        
-        self.lineDstD0GammaSS  =  StrippingLine(name+'Dst0D0GammaSSLine', 
+
+        self.lineDstD0GammaSS  =  StrippingLine(name+'Dst0D0GammaSSLine',
                                                 #HLT = config["HLT_FILTER"],
                                                 prescale = 1.0,
                                                 selection = self.BDstD0GammaSS)
-        
-        self.lineDstD0Aprime   =  StrippingLine(name+'Dst0D0AprimeLine', 
+
+        self.lineDstD0Aprime   =  StrippingLine(name+'Dst0D0AprimeLine',
                                                 #HLT = config["HLT_FILTER"],
                                                 prescale = 1.0,
                                                 selection = self.BDstD0Aprime)
-        
-        self.lineDstD0AprimeSS =  StrippingLine(name+'Dst0D0AprimeSSLine', 
+
+        self.lineDstD0AprimeSS =  StrippingLine(name+'Dst0D0AprimeSSLine',
                                                 #HLT = config["HLT_FILTER"],
                                                 prescale = 1.0,
                                                 selection = self.BDstD0AprimeSS)
 
-        self.lineDstD0Pi0      =  StrippingLine(name+'Dst0D0Pi0Line', 
+        self.lineDstD0Pi0      =  StrippingLine(name+'Dst0D0Pi0Line',
                                              #HLT = config["HLT_FILTER"],
                                              prescale = 1.0,
                                              selection = self.BDstD0Pi0)
 
-        self.lineDstD0Pi0Dalitz   =  StrippingLine(name+'Dst0D0Pi0DalitzLine', 
+        self.lineDstD0Pi0Dalitz   =  StrippingLine(name+'Dst0D0Pi0DalitzLine',
                                                    #HLT = config["HLT_FILTER"],
                                                    prescale = 1.0,
                                                    selection = self.BDstD0Pi0Dalitz)
-        
+
         self.registerLine(self.lineDstD0Gamma)
         self.registerLine(self.lineDstD0GammaSS)
         self.registerLine(self.lineDstD0Aprime)
         self.registerLine(self.lineDstD0AprimeSS)
         self.registerLine(self.lineDstD0Pi0)
         self.registerLine(self.lineDstD0Pi0Dalitz)
-        
+
 
 def TOSFilter( name = None, sel = None, trigger = None ):
     if len(trigger) == 0:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py
index 913d9fd85ea75a7dd5e6dff95f53a11fcc73df15..77f14f7d11f4db3b849f349cd74baf26d80cb9e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -28,24 +28,24 @@ default_config = {
     'WGs'         : ['Semileptonic'],
     'BUILDERTYPE' : 'B2DstMuNuInclAllLinesConf',
     'CONFIG'      : {
-            "TTSpecs"      : {}#{'Hlt1.*Track.*Decision%TOS':0,'Hlt2TopoMu(2|3|4)Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0} 
+            "TTSpecs"      : {}#{'Hlt1.*Track.*Decision%TOS':0,'Hlt2TopoMu(2|3|4)Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0}
             ,"HLT_FILTER"   : ""#"HLT_PASS_RE('Hlt2.*SingleMuon.*Decision') | HLT_PASS_RE('Hlt2TopoMu(2|3|4)Body.*Decision')"
             },
     'STREAMS'     : ['Semileptonic'],
 }
 
 class B2DstMuNuInclAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__=config
-        
-        
+
+
         self.D0 = Selection("D0For"+name,
                             Algorithm=CombineParticles(DecayDescriptors = ["[D0 -> K- pi+]cc"],
                                                        DaughtersCuts = {"K-":"(PIDK > 10) & (PT > 800*MeV)",
@@ -53,45 +53,45 @@ class B2DstMuNuInclAllLinesConf(LineBuilder) :
                                                        CombinationCut = "(AM > 900*MeV) & (AM < 1900*MeV) & (ADOCACHI2CUT(10, ''))",
                                                        MotherCut =    "(VFASPF(VCHI2/VDOF) < 3) & (BPVVDCHI2 > 100.) & (BPVDIRA> 0.99)"),
                             RequiredSelections = [StdLooseKaons,StdLoosePions])
-        
+
         self.Dst = Selection("DstFor"+name,
                              Algorithm=CombineParticles(DecayDescriptors = ["[D*(2010)+ -> D0 pi+]cc"],
                                                         DaughtersCuts = {"pi+":"(PIDe < 5) & (PT > 120*MeV)"},
                                                         CombinationCut = "(AM - ACHILD(1,M) < 220*MeV)",
                                                         MotherCut =    "(VFASPF(VCHI2/VDOF) < 3)"),
                              RequiredSelections = [self.D0,StdAllLoosePions])
-        
+
         self.DstWS = Selection("DstWSFor"+name,
                                Algorithm=CombineParticles(DecayDescriptors = ["[D*(2010)- -> D0 pi-]cc"],
                                                           DaughtersCuts = {"pi+":"(PIDe < 5) & (PT > 120*MeV)"},
                                                           CombinationCut = "(AM - ACHILD(1,M) < 220*MeV)",
                                                           MotherCut =    "(VFASPF(VCHI2/VDOF) < 3)"),
                                RequiredSelections = [self.D0,StdAllLoosePions])
-        
+
         self.B = Selection("BFor"+name,
                            Algorithm=CombineParticles(DecayDescriptors = ["[B~0 -> D*(2010)+ mu-]cc"],
                                                       DaughtersCuts = {"mu-":"(PT > 1200*MeV)"},
                                                       CombinationCut = "(AM > 2500*MeV) & (AM < 5000*MeV)",
                                                       MotherCut =    "(VFASPF(VCHI2/VDOF) < 3) & (BPVVDCHI2 > 25.) & (BPVDIRA> 0.99)"),
                            RequiredSelections = [self.Dst,StdLooseMuons])
-        
+
         self.BWS = Selection("BWSFor"+name,
                              Algorithm=CombineParticles(DecayDescriptors = ["[B~0 -> D*(2010)+ mu-]cc"],
                                                         DaughtersCuts = {"mu-":"(PT > 1200*MeV)"},
                                                         CombinationCut = "(AM > 2500*MeV) & (AM < 5000*MeV)",
                                                         MotherCut =    "(VFASPF(VCHI2/VDOF) < 3) & (BPVVDCHI2 > 25.) & (BPVDIRA> 0.99)"),
                              RequiredSelections = [self.DstWS,StdLooseMuons])
-        
-        
-        self.line =  StrippingLine(name+'Line', 
+
+
+        self.line =  StrippingLine(name+'Line',
                                    #HLT = config["HLT_FILTER"],
                                    prescale = 1.0,
                                    selection = self.B) #TOSFilter("TOSB"+name,B,config["TTSpecs"]))
 
-        self.lineWS =  StrippingLine(name+'WSLine', 
+        self.lineWS =  StrippingLine(name+'WSLine',
                                    prescale = 1.0,
-                                   selection = self.BWS) 
-        
+                                   selection = self.BWS)
+
         self.registerLine(self.line)
         self.registerLine(self.lineWS)
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
index d20b4f25b0750253035a8334c0d68161ab29b68f..ed51f910fbf4ba66d067f1614b2f3e0875a3f734 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -19,7 +19,7 @@ StrippingB2DMuForTauMu lines.
 '''
 # =============================================================================
 ##
-#  B+ -> p p~ tau nu exclusive reconstruction. 
+#  B+ -> p p~ tau nu exclusive reconstruction.
 #
 #  Stripping lines for the charmless semileptonic decay B+ -> p p~ tau nu.
 #
@@ -28,30 +28,30 @@ StrippingB2DMuForTauMu lines.
 #
 #  This together with form factor predictions from either light cone
 #  sum rules or lattice QCD will allow a measurement of R(ppbar).
-# 
+#
 #  Three lines are included:
 #  Two of which strip the opposite sign (right sign) proton and muon and combinations.
 #  One of which has no prescale and strips protons and muons with a corrected mass >
 #  4 GeV.  The other line is prescaled by a factor of 0.5 and strips < 4 GeV in corrected
 #  mass.  This exploits the fact that the corrected mass for Lb->pmunu peaks at the Lambda_b
-#  mass.  The final line strips same sign proton and muon cominations over the whole corrected 
+#  mass.  The final line strips same sign proton and muon cominations over the whole corrected
 #  mass region.  This will be ussed to extract shapes for the combinatorial background.
 #
 #  Stripping XX, with requirements that the
 #  rate <0.05% and timing <0.5ms/evt.
-## 
+##
 
 """
-  b->p p mu nu X reconstruction. 
+  b->p p mu nu X reconstruction.
 
   Stripping lines for the charmless semileptonic decay B+ -> p p~ mu nu.
 
   The lines will lead to a  measurement of the ratio of branching frations
-  B+->p p~ tau nu and B+-> p p~ mu nu. 
+  B+->p p~ tau nu and B+-> p p~ mu nu.
 
   This together with form factor predictions from either light cone
   sum rules or lattice QCD will allow a measurement of R(ppbar).
- 
+
   Last modification $Date: 2016-October-17 $
                by $Author: Mark Smith $
 """
@@ -68,11 +68,11 @@ default_config = {
       "MuonTRCHI2"          : 4.     ,#adimensional
       "MuonP"               : 3000.  ,#MeV
       "MuonMINIPCHI2"       : 16.    ,#adminensional
-      #Proton Cuts 
+      #Proton Cuts
       "ProtonTRCHI2"        : 3.     ,#adimensional
       "ProtonP"             : 15000. ,#MeV
-      "ProtonPT"            : 800.  , 
-      "ProtonPIDK"          : 2.     ,#adimensional 
+      "ProtonPT"            : 800.  ,
+      "ProtonPIDK"          : 2.     ,#adimensional
       "ProtonPIDp"          : 2.     ,#adimensional
       "ProtonMINIPCHI2"     : 9.    ,#adminensional
       #B Mother Cuts
@@ -101,7 +101,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     """
     Definition of B+->p p~ mu nu stripping
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self,name,config):
@@ -111,7 +111,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
 
         self.GECs = { "Code":"( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                       "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         self._muonSel=None
         self._muonFilter()
 
@@ -145,7 +145,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
         self.registerLine(self._SS_Bplus_fakeP_line())
         self.registerLine(self._Bplus_fakeMu_line())
         self.registerLine(self._SS_Bplus_fakeMu_line())
-        
+
     def _NominalMuSelection( self ):
         return "(TRCHI2DOF < %(MuonTRCHI2)s ) &  (P> %(MuonP)s *MeV)"\
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
@@ -157,7 +157,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
          "& (~ISMUON) & (INMUON)"\
                "& (MIPCHI2DV(PRIMARY)> %(MuonMINIPCHI2)s )"
-    
+
     def _NominalPSelection( self ):
         return "(TRCHI2DOF < %(ProtonTRCHI2)s )&  (P> %(ProtonP)s *MeV) &  (PT> %(ProtonPT)s *MeV)"\
                "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
@@ -261,7 +261,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _muonFilter( self ):
         if self._muonSel is not None:
             return self._muonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -270,7 +270,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
         _muSel=Selection("Mu_for"+self._name,
                          Algorithm=_mu,
                          RequiredSelections = [StdLooseMuons])
-        
+
         self._muonSel=_muSel
         return _muSel
 
@@ -278,7 +278,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _fakemuonFilter( self ):
         if self._fakemuonSel is not None:
             return self._fakemuonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllNoPIDsMuons
@@ -287,7 +287,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
         _muSel=Selection("fakeMu_for"+self._name,
                          Algorithm=_mu,
                          RequiredSelections = [StdAllNoPIDsMuons])
-        
+
         self._fakemuonSel=_muSel
         return _muSel
 
@@ -295,16 +295,16 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _protonFilter( self ):
         if self._protonSel is not None:
             return self._protonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseProtons
-        
+
         _pr = FilterDesktop( Code = self._NominalPSelection() % self._config )
         _prSel=Selection("p_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdLooseProtons])
-        
+
         self._protonSel=_prSel
         return _prSel
 
@@ -312,22 +312,22 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _fakeprotonFilter( self ):
         if self._fakeprotonSel is not None:
             return self._fakeprotonSel
-  
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllNoPIDsPions
-        
+
         _pr = FilterDesktop( Code = self._FakePSelection() % self._config )
         _prSel=Selection("fakep_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdAllNoPIDsPions])
-        
+
         self._fakeprotonSel=_prSel
         return _prSel
 
 
     def _Definitions(self):
-        return [ 
+        return [
             "from LoKiPhys.decorators import *",
                            ]
 
@@ -335,7 +335,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _PPbar( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         PPbar = CombineParticles(DecayDescriptors = ["J/psi(1S) -> p+ p~-"], ReFitPVs = True)
         PPbar.Preambulo = self._Definitions()
         PPbar.MotherCut = self._PPbarSelection() % self._config
@@ -349,7 +349,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _PPbar_SS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         PPbar_SS = CombineParticles(DecayDescriptors = ["[J/psi(1S) -> p+ p+]cc"], ReFitPVs = True)
         PPbar_SS.Preambulo = self._Definitions()
         PPbar_SS.MotherCut = self._PPbarSelection() % self._config
@@ -364,7 +364,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _fakePPbar( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         PPbar = CombineParticles(DecayDescriptors = ["[N(1440)0 -> p+ pi-]cc"], ReFitPVs = True)
         PPbar.Preambulo = self._Definitions()
         PPbar.MotherCut = self._fakePPbarSelection() % self._config
@@ -380,7 +380,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _fakePPbar_SS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         PPbar = CombineParticles(DecayDescriptors = ["[N(1440)0 -> p+ pi+]cc"], ReFitPVs = True)
         PPbar.Preambulo = self._Definitions()
         PPbar.MotherCut = self._fakePPbarSelection() % self._config
@@ -439,13 +439,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_B( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection,MergedSelection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_B_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._daughters()])
@@ -456,13 +456,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_BTopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection,MergedSelection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_BTopo_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._daughters()])
@@ -473,13 +473,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_B_SS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection,MergedSelection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_SS_B_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._daughters_SS()])
@@ -490,13 +490,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_B_fakeMu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_fakeMu_B_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._fakemuonFilter(), self._daughters()])
@@ -506,13 +506,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_B_fakeP( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["FAKEPDECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV) & (AM<8000*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_fakeP_B_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._fakedaughters()])
@@ -522,13 +522,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_B_SSfakeP( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["FAKEPDECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV) & (AM<8000*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_SSfakeP_B_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._fakedaughters_SS()])
@@ -538,13 +538,13 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def _bhad2PMuX_B_SSfakeMu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._BMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("ppMu_SSfakeMu_B_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._fakemuonFilter(), self._daughters_SS()])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py
index d72ee6fb25ae385849783feab6836c3b3cc7400e..a1c8641ed9d8902df2490d7b353dcede84fdf442 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py
@@ -83,7 +83,7 @@ default_config = {
         'Prescale_Bu2D0TauNu'            : 1.0,
         'Prescale_B0s2DsTauNu'           : 1.0,
         'Prescale_Bc2JpsiTauNu'          : 1.0,
-        'Prescale_Lb2LcTauNu'            : 1.0,       
+        'Prescale_Lb2LcTauNu'            : 1.0,
         'Prescale_Lb2pTauNu'             : 1.0,
         'Prescale_Bu2DdoubleStar0TauNu'  : 1.0,
         'Prescale_Bu2Dstar02Pi0D0TauNu'        : 1.0,
@@ -119,7 +119,7 @@ default_config = {
         'Lc_K_PT'          : 150.0,  #MeV
         'Lc_K_TRCHI2DOF'   : 3.0,
         'Lc_K_IPCHI2'      : 10.0,
-        'Lc_K_PIDK'        : 3.0,    
+        'Lc_K_PIDK'        : 3.0,
         'Lc_K_TRPCHI2' : 0.00000001,
         #Lc pion cuts
         'Lc_Pi_PT'         : 150.0, # MeV
@@ -140,7 +140,7 @@ default_config = {
         'p_PIDp'        : 0.6,
         'p_PE'          : 15000,  #MeV
         #D0-resonance parameters
-        'D0_MassW'        : 40.0,      #MeV, 100 in StdLooseD0 
+        'D0_MassW'        : 40.0,      #MeV, 100 in StdLooseD0
         'D0_BPVVDCHI2'    : 36.0,      #36 in StdLooseD0
         'D0_DIRA'         : 0.995,
         'D0_PT'           : 1200.0,    #MeV, 1.2 GeV in StdLooseD02KPi
@@ -150,7 +150,7 @@ default_config = {
         #D-resonance parameters
         'D_MassW'         : 40.0,      #MeV, 100 in StdLooseDplus
         'D_BPVVDCHI2'     : 50.0,      #36 in StdLooseDplus
-        'Ds_BPVVDCHI2'    : 36.0,      #shorter lifetime than Dplus 
+        'Ds_BPVVDCHI2'    : 36.0,      #shorter lifetime than Dplus
         'D_DIRA'          : 0.995,   #0.98 in StdLooseDplus
         'D_PT'            : 1600.0,    #MeV, 1.2 in StdLooseDplus
         'D_VCHI2'         : 10.0,      #30 in StdLooseDplus
@@ -159,7 +159,7 @@ default_config = {
         'slowPi_TRCHI2DOF' : 30.0,
         'slowPi_PT'        : 50.0,    #MeV
         'Dstar_PT'         : 1250.0,   #MeV, 1250 in StdLooseD*
-        'Dstar_VCHI2'      : 25.0,     #MeV, 25 in StdLooseD*WithD02KPi 
+        'Dstar_VCHI2'      : 25.0,     #MeV, 25 in StdLooseD*WithD02KPi
         'Dstar_MassW'      : 50.0,     #MeV, 50 MeV in StdLooseD*WithD02KPi
         'Dstar_DeltaM_low'  : 135.0,  #MeV
         'Dstar_DeltaM_high' : 160.0,   #MeV, 165.5 in StdLooseD*
@@ -184,7 +184,7 @@ default_config = {
         'DdoubleStar0_Pi_IPCHI2' : 4.0,
         'DdoubleStar0_Pi_TRCHI2' : 3.0,
         'DdoubleStar0_Pi_PIDK'   : 8.0,
-        #DdoubleStar0(2420) 
+        #DdoubleStar0(2420)
         'DdoubleStar0_VCHI2'         : 25.0,
         'DdoubleStar0_PT'            : 500.0,  #MeV
         'DdoubleStar0_DeltaM_low'    : 350.0,  #MeV
@@ -193,19 +193,19 @@ default_config = {
         #Dstar0-resonance parameters for pi0 mode
         'Dstar02Pi0D0_PT'          : 1250.0,  #MeV
         'Dstar02Pi0D0_VCHI2'       :  25.0,   #MeV
-        'Dstar02Pi0D0_MassW'       :  50.0,   #MeV   
-        'Dstar02Pi0D0_DeltaM_low'  : 120.0,   #MeV   
-        'Dstar02Pi0D0_DeltaM_high' : 200.0,   #MeV   
+        'Dstar02Pi0D0_MassW'       :  50.0,   #MeV
+        'Dstar02Pi0D0_DeltaM_low'  : 120.0,   #MeV
+        'Dstar02Pi0D0_DeltaM_high' : 200.0,   #MeV
         #Cuts on single pions which are used to form the D*0 from D0 and pi0
-        'Dstar02Pi0D0_Pi_PT'      : 200.0,    #MeV  
+        'Dstar02Pi0D0_Pi_PT'      : 200.0,    #MeV
         #Dstar0-resonance parameters for gamma mode
         'Dstar02GammaD0_PT'          : 1250.0,  #MeV
         'Dstar02GammaD0_VCHI2'       :  25.0,   #MeV
-        'Dstar02GammaD0_MassW'       :  50.0,   #MeV  
-        'Dstar02GammaD0_DeltaM_low'  : 0.0,   #MeV   
-        'Dstar02GammaD0_DeltaM_high' : 250.0,   #MeV   
+        'Dstar02GammaD0_MassW'       :  50.0,   #MeV
+        'Dstar02GammaD0_DeltaM_low'  : 0.0,   #MeV
+        'Dstar02GammaD0_DeltaM_high' : 250.0,   #MeV
         #Cuts on singlegamma which are used to form the D*0 from D0 and gamma
-        'Dstar02GammaD0_Pi_PT'      : 400.0,    #MeV 
+        'Dstar02GammaD0_Pi_PT'      : 400.0,    #MeV
         #Cuts on single pions which are used to form the D_1(2420)0 from D*(pi0 mode) and pion
         'DdoubleStar2PiDstar02Pi0D0_Pi_IPCHI2' : 4.0,
         'DdoubleStar2PiDstar02Pi0D0_Pi_TRCHI2' : 3.0,
@@ -231,7 +231,7 @@ default_config = {
         #Slow pion ghost prob
         'TRGHP_slowPi'      : 0.6,
         #HLT1 trigger
-        'TisTosSpecs'       : { 'Hlt1.*Decision%TOS' : 0 }    
+        'TisTosSpecs'       : { 'Hlt1.*Decision%TOS' : 0 }
     },
     'STREAMS' : ['BhadronCompleteEvent']
 }
@@ -249,19 +249,19 @@ class B2XTauNuAllLinesConf(LineBuilder):
     usage: config={...}
     B2XTauNuConf(name+LineSuffix, config)
     Will make lines ending in LineSuffix with the config configurations
-    
+
     The cuts are configuration parameter only if they are different between the lines,
     common cuts are hardcoded.
-    
+
     Use conf.printCuts to check the cuts in python
     The selections are available individually as PionSel, PiPiSel, TauSel, DstarSel and B0Sel
     The Line object, a member of this class, holds the configured line
     """
-    
+
     Line=None
     Selections=[]
     TopSelectionSeq=None
-   
+
     Dstar_KCut=''
     Dstar_PiCut=''
     Dstar_slowPiCut=''
@@ -318,7 +318,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     DdoubleStar2PiDstar02Pi0D0Cut=''
     DdoubleStar2PiDstar02GammaD0_PionCut=''
     DdoubleStar2PiDstar02GammaD0Cut=''
-   
+
 
     JpsiSel=None
     DstarSel=None
@@ -327,7 +327,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     DsSel=None
     LcSel=None
     pSel=None
-    
+
     B0d2DstarTauNuSel=None
     B0d2DTauNuSel=None
     B0s2DsTauNuSel=None
@@ -355,11 +355,11 @@ class B2XTauNuAllLinesConf(LineBuilder):
     B0d2DdoubleStar2PiDstar02GammaD0TauNuSel=None
     B0d2DdoubleStar2PiDstar02GammaD0TauNuSelWS=None
     B0d2DdoubleStar2PiDstar02GammaD0TauNuSelNonPhysTau=None
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-        
+
     __confdict__={}
-    
+
     def __init__(self, name, config):
         '''The constructor of the configuration class.
         Requires a name which is added to the end of each algorithm name
@@ -378,7 +378,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                      " (MIPCHI2DV(PRIMARY)> %(D_K_IPCHI2)s ) & (TRGHP < %(TRGHP)s) & "\
                      " (PIDK >  %(D_K_PIDK)s),1),2) " % config
 
-        
+
         #Cuts for pion from D0
         self.Dstar_PiCut = "& CHILDCUT(CHILDCUT( (PT> %(D_Pi_PT)s*MeV) & "\
                      " (TRCHI2DOF < %(D_Pi_TRCHI2)s) & (TRGHP < %(TRGHP)s) & "\
@@ -388,30 +388,30 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.Dstar_D0Cut = "& CHILDCUT( (PT>%(D0_PT)s*MeV) & (ADMASS('D0') < %(D0_MassW)s *MeV ) & (BPVDIRA > %(D0_DIRA)s) & " \
                      " (BPVVDCHI2 > %(D0_BPVVDCHI2)s) & (VFASPF(VCHI2/VDOF)<%(D0_VCHI2)s),2)  "% config
 
-        # Cuts for Dstar        
+        # Cuts for Dstar
         self.Dstar_slowPiCut= "& CHILDCUT( (PT>%(slowPi_PT)s*MeV) & "\
-                        " (TRCHI2DOF < %(slowPi_TRCHI2DOF)s) & (TRGHP < %(TRGHP_slowPi)s),1)" % config       
+                        " (TRCHI2DOF < %(slowPi_TRCHI2DOF)s) & (TRGHP < %(TRGHP_slowPi)s),1)" % config
+
 
-        
 
         self.DstarCut = " (VFASPF(VCHI2/VDOF) < %(Dstar_VCHI2)s ) & (M-MAXTREE('D0'==ABSID,M)>%(Dstar_DeltaM_low)s*MeV) & (M-MAXTREE('D0'==ABSID,M)<%(Dstar_DeltaM_high)s*MeV) &"\
                         " (PT>%(Dstar_PT)s *MeV) & ((ADMASS('D*(2010)+')< %(Dstar_MassW)s*MeV))" % config
-        
-        
+
+
 
         self.totalDstarCut = self.DstarCut + self.Dstar_KCut + self.Dstar_PiCut + self.Dstar_D0Cut+ self.Dstar_slowPiCut
         #cuts for D*+  with wrong pion = idem as normal Dstar
-        
 
-        
+
+
         #StdLooseDPlus has the following decay chain: D+ -> K pi pi
 
         #Cuts for kaon from D+ (also used as cuts for D0 -> K pi kaon)
         self.D_KCut  = "& CHILDCUT( ('K+'==ABSID) & (PT > %(Dplus_K_PT)s*MeV) & "\
                            " (TRCHI2DOF < %(D_K_TRCHI2DOF)s ) & (TRPCHI2 > %(Dplus_K_TRPCHI2)s) &"\
                            " (MIPCHI2DV(PRIMARY)> %(D_K_IPCHI2)s ) & (TRGHP < %(TRGHP)s) & "\
-                           " (PIDK > %(Dplus_K_PIDK)s),1) " % config 
-        
+                           " (PIDK > %(Dplus_K_PIDK)s),1) " % config
+
         #First daughter pion (also used as cuts for D0 -> K pi pion)
         self.D_Pi1Cut = "& CHILDCUT( ('pi+'==ABSID) & (PT> %(D_Pi_PT)s*MeV) & (TRPCHI2 > %(Dplus_Pi_TRPCHI2)s) &"\
                             " (TRCHI2DOF < %(D_Pi_TRCHI2)s) & (TRGHP < %(TRGHP)s) & "\
@@ -421,7 +421,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.D_Pi2Cut = "& CHILDCUT( ('pi+'==ABSID) & (PT> %(D_Pi_PT)s*MeV) & (TRPCHI2 > %(Dplus_Pi_TRPCHI2)s) & "\
                             " (TRCHI2DOF < %(D_Pi_TRCHI2)s) & (TRGHP < %(TRGHP)s) & "\
                             " (MIPCHI2DV(PRIMARY)> %(D_Pi_IPCHI2)s) & (PIDK < %(D_Pi_PIDK)s),3)" % config
-   
+
         #D+ cuts
         self.DplusCut = "(PT>%(D_PT)s*MeV) & (ADMASS('D+') < %(D_MassW)s *MeV ) & (BPVDIRA > %(D_DIRA)s) & " \
                      " (BPVVDCHI2 > %(D_BPVVDCHI2)s) & (VFASPF(VCHI2/VDOF)<%(D_VCHI2)s) & (MIPCHI2DV(PRIMARY)> %(D_MIPCHI2)s)"% config
@@ -429,36 +429,36 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.totalDplusCut = self.DplusCut + self.D_KCut + self.D_Pi1Cut + self.D_Pi2Cut
 
 
-        #Cuts for Ds 
+        #Cuts for Ds
 
         #First daughter kaon
         self.Ds_K1Cut  = "& CHILDCUT( ('K+'==ABSID) & (PT > %(Ds_K_PT)s*MeV) & "\
                            " (TRCHI2DOF < %(D_K_TRCHI2DOF)s ) &"\
                            " (MIPCHI2DV(PRIMARY)> %(D_K_IPCHI2)s ) & (TRGHP < %(TRGHP)s) & "\
-                           " (PIDK > %(Dplus_K_PIDK)s),1) " % config 
+                           " (PIDK > %(Dplus_K_PIDK)s),1) " % config
 
         #Second daughter kaon
         self.Ds_K2Cut  = "& CHILDCUT( ('K+'==ABSID) & (PT > %(Ds_K_PT)s*MeV) & "\
                            " (TRCHI2DOF < %(D_K_TRCHI2DOF)s ) &"\
                            " (MIPCHI2DV(PRIMARY)> %(D_K_IPCHI2)s ) & (TRGHP < %(TRGHP)s) & "\
                            " (PIDK > %(Dplus_K_PIDK)s),2) " % config
-        
+
         #Daughter pion
         self.Ds_PiCut = "& CHILDCUT( ('pi+'==ABSID) & (PT> %(D_Pi_PT)s*MeV) &"\
                             " (TRCHI2DOF < %(D_Pi_TRCHI2)s) & (TRGHP < %(TRGHP)s) & "\
                             " (MIPCHI2DV(PRIMARY)> %(D_Pi_IPCHI2)s ) & (PIDK < %(D_Pi_PIDK)s),3)" % config
-        
+
         #Ds cuts
         self.DsCut = "(PT>%(D_PT)s*MeV) & (ADMASS('D_s+') < %(D_MassW)s *MeV ) & (BPVDIRA > %(D_DIRA)s) & " \
                      " (BPVVDCHI2 > %(Ds_BPVVDCHI2)s) & (VFASPF(VCHI2/VDOF)<%(D_VCHI2)s) & (MIPCHI2DV(PRIMARY)> %(D_MIPCHI2)s)"% config
 
         self.totalDsCut = self.DsCut + self.Ds_K1Cut + self.Ds_K2Cut + self.Ds_PiCut
-        
 
 
-        #StdLooseD02HH contains the decay : D0 -> K pi 
 
-        
+        #StdLooseD02HH contains the decay : D0 -> K pi
+
+
         #Cuts on D0
         self.D0Cut = "(PT>%(D0_PT)s*MeV) & (ADMASS('D0') < %(D0_MassW)s *MeV ) & (BPVDIRA > %(D0_DIRA)s) & " \
                      " (BPVVDCHI2 > %(D0_BPVVDCHI2)s) & (VFASPF(VCHI2/VDOF)<%(D0_VCHI2)s) & (MIPCHI2DV(PRIMARY)> %(D_MIPCHI2)s)"% config
@@ -472,8 +472,8 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.Lc_KCut  = "& INTREE( ('K-'==ABSID) & (PT > %(Lc_K_PT)s*MeV) & "\
                            " (TRCHI2DOF < %(Lc_K_TRCHI2DOF)s ) & (TRPCHI2 > %(Lc_K_TRPCHI2)s) &"\
                            " (MIPCHI2DV(PRIMARY)> %(Lc_K_IPCHI2)s ) & (TRGHP < %(TRGHP)s) & "\
-                           " (PIDK > %(Lc_K_PIDK)s)) " % config 
-        
+                           " (PIDK > %(Lc_K_PIDK)s)) " % config
+
         # pion (also used as cuts for D0 -> K pi pion)
         self.Lc_PiCut = "& INTREE ( ('pi+'==ABSID) & (PT> %(Lc_Pi_PT)s*MeV) & (TRPCHI2 > %(Lc_Pi_TRPCHI2)s) &"\
                             " (TRCHI2DOF < %(Lc_Pi_TRCHI2)s) & (TRGHP < %(TRGHP)s) & "\
@@ -483,10 +483,10 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.Lc_pCut = "& INTREE( ('p+'==ABSID) & (PT> %(Lc_p_PT)s*MeV)  & "\
                             " (TRCHI2DOF < %(Lc_p_TRCHI2DOF)s) & (TRGHP < %(TRGHP)s) & "\
                             " (MIPCHI2DV(PRIMARY)> %(Lc_p_IPCHI2)s) & (PIDp > %(Lc_p_PIDp)s))" % config
-   
+
         #Lc cuts
         self.LcCut = "(PT>%(Lc_PT)s*MeV) & (ADMASS('Lambda_c+') < %(Lc_MassW)s *MeV )& (BPVDIRA > %(Lc_DIRA)s) & (BPVVDCHI2 > %(Lc_BPVVDCHI2)s) & (VFASPF(VCHI2/VDOF)<%(Lc_VCHI2)s) & (MIPCHI2DV(PRIMARY)> %(Lc_MIPCHI2)s)"% config
-         
+
         self.totalLcCut = self.LcCut  + self.Lc_pCut + self.Lc_PiCut + self.Lc_KCut
 
         #P cuts for pTaunu
@@ -495,23 +495,23 @@ class B2XTauNuAllLinesConf(LineBuilder):
                             " (MIPCHI2DV(PRIMARY)> %(p_IPCHI2)s) & (PROBNNp > %(p_PIDp)s) & (PROBNNk < .1) & (PROBNNpi < .1) " % config
 
 #Lc cuts for Invertex vertex selection
- 
-       
+
+
         self.LcLightCut = " (ADMASS('Lambda_c+') < %(Lc_MassW)s *MeV )&  (BPVVDCHI2 > %(Lc_BPVVDCHI2)s) & (VFASPF(VCHI2/VDOF)<%(Lc_VCHI2)s)& (MIPCHI2DV(PRIMARY)> %(Lc_MIPCHI2)s) "% config
         self.Lc_pLightcut="& INTREE( ('p+'==ABSID)& (TRCHI2DOF < %(Lc_p_TRCHI2DOF)s) & (TRGHP < %(TRGHP)s) & (PIDp > %(Lc_p_PIDp)s))" % config
         self.Lc_KLightcut = "& INTREE( ('K-'==ABSID) & (TRCHI2DOF < %(Lc_K_TRCHI2DOF)s ) & (TRGHP < %(TRGHP)s) & (PIDK > %(Lc_K_PIDK)s)) " % config
-        
+
 
         self.totalLcInvVertCut=  self.LcLightCut + self.Lc_pCut+self.Lc_KCut
 
         #Dstar cuts for Invertex vertex selection
- 
-       
+
+
         self.DLightCut = "  (M-MAXTREE('D0'==ABSID,M)>%(Dstar_DeltaM_low)s*MeV) & (M-MAXTREE('D0'==ABSID,M)<%(Dstar_DeltaM_high)s*MeV) & (VFASPF(VCHI2/VDOF)<%(D0_VCHI2)s) & CHILDCUT(  (ADMASS('D0') < %(D0_MassW)s *MeV ),2)  "% config
-       
+
         self.DLight_partCut="& INTREE( ('K-'==ABSID)& (TRCHI2DOF < %(D_K_TRCHI2DOF)s) & (TRGHP < %(TRGHP)s)) &INTREE( ('pi+'==ABSID)& (TRCHI2DOF < %(D_Pi_TRCHI2)s) & (TRGHP < %(TRGHP)s)) " % config
         self.totalDInvVertCut=  self.DLightCut +self.DLight_partCut
-        
+
         #J/psi cuts for Bc mode
         self.MuonCut = " & (MINTREE('mu+'==ABSID,PT) > %(Muon_PT)s *MeV) & (MAXTREE('mu+'==ABSID,TRCHI2DOF) < %(Muon_TRCHI2DOF)s)" %config
         self.JpsiCut = "(ADMASS('J/psi(1S)') < %(Jpsi_MassW)s *MeV) & (VFASPF(VCHI2PDOF)< %(Jpsi_VCHI2)s) & (PT > %(Jpsi_PT)s *MeV)" %config
@@ -526,32 +526,32 @@ class B2XTauNuAllLinesConf(LineBuilder):
         #Cuts for D_1(2420)0 -> D*(2010)+ pi- and D*_2(2460)0 -> D*(2010)+ pi-
         self.DdoubleStar0Cut = " (VFASPF(VCHI2/VDOF) < %(DdoubleStar0_VCHI2)s ) & (M-MAXTREE('D*(2010)+'==ABSID,M)>%(DdoubleStar0_DeltaM_low)s*MeV) & (M-MAXTREE('D*(2010)+'==ABSID,M)<%(DdoubleStar0_DeltaM_high)s*MeV) &"\
                         " (PT>%(DdoubleStar0_PT)s *MeV) & ((ADMASS('D_1(2420)0')< %(DdoubleStar0_MassW)s*MeV))" % config
-                        
+
         # Cuts for D*0 (pi0 mode)
         self.Dstar02Pi0D0Cut = " (VFASPF(VCHI2/VDOF) < %(Dstar02Pi0D0_VCHI2)s ) & (M-MAXTREE('D0'==ABSID,M)>%(Dstar02Pi0D0_DeltaM_low)s*MeV) & (M-MAXTREE('D0'==ABSID,M)<%(Dstar02Pi0D0_DeltaM_high)s*MeV) &"\
                         " (PT>%(Dstar02Pi0D0_PT)s *MeV) & ((ADMASS('D*(2007)0')< %(Dstar02Pi0D0_MassW)s*MeV))" % config
         # Cuts for pi0 from D*0 -> pi0 D0
         self.Dstar02Pi0D0_PionCut = "(PT>%(Dstar02Pi0D0_Pi_PT)s *MeV)" %config
-        
+
         # Cuts for D*0 (Gamma mode)
         self.Dstar02GammaD0Cut = " (VFASPF(VCHI2/VDOF) < %(Dstar02GammaD0_VCHI2)s ) & (M-MAXTREE('D0'==ABSID,M)>%(Dstar02GammaD0_DeltaM_low)s*MeV) & (M-MAXTREE('D0'==ABSID,M)<%(Dstar02GammaD0_DeltaM_high)s*MeV) &"\
                         " (PT>%(Dstar02GammaD0_PT)s *MeV) & ((ADMASS('D*(2007)0')< %(Dstar02GammaD0_MassW)s*MeV))" % config
         # Cuts for Gamma from D*0 -> Gamma D0
         self.Dstar02GammaD0_PionCut = "(PT>%(Dstar02GammaD0_Pi_PT)s *MeV)" %config
 
-        #Cuts for pion in D_1(2420)- -> D*(2007)0 (pi0 mode) pi- 
+        #Cuts for pion in D_1(2420)- -> D*(2007)0 (pi0 mode) pi-
         self.DdoubleStar2PiDstar02Pi0D0_PionCut = "(MIPCHI2DV(PRIMARY)> %(DdoubleStar2PiDstar02Pi0D0_Pi_IPCHI2)s ) & (TRCHI2DOF < %(DdoubleStar2PiDstar02Pi0D0_Pi_TRCHI2)s) & (PIDK < %(DdoubleStar2PiDstar02Pi0D0_Pi_PIDK)s) & (TRGHP < %(TRGHP_slowPi)s)" %config
-        # Cuts for pi from  D_1(2420)- -> D*(2007)0 (pi0 mode) pi- 
+        # Cuts for pi from  D_1(2420)- -> D*(2007)0 (pi0 mode) pi-
         self.DdoubleStar2PiDstar02Pi0D0Cut = " (VFASPF(VCHI2/VDOF) < %(DdoubleStar2PiDstar02Pi0D0_VCHI2)s ) & (M-MAXTREE('D*(2007)0'==ABSID,M)>%(DdoubleStar2PiDstar02Pi0D0_DeltaM_low)s*MeV) & (M-MAXTREE('D*(2007)0'==ABSID,M)<%(DdoubleStar2PiDstar02Pi0D0_DeltaM_high)s*MeV) &"\
                         " (PT>%(DdoubleStar2PiDstar02Pi0D0_PT)s *MeV) & ((ADMASS('D_1(2420)-')< %(DdoubleStar2PiDstar02Pi0D0_MassW)s*MeV))" % config
 
-        #Cuts for pion in D_1(2420)- -> D*(2007)0 (Gamma mode) pi- 
+        #Cuts for pion in D_1(2420)- -> D*(2007)0 (Gamma mode) pi-
         self.DdoubleStar2PiDstar02GammaD0_PionCut = "(MIPCHI2DV(PRIMARY)> %(DdoubleStar2PiDstar02GammaD0_Pi_IPCHI2)s ) & (TRCHI2DOF < %(DdoubleStar2PiDstar02GammaD0_Pi_TRCHI2)s) & (PIDK < %(DdoubleStar2PiDstar02GammaD0_Pi_PIDK)s) & (TRGHP < %(TRGHP_slowPi)s)" %config
-        # Cuts for pi from  D_1(2420)- -> D*(2007)0 (Gamma mode) pi- 
+        # Cuts for pi from  D_1(2420)- -> D*(2007)0 (Gamma mode) pi-
         self.DdoubleStar2PiDstar02GammaD0Cut = " (VFASPF(VCHI2/VDOF) < %(DdoubleStar2PiDstar02GammaD0_VCHI2)s ) & (M-MAXTREE('D*(2007)0'==ABSID,M)>%(DdoubleStar2PiDstar02GammaD0_DeltaM_low)s*MeV) & (M-MAXTREE('D*(2007)0'==ABSID,M)<%(DdoubleStar2PiDstar02GammaD0_DeltaM_high)s*MeV) &"\
                         " (PT>%(DdoubleStar2PiDstar02GammaD0_PT)s *MeV) & ((ADMASS('D_1(2420)-')< %(DdoubleStar2PiDstar02GammaD0_MassW)s*MeV))" % config
 
-       
+
         #B combination cuts
         self.B0CombCut="(((DAMASS('B0') > %(B_DeltaM_low)s*MeV) & (DAMASS('B0') < %(B_DeltaM_high)s*MeV)) or ((DAMASS('B0') > %(B_upperDeltaM_low)s*MeV) & (DAMASS('B0') < %(B_upperDeltaM_high)s*MeV))) & (AMAXDOCA('',0) < %(B_DOCAMAX)s*mm)" %config
 
@@ -567,9 +567,9 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.B0dCombInvVertCut="(ACHILD(VFASPF(VZ),2) - ACHILD(VFASPF(VZ),1) >  %(DInvVertD)s *mm)&(ACHILD(VFASPF(VZ),2) - ACHILD(VFASPF(VZ),1) <50.) & (DAMASS('B0') < %(B_DeltaM_high)s*MeV)" %config
         #B cuts
         self.BCut = " (BPVDIRA > %(B_BPVDIRA)s)" %config
-       
+
         self.BInvVertCut = " (BPVDIRA >%(B_BPVDIRA)s)" %config
-     
+
 
         ### Now make all the selections ###
 
@@ -584,7 +584,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__FilterLcInvVert__()
         self.__FilterDInvVert__()
         self.__FilterJpsi2MuMu__()
-        
+
         self.__MakeB0d2DstarTauNu__()
         self.__MakeB0d2DstarWSSlowTauNu__()
         self.__MakeB0d2DstarTauNuWS__()
@@ -627,25 +627,25 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNu__()
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuWS__()
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
-              
+
         from StrippingConf.StrippingLine import StrippingLine
         from PhysSelPython.Wrappers import SelectionSequence
 
-        
+
         #TisTos filter
         def filterTisTos(name,Input,myTisTosSpecs):
-            
+
             from Configurables import TisTosParticleTagger
             from PhysSelPython.Wrappers import Selection
             myTagger = TisTosParticleTagger(name + "_TisTosTagger")
             myTagger.TisTosSpecs = myTisTosSpecs
-            
+
             # To speed it up, TisTos only with tracking system
             myTagger.ProjectTracksToCalo = False
             myTagger.CaloClustForCharged = False
             myTagger.CaloClustForNeutral = False
             myTagger.TOSFrac = { 4:0.0, 5:0.0 }
-            
+
             return Selection(name + "_SelTisTos",
                              Algorithm = myTagger,
                              RequiredSelections = [ Input ] )
@@ -665,7 +665,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         )
         self.registerLine(B0d2DstarTauNuLine)
 
-        
+
         self.TOSB0d2DstarWSSlowTauNu = filterTisTos("TOSB0d2DstarWSSlowTauNu",
                                              Input = self.B0d2DstarWSSlowTauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -679,14 +679,14 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         )
         self.registerLine(B0d2DstarWSSlowTauNuLine)
 
-        
-        
+
+
 
         self.TOSB0d2DstarTauNuWS = filterTisTos("TOSB0d2DstarTauNuWS",
                                              Input = self.B0d2DstarTauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         B0d2DstarTauNuWSLine=StrippingLine("B0d2DstarTauNuWSFor"+self._name,
                                           prescale = config['Prescale_B0d2DstarTauNu'],
                                           postscale = config['Postscale'],
@@ -706,13 +706,13 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                           )
         self.registerLine(B0d2DstarTauNuNonPhysTauLine)
 
-        
+
 
         self.TOSB0d2DTauNu = filterTisTos("TOSB0d2DTauNu",
                                              Input = self.B0d2DTauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         B0d2DTauNuLine=StrippingLine("B0d2DTauNuFor"+self._name,
                                     prescale = config['Prescale_B0d2DTauNu'],
                                     postscale = config['Postscale'],
@@ -724,7 +724,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.B0d2DTauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         B0d2DTauNuWSLine=StrippingLine("B0d2DTauNuWSFor"+self._name,
                                       prescale = config['Prescale_B0d2DTauNu'],
                                       postscale = config['Postscale'],
@@ -748,7 +748,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.Bu2D0TauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2D0TauNuLine=StrippingLine("Bu2D0TauNuFor"+self._name,
                                      prescale = config['Prescale_Bu2D0TauNu'],
                                      postscale = config['Postscale'],
@@ -760,7 +760,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.Bu2D0TauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2D0TauNuWSLine=StrippingLine("Bu2D0TauNuWSFor"+self._name,
                                        prescale = config['Prescale_Bu2D0TauNu'],
                                        postscale = config['Postscale'],
@@ -784,7 +784,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.Bc2JpsiTauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bc2JpsiTauNuLine=StrippingLine("Bc2JpsiTauNuFor"+self._name,
                                        prescale = config['Prescale_Bc2JpsiTauNu'],
                                        postscale = config['Postscale'],
@@ -808,7 +808,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.Lb2LcTauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Lb2LcTauNuLine=StrippingLine("Lb2LcTauNuFor"+self._name,
                                      prescale = config['Prescale_Lb2LcTauNu'],
                                      postscale = config['Postscale'],
@@ -820,7 +820,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.Lb2LcTauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Lb2LcTauNuWSLine=StrippingLine("Lb2LcTauNuWSFor"+self._name,
                                        prescale = config['Prescale_Lb2LcTauNu'],
                                        postscale = config['Postscale'],
@@ -832,7 +832,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                           Input = self.Lb2pTauNuSel,
                                           myTisTosSpecs = config['TisTosSpecs']
                                           )
-        
+
         Lb2pTauNuLine=StrippingLine("Lb2pTauNuFor"+self._name,
                                      prescale = config['Prescale_Lb2pTauNu'],
                                      postscale = config['Postscale'],
@@ -844,7 +844,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.Lb2pTauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Lb2pTauNuWSLine=StrippingLine("Lb2pTauNuWSFor"+self._name,
                                        prescale = config['Prescale_Lb2pTauNu'],
                                        postscale = config['Postscale'],
@@ -863,12 +863,12 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                        algos = [ self.TOSLb2LcTauNuNonPhys ]
                                        )
         self.registerLine(Lb2LcTauNuNonPhysTauLine)
-        
+
         self.TOSLb2LcTauNuInvVert = filterTisTos("TOSLb2LcTauNuInvVert",
                                              Input = self.Lb2LcTauNuSelInvVert,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Lb2LcTauNuInvVertLine=StrippingLine("Lb2LcTauNuInvVertFor"+self._name,
                                      prescale = config['Prescale_Lb2LcTauNu'],
                                      postscale = config['Postscale'],
@@ -880,19 +880,19 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.B0d2DstarTauNuSelInvVert,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         B0d2DstarTauNuInvVertLine=StrippingLine("B0d2DstarTauNuInvVertFor"+self._name,
                                      prescale = config['Prescale_B0d2DstarTauNu'],
                                      postscale = config['Postscale'],
                                      algos = [ self.TOSB0d2DstarTauNuInvVert ]
                                      )
         self.registerLine(B0d2DstarTauNuInvVertLine)
-        
+
         self.TOSBs2DsTauNu = filterTisTos("TOSBs2DsTauNu",
                                              Input = self.B0s2DsTauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bs2DsTauNuLine=StrippingLine("Bs2DsTauNuFor"+self._name,
                                      prescale = config['Prescale_B0s2DsTauNu'],
                                      postscale = config['Postscale'],
@@ -904,7 +904,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                              Input = self.B0s2DsTauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bs2DsTauNuWSLine=StrippingLine("Bs2DsTauNuWSFor"+self._name,
                                        prescale = config['Prescale_B0s2DsTauNu'],
                                        postscale = config['Postscale'],
@@ -925,7 +925,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.registerLine(Bs2DsTauNuNonPhysTauLine)
 
 
-        
+
 
         self.TOSBu2DdoubleStar0TauNu = filterTisTos("TOSBu2DdoubleStar0TauNu",
                                              Input = self.Bu2DdoubleStar0TauNuSel,
@@ -938,12 +938,12 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSBu2DdoubleStar0TauNu ]
                                         )
         self.registerLine(Bu2DdoubleStar0TauNuLine)
-        
+
         self.TOSBu2DdoubleStar0TauNuWS = filterTisTos("TOSBu2DdoubleStar0TauNuWS",
                                              Input = self.Bu2DdoubleStar0TauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2DdoubleStar0TauNuWSLine=StrippingLine("Bu2DdoubleStar0TauNuWSFor"+self._name,
                                           prescale = config['Prescale_Bu2DdoubleStar0TauNu'],
                                           postscale = config['Postscale'],
@@ -962,81 +962,81 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                           algos = [ self.TOSBu2DdoubleStar0TauNuNonPhys ]
                                           )
         self.registerLine(Bu2DdoubleStar0TauNuNonPhysTauLine)
-        
+
         self.TOSBu2Dstar02Pi0D0TauNu = filterTisTos("TOSBu2Dstar02Pi0D0TauNu",
                                              Input = self.Bu2Dstar02Pi0D0TauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2Dstar02Pi0D0TauNuLine=StrippingLine("Bu2Dstar02Pi0D0TauNuFor"+self._name,
                                         prescale = config['Prescale_Bu2Dstar02Pi0D0TauNu'],
                                         postscale = config['Postscale'],
-                                        
+
                                         algos = [ self.TOSBu2Dstar02Pi0D0TauNu ]
                                         )
         self.registerLine(Bu2Dstar02Pi0D0TauNuLine)
-        
+
         self.TOSBu2Dstar02Pi0D0TauNuWS = filterTisTos("TOSBu2Dstar02Pi0D0TauNuWS",
                                              Input = self.Bu2Dstar02Pi0D0TauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2Dstar02Pi0D0TauNuWSLine=StrippingLine("Bu2Dstar02Pi0D0TauNuWSFor"+self._name,
                                         prescale = config['Prescale_Bu2Dstar02Pi0D0TauNu'],
                                         postscale = config['Postscale'],
                                         algos = [ self.TOSBu2Dstar02Pi0D0TauNuWS ]
                                         )
         self.registerLine(Bu2Dstar02Pi0D0TauNuWSLine)
-        
+
         self.TOSBu2Dstar02Pi0D0TauNuNonPhys = filterTisTos("TOSBu2Dstar02Pi0D0TauNuNonPhys",
                                              Input = self.Bu2Dstar02Pi0D0TauNuSelNonPhysTau,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2Dstar02Pi0D0TauNuNonPhysTauLine=StrippingLine("Bu2Dstar02Pi0D0TauNuNonPhysFor"+self._name,
                                         prescale = config['Prescale_NonPhys'],
                                         postscale = config['Postscale'],
                                         algos = [ self.TOSBu2Dstar02Pi0D0TauNuNonPhys ]
                                         )
         self.registerLine(Bu2Dstar02Pi0D0TauNuNonPhysTauLine)
-        
+
         self.TOSBu2Dstar02GammaD0TauNu = filterTisTos("TOSBu2Dstar02GammaD0TauNu",
                                              Input = self.Bu2Dstar02GammaD0TauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2Dstar02GammaD0TauNuLine=StrippingLine("Bu2Dstar02GammaD0TauNuFor"+self._name,
                                         prescale = config['Prescale_Bu2Dstar02GammaD0TauNu'],
                                         postscale = config['Postscale'],
-                                        
+
                                         algos = [ self.TOSBu2Dstar02GammaD0TauNu ]
                                         )
         self.registerLine(Bu2Dstar02GammaD0TauNuLine)
-        
+
         self.TOSBu2Dstar02GammaD0TauNuWS = filterTisTos("TOSBu2Dstar02GammaD0TauNuWS",
                                              Input = self.Bu2Dstar02GammaD0TauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2Dstar02GammaD0TauNuWSLine=StrippingLine("Bu2Dstar02GammaD0TauNuWSFor"+self._name,
                                         prescale = config['Prescale_Bu2Dstar02GammaD0TauNu'],
                                         postscale = config['Postscale'],
                                         algos = [ self.TOSBu2Dstar02GammaD0TauNuWS ]
                                         )
         self.registerLine(Bu2Dstar02GammaD0TauNuWSLine)
-        
+
         self.TOSBu2Dstar02GammaD0TauNuNonPhys = filterTisTos("TOSBu2Dstar02GammaD0TauNuNonPhys",
                                              Input = self.Bu2Dstar02GammaD0TauNuSelNonPhysTau,
                                              myTisTosSpecs = config['TisTosSpecs']
                                              )
-        
+
         Bu2Dstar02GammaD0TauNuNonPhysTauLine=StrippingLine("Bu2Dstar02GammaD0TauNuNonPhysFor"+self._name,
                                         prescale = config['Prescale_NonPhys'],
                                         postscale = config['Postscale'],
                                         algos = [ self.TOSBu2Dstar02GammaD0TauNuNonPhys ]
                                         )
         self.registerLine(Bu2Dstar02GammaD0TauNuNonPhysTauLine)
-        
+
         self.TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNu = filterTisTos("TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNu",
                                              Input = self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -1048,7 +1048,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNu ]
                                         )
         self.registerLine(B0d2DdoubleStar2PiDstar02Pi0D0TauNuLine)
-        
+
         self.TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS = filterTisTos("TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS",
                                              Input = self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -1060,7 +1060,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS ]
                                         )
         self.registerLine(B0d2DdoubleStar2PiDstar02Pi0D0TauNuWSLine)
-        
+
         self.TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhys = filterTisTos("TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhys",
                                              Input = self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSelNonPhysTau,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -1072,7 +1072,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhys ]
                                         )
         self.registerLine(B0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTauLine)
-        
+
         self.TOSB0d2DdoubleStar2PiDstar02GammaD0TauNu = filterTisTos("TOSB0d2DdoubleStar2PiDstar02GammaD0TauNu",
                                              Input = self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSel,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -1084,7 +1084,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSB0d2DdoubleStar2PiDstar02GammaD0TauNu ]
                                         )
         self.registerLine(B0d2DdoubleStar2PiDstar02GammaD0TauNuLine)
-        
+
         self.TOSB0d2DdoubleStar2PiDstar02GammaD0TauNuWS = filterTisTos("TOSB0d2DdoubleStar2PiDstar02GammaD0TauNuWS",
                                              Input = self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSelWS,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -1096,7 +1096,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSB0d2DdoubleStar2PiDstar02GammaD0TauNuWS ]
                                         )
         self.registerLine(B0d2DdoubleStar2PiDstar02GammaD0TauNuWSLine)
-        
+
         self.TOSB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhys = filterTisTos("TOSB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhys",
                                              Input = self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSelNonPhysTau,
                                              myTisTosSpecs = config['TisTosSpecs']
@@ -1108,8 +1108,8 @@ class B2XTauNuAllLinesConf(LineBuilder):
                                         algos = [ self.TOSB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhys ]
                                         )
         self.registerLine(B0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTauLine)
-        
-        
+
+
         ### Collect them all together in a nice way ###
         self.Line=B0d2DstarTauNuLine
         self.Selections=[self.DstarSel, self.B0d2DstarTauNuSel]
@@ -1122,7 +1122,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         self.Line=B0d2DstarTauNuNonPhysTauLine
         self.Selections=[self.DstarSel, self.B0d2DstarTauNuSelNonPhysTau]
-        
+
         self.Line=B0d2DTauNuLine
         self.Selections=[self.DplusSel, self.B0d2DTauNuSel]
 
@@ -1131,7 +1131,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         self.Line=B0d2DTauNuNonPhysTauLine
         self.Selections=[self.DplusSel, self.B0d2DTauNuSelNonPhysTau]
-        
+
 
         self.Line=Bu2D0TauNuLine
         self.Selections=[self.D0Sel, self.Bu2D0TauNuSel]
@@ -1141,14 +1141,14 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         self.Line=Bu2D0TauNuNonPhysTauLine
         self.Selections=[self.D0Sel, self.Bu2D0TauNuSelNonPhysTau]
-        
+
 
         self.Line=Bc2JpsiTauNuLine
         self.Selections=[self.JpsiSel, self.Bc2JpsiTauNuSel]
 
         self.Line=Bc2JpsiTauNuNonPhysTauLine
         self.Selections=[self.JpsiSel, self.Bc2JpsiTauNuSelNonPhysTau]
-        
+
 
         self.Line=Bs2DsTauNuLine
         self.Selections=[self.DsSel, self.B0s2DsTauNuSel]
@@ -1164,7 +1164,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         self.Line=Lb2LcTauNuWSLine
         self.Selections=[self.LcSel, self.Lb2LcTauNuSelWS]
-        
+
         self.Line=Lb2pTauNuLine
         self.Selections=[self.pSel, self.Lb2pTauNuSel]
 
@@ -1179,7 +1179,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         self.Line=B0d2DstarTauNuInvVertLine
         self.Selections=[self.LcSelInvVert, self.B0d2DstarTauNuSelInvVert]
-        
+
 
 
         self.Line=Bu2DdoubleStar0TauNuLine
@@ -1190,218 +1190,218 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         self.Line=Bu2DdoubleStar0TauNuNonPhysTauLine
         self.Selections=[self.DdoubleStar02DstarPiSel, self.Bu2DdoubleStar0TauNuSelNonPhysTau]
-        
+
         self.Line=Bu2Dstar02Pi0D0TauNuLine
         self.Selections=[self.Dstar02Pi0D0Sel, self.Bu2Dstar02Pi0D0TauNuSel]
-        
+
         self.Line=Bu2Dstar02Pi0D0TauNuWSLine
         self.Selections=[self.Dstar02Pi0D0Sel, self.Bu2Dstar02Pi0D0TauNuSelWS]
-        
+
         self.Line=Bu2Dstar02Pi0D0TauNuNonPhysTauLine
         self.Selections=[self.Dstar02Pi0D0Sel, self.Bu2Dstar02Pi0D0TauNuSelNonPhysTau]
-        
+
         self.Line=Bu2Dstar02GammaD0TauNuLine
         self.Selections=[self.Dstar02GammaD0Sel, self.Bu2Dstar02GammaD0TauNuSel]
-        
+
         self.Line=Bu2Dstar02GammaD0TauNuWSLine
         self.Selections=[self.Dstar02GammaD0Sel, self.Bu2Dstar02GammaD0TauNuSelWS]
-        
+
         self.Line=Bu2Dstar02GammaD0TauNuNonPhysTauLine
         self.Selections=[self.Dstar02GammaD0Sel, self.Bu2Dstar02GammaD0TauNuSelNonPhysTau]
-        
+
         self.Line=B0d2DdoubleStar2PiDstar02Pi0D0TauNuLine
         self.Selections=[self.DdoubleStar2PiDstar02Pi0D0Sel, self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSel]
-        
+
         self.Line=B0d2DdoubleStar2PiDstar02Pi0D0TauNuWSLine
         self.Selections=[self.DdoubleStar2PiDstar02Pi0D0Sel, self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSelWS]
-        
+
         self.Line=B0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTauLine
         self.Selections=[self.DdoubleStar2PiDstar02Pi0D0Sel, self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSelNonPhysTau]
-        
+
         self.Line=B0d2DdoubleStar2PiDstar02GammaD0TauNuLine
         self.Selections=[self.DdoubleStar2PiDstar02GammaD0Sel, self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSel]
-        
+
         self.Line=B0d2DdoubleStar2PiDstar02GammaD0TauNuWSLine
         self.Selections=[self.DdoubleStar2PiDstar02GammaD0Sel, self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSelWS]
-        
+
         self.Line=B0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTauLine
         self.Selections=[self.DdoubleStar2PiDstar02GammaD0Sel, self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSelNonPhysTau]
-        
-        
+
+
     ############ Functions to make Selections #######################
 
     def __FilterDstars__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         DstarsForB0d = FilterDesktop(
             Code = self.totalDstarCut
             )
         MyStdDstars = DataOnDemand(Location = 'Phys/StdLooseDstarWithD02KPi/Particles')
         SelDstarsForB0d = Selection("SelDstarsFor"+self._name,
                                     Algorithm=DstarsForB0d, RequiredSelections = [MyStdDstars])
-        
+
         self.DstarSel=SelDstarsForB0d
 
     def __FilterDstarWS__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         DstarWSForB0d = FilterDesktop(
             Code = self.totalDstarCut
             )
         MyStdDstarWS = DataOnDemand(Location = 'Phys/StdLooseDstarWithD02KPiDCS/Particles')
         SelDstarWSForB0d = Selection("SelDstarWSFor"+self._name,
                                     Algorithm=DstarWSForB0d, RequiredSelections = [MyStdDstarWS])
-        
+
         self.DstarWSSel=SelDstarWSForB0d
-        
-        
+
+
     def __FilterDplus__(self):
-            
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         DplusForB0d = FilterDesktop(
             Code = self.totalDplusCut
             )
         MyStdDplus = DataOnDemand(Location = 'Phys/StdLooseDplus2KPiPi/Particles')
         SelDplusForB0d = Selection("SelDplusFor"+self._name,
                                    Algorithm=DplusForB0d, RequiredSelections = [MyStdDplus])
-        
+
         self.DplusSel=SelDplusForB0d
-        
-            
-            
+
+
+
     def __FilterD0__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         D0ForBu = FilterDesktop(
             Code = self.totalD0Cut
             )
         MyStdD0 = DataOnDemand(Location = 'Phys/StdLooseD02KPi/Particles')
         SelD0ForBu = Selection("SelD0For"+self._name,
                                Algorithm=D0ForBu, RequiredSelections = [MyStdD0])
-        
+
         self.D0Sel=SelD0ForBu
-        
-   
-        
+
+
+
     def __FilterDs__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         DsForB0s = FilterDesktop(
             Code = self.totalDsCut
             )
         MyStdDs = DataOnDemand(Location = 'Phys/StdLooseDsplus2KKPi/Particles')
         SelDsForB0s = Selection("SelDsFor"+self._name,
                                 Algorithm=DsForB0s, RequiredSelections = [MyStdDs])
-        
+
         self.DsSel=SelDsForB0s
-        
+
     def __FilterLc__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-         
+
         LcForLb = FilterDesktop(
             Code = self.totalLcCut
             )
         MyStdLc = DataOnDemand(Location = 'Phys/StdLooseLambdac2PKPi/Particles')
         SelLcForLb = Selection("SelLcFor"+self._name,
                                 Algorithm=LcForLb, RequiredSelections = [MyStdLc])
-        
+
         self.LcSel=SelLcForLb
 
     def __Filterp__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-         
+
         pForLb = FilterDesktop(
             Code = self.pCut
             )
         MyStdp = DataOnDemand(Location = 'Phys/StdLooseProtons/Particles')
         SelpForLb = Selection("SelpFor"+self._name,
                                 Algorithm=pForLb, RequiredSelections = [MyStdp])
-        
+
         self.pSel=SelpForLb
-        
-        
+
+
     def __FilterLcInvVert__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-         
+
         LcForLbInvVert = FilterDesktop(
             Code = self.totalLcInvVertCut
             )
         MyStdLcInvVert = DataOnDemand(Location = 'Phys/StdLooseLambdac2PKPi/Particles')
         SelLcForLbInvVert = Selection("SelLcForLbInvVert"+self._name,
                                 Algorithm=LcForLbInvVert, RequiredSelections = [MyStdLcInvVert])
-        
+
         self.LcSelInvVert=SelLcForLbInvVert
 
     def __FilterDInvVert__(self):
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-         
+
         DstarForB0dInvVert = FilterDesktop(
             Code = self.totalDInvVertCut
             )
         MyStdDstarInvVert = DataOnDemand(Location = 'Phys/StdLooseDstarWithD02KPi/Particles')
         SelDstarForB0dInvVert = Selection("SelDstarForB0dInvVert"+self._name,
                                 Algorithm=DstarForB0dInvVert, RequiredSelections = [MyStdDstarInvVert])
-        
-        self.DstarSelInvVert=SelDstarForB0dInvVert  
-        
+
+        self.DstarSelInvVert=SelDstarForB0dInvVert
+
     def __FilterJpsi2MuMu__(self):
-        
-        
+
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         from CommonParticles import StdLooseJpsi2MuMu
-            
+
         JpsiForBc = FilterDesktop(
             Code = self.totalJpsiCut
             )
         MyStdLooseJpsi2MuMu = DataOnDemand(Location = 'Phys/StdLooseJpsi2MuMu/Particles')
         SelJpsiForBc = Selection("SelJpsiFor"+self._name,
                                  Algorithm=JpsiForBc, RequiredSelections = [MyStdLooseJpsi2MuMu])
-        
+
         self.JpsiSel=SelJpsiForBc
-        
-        
+
+
     def __MakeDdoubleStar02DstarPi__(self):
         """
         [D_1(2420)0 -> D*(2010)+ pi-]cc, [D*_2(2460)0 -> D*(2010)+ pi-]cc
         useful for understanding background in B0 -> D* tau
         """
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         from StandardParticles import StdLoosePions
-        
-        
-        CombDdoubleStar02DstarPi = CombineParticles(        
+
+
+        CombDdoubleStar02DstarPi = CombineParticles(
             DecayDescriptors = ["[D_1(2420)0 -> D*(2010)+ pi-]cc"],
             DaughtersCuts = { "pi-" : self.DdoubleStar0_PionCut },
             MotherCut      = self.DdoubleStar0Cut,
             )
-        
+
         SelDdoubleStar02DstarPi = Selection("SelDdoubleStar02DstarPi", Algorithm=CombDdoubleStar02DstarPi,
                                            RequiredSelections = [self.DstarSel,StdLoosePions])
-        
+
         self.DdoubleStar02DstarPiSel=SelDdoubleStar02DstarPi
-        
- 
+
+
     def __MakeB0d2DstarTauNu__(self):
         """
         B0d selection:
@@ -1412,16 +1412,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DstarTauNu = CombineParticles(        
+
+        CombB0d2DstarTauNu = CombineParticles(
             DecayDescriptors = ["[B0 -> D*(2010)- tau+]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DstarTauNu = Selection("SelB0d2DstarTauNu", Algorithm=CombB0d2DstarTauNu,
                                     RequiredSelections = [self.DstarSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DstarTauNuSel=SelB0d2DstarTauNu
 
     def __MakeB0d2DstarWSSlowTauNu__(self):
@@ -1434,19 +1434,19 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DstarWSSTauNu = CombineParticles(        
+
+        CombB0d2DstarWSSTauNu = CombineParticles(
             DecayDescriptors = ["[B0 -> D*(2010)- tau+]cc"],
             DaughtersCuts = { "tau+" : "(BPVVDR >.2) & (BPVVDR <6.)" },
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DstarWSSlowTauNu = Selection("SelB0d2DstarWSSlowTauNu", Algorithm=CombB0d2DstarWSSTauNu,
                                     RequiredSelections = [self.DstarWSSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DstarWSSlowTauNuSel=SelB0d2DstarWSSlowTauNu
-        
+
     def __MakeB0d2DstarTauNuWS__(self):
         """
         B0d selection:
@@ -1458,16 +1458,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DstarTauNuWS = CombineParticles(        
+
+        CombB0d2DstarTauNuWS = CombineParticles(
             DecayDescriptors = ["[B0 -> D*(2010)- tau-]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DstarTauNuWS = Selection("SelB0d2DstarTauNuWS", Algorithm=CombB0d2DstarTauNuWS,
                                     RequiredSelections = [self.DstarSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DstarTauNuSelWS=SelB0d2DstarTauNuWS
 
 
@@ -1483,19 +1483,19 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombB0d2DstarTauNuNonPhysTau = CombineParticles(        
+
+        CombB0d2DstarTauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B0 -> D*(2010)- tau+]cc"],#, "[B0 -> D*(2010)+ tau+]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DstarTauNuNonPhysTau = Selection("SelB0d2DstarTauNuNonPhysTau", Algorithm=CombB0d2DstarTauNuNonPhysTau,
                                     RequiredSelections = [self.DstarSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DstarTauNuSelNonPhysTau=SelB0d2DstarTauNuNonPhysTau
 
-        
+
     def __MakeB0d2DTauNu__(self):
         """
         B0d selection:
@@ -1506,21 +1506,21 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DTauNu = CombineParticles(        
+
+        CombB0d2DTauNu = CombineParticles(
             DecayDescriptors = ["[B0 -> D- tau+]cc"],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DTauNu = Selection("SelB0d2DTauNu", Algorithm=CombB0d2DTauNu,
                                     RequiredSelections = [self.DplusSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DTauNuSel=SelB0d2DTauNu
 
 
-            
+
     def __MakeB0d2DTauNuWS__(self):
         """
         B0d selection:
@@ -1532,24 +1532,24 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DTauNuWS = CombineParticles(        
+
+        CombB0d2DTauNuWS = CombineParticles(
             DecayDescriptors = ["[B0 -> D- tau-]cc" ],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DTauNuWS = Selection("SelB0d2DTauNuWS", Algorithm=CombB0d2DTauNuWS,
                                     RequiredSelections = [self.DplusSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DTauNuSelWS=SelB0d2DTauNuWS
 
 
     def __MakeB0d2DTauNuNonPhysTau__(self):
         """
         B0d selection:
-        [B0 -> D- tau+++]cc 
+        [B0 -> D- tau+++]cc
         use of non-physical tau+++ is useful as an independent background source
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
@@ -1557,17 +1557,17 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombB0d2DTauNuNonPhysTau = CombineParticles(        
+
+        CombB0d2DTauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B0 -> D- tau+]cc"],#, "[B0 -> D+ tau+]cc"],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DTauNuNonPhysTau = Selection("SelB0d2DTauNuNonPhysTau", Algorithm=CombB0d2DTauNuNonPhysTau,
                                     RequiredSelections = [self.DplusSel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DTauNuSelNonPhysTau=SelB0d2DTauNuNonPhysTau
 
 
@@ -1582,17 +1582,17 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2D0TauNu = CombineParticles(        
+
+        CombBu2D0TauNu = CombineParticles(
             DecayDescriptors = ["[B- -> D0 tau-]cc"],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2D0TauNu = Selection("SelBu2D0TauNu", Algorithm=CombBu2D0TauNu,
                                     RequiredSelections = [self.D0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2D0TauNuSel=SelBu2D0TauNu
 
 
@@ -1608,24 +1608,24 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2D0TauNuWS = CombineParticles(        
+
+        CombBu2D0TauNuWS = CombineParticles(
             DecayDescriptors = ["[B- -> D0 tau+]cc"],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2D0TauNuWS = Selection("SelBu2D0TauNuWS", Algorithm=CombBu2D0TauNuWS,
                                     RequiredSelections = [self.D0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2D0TauNuSelWS=SelBu2D0TauNuWS
 
 
     def __MakeBu2D0TauNuNonPhysTau__(self):
         """
         Bu selection:
-        [B- -> D0 tau---]cc, [B- -> D0 tau---]cc 
+        [B- -> D0 tau---]cc, [B- -> D0 tau---]cc
         use of non-physical tau+++ is useful as an independent background source
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
@@ -1633,21 +1633,21 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombBu2D0TauNuNonPhysTau = CombineParticles(        
+
+        CombBu2D0TauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B- -> D0 tau-]cc"],#, "[B- -> D~0 tau-]cc" ],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2D0TauNuNonPhysTau = Selection("SelBu2D0TauNuNonPhysTau", Algorithm=CombBu2D0TauNuNonPhysTau,
                                     RequiredSelections = [self.D0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2D0TauNuSelNonPhysTau=SelBu2D0TauNuNonPhysTau
 
 
-        
+
     def __MakeBc2JpsiTauNu__(self):
         """
         Bc selection:
@@ -1658,16 +1658,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBc2JpsiTauNu = CombineParticles(        
+
+        CombBc2JpsiTauNu = CombineParticles(
             DecayDescriptors = ["B_c+ -> J/psi(1S) tau+", "B_c- -> J/psi(1S) tau-" ],
             CombinationCut = self.BcCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBc2JpsiTauNu = Selection("SelBc2JpsiTauNu", Algorithm=CombBc2JpsiTauNu,
                                     RequiredSelections = [self.JpsiSel,MyStdLooseDetachedTau])
-        
+
         self.Bc2JpsiTauNuSel=SelBc2JpsiTauNu
 
 
@@ -1681,16 +1681,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombBc2JpsiTauNuNonPhysTau = CombineParticles(        
+
+        CombBc2JpsiTauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["B_c+ -> J/psi(1S) tau+", "B_c- -> J/psi(1S) tau-" ],
             CombinationCut = self.BcCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBc2JpsiTauNuNonPhysTau = Selection("SelBc2JpsiTauNuNonPhysTau", Algorithm=CombBc2JpsiTauNuNonPhysTau,
                                     RequiredSelections = [self.JpsiSel,MyStdLooseDetachedTau])
-        
+
         self.Bc2JpsiTauNuSelNonPhysTau=SelBc2JpsiTauNuNonPhysTau
 
 
@@ -1704,21 +1704,21 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBs2DsTauNu = CombineParticles(        
+
+        CombBs2DsTauNu = CombineParticles(
             DecayDescriptors = ["[B_s0 -> D_s- tau+]cc"],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.BsCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBs2DsTauNu = Selection("SelBs2DsTauNu", Algorithm=CombBs2DsTauNu,
                                     RequiredSelections = [self.DsSel,MyStdLooseDetachedTau])
-        
+
         self.B0s2DsTauNuSel=SelBs2DsTauNu
 
 
-            
+
     def __MakeB0s2DsTauNuWS__(self):
         """
         B0s selection:
@@ -1730,17 +1730,17 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBs2DsTauNuWS = CombineParticles(        
+
+        CombBs2DsTauNuWS = CombineParticles(
             DecayDescriptors = ["[B_s0 -> D_s+ tau+]cc" ],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.BsCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBs2DsTauNuWS = Selection("SelBs2DsTauNuWS", Algorithm=CombBs2DsTauNuWS,
                                     RequiredSelections = [self.DsSel,MyStdLooseDetachedTau])
-        
+
         self.B0s2DsTauNuSelWS=SelBs2DsTauNuWS
 
 
@@ -1755,17 +1755,17 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombBs2DsTauNuNonPhysTau = CombineParticles(        
+
+        CombBs2DsTauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B_s0 -> D_s+ tau-]cc"],#, "[B_s0 -> D_s+ tau-]cc" ],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.98)" },
             CombinationCut = self.BsCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBs2DsTauNuNonPhysTau = Selection("SelBs2DsTauNuNonPhysTau", Algorithm=CombBs2DsTauNuNonPhysTau,
                                     RequiredSelections = [self.DsSel,MyStdLooseDetachedTau])
-        
+
         self.B0s2DsTauNuSelNonPhysTau=SelBs2DsTauNuNonPhysTau
     def __MakeLb2LcTauNu__(self):
         """
@@ -1777,22 +1777,22 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombLb2LcTauNu = CombineParticles(        
+
+        CombLb2LcTauNu = CombineParticles(
             DecayDescriptors = ["[Lambda_b0 -> Lambda_c+ tau-]cc"],
             DaughtersCuts = { "tau-" : "(BPVDIRA > 0.995)" },
             CombinationCut = self.LbCombCut,
             MotherCut      = self.BCut,
-           
+
             )
-    
+
         SelLb2LcTauNu = Selection("SelLb2LcTauNu", Algorithm=CombLb2LcTauNu,
                                     RequiredSelections = [self.LcSel,MyStdLooseDetachedTau])
-        
+
         self.Lb2LcTauNuSel=SelLb2LcTauNu
 
 
-            
+
     def __MakeLb2LcTauNuWS__(self):
         """
         Lb selection:
@@ -1804,17 +1804,17 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombLb2LcTauNuWS = CombineParticles(        
+
+        CombLb2LcTauNuWS = CombineParticles(
             DecayDescriptors = ["[Lambda_b0 -> Lambda_c+ tau+]cc" ],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.995)" },
             CombinationCut = self.LbCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelLb2LcTauNuWS = Selection("SelLb2LcTauNuWS", Algorithm=CombLb2LcTauNuWS,
                                     RequiredSelections = [self.LcSel,MyStdLooseDetachedTau])
-        
+
         self.Lb2LcTauNuSelWS=SelLb2LcTauNuWS
 
     def __MakeLb2pTauNu__(self):
@@ -1827,22 +1827,22 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombLb2pTauNu = CombineParticles(        
+
+        CombLb2pTauNu = CombineParticles(
             DecayDescriptors = ["[Lambda_b0 -> p+ tau-]cc"],
             DaughtersCuts = { "tau-" : "(BPVDIRA > 0.995)" },
             MotherCut      = self.LbCombpInvVertCut,
-           
-           
+
+
             )
-    
+
         SelLb2pTauNu = Selection("SelLb2pTauNu", Algorithm=CombLb2pTauNu,
                                     RequiredSelections = [self.pSel,MyStdLooseDetachedTau])
-        
+
         self.Lb2pTauNuSel=SelLb2pTauNu
 
 
-            
+
     def __MakeLb2pTauNuWS__(self):
         """
         Lb selection:
@@ -1854,22 +1854,22 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombLb2pTauNuWS = CombineParticles(        
+
+        CombLb2pTauNuWS = CombineParticles(
             DecayDescriptors = ["[Lambda_b0 -> p+ tau+]cc" ],
             DaughtersCuts = { "tau+" : "(BPVDIRA > 0.995)" },
             MotherCut      = self.LbCombpInvVertCut,
-       
+
             )
-        
+
         SelLb2pTauNuWS = Selection("SelLb2pTauNuWS", Algorithm=CombLb2pTauNuWS,
                                     RequiredSelections = [self.pSel,MyStdLooseDetachedTau])
-        
+
         self.Lb2pTauNuSelWS=SelLb2pTauNuWS
 
-     
-           
-        
+
+
+
     def __MakeLb2LcTauNuNonPhysTau__(self):
         """
         Lb selection:
@@ -1881,23 +1881,23 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombLb2LcTauNuNonPhysTau = CombineParticles(        
+
+        CombLb2LcTauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[Lambda_b0 -> Lambda_c+ tau-]cc"],#, "[Lb -> Lc+ tau-]cc" ],
             DaughtersCuts = { "tau-" : "(BPVDIRA > 0.995)" },
             CombinationCut = self.LbCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelLb2LcTauNuNonPhysTau = Selection("SelLb2LcTauNuNonPhysTau", Algorithm=CombLb2LcTauNuNonPhysTau,
                                     RequiredSelections = [self.LcSel,MyStdLooseDetachedTau])
-        
+
         self.Lb2LcTauNuSelNonPhysTau=SelLb2LcTauNuNonPhysTau
 
     def __MakeLb2LcTauNuInvVert__(self):
         """
         Lb selection:
-        [Lambda_b0 -> Lambda_c+ tau-]cc, 
+        [Lambda_b0 -> Lambda_c+ tau-]cc,
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
@@ -1905,22 +1905,22 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombLb2LcTauNuInvVert = CombineParticles(        
+
+        CombLb2LcTauNuInvVert = CombineParticles(
             DecayDescriptors = ["[Lambda_b0 -> Lambda_c+ tau-]cc"],
             CombinationCut = self.LbCombInvVertCut,
             MotherCut      = self.BInvVertCut,
             )
-        
+
         SelLb2LcTauNuInvVert = Selection("SelLb2LcTauNuInvVert", Algorithm=CombLb2LcTauNuInvVert,
                                     RequiredSelections = [self.LcSelInvVert,MyStdLooseDetachedTau])
-        
+
         self.Lb2LcTauNuSelInvVert=SelLb2LcTauNuInvVert
 
     def __MakeB0d2DstarTauNuInvVert__(self):
         """
         Dstar  selection:
-        [B0 -> Dstar*- tau+]cc, 
+        [B0 -> Dstar*- tau+]cc,
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
@@ -1928,18 +1928,18 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DstarTauNuInvVert = CombineParticles(                    
+
+        CombB0d2DstarTauNuInvVert = CombineParticles(
             DecayDescriptors = ["[B0 -> D*(2010)- tau+]cc"],
             CombinationCut = self.B0dCombInvVertCut,
             MotherCut      = self.BInvVertCut,
             )
-        
+
         SelB0d2DstarTauNuInvVert = Selection("SelB0d2DstarTauNuInvVert", Algorithm=CombB0d2DstarTauNuInvVert,
                                     RequiredSelections = [self.DstarSelInvVert,MyStdLooseDetachedTau])
-        
+
         self.B0d2DstarTauNuSelInvVert=SelB0d2DstarTauNuInvVert
-        
+
     def __MakeBu2DdoubleStar0TauNu__(self):
         """
         [B- -> (D_1(2420)0 -> D*+ pi-) tau-]cc
@@ -1950,19 +1950,19 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2DdoubleStar0TauNu = CombineParticles(        
+
+        CombBu2DdoubleStar0TauNu = CombineParticles(
             DecayDescriptors = ["[B- -> D_1(2420)0 tau-]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2DdoubleStar0TauNu = Selection("SelBu2DdoubleStar0TauNu", Algorithm=CombBu2DdoubleStar0TauNu,
                                     RequiredSelections = [self.DdoubleStar02DstarPiSel,MyStdLooseDetachedTau])
-        
+
         self.Bu2DdoubleStar0TauNuSel=SelBu2DdoubleStar0TauNu
 
-   
+
 
 
     def __MakeBu2DdoubleStar0TauNuWS__(self):
@@ -1976,16 +1976,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2DdoubleStar0TauNuWS = CombineParticles(        
+
+        CombBu2DdoubleStar0TauNuWS = CombineParticles(
             DecayDescriptors = ["[B- -> D_1(2420)0 tau+]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2DdoubleStar0TauNuWS = Selection("SelBu2DdoubleStar0TauNuWS", Algorithm=CombBu2DdoubleStar0TauNuWS,
                                     RequiredSelections = [self.DdoubleStar02DstarPiSel,MyStdLooseDetachedTau])
-        
+
         self.Bu2DdoubleStar0TauNuSelWS=SelBu2DdoubleStar0TauNuWS
 
 
@@ -2000,16 +2000,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombBu2DdoubleStar0TauNuNonPhysTau = CombineParticles(        
+
+        CombBu2DdoubleStar0TauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B- -> D_1(2420)0 tau-]cc"],#, "[B~0 -> D_1(2420)~0 tau+]cc", "[B~0 -> D*_2(2460)~0 tau+]cc" ],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2DdoubleStar0TauNuNonPhysTau = Selection("SelBu2DdoubleStar0TauNuNonPhysTau", Algorithm=CombBu2DdoubleStar0TauNuNonPhysTau,
                                     RequiredSelections = [self.DdoubleStar02DstarPiSel,MyStdLooseDetachedTau])
-        
+
         self.Bu2DdoubleStar0TauNuSelNonPhysTau=SelBu2DdoubleStar0TauNuNonPhysTau
 
     def __MakeDStar02Pi0D0__(self):
@@ -2017,21 +2017,21 @@ class B2XTauNuAllLinesConf(LineBuilder):
         make D*0 -> D0 pi0
         [D(2007)0 -> D0 pi0]cc
         """
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         from StandardParticles import StdLooseResolvedPi0
-        
-        
-        CombDStar02Pi0D0 = CombineParticles(        
+
+
+        CombDStar02Pi0D0 = CombineParticles(
             DecayDescriptors = ["[D*(2007)0 -> D0 pi0]cc"],
             DaughtersCuts = { "pi0" : self.Dstar02Pi0D0_PionCut },
             MotherCut      = self.Dstar02Pi0D0Cut,
             )
-        
+
         SelDStar02Pi0D0 = Selection("SelDStar02Pi0D0", Algorithm=CombDStar02Pi0D0,
                                            RequiredSelections = [self.D0Sel,StdLooseResolvedPi0])
-        
+
         self.Dstar02Pi0D0Sel=SelDStar02Pi0D0
 
     def __MakeBu2Dstar02Pi0D0TauNu__(self):
@@ -2043,16 +2043,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2Dstar02Pi0D0TauNu = CombineParticles(        
+
+        CombBu2Dstar02Pi0D0TauNu = CombineParticles(
             DecayDescriptors = ["[B- -> D*(2007)0 tau-]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2Dstar02Pi0D0TauNu = Selection("SelBu2Dstar02Pi0D0TauNu", Algorithm=CombBu2Dstar02Pi0D0TauNu,
                                     RequiredSelections = [self.Dstar02Pi0D0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2Dstar02Pi0D0TauNuSel=SelBu2Dstar02Pi0D0TauNu
 
 
@@ -2066,16 +2066,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2Dstar02Pi0D0TauNuWS = CombineParticles(        
+
+        CombBu2Dstar02Pi0D0TauNuWS = CombineParticles(
             DecayDescriptors = ["[B- -> D*(2007)0 tau+]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2Dstar02Pi0D0TauNuWS = Selection("SelBu2Dstar02Pi0D0TauNuWS", Algorithm=CombBu2Dstar02Pi0D0TauNuWS,
                                     RequiredSelections = [self.Dstar02Pi0D0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2Dstar02Pi0D0TauNuSelWS=SelBu2Dstar02Pi0D0TauNuWS
 
 
@@ -2089,40 +2089,40 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombBu2Dstar02Pi0D0TauNuNonPhysTau = CombineParticles(        
+
+        CombBu2Dstar02Pi0D0TauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B- -> D*(2007)0 tau-]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2Dstar02Pi0D0TauNuNonPhysTau = Selection("SelBu2Dstar02Pi0D0TauNuNonPhysTau", Algorithm=CombBu2Dstar02Pi0D0TauNuNonPhysTau,
                                     RequiredSelections = [self.Dstar02Pi0D0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2Dstar02Pi0D0TauNuSelNonPhysTau=SelBu2Dstar02Pi0D0TauNuNonPhysTau
-        
+
     def __MakeDStar02GammaD0__(self):
         """
         make D*0 -> D0 Gamma
         [D(2007)0 -> D0 Gamma]cc
         """
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         from StandardParticles import StdLooseAllPhotons
-        
-        
-        CombDStar02GammaD0 = CombineParticles(        
+
+
+        CombDStar02GammaD0 = CombineParticles(
             DecayDescriptors = ["[D*(2007)0 -> D0 gamma]cc"],
             DaughtersCuts = { "gamma" : self.Dstar02GammaD0_PionCut },
             MotherCut      = self.Dstar02GammaD0Cut,
             )
-        
+
         SelDStar02GammaD0 = Selection("SelDStar02GammaD0", Algorithm=CombDStar02GammaD0,
                                            RequiredSelections = [self.D0Sel,StdLooseAllPhotons])
-        
+
         self.Dstar02GammaD0Sel=SelDStar02GammaD0
-        
+
     def __MakeBu2Dstar02GammaD0TauNu__(self):
         """
         [B- -> D*0 tau-]cc
@@ -2132,16 +2132,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2Dstar02GammaD0TauNu = CombineParticles(        
+
+        CombBu2Dstar02GammaD0TauNu = CombineParticles(
             DecayDescriptors = ["[B- -> D*(2007)0 tau-]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2Dstar02GammaD0TauNu = Selection("SelBu2Dstar02GammaD0TauNu", Algorithm=CombBu2Dstar02GammaD0TauNu,
                                     RequiredSelections = [self.Dstar02GammaD0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2Dstar02GammaD0TauNuSel=SelBu2Dstar02GammaD0TauNu
 
 
@@ -2155,16 +2155,16 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombBu2Dstar02GammaD0TauNuWS = CombineParticles(        
+
+        CombBu2Dstar02GammaD0TauNuWS = CombineParticles(
             DecayDescriptors = ["[B- -> D*(2007)0 tau+]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2Dstar02GammaD0TauNuWS = Selection("SelBu2Dstar02GammaD0TauNuWS", Algorithm=CombBu2Dstar02GammaD0TauNuWS,
                                     RequiredSelections = [self.Dstar02GammaD0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2Dstar02GammaD0TauNuSelWS=SelBu2Dstar02GammaD0TauNuWS
 
 
@@ -2178,39 +2178,39 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombBu2Dstar02GammaD0TauNuNonPhysTau = CombineParticles(        
+
+        CombBu2Dstar02GammaD0TauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B- -> D*(2007)0 tau-]cc"],
             CombinationCut = self.BplusCombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelBu2Dstar02GammaD0TauNuNonPhysTau = Selection("SelBu2Dstar02GammaD0TauNuNonPhysTau", Algorithm=CombBu2Dstar02GammaD0TauNuNonPhysTau,
                                     RequiredSelections = [self.Dstar02GammaD0Sel,MyStdLooseDetachedTau])
-        
+
         self.Bu2Dstar02GammaD0TauNuSelNonPhysTau=SelBu2Dstar02GammaD0TauNuNonPhysTau
-        
+
     def __MakeDdoubleStar2PiDstar02Pi0D0__(self):
         """
         [D_1(2420)- -> D*(2007)0 pi-]cc
         """
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         from StandardParticles import StdLoosePions
-        
-        
-        CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(        
+
+
+        CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
             DecayDescriptors = ["[D_1(2420)- -> D*(2007)0 pi-]cc"],
             DaughtersCuts = { "pi-" : self.DdoubleStar2PiDstar02Pi0D0_PionCut },
             MotherCut      = self.DdoubleStar2PiDstar02Pi0D0Cut,
             )
-        
+
         SelDdoubleStar2PiDstar02Pi0D0 = Selection("SelDdoubleStar2PiDstar02Pi0D0", Algorithm=CombDdoubleStar2PiDstar02Pi0D0,
                                            RequiredSelections = [self.Dstar02Pi0D0Sel,StdLoosePions])
-        
+
         self.DdoubleStar2PiDstar02Pi0D0Sel=SelDdoubleStar2PiDstar02Pi0D0
-        
+
     def __MakeB0d2DdoubleStar2PiDstar02Pi0D0TauNu__(self):
         """
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
@@ -2220,18 +2220,18 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DdoubleStar2PiDstar02Pi0D0TauNu = CombineParticles(        
+
+        CombB0d2DdoubleStar2PiDstar02Pi0D0TauNu = CombineParticles(
             DecayDescriptors = ["[B0 -> D_1(2420)- tau+]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DdoubleStar2PiDstar02Pi0D0TauNu = Selection("SelB0d2DdoubleStar2PiDstar02Pi0D0TauNu", Algorithm=CombB0d2DdoubleStar2PiDstar02Pi0D0TauNu,
                                     RequiredSelections = [self.DdoubleStar2PiDstar02Pi0D0Sel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSel=SelB0d2DdoubleStar2PiDstar02Pi0D0TauNu
-        
+
     def __MakeB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS__(self):
         """
         [B0 -> (D_1(2420)- -> D*0 pi-) tau-]cc
@@ -2242,18 +2242,18 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS = CombineParticles(        
+
+        CombB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS = CombineParticles(
             DecayDescriptors = ["[B0 -> D_1(2420)- tau-]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS = Selection("SelB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS", Algorithm=CombB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS,
                                     RequiredSelections = [self.DdoubleStar2PiDstar02Pi0D0Sel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSelWS=SelB0d2DdoubleStar2PiDstar02Pi0D0TauNuWS
-        
+
     def __MakeB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau__(self):
         """
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+++]cc
@@ -2264,39 +2264,39 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau = CombineParticles(        
+
+        CombB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B0 -> D_1(2420)- tau+]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau = Selection("SelB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau", Algorithm=CombB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau,
                                     RequiredSelections = [self.DdoubleStar2PiDstar02Pi0D0Sel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DdoubleStar2PiDstar02Pi0D0TauNuSelNonPhysTau=SelB0d2DdoubleStar2PiDstar02Pi0D0TauNuNonPhysTau
-        
+
     def __MakeDdoubleStar2PiDstar02GammaD0__(self):
         """
         [D_1(2420)- -> D*(2007)0 pi-]cc
         """
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
         from StandardParticles import StdLoosePions
-        
-        
-        CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(        
+
+
+        CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
             DecayDescriptors = ["[D_1(2420)- -> D*(2007)0 pi-]cc"],
             DaughtersCuts = { "pi-" : self.DdoubleStar2PiDstar02GammaD0_PionCut },
             MotherCut      = self.DdoubleStar2PiDstar02GammaD0Cut,
             )
-        
+
         SelDdoubleStar2PiDstar02GammaD0 = Selection("SelDdoubleStar2PiDstar02GammaD0", Algorithm=CombDdoubleStar2PiDstar02GammaD0,
                                            RequiredSelections = [self.Dstar02GammaD0Sel,StdLoosePions])
-        
+
         self.DdoubleStar2PiDstar02GammaD0Sel=SelDdoubleStar2PiDstar02GammaD0
-        
+
     def __MakeB0d2DdoubleStar2PiDstar02GammaD0TauNu__(self):
         """
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
@@ -2306,18 +2306,18 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DdoubleStar2PiDstar02GammaD0TauNu = CombineParticles(        
+
+        CombB0d2DdoubleStar2PiDstar02GammaD0TauNu = CombineParticles(
             DecayDescriptors = ["[B0 -> D_1(2420)- tau+]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DdoubleStar2PiDstar02GammaD0TauNu = Selection("SelB0d2DdoubleStar2PiDstar02GammaD0TauNu", Algorithm=CombB0d2DdoubleStar2PiDstar02GammaD0TauNu,
                                     RequiredSelections = [self.DdoubleStar2PiDstar02GammaD0Sel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSel=SelB0d2DdoubleStar2PiDstar02GammaD0TauNu
-        
+
     def __MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuWS__(self):
         """
         [B0 -> (D_1(2420)- -> D*0 pi-) tau-]cc
@@ -2328,18 +2328,18 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
-        
-        CombB0d2DdoubleStar2PiDstar02GammaD0TauNuWS = CombineParticles(        
+
+        CombB0d2DdoubleStar2PiDstar02GammaD0TauNuWS = CombineParticles(
             DecayDescriptors = ["[B0 -> D_1(2420)- tau-]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DdoubleStar2PiDstar02GammaD0TauNuWS = Selection("SelB0d2DdoubleStar2PiDstar02GammaD0TauNuWS", Algorithm=CombB0d2DdoubleStar2PiDstar02GammaD0TauNuWS,
                                     RequiredSelections = [self.DdoubleStar2PiDstar02GammaD0Sel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSelWS=SelB0d2DdoubleStar2PiDstar02GammaD0TauNuWS
-        
+
     def __MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__(self):
         """
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+++]cc
@@ -2350,14 +2350,14 @@ class B2XTauNuAllLinesConf(LineBuilder):
         from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3piNonPhys/Particles')
-        
-        CombB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau = CombineParticles(        
+
+        CombB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau = CombineParticles(
             DecayDescriptors = ["[B0 -> D_1(2420)- tau+]cc"],
             CombinationCut = self.B0CombCut,
             MotherCut      = self.BCut,
             )
-        
+
         SelB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau = Selection("SelB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau", Algorithm=CombB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau,
                                     RequiredSelections = [self.DdoubleStar2PiDstar02GammaD0Sel,MyStdLooseDetachedTau])
-        
+
         self.B0d2DdoubleStar2PiDstar02GammaD0TauNuSelNonPhysTau=SelB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py
index 5f84c6712fe184febee5f52d98bb0fa8ff342c77..c3469ba69f76d4d90fdcb2e8202d05211b5fb6e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py
@@ -30,7 +30,7 @@ B->Xu e nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #  B0 -> pi+ e- nu
 #  B+ -> rho e+ nu
 #  B+ -> omega e+ nu
-#  Bs0 -> K+  e- nu, 
+#  Bs0 -> K+  e- nu,
 #  B+ -> phi e+ nu
 #  Bs0 -> K*+ e- nu, (with K*+->KS0 Pi)
 #
@@ -42,7 +42,7 @@ B->Xu e nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #
 #  Stripping XX, with requirements that the
 #  rate <0.05% and timing <1ms/evt.
-## 
+##
 
 """
 # =============================================================================
@@ -59,7 +59,7 @@ B->Xu e nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #  B0 -> pi+ e- nu
 #  B+ -> rho e+ nu
 #  B+ -> omega e+ nu
-#  Bs0 -> K+  e- nu, 
+#  Bs0 -> K+  e- nu,
 #  B+ -> phi e+ nu
 #  Bs0 -> K*+ e- nu, (with K*+->KS0 Pi)
 #
@@ -71,7 +71,7 @@ B->Xu e nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #
 #  Stripping XX, with requirements that the
 #  rate <0.05% and timing <1ms/evt.
-## 
+##
 Last modification $Date: 2018-January-10 $
                by $Author: decianm $
 """
@@ -102,10 +102,10 @@ default_config = {
       "KaonPTight"          : 10000. ,#MeV
       "KaonPT"              : 400.   ,#MeV
       "KaonPTTight"         : 1000.   ,#MeV
-      "KaonPIDK"            : 5.     ,#adimensional 
+      "KaonPIDK"            : 5.     ,#adimensional
       "KaonPIDmu"           : 5.     ,#adimensional
       "KaonPIDp"            : 5.     ,#adimensional
-      "KaonPIDK_phi"        : 2.     ,#adimensional 
+      "KaonPIDK_phi"        : 2.     ,#adimensional
       "KaonPIDmu_phi"       : -2.    ,#adimensional
       "KaonPIDp_phi"        : -2.    ,#adimensional
       "KaonMINIPCHI2"       : 36     ,#adminensional
@@ -115,9 +115,9 @@ default_config = {
       "PionPTight"          : 10000. ,#MeV
       "PionPT"              : 300.   ,#MeV
       "PionPTTight"         : 800.   ,#MeV
-      "PionPIDK"            : -2.    ,#adimensional 
+      "PionPIDK"            : -2.    ,#adimensional
       "PionMINIPCHI2"       : 36      ,#adminensional
-      
+
       #phi channel
       "PhiUpperMass"        : 2200. ,#MeV
       "PhiVCHI2DOF"         : 6     ,#adimensional
@@ -141,7 +141,7 @@ default_config = {
       "RhoChPionPIDK"       : -2.  ,#adminensional
                    #    "RhoFDCHI2"           : 100.  ,#adimensional
                    #    "RhoFD"               : 6     ,#mm
-                   #    "RhoIPMin"            : 0.3   ,#mm    
+                   #    "RhoIPMin"            : 0.3   ,#mm
       "RhoDIRA"             : 0.98   ,#adimensional
       "RhoChPionMINIPCHI2"  : 36.    ,#adimensional
       # Omega cuts
@@ -198,12 +198,12 @@ default_config = {
       "XEMassUpper"        : 5500. ,#MeV
       "XEMassUpperHigh"    : 6500. ,#MeV
       "Enu"                 : 1850. ,#MeV
-      "EnuK"                : 2000. ,#MeV      
+      "EnuK"                : 2000. ,#MeV
       # Prescales
       'NoPrescales'         : False,
       'PiENu_prescale'     : 0.2
       },
-  'STREAMS'     : ['Semileptonic']    
+  'STREAMS'     : ['Semileptonic']
 }
 
 from Gaudi.Configuration import *
@@ -222,7 +222,7 @@ def makeTOSFilter(name,specs, useCalo):
     return tosFilter
 
 def tosSelection(sel,specs,useCalo=False):
-    from PhysSelPython.Wrappers import Selection 
+    from PhysSelPython.Wrappers import Selection
     '''Filters Selection sel to be TOS.'''
     tosFilter = makeTOSFilter(sel.name(),specs, useCalo)
     return Selection(sel.name()+'TOS', Algorithm=tosFilter,
@@ -234,7 +234,7 @@ class B2XuENuBuilder(LineBuilder):
     """
     Definition of B->Xu e nu stripping module
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self,name,config):
@@ -251,7 +251,7 @@ class B2XuENuBuilder(LineBuilder):
         ## Electrons
         self._electronSel=None
         self._electronFilter()
-        
+
         self._electronSelNoPID=None
         self._electronFilterNoPID()
 
@@ -260,7 +260,7 @@ class B2XuENuBuilder(LineBuilder):
 
         self._electronSelTOSNoPID=None
         self._electronFilterTOSNoPID()
-        
+
         self._electronSelTight=None
         self._electronFilterTight()
 
@@ -276,7 +276,7 @@ class B2XuENuBuilder(LineBuilder):
 
         self._pionSelNoPID=None
         self._pionFilterNoPID()
-        
+
         self._pionSelTight=None
         self._pionFilterTight()
 
@@ -286,7 +286,7 @@ class B2XuENuBuilder(LineBuilder):
         ## Kaons
         self._kaonSel=None
         self._kaonFilter()
-        
+
         self._kaonForPhiSel=None
         self._kaonForPhiFilter()
 
@@ -312,23 +312,23 @@ class B2XuENuBuilder(LineBuilder):
         ## Omega
         self._omega782Sel=None
         self._Omega2PiPiPi0Filter()
-        
+
         self._omega782WSSel=None
         self._Omega2PiPiPi0WSFilter()
-        
+
         self._omega782SelNoPID=None
         self._Omega2PiPiPi0FilterNoPID()
 
         ## Phi
         self._phi1020Sel=None
         self._Phi2KKFilter()
-        
+
         self._phi1020SelWS=None
         self._Phi2KKFilterWS()
 
         self._phi1020SelNoPID=None
         self._Phi2KKFilterNoPID()
-        
+
         ## KS for Majorana
         self._KshMajoranaSSESel=None
         self._KshMajoranaSSEFilter()
@@ -417,7 +417,7 @@ class B2XuENuBuilder(LineBuilder):
                "& (TRGHOSTPROB < %(ElectronGHOSTPROB)s)"\
                "& (PIDe > %(ElectronPIDe)s )"\
                "& (MIPCHI2DV(PRIMARY)> %(ElectronMINIPCHI2)s )"
-   
+
     def _NominalElectronSelectionTightNoPID( self ):
         return "(TRCHI2DOF < %(ElectronTRCHI2)s ) &  (P> %(ElectronPTight)s *MeV) &  (PT> %(ElectronPTTight)s* MeV)"\
                "& (TRGHOSTPROB < %(ElectronGHOSTPROB)s)"\
@@ -477,7 +477,7 @@ class B2XuENuBuilder(LineBuilder):
         return "(TRCHI2DOF < %(PionTRCHI2)s )&  (P> %(PionPTight)s *MeV) &  (PT> %(PionPTTight)s *MeV)"\
                "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
                "& (MIPCHI2DV(PRIMARY)> %(PionMINIPCHI2)s )"
-    
+
     ### K shorts
     def _NominalKsSelection( self ):
         return " (BPVVD >%(KsLLCutFD)s*mm)& (MM>%(KSLLMassLow)s*MeV)&(MM<%(KSLLMassHigh)s*MeV)  & (BPVVDCHI2> %(KSLLCutFDChi2)s ) & (PT > %(KS0PT)s*MeV) & (VFASPF(VCHI2PDOF) < %(KS0VertexChi2)s) & CHILDCUT((TRCHI2DOF < %(KS0DaugTrackChi2)s),1) & CHILDCUT((TRCHI2DOF < %(KS0DaugTrackChi2)s),2) & CHILDCUT((MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s),1) & CHILDCUT((MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s),2) & (MIPCHI2DV(PRIMARY) > %(KS0MIPChi2)s)"
@@ -504,14 +504,14 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Pi_SSLine', prescale =  1.0 if NoPS else self.config["PiENu_prescale"],
                              FILTER=self.GECs,
                              algos = [ self._B2PiENuSS()])
-    
+
     def _Pi_NoPIDe_line( self ):
         NoPS =  self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'B2Pi_NoPIDELine', prescale = 1.0 if NoPS else 0.02,
                              FILTER=self.GECs,
                              algos = [ self._B2PiENuNoPIDe()])
-    
+
     def _Pi_NoPIDhad_line( self ):
         NoPS =  self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -539,42 +539,42 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bs2K_SSLine', prescale = 1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KENuSS()])
-   
+
     def _K_NoPIDe_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_NoPIDELine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KENu_NoPIDe()])
-    
+
     def _KSS_NoPIDe_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_SSNoPIDELine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KENuSS_NoPIDe()])
-    
+
     def _K_NoPIDK_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_NoPIDKLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KENu_NoPIDK()])
-    
+
     def _KSS_NoPIDK_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_SSNoPIDKLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KENuSS_NoPIDK()])
-    
+
     def _K_NoPIDKe_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_NoPIDKELine', prescale = 1.0 if NoPS else .01,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KENu_NoPIDKe()])
-    
+
     def _KSS_NoPIDKe_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -595,14 +595,14 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Phi_NoETopoLine', prescale =  1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._B2PhiENuNoETopo()])
-    
+
     def _PhiWS_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'B2Phi_WSLine', prescale = 1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._B2PhiENuWS()])
-    
+
     def _Phi_NoPIDe_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -616,7 +616,7 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Phi_NoPIDKLine', prescale = 1.0 if NoPS else 0.01,
                              FILTER=self.GECs,
                              algos = [ self._B2PhiENu_NoPIDhad()])
-    
+
     def _PhiBadVtx_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -638,7 +638,7 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Rho_NoETopoLine', prescale =  1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoENuNoETopo()])
-    
+
     def _Rho_NoPIDe_line(self):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -652,27 +652,27 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Rho_NoPIDPiLine', prescale = 1.0 if NoPS else 0.05,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoENu_NoPIDhad()])
-    
+
     def _RhoWS_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Rho_WSLine', prescale = 1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoENuWS()])
-    
+
     def _RhoBadVtx_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Rho_BadVtxLine', prescale = 1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoENuBadVtx()])
-    
+
     def _RhoSB_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Rho_SBLine', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoENuSB()])
-    
+
     ##### B -> omega e nu lines
     def _Omega_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
@@ -686,14 +686,14 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Omega_NoETopoLine', prescale =  1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._Bu2OmegaENuNoETopo()])
-    
+
     def _Omega_NoPIDe_line(self):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Omega_NoPIDELine', prescale = 1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bu2OmegaENu_NoPIDe()])
-    
+
     def _Omega_NoPIDhad_line(self):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -707,7 +707,7 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Omega_WSLine', prescale = 1.0 if NoPS else 0.3,
                              FILTER=self.GECs,
                              algos = [ self._Bu2OmegaENuWS()])
-    
+
     def _OmegaBadVtx_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -721,7 +721,7 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2KshSSE_SSEminusLine', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bu2KshSSENu_SSEminus()])
-    
+
     def _KshMajoranaOSE_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2KshOSE_SSEplusLine', prescale = 1.0,
@@ -735,7 +735,7 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KstarENu()])
-    
+
     def _Kstar_NoETopo_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -756,7 +756,7 @@ class B2XuENuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bs2Kstar_NoPIDPiLine', prescale = 1.0 if NoPS else 0.02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KstarENu_NoPIDhad()])
-    
+
     def _KstarSS_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -781,7 +781,7 @@ class B2XuENuBuilder(LineBuilder):
     def _electronFilter( self ):
         if self._electronSel is not None:
             return self._electronSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseElectrons
@@ -789,16 +789,16 @@ class B2XuENuBuilder(LineBuilder):
         _eSel=Selection("E_for"+self._name,
                          Algorithm=_e,
                          RequiredSelections = [StdLooseElectrons])
-        
+
         self._electronSel=_eSel
-        
+
         return _eSel
 
     ######--######
     def _electronFilterNoPID( self ):
         if self._electronSelNoPID is not None:
             return self._electronSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsElectrons
@@ -806,17 +806,17 @@ class B2XuENuBuilder(LineBuilder):
         _eSelNoPID=Selection("ENoPID_for"+self._name,
                          Algorithm=_eNoPID,
                          RequiredSelections = [StdNoPIDsElectrons])
-        
+
         self._electronSelNoPID=_eSelNoPID
-        
+
         return _eSelNoPID
 
-    
+
     ######--######
     def _electronFilterTight( self ):
         if self._electronSelTight is not None:
             return self._electronSelTight
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseElectrons
@@ -824,16 +824,16 @@ class B2XuENuBuilder(LineBuilder):
         _eTightSel=Selection("ETightCuts_for"+self._name,
                          Algorithm=_eTight,
                          RequiredSelections = [StdLooseElectrons])
-        
+
         self._electronSelTight=_eTightSel
-        
+
         return _eTightSel
 
     ######--######
     def _electronFilterTightNoPID( self ):
         if self._electronSelTightNoPID is not None:
             return self._electronSelTightNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsElectrons
@@ -841,16 +841,16 @@ class B2XuENuBuilder(LineBuilder):
         _eTightSelNoPID=Selection("ETightNoPIDCuts_for"+self._name,
                          Algorithm=_eTightNoPID,
                          RequiredSelections = [StdNoPIDsElectrons])
-        
+
         self._electronSelTightNoPID=_eTightSelNoPID
-        
+
         return _eTightSelNoPID
 
     ######--######
     def _electronFilterTOS( self ):
         if self._electronSelTOS is not None:
             return self._electronSelTOS
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseElectrons
@@ -861,14 +861,14 @@ class B2XuENuBuilder(LineBuilder):
         eSelTOS = tosSelection(_eSelTOS,{'L0.*Electron.*Decision%TOS':0}, True)
 
         self._electronSelTOS=_eSelTOS
-        
+
         return _eSelTOS
 
     ######--######
     def _electronFilterTOSNoPID( self ):
         if self._electronSelTOSNoPID is not None:
             return self._electronSelTOSNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsElectrons
@@ -879,7 +879,7 @@ class B2XuENuBuilder(LineBuilder):
         _eSelTOSNoPID = tosSelection(_eSelTOSNoPID,{'L0.*Electron.*Decision%TOS':0}, True)
 
         self._electronSelTOSNoPID=_eSelTOSNoPID
-        
+
         return _eSelTOSNoPID
 
     ## Pions
@@ -887,11 +887,11 @@ class B2XuENuBuilder(LineBuilder):
     def _pionFilter( self ):
         if self._pionSel is not None:
             return self._pionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _pi = FilterDesktop( Code = self._NominalPiSelection() % self._config )
         _piSel=Selection("Pi_for"+self._name,
                          Algorithm=_pi,
@@ -903,11 +903,11 @@ class B2XuENuBuilder(LineBuilder):
     def _pionFilterNoPID( self ):
         if self._pionSelNoPID is not None:
             return self._pionSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions
-        
+
         _piNoPID = FilterDesktop( Code = self._NominalPiSelectionNoPID() % self._config )
         _piSelNoPID=Selection("PiNoPID_for"+self._name,
                          Algorithm=_piNoPID,
@@ -919,27 +919,27 @@ class B2XuENuBuilder(LineBuilder):
     def _pionFilterTight( self ):
         if self._pionSelTight is not None:
             return self._pionSelTight
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _piTight = FilterDesktop( Code = self._NominalPiSelectionTight() % self._config )
         _piSelTight=Selection("PiTight_for"+self._name,
                          Algorithm=_piTight,
                          RequiredSelections = [StdLoosePions])
         self._pionSelTight=_piSelTight
         return _piSelTight
-    
+
     ######--######
     def _pionFilterTightNoPID( self ):
         if self._pionSelTightNoPID is not None:
             return self._pionSelTightNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions
-        
+
         _piNoPIDTight = FilterDesktop( Code = self._NominalPiSelectionTightNoPID() % self._config )
         _piSelNoPIDTight=Selection("PiTightNoPID_for"+self._name,
                          Algorithm=_piNoPIDTight,
@@ -948,16 +948,16 @@ class B2XuENuBuilder(LineBuilder):
         return _piSelNoPIDTight
 
     ## Kaons
-    
+
     ######Kaon Filter######
     def _kaonFilter( self ):
         if self._kaonSel is not None:
             return self._kaonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._NominalKSelection() % self._config )
         _kaSel=Selection("K_for"+self._name,
                          Algorithm=_ka,
@@ -969,11 +969,11 @@ class B2XuENuBuilder(LineBuilder):
     def _kaonFilterNoPID( self ):
         if self._kaonSelNoPID is not None:
             return self._kaonSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._NominalKSelectionNoPID() % self._config )
         _kaSelNoPID=Selection("KNoPID_for"+self._name,
                          Algorithm=_ka,
@@ -985,11 +985,11 @@ class B2XuENuBuilder(LineBuilder):
     def _kaonForPhiFilter( self ):
         if self._kaonForPhiSel is not None:
             return self._kaonForPhiSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._KforPhiSelection() % self._config )
         _kaSel=Selection("K_Phi"+self._name,
                          Algorithm=_ka,
@@ -1001,11 +1001,11 @@ class B2XuENuBuilder(LineBuilder):
     def _kaonForPhiFilterNoPID( self ):
         if self._kaonForPhiSelNoPID is not None:
             return self._kaonForPhiSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsKaons
-        
+
         _kaNoPID = FilterDesktop( Code = self._KforPhiSelectionNoPID() % self._config )
         _kaSelNoPID=Selection("KNoPID_Phi"+self._name,
                          Algorithm=_kaNoPID,
@@ -1017,7 +1017,7 @@ class B2XuENuBuilder(LineBuilder):
     def _MajoranaLineElectronFilter( self ):
         if self._MajoranaLineElectronSel is not None:
             return self._MajoranaLineElectronSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseElectrons
@@ -1025,41 +1025,41 @@ class B2XuENuBuilder(LineBuilder):
         _emajoranaSel=Selection("EMajorana_for"+self._name,
                                  Algorithm=_emajorana,
                                  RequiredSelections = [StdLooseElectrons])
-        
+
         self._MajoranaLineElectronSel=_emajoranaSel
-        
+
         return _emajoranaSel
-    
+
     #####
     ## Composites
     #####
-    
+
     ######--######
     def _KsFilter( self ):
         if self._KSSel is not None:
            return self._KSSel
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         _code =  FilterDesktop( Code = self._NominalKsSelection() % self._config )
-      
+
         _KsSel=Selection("KS02PiPi_for"+self._name,
                          Algorithm= _code,
                          RequiredSelections = [self._stdVeryLooseKsLL,self._stdLooseKsLD,self._stdLooseKsDD])
-      
+
         self._KSSel = _KsSel
-      
+
         return _KsSel
-    
+
     ##### phi -> KK filter (generall di-kaon filter) #####
     def _Phi2KKFilter( self ):
         if self._phi1020Sel is not None:
             return self._phi1020Sel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _phi1020 = CombineParticles(
             DecayDescriptors = ["phi(1020) -> K- K+"] ,
             CombinationCut = "(AM< %(PhiUpperMass)s)" % self._config,
@@ -1069,19 +1069,19 @@ class B2XuENuBuilder(LineBuilder):
         _phi1020Sel=Selection("PhiKK_for"+self._name,
                              Algorithm=_phi1020,
                              RequiredSelections = [self._kaonForPhiFilter()])
-        
+
         self._phi1020Sel=_phi1020Sel
-        
+
         return _phi1020Sel
 
     ######--######
     def _Phi2KKFilterNoPID( self ):
         if self._phi1020SelNoPID is not None:
             return self._phi1020SelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _phi1020NoPID = CombineParticles(
             DecayDescriptors = ["phi(1020) -> K- K+"] ,
             CombinationCut = "(AM< %(PhiUpperMass)s)" % self._config,
@@ -1091,19 +1091,19 @@ class B2XuENuBuilder(LineBuilder):
         _phi1020SelNoPID=Selection("PhiKKNoPID_for"+self._name,
                              Algorithm=_phi1020NoPID,
                              RequiredSelections = [self._kaonForPhiFilterNoPID()])
-        
+
         self._phi1020SelNoPID=_phi1020SelNoPID
-        
+
         return _phi1020SelNoPID
 
     ######--######
     def _Phi2KKFilterWS( self ):
         if self._phi1020SelWS is not None:
             return self._phi1020SelWS
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _phi1020WS = CombineParticles(
             DecayDescriptors = ["[phi(1020) -> K+ K+]cc"] ,
             CombinationCut = "(AM< %(PhiUpperMass)s)" % self._config,
@@ -1113,21 +1113,21 @@ class B2XuENuBuilder(LineBuilder):
         _phi1020SelWS=Selection("PhiKKWS_for"+self._name,
                                 Algorithm=_phi1020WS,
                                 RequiredSelections = [self._kaonForPhiFilter()])
-        
+
         self._phi1020SelWS=_phi1020SelWS
-        
+
         return _phi1020SelWS
 
-    
+
     #####Make the Rho######
     def _Rho02PiPiFilter( self ):
         if self._rho770Sel is not None:
             return self._rho770Sel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770 = CombineParticles(
             DecayDescriptors = ["rho(770)0 -> pi- pi+"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1144,20 +1144,20 @@ class B2XuENuBuilder(LineBuilder):
         _rho770Sel=Selection("Rho02PiPi_for"+self._name,
                              Algorithm=_rho770,
                              RequiredSelections = [self._pionFilter()])
-        
+
         self._rho770Sel=_rho770Sel
-        
+
         return _rho770Sel
 
     ######--######
     def _Rho02PiPiFilterNoPID( self ):
         if self._rho770SelNoPID is not None:
             return self._rho770SelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770NoPID = CombineParticles(
             DecayDescriptors = ["rho(770)0 -> pi- pi+"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1174,20 +1174,20 @@ class B2XuENuBuilder(LineBuilder):
         _rho770SelNoPID=Selection("Rho02PiPiNoPID_for"+self._name,
                                   Algorithm=_rho770NoPID,
                                   RequiredSelections = [self._pionFilterNoPID()])
-        
+
         self._rho770SelNoPID=_rho770SelNoPID
-        
+
         return _rho770SelNoPID
 
     ######--######
     def _Rho02PiPiWSFilter( self ):
         if self._rho770WSSel is not None:
             return self._rho770WSSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770WS = CombineParticles(
             DecayDescriptors = ["[rho(770)0 -> pi+ pi+]cc"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1203,19 +1203,19 @@ class B2XuENuBuilder(LineBuilder):
         _rho770SelWS=Selection("Rho02PiPiWS_for"+self._name,
                              Algorithm=_rho770WS,
                              RequiredSelections = [self._pionFilter()])
-        
+
         self._rho770WSSel=_rho770SelWS
         return _rho770SelWS
-    
+
     ######--######
     def _Rho02PiPiSBFilter( self ):
         if self._rho770SBSel is not None:
             return self._rho770SBSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770SB = CombineParticles(
             DecayDescriptors = ["rho(770)0 -> pi+ pi-"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1223,7 +1223,7 @@ class B2XuENuBuilder(LineBuilder):
                                },
             CombinationCut = "((AM > %(RhoMassWindowMin1SB)s) & (AM < %(RhoMassWindowMax1SB)s))"\
             " | ((AM > %(RhoMassWindowMin2SB)s) & (AM < %(RhoMassWindowMax2SB)s))" % self._config,
-            
+
             MotherCut       = "(MAXTREE('pi+'==ABSID,PT )>%(RhoLeadingPionPT)s *MeV )"\
             "& (VFASPF(VCHI2/VDOF) < %(RhoVCHI2DOF)s ) & (PT > %(RhoPT)s *MeV) "\
             "& (MIPCHI2DV(PRIMARY)> %(RhoMINIPCHI2)s ) & (BPVDIRA> %(RhoDIRA)s)"%self._config
@@ -1231,7 +1231,7 @@ class B2XuENuBuilder(LineBuilder):
         _rho770SelSB=Selection("Rho02PiPiSB_for"+self._name,
                                Algorithm=_rho770SB,
                                RequiredSelections = [self._pionFilter()])
-        
+
         self._rho770SBSel=_rho770SelSB
         return _rho770SelSB
 
@@ -1239,11 +1239,11 @@ class B2XuENuBuilder(LineBuilder):
     def _Omega2PiPiPi0Filter( self ):
         if self._omega782Sel is not None:
             return self._omega782Sel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
-        
+
         _omega782 = DaVinci__N3BodyDecays(
             DecayDescriptor  = "omega(782) -> pi+ pi- pi0" ,
             DaughtersCuts    = {"pi+":"(PT> %(OmegaChPionPT)s *MeV)"\
@@ -1258,20 +1258,20 @@ class B2XuENuBuilder(LineBuilder):
         _omega782Sel=Selection("Omega2PiPiPi0_for"+self._name,
                                Algorithm=_omega782,
                                RequiredSelections = [StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0])
-        
+
         self._omega782Sel=_omega782Sel
-        
+
         return _omega782Sel
 
     ######--######
     def _Omega2PiPiPi0FilterNoPID( self ):
         if self._omega782SelNoPID is not None:
             return self._omega782SelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions, StdLooseResolvedPi0, StdLooseMergedPi0
-        
+
         _omega782NoPID = DaVinci__N3BodyDecays(
             DecayDescriptor  = "omega(782) -> pi+ pi- pi0" ,
             DaughtersCuts    = {"pi+":"(PT> %(OmegaChPionPT)s *MeV)"\
@@ -1286,20 +1286,20 @@ class B2XuENuBuilder(LineBuilder):
         _omega782SelNoPID=Selection("Omega2PiPiPi0NoPID_for"+self._name,
                                     Algorithm=_omega782NoPID,
                                     RequiredSelections = [StdNoPIDsPions, StdLooseResolvedPi0, StdLooseMergedPi0])
-        
+
         self._omega782SelNoPID=_omega782SelNoPID
-        
+
         return _omega782SelNoPID
 
     ######--######
     def _Omega2PiPiPi0WSFilter( self ):
         if self._omega782WSSel is not None:
             return self._omega782WSSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
-        
+
         _omega782WS = DaVinci__N3BodyDecays(
             DecayDescriptor   = "[omega(782) -> pi+ pi+ pi0]cc" ,
             DaughtersCuts     = {"pi+":"(PT> %(OmegaChPionPT)s *MeV)"\
@@ -1314,20 +1314,20 @@ class B2XuENuBuilder(LineBuilder):
         _omega782WSSel=Selection("Omega2PiPiPi0WS_for"+self._name,
                                Algorithm=_omega782WS,
                                RequiredSelections = [StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0])
-        
+
         self._omega782WSSel=_omega782WSSel
-        
+
         return _omega782WSSel
-    
+
     ######Make the Kshort->EPi Same Sign for Majorana####
     def _KshMajoranaSSEFilter( self ):
         if self._KshMajoranaSSESel is not None:
             return self._KshMajoranaSSESel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseElectrons
-     
+
         _Ksh = CombineParticles(
             DecayDescriptor = "KS0 -> e- pi+",
             DaughtersCuts   = {"pi+":"(P > %(KS0DaugP)s)& (PT > %(KS0DaugPT)s)"\
@@ -1335,27 +1335,27 @@ class B2XuENuBuilder(LineBuilder):
                                "& (MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)"   % self._config
                                },
             CombinationCut  = "(ADOCACHI2CUT(25, ''))"% self._config,
-            
-            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config 
+
+            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config
             )
-        
-        #_Ksh.ReFitPVs = True        
+
+        #_Ksh.ReFitPVs = True
         _KshMajoranaSSESel=Selection("KshMajoranaSSE_for"+self._name,
                                       Algorithm=_Ksh,
                                       RequiredSelections = [StdLoosePions, self._MajoranaLineElectronFilter()])
         self._KshMajoranaSSESel=_KshMajoranaSSESel
-        
+
         return _KshMajoranaSSESel
-    
+
     ######Make the Kshort->EPi Opposite Sign for Majorana####
     def _KshMajoranaOSEFilter( self ):
         if self._KshMajoranaOSESel is not None:
             return self._KshMajoranaOSESel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseElectrons
-        
+
         _Ksh = CombineParticles(
             DecayDescriptor = "KS0 -> e+ pi-",
             DaughtersCuts   = {"pi-":"(P > %(KS0DaugP)s)& (PT > %(KS0DaugPT)s)"\
@@ -1363,19 +1363,19 @@ class B2XuENuBuilder(LineBuilder):
                                "&(MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)"   % self._config
                                },
             CombinationCut  = "(ADOCACHI2CUT(25, ''))"% self._config,
-            
-            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config 
+
+            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config
             )
         # _Ksh.ReFitPVs = True
         _KshMajoranaOSESel=Selection("KshMajoranaOSE_for"+self._name,
                                       Algorithm=_Ksh,
                                       RequiredSelections = [StdLoosePions, self._MajoranaLineElectronFilter()])
         self._KshMajoranaOSESel=_KshMajoranaOSESel
-        
+
         return _KshMajoranaOSESel
 
     ## Kstars
-    
+
     # Make the K*+ out of KS and pi+
     def _Kstar2KPiFilter( self ):
         if self._KstarSel is not None:
@@ -1437,7 +1437,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PiENu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KE = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ e-]cc"],
             CombinationCut = "(AM>%(KEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1445,7 +1445,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KESel=Selection("PiE_for"+self._name,
                          Algorithm=_KE,
                          RequiredSelections = [self._electronFilterTOS(), self._pionFilterTight()])
@@ -1455,7 +1455,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PiENuNoETopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KENoETopo = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ e-]cc"],
             CombinationCut = "(AM>%(KEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1463,7 +1463,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KESelNoETopo=Selection("PiENoETopo_for"+self._name,
                          Algorithm=_KENoETopo,
                          RequiredSelections = [self._electronFilterTOS(), self._pionFilterTight()])
@@ -1474,7 +1474,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PiENuNoPIDe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KENoPIDe = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ e-]cc"],
             CombinationCut = "(AM>%(KEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1482,7 +1482,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KESelNoPIDe=Selection("PiENoPIDe_for"+self._name,
                                  Algorithm=_KENoPIDe,
                                  RequiredSelections = [self._electronFilterNoPID(), self._pionFilterTight()])
@@ -1492,7 +1492,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PiENuNoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KENoPIDhad = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ e-]cc"],
             CombinationCut = "(AM>%(KEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1500,17 +1500,17 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KESelNoPIDhad=Selection("PiENoPIDhad_for"+self._name,
                                   Algorithm=_KENoPIDhad,
                                   RequiredSelections = [self._electronFilterTOS(), self._pionFilterTightNoPID()])
         _KESelNoPIDhad = tosSelection(_KESelNoPIDhad,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _KESelNoPIDhad
-    
+
     def _B2PiENuSS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KESS = CombineParticles(
             DecayDescriptors = ["[B0 -> pi- e-]cc"],
             CombinationCut = "(AM>%(KEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1518,7 +1518,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-      
+
         _KESelSS=Selection("PiESS_for"+self._name,
                           Algorithm=_KESS,
                           RequiredSelections = [self._electronFilterTOS(), self._pionFilterTight()])
@@ -1530,7 +1530,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bs2KENu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KE = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1538,7 +1538,7 @@ class B2XuENuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KESel=Selection("KE_for"+self._name,
                          Algorithm=_KE,
                          RequiredSelections = [self._electronFilterTOS(), self._kaonFilter()])
@@ -1548,7 +1548,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bs2KENuNoETopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KENoETopo = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1556,17 +1556,17 @@ class B2XuENuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KESelNoETopo=Selection("KENoETopo_for"+self._name,
                          Algorithm=_KENoETopo,
                          RequiredSelections = [self._electronFilter(), self._kaonFilter()])
         _KESelNoETopo = tosSelection(_KESelNoETopo,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _KESelNoETopo
-    
+
     def _Bs2KENuSS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KESS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1585,7 +1585,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bs2KENu_NoPIDe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KE = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1593,17 +1593,17 @@ class B2XuENuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KESel=Selection("KE_NoPIDe_for"+self._name,
                          Algorithm=_KE,
                          RequiredSelections = [self._electronFilterNoPID(), self._kaonFilter()])
         _KESel = tosSelection(_KESel,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _KESel
-    
+
     def _Bs2KENuSS_NoPIDe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KESS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1622,7 +1622,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bs2KENu_NoPIDK( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KE = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1630,17 +1630,17 @@ class B2XuENuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KESel=Selection("KE_NoPIDK_for"+self._name,
                          Algorithm=_KE,
                          RequiredSelections = [self._electronFilterTOS(), self._kaonFilterNoPID()])
         _KESel = tosSelection(_KESel,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _KESel
-    
+
     def _Bs2KENuSS_NoPIDK( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KESS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1659,7 +1659,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bs2KENu_NoPIDKe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KE = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1667,17 +1667,17 @@ class B2XuENuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KESel=Selection("KE_NoPIDKe_for"+self._name,
                          Algorithm=_KE,
                          RequiredSelections = [self._electronFilterNoPID(), self._kaonFilterNoPID()])
         _KESel = tosSelection(_KESel,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _KESel
-    
+
     def _Bs2KENuSS_NoPIDKe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KESS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1696,7 +1696,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PhiENu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiE = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) e+]cc"],
             CombinationCut = "(AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1715,7 +1715,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PhiENuNoETopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiENoETopo = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) e+]cc"],
             CombinationCut = "(AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1735,7 +1735,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PhiENuWS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiEWS = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) e+]cc"],
             CombinationCut = "(AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1750,13 +1750,13 @@ class B2XuENuBuilder(LineBuilder):
             # _KMuSel = tosSelection(_KMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleElectron.*Decision%TOS':0})
         _PhiESelWS = tosSelection(_PhiESelWS,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*TopoE3Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _PhiESelWS
-   
+
    ######Bu->PhiENu Fake E ######
-   
+
     def _B2PhiENu_NoPIDe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiE = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) e+]cc"],
             CombinationCut = "(AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1770,11 +1770,11 @@ class B2XuENuBuilder(LineBuilder):
                          RequiredSelections = [self._electronFilterNoPID(), self._Phi2KKFilter()])
         _PhiENoPIDeSel = tosSelection(_PhiENoPIDeSel,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*Topo3Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _PhiENoPIDeSel
-    
+
     def _B2PhiENu_NoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiENoPIDHad = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) e+]cc"],
             CombinationCut = "(AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1793,7 +1793,7 @@ class B2XuENuBuilder(LineBuilder):
     def _B2PhiENuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiEBadVtx = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) e+]cc"],
             CombinationCut = "(AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1810,12 +1810,12 @@ class B2XuENuBuilder(LineBuilder):
         return _PhiESelBadVtx
 
 
-      
+
     ######Bu->RhoENu ######
     def _Bu2RhoENu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoE = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1833,7 +1833,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2RhoENuNoETopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoENoETopo = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1851,7 +1851,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2RhoENu_NoPIDe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoE_NoPIDe = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1869,7 +1869,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2RhoENu_NoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoE_NoPIDhad = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1888,7 +1888,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2RhoENuWS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoEWS = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1896,7 +1896,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _RhoESelWS=Selection("RhoEWS_for"+self._name,
                          Algorithm=_RhoEWS,
                          RequiredSelections = [self._electronFilterTight(), self._Rho02PiPiWSFilter()])
@@ -1906,7 +1906,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2RhoENuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoEBadVtx = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1914,18 +1914,18 @@ class B2XuENuBuilder(LineBuilder):
             " & (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _RhoESelBadVtx=Selection("RhoEBadVtx_for"+self._name,
                                   Algorithm=_RhoEBadVtx,
                                   RequiredSelections = [self._electronFilterTight(), self._Rho02PiPiFilter()])
         _RhoESelBadVtx = tosSelection(_RhoESelBadVtx,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*TopoE3Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _RhoESelBadVtx
-    
-    ### This is not needed anymore, as long as the pi+pi- mass window is large enough.    
+
+    ### This is not needed anymore, as long as the pi+pi- mass window is large enough.
     def _Bu2RhoMuNuSB( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMu = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1934,7 +1934,7 @@ class B2XuENuBuilder(LineBuilder):
 
             ReFitPVs = True
             )
-        
+
         _RhoMu.Preambulo = [ "from LoKiPhys.decorators import *",
                            "dx = (VFASPF(VX)-BPV(VX))",
                            "dy = (VFASPF(VY)-BPV(VY))",
@@ -1958,18 +1958,18 @@ class B2XuENuBuilder(LineBuilder):
                            "solution_b = ((-quadb - sqrt(max(Discriminant,0)))/(2*quada))",
                            "ratio = (solution_a/solution_b)"
                            ]
-        
+
         _RhoMuSel=Selection("RhoMuSB_for"+self._name,
                          Algorithm=_RhoMu,
                          RequiredSelections = [self._electronFilterTight(), self._Rho02PiPiSBFilter()])
         _RhoMuSel = tosSelection(_RhoMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*TopoMu3Body.*Decision%TOS':0,'Hlt2.*SingleElectron.*Decision%TOS':0})
         return _RhoMuSel
-    
+
     ######Bu->OmegaENu ######
     def _Bu2OmegaENu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaE = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -1983,11 +1983,11 @@ class B2XuENuBuilder(LineBuilder):
                               RequiredSelections = [self._electronFilterTight(), self._Omega2PiPiPi0Filter()])
         _OmegaESel = tosSelection(_OmegaESel,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*TopoE3Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _OmegaESel
-    
+
     def _Bu2OmegaENuNoETopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaENoETopo = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -2005,7 +2005,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2OmegaENu_NoPIDe( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaE_NoPIDe = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -2023,7 +2023,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2OmegaENu_NoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaE_NoPIDhad = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -2042,7 +2042,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2OmegaENuWS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaEWS = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -2050,7 +2050,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _OmegaESelWS=Selection("OmegaEWS_for"+self._name,
                                 Algorithm=_OmegaEWS,
                                 RequiredSelections = [self._electronFilterTight(), self._Omega2PiPiPi0WSFilter()])
@@ -2060,7 +2060,7 @@ class B2XuENuBuilder(LineBuilder):
     def _Bu2OmegaENuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaEBadVtx = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) e+]cc"],
             CombinationCut = "(AM>%(RhoEMassLowTight)s*MeV) & (AM<%(XEMassUpper)s*MeV)" % self._config,
@@ -2068,19 +2068,19 @@ class B2XuENuBuilder(LineBuilder):
             " & (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _OmegaESelBadVtx=Selection("OmegaEBadVtx_for"+self._name,
                                     Algorithm=_OmegaEBadVtx,
                                     RequiredSelections = [self._electronFilterTight(), self._Omega2PiPiPi0Filter()])
         _OmegaESelBadVtx = tosSelection(_OmegaESelBadVtx,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*TopoE3Body.*Decision%TOS':0,'Hlt2.*Single:*Electron.*Decision%TOS':0})
         return _OmegaESelBadVtx
-    
+
 
     ######Bu->KshENu SS & OS######
     def _Bu2KshSSENu_SSEminus( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KshSSE_SSEminus = CombineParticles(
             DecayDescriptors = ["[B- -> KS0 e-]cc"],
             CombinationCut = "(AM>%(KS0EMassLowTight)s*MeV) & (AM<%(XEMassUpperHigh)s*MeV)" % self._config,
@@ -2088,17 +2088,17 @@ class B2XuENuBuilder(LineBuilder):
             "& (MINTREE( (ABSID=='KS0') , VFASPF(VZ))-VFASPF(VZ) > %(KS0Z)s *mm )" % self._config,
             ReFitPVs = True
             )
-        
+
         _KshSSE_SSEminusSel=Selection("KshSSE_SSEminus_for"+self._name,
                               Algorithm=_KshSSE_SSEminus,
                               RequiredSelections = [self._electronFilter(), self._KshMajoranaSSEFilter()])
         return _KshSSE_SSEminusSel
-    
-    
+
+
     def _Bu2KshOSENu_SSEplus( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KshOSE_SSEplus = CombineParticles(
             DecayDescriptors = ["[B- -> KS0 e-]cc"],
             CombinationCut = "(AM>%(KS0EMassLowTight)s*MeV) & (AM<%(XEMassUpperHigh)s*MeV)" % self._config,
@@ -2106,7 +2106,7 @@ class B2XuENuBuilder(LineBuilder):
             "& (MINTREE( (ABSID=='KS0') , VFASPF(VZ))-VFASPF(VZ) > %(KS0Z)s *mm )" % self._config,
             ReFitPVs = True
             )
-        
+
         _KshOSE_SSEplusSel=Selection("KshOSE_SSEplus_for"+self._name,
                               Algorithm=_KshOSE_SSEplus,
                               RequiredSelections = [self._electronFilter(), self._KshMajoranaOSEFilter()])
@@ -2122,7 +2122,7 @@ class B2XuENuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarESel=Selection("KstarE_for"+self._name,
                                 Algorithm=_KstarE,
                                 RequiredSelections = [self._electronFilter(), self._Kstar2KPiFilter()])
@@ -2138,7 +2138,7 @@ class B2XuENuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarESelNoETopo=Selection("KstarENoETopo_for"+self._name,
                                 Algorithm=_KstarENoETopo,
                                 RequiredSelections = [self._electronFilter(), self._Kstar2KPiFilter()])
@@ -2154,7 +2154,7 @@ class B2XuENuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarESelNoPIDe=Selection("KstarENoPIDe_for"+self._name,
                                    Algorithm=_KstarENoPIDe,
                                    RequiredSelections = [self._electronFilterNoPID(), self._Kstar2KPiFilter()])
@@ -2170,24 +2170,24 @@ class B2XuENuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarESelNoPIDhad=Selection("KstarENoPIDHad_for"+self._name,
                                       Algorithm=_KstarENoPIDhad,
                                       RequiredSelections = [self._electronFilter(), self._Kstar2KPiFilterNoPID()])
         _KstarESelNoPIDhad = tosSelection(_KstarESelNoPIDhad,{'Hlt2.*TopoE2Body.*Decision%TOS':0,'Hlt2.*TopoE3Body.*Decision%TOS':0,'Hlt2.*Single.*Electron.*Decision%TOS':0})
         return _KstarESelNoPIDhad
 
-    
+
     def _Bs2KstarENuSS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KstarESS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K*(892)- e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarESSSel=Selection("KstarESS_for"+self._name,
                                   Algorithm=_KstarESS,
                                   RequiredSelections = [self._electronFilter(), self._Kstar2KPiFilter()])
@@ -2197,13 +2197,13 @@ class B2XuENuBuilder(LineBuilder):
     def _Bs2KstarENuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KstarEBadVtx = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K*(892)+ e-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)> %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarESelBadVtx=Selection("KstarEBadVtx_for"+self._name,
                                 Algorithm=_KstarEBadVtx,
                                 RequiredSelections = [self._electronFilter(), self._Kstar2KPiFilter()])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py
index 3bbb84cacf62d399cc1eb27ca6d1afc6b4a405dc..b4b2c6fc94e200e6948cc5fc286b70a2d7a81283 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py
@@ -28,7 +28,7 @@ B->Xu mu nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #  B0 -> pi+ mu nu
 #  B+ -> rho mu nu
 #  B+ -> omega mu nu
-#  Bs0 -> K+  mu- nu, 
+#  Bs0 -> K+  mu- nu,
 #  B -> phi mu nu
 #  Bs0 -> K*+ mu- nu, (with K*+->KS0 Pi)
 #
@@ -40,7 +40,7 @@ B->Xu mu nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #
 #  Stripping XX, with requirements that the
 #  rate <0.05% and timing <1ms/evt.
-## 
+##
 
 """
 ##
@@ -54,7 +54,7 @@ B->Xu mu nu exclusive reconstruction in Xu=pi/rho/omega/phi/K/K*+ channels
 #  B0 -> pi+ mu nu
 #  B+ -> rho mu nu
 #  B+ -> omega mu nu
-#  Bs0 -> K+  mu- nu, 
+#  Bs0 -> K+  mu- nu,
 #  B -> phi mu nu
 #  Bs0 -> K*+ mu- nu, (with K*+->KS0 Pi)
 #
@@ -97,10 +97,10 @@ default_config = {
       "KaonPTight"          : 10000. ,#MeV
       "KaonPT"              : 400.   ,#MeV
       "KaonPTTight"         : 1000.   ,#MeV
-      "KaonPIDK"            : 5.     ,#adimensional 
+      "KaonPIDK"            : 5.     ,#adimensional
       "KaonPIDmu"           : 5.     ,#adimensional
       "KaonPIDp"            : 5.     ,#adimensional
-      "KaonPIDK_phi"        : 2.     ,#adimensional 
+      "KaonPIDK_phi"        : 2.     ,#adimensional
       "KaonPIDmu_phi"       : -2.    ,#adimensional
       "KaonPIDp_phi"        : -2.    ,#adimensional
       "KaonMINIPCHI2"       : 36     ,#adminensional
@@ -110,9 +110,9 @@ default_config = {
       "PionPTight"          : 10000. ,#MeV
       "PionPT"              : 300.   ,#MeV
       "PionPTTight"         : 800.   ,#MeV
-      "PionPIDK"            : -2.    ,#adimensional 
+      "PionPIDK"            : -2.    ,#adimensional
       "PionMINIPCHI2"       : 36      ,#adminensional
-      
+
       #phi channel
       "PhiUpperMass"        : 2200. ,#MeV
       "PhiVCHI2DOF"         : 6     ,#adimensional
@@ -136,7 +136,7 @@ default_config = {
       "RhoChPionPIDK"       : -2.  ,#adminensional
                    #    "RhoFDCHI2"           : 100.  ,#adimensional
                    #    "RhoFD"               : 6     ,#mm
-                   #    "RhoIPMin"            : 0.3   ,#mm    
+                   #    "RhoIPMin"            : 0.3   ,#mm
       "RhoDIRA"             : 0.98   ,#adimensional
       "RhoChPionMINIPCHI2"  : 36.    ,#adimensional
       # Omega cuts
@@ -193,12 +193,12 @@ default_config = {
       "XMuMassUpper"        : 5500. ,#MeV
       "XMuMassUpperHigh"    : 6500. ,#MeV
       "Enu"                 : 1850. ,#MeV
-      "EnuK"                : 2000. ,#MeV      
+      "EnuK"                : 2000. ,#MeV
       # Prescales
       'NoPrescales'         : False,
       'PiMuNu_prescale'     : 0.2
       },
-  'STREAMS'     : ['Semileptonic']    
+  'STREAMS'     : ['Semileptonic']
 }
 
 from Gaudi.Configuration import *
@@ -217,7 +217,7 @@ def makeTOSFilter(name,specs):
     return tosFilter
 
 def tosSelection(sel,specs):
-    from PhysSelPython.Wrappers import Selection 
+    from PhysSelPython.Wrappers import Selection
     '''Filters Selection sel to be TOS.'''
     tosFilter = makeTOSFilter(sel.name(),specs)
     return Selection(sel.name()+'TOS', Algorithm=tosFilter,
@@ -229,7 +229,7 @@ class B2XuMuNuBuilder(LineBuilder):
     """
     Definition of B->Xu mu nu stripping module
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self,name,config):
@@ -246,7 +246,7 @@ class B2XuMuNuBuilder(LineBuilder):
         ## Muons
         self._muonSel=None
         self._muonFilter()
-        
+
         self._muonSelNoPID=None
         self._muonFilterNoPID()
 
@@ -255,7 +255,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         self._muonSelTOSNoPID=None
         self._muonFilterTOSNoPID()
-        
+
         self._muonSelTight=None
         self._muonFilterTight()
 
@@ -271,7 +271,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         self._pionSelNoPID=None
         self._pionFilterNoPID()
-        
+
         self._pionSelTight=None
         self._pionFilterTight()
 
@@ -281,7 +281,7 @@ class B2XuMuNuBuilder(LineBuilder):
         ## Kaons
         self._kaonSel=None
         self._kaonFilter()
-        
+
         self._kaonForPhiSel=None
         self._kaonForPhiFilter()
 
@@ -307,23 +307,23 @@ class B2XuMuNuBuilder(LineBuilder):
         ## Omega
         self._omega782Sel=None
         self._Omega2PiPiPi0Filter()
-        
+
         self._omega782WSSel=None
         self._Omega2PiPiPi0WSFilter()
-        
+
         self._omega782SelNoPID=None
         self._Omega2PiPiPi0FilterNoPID()
 
         ## Phi
         self._phi1020Sel=None
         self._Phi2KKFilter()
-        
+
         self._phi1020SelWS=None
         self._Phi2KKFilterWS()
 
         self._phi1020SelNoPID=None
         self._Phi2KKFilterNoPID()
-        
+
         ## KS for Majorana
         self._KshMajoranaSSMuSel=None
         self._KshMajoranaSSMuFilter()
@@ -412,7 +412,7 @@ class B2XuMuNuBuilder(LineBuilder):
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
                "& (PIDmu > %(MuonPIDmu)s )"\
                "& (MIPCHI2DV(PRIMARY)> %(MuonMINIPCHI2)s )"
-   
+
     def _NominalMuSelectionTightNoPID( self ):
         return "(TRCHI2DOF < %(MuonTRCHI2)s ) &  (P> %(MuonPTight)s *MeV) &  (PT> %(MuonPTTight)s* MeV)"\
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
@@ -472,7 +472,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return "(TRCHI2DOF < %(PionTRCHI2)s )&  (P> %(PionPTight)s *MeV) &  (PT> %(PionPTTight)s *MeV)"\
                "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
                "& (MIPCHI2DV(PRIMARY)> %(PionMINIPCHI2)s )"
-    
+
     ### K shorts
     def _NominalKsSelection( self ):
         return " (BPVVD >%(KsLLCutFD)s*mm)& (MM>%(KSLLMassLow)s*MeV)&(MM<%(KSLLMassHigh)s*MeV)  & (BPVVDCHI2> %(KSLLCutFDChi2)s ) & (PT > %(KS0PT)s*MeV) & (VFASPF(VCHI2PDOF) < %(KS0VertexChi2)s) & CHILDCUT((TRCHI2DOF < %(KS0DaugTrackChi2)s),1) & CHILDCUT((TRCHI2DOF < %(KS0DaugTrackChi2)s),2) & CHILDCUT((MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s),1) & CHILDCUT((MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s),2) & (MIPCHI2DV(PRIMARY) > %(KS0MIPChi2)s)"
@@ -490,7 +490,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Pi_Line', prescale = 1.0 if NoPS else self.config["PiMuNu_prescale"],
                              FILTER=self.GECs,
                              algos = [ self._B2PiMuNu()])
-    
+
     def _Pi_NoMuTopo_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -504,14 +504,14 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Pi_SSLine', prescale =  1.0 if NoPS else self.config["PiMuNu_prescale"],
                              FILTER=self.GECs,
                              algos = [ self._B2PiMuNuSS()])
-    
+
     def _Pi_NoPIDmu_line( self ):
         NoPS =  self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'B2Pi_NoPIDMuLine', prescale = 1.0 if NoPS else 0.005,
                              FILTER=self.GECs,
                              algos = [ self._B2PiMuNuNoPIDmu()])
-    
+
     def _Pi_NoPIDhad_line( self ):
         NoPS =  self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -525,7 +525,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bs2K_Line', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNu()])
-    
+
     def _K_NoMuTopo_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -539,42 +539,42 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bs2K_SSLine', prescale = 1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNuSS()])
-   
+
     def _K_NoPIDmu_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_NoPIDMuLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNu_NoPIDmu()])
-    
+
     def _KSS_NoPIDmu_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_SSNoPIDMuLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNuSS_NoPIDmu()])
-    
+
     def _K_NoPIDK_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_NoPIDKLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNu_NoPIDK()])
-    
+
     def _KSS_NoPIDK_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_SSNoPIDKLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNuSS_NoPIDK()])
-    
+
     def _K_NoPIDKmu_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2K_NoPIDKMuLine', prescale = 1.0 if NoPS else .02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KMuNu_NoPIDKmu()])
-    
+
     def _KSS_NoPIDKmu_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -595,14 +595,14 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Phi_NoMuTopoLine', prescale = 1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._B2PhiMuNuNoMuTopo()])
-    
+
     def _PhiWS_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'B2Phi_WSLine', prescale = 1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._B2PhiMuNuWS()])
-    
+
     def _Phi_NoPIDmu_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -616,7 +616,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'B2Phi_NoPIDKLine', prescale = 1.0 if NoPS else 0.01,
                              FILTER=self.GECs,
                              algos = [ self._B2PhiMuNu_NoPIDhad()])
-    
+
     def _PhiBadVtx_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -631,7 +631,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Rho_Line', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoMuNu()])
-    
+
     def _Rho_NoMuTopo_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -652,27 +652,27 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Rho_NoPIDPiLine', prescale = 1.0 if NoPS else 0.05,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoMuNu_NoPIDhad()])
-    
+
     def _RhoWS_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Rho_WSLine', prescale = 1.0 if NoPS else 0.2,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoMuNuWS()])
-    
+
     def _RhoBadVtx_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Rho_BadVtxLine', prescale = 1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoMuNuBadVtx()])
-    
+
     def _RhoSB_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Rho_SBLine', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bu2RhoMuNuSB()])
-    
+
     ##### B -> omega mu nu lines
     def _Omega_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
@@ -686,14 +686,14 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Omega_NoMuTopoLine', prescale =  1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bu2OmegaMuNuNoMuTopo()])
-    
+
     def _Omega_NoPIDmu_line(self):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2Omega_NoPIDMuLine', prescale = 1.0 if NoPS else 0.1,
                              FILTER=self.GECs,
                              algos = [ self._Bu2OmegaMuNu_NoPIDmu()])
-    
+
     def _Omega_NoPIDhad_line(self):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -707,7 +707,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2Omega_WSLine', prescale = 1.0 if NoPS else 0.3,
                              FILTER=self.GECs,
                              algos = [ self._Bu2OmegaMuNuWS()])
-    
+
     def _OmegaBadVtx_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -721,7 +721,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bu2KshSSMu_SSMuminus_Line', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Bu2KshSSMuNu_SSMuminus()])
-    
+
     def _KshMajoranaOSMu_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bu2KshOSMu_SSMuplus_Line', prescale = 1.0,
@@ -756,7 +756,7 @@ class B2XuMuNuBuilder(LineBuilder):
         return StrippingLine(self._name+'Bs2Kstar_NoPIDPiLine', prescale = 1.0 if NoPS else 0.02,
                              FILTER=self.GECs,
                              algos = [ self._Bs2KstarMuNu_NoPIDhad()])
-    
+
     def _KstarSS_line( self ):
         NoPS = self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
@@ -781,7 +781,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _muonFilter( self ):
         if self._muonSel is not None:
             return self._muonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -789,16 +789,16 @@ class B2XuMuNuBuilder(LineBuilder):
         _muSel=Selection("Mu_for"+self._name,
                          Algorithm=_mu,
                          RequiredSelections = [StdLooseMuons])
-        
+
         self._muonSel=_muSel
-        
+
         return _muSel
 
     ######--######
     def _muonFilterNoPID( self ):
         if self._muonSelNoPID is not None:
             return self._muonSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsMuons
@@ -806,17 +806,17 @@ class B2XuMuNuBuilder(LineBuilder):
         _muSelNoPID=Selection("MuNoPID_for"+self._name,
                          Algorithm=_muNoPID,
                          RequiredSelections = [StdNoPIDsMuons])
-        
+
         self._muonSelNoPID=_muSelNoPID
-        
+
         return _muSelNoPID
 
-    
+
     ######--######
     def _muonFilterTight( self ):
         if self._muonSelTight is not None:
             return self._muonSelTight
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -824,16 +824,16 @@ class B2XuMuNuBuilder(LineBuilder):
         _muTightSel=Selection("MuTightCuts_for"+self._name,
                          Algorithm=_muTight,
                          RequiredSelections = [StdLooseMuons])
-        
+
         self._muonSelTight=_muTightSel
-        
+
         return _muTightSel
 
     ######--######
     def _muonFilterTightNoPID( self ):
         if self._muonSelTightNoPID is not None:
             return self._muonSelTightNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsMuons
@@ -841,16 +841,16 @@ class B2XuMuNuBuilder(LineBuilder):
         _muTightSelNoPID=Selection("MuTightNoPIDCuts_for"+self._name,
                          Algorithm=_muTightNoPID,
                          RequiredSelections = [StdNoPIDsMuons])
-        
+
         self._muonSelTightNoPID=_muTightSelNoPID
-        
+
         return _muTightSelNoPID
 
     ######--######
     def _muonFilterTOS( self ):
         if self._muonSelTOS is not None:
             return self._muonSelTOS
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -861,14 +861,14 @@ class B2XuMuNuBuilder(LineBuilder):
         _muSelTOS = tosSelection(_muSelTOS,{'L0.*Muon.*Decision%TOS':0})
 
         self._muonSelTOS=_muSelTOS
-        
+
         return _muSelTOS
 
     ######--######
     def _muonFilterTOSNoPID( self ):
         if self._muonSelTOSNoPID is not None:
             return self._muonSelTOSNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsMuons
@@ -879,7 +879,7 @@ class B2XuMuNuBuilder(LineBuilder):
         _muSelTOSNoPID = tosSelection(_muSelTOSNoPID,{'L0.*Muon.*Decision%TOS':0})
 
         self._muonSelTOSNoPID=_muSelTOSNoPID
-        
+
         return _muSelTOSNoPID
 
     ## Pions
@@ -887,11 +887,11 @@ class B2XuMuNuBuilder(LineBuilder):
     def _pionFilter( self ):
         if self._pionSel is not None:
             return self._pionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _pi = FilterDesktop( Code = self._NominalPiSelection() % self._config )
         _piSel=Selection("Pi_for"+self._name,
                          Algorithm=_pi,
@@ -903,11 +903,11 @@ class B2XuMuNuBuilder(LineBuilder):
     def _pionFilterNoPID( self ):
         if self._pionSelNoPID is not None:
             return self._pionSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions
-        
+
         _piNoPID = FilterDesktop( Code = self._NominalPiSelectionNoPID() % self._config )
         _piSelNoPID=Selection("PiNoPID_for"+self._name,
                          Algorithm=_piNoPID,
@@ -919,27 +919,27 @@ class B2XuMuNuBuilder(LineBuilder):
     def _pionFilterTight( self ):
         if self._pionSelTight is not None:
             return self._pionSelTight
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _piTight = FilterDesktop( Code = self._NominalPiSelectionTight() % self._config )
         _piSelTight=Selection("PiTight_for"+self._name,
                          Algorithm=_piTight,
                          RequiredSelections = [StdLoosePions])
         self._pionSelTight=_piSelTight
         return _piSelTight
-    
+
     ######--######
     def _pionFilterTightNoPID( self ):
         if self._pionSelTightNoPID is not None:
             return self._pionSelTightNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions
-        
+
         _piNoPIDTight = FilterDesktop( Code = self._NominalPiSelectionTightNoPID() % self._config )
         _piSelNoPIDTight=Selection("PiTightNoPID_for"+self._name,
                          Algorithm=_piNoPIDTight,
@@ -948,16 +948,16 @@ class B2XuMuNuBuilder(LineBuilder):
         return _piSelNoPIDTight
 
     ## Kaons
-    
+
     ######Kaon Filter######
     def _kaonFilter( self ):
         if self._kaonSel is not None:
             return self._kaonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._NominalKSelection() % self._config )
         _kaSel=Selection("K_for"+self._name,
                          Algorithm=_ka,
@@ -969,11 +969,11 @@ class B2XuMuNuBuilder(LineBuilder):
     def _kaonFilterNoPID( self ):
         if self._kaonSelNoPID is not None:
             return self._kaonSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._NominalKSelectionNoPID() % self._config )
         _kaSelNoPID=Selection("KNoPID_for"+self._name,
                          Algorithm=_ka,
@@ -985,11 +985,11 @@ class B2XuMuNuBuilder(LineBuilder):
     def _kaonForPhiFilter( self ):
         if self._kaonForPhiSel is not None:
             return self._kaonForPhiSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseKaons
-        
+
         _ka = FilterDesktop( Code = self._KforPhiSelection() % self._config )
         _kaSel=Selection("K_Phi"+self._name,
                          Algorithm=_ka,
@@ -1001,11 +1001,11 @@ class B2XuMuNuBuilder(LineBuilder):
     def _kaonForPhiFilterNoPID( self ):
         if self._kaonForPhiSelNoPID is not None:
             return self._kaonForPhiSelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsKaons
-        
+
         _kaNoPID = FilterDesktop( Code = self._KforPhiSelectionNoPID() % self._config )
         _kaSelNoPID=Selection("KNoPID_Phi"+self._name,
                          Algorithm=_kaNoPID,
@@ -1017,7 +1017,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _MajoranaLineMuFilter( self ):
         if self._MajoranaLineMuSel is not None:
             return self._MajoranaLineMuSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -1025,41 +1025,41 @@ class B2XuMuNuBuilder(LineBuilder):
         _mumajoranaSel=Selection("MuMajorana_for"+self._name,
                                  Algorithm=_mumajorana,
                                  RequiredSelections = [StdLooseMuons])
-        
+
         self._MajoranaLineMuSel=_mumajoranaSel
-        
+
         return _mumajoranaSel
-    
+
     #####
     ## Composites
     #####
-    
+
     ######--######
     def _KsFilter( self ):
         if self._KSSel is not None:
            return self._KSSel
-       
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        
+
         _code =  FilterDesktop( Code = self._NominalKsSelection() % self._config )
-      
+
         _KsSel=Selection("KS02PiPi_for"+self._name,
                          Algorithm= _code,
                          RequiredSelections = [self._stdVeryLooseKsLL,self._stdLooseKsLD,self._stdLooseKsDD])
-      
+
         self._KSSel = _KsSel
-      
+
         return _KsSel
-    
+
     ##### phi -> KK filter (generall di-kaon filter) #####
     def _Phi2KKFilter( self ):
         if self._phi1020Sel is not None:
             return self._phi1020Sel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _phi1020 = CombineParticles(
             DecayDescriptors = ["phi(1020) -> K- K+"] ,
             CombinationCut = "(AM< %(PhiUpperMass)s)" % self._config,
@@ -1069,19 +1069,19 @@ class B2XuMuNuBuilder(LineBuilder):
         _phi1020Sel=Selection("PhiKK_for"+self._name,
                              Algorithm=_phi1020,
                              RequiredSelections = [self._kaonForPhiFilter()])
-        
+
         self._phi1020Sel=_phi1020Sel
-        
+
         return _phi1020Sel
 
     ######--######
     def _Phi2KKFilterNoPID( self ):
         if self._phi1020SelNoPID is not None:
             return self._phi1020SelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _phi1020NoPID = CombineParticles(
             DecayDescriptors = ["phi(1020) -> K- K+"] ,
             CombinationCut = "(AM< %(PhiUpperMass)s)" % self._config,
@@ -1091,19 +1091,19 @@ class B2XuMuNuBuilder(LineBuilder):
         _phi1020SelNoPID=Selection("PhiKKNoPID_for"+self._name,
                              Algorithm=_phi1020NoPID,
                              RequiredSelections = [self._kaonForPhiFilterNoPID()])
-        
+
         self._phi1020SelNoPID=_phi1020SelNoPID
-        
+
         return _phi1020SelNoPID
 
     ######--######
     def _Phi2KKFilterWS( self ):
         if self._phi1020SelWS is not None:
             return self._phi1020SelWS
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _phi1020WS = CombineParticles(
             DecayDescriptors = ["[phi(1020) -> K+ K+]cc"] ,
             CombinationCut = "(AM< %(PhiUpperMass)s)" % self._config,
@@ -1113,21 +1113,21 @@ class B2XuMuNuBuilder(LineBuilder):
         _phi1020SelWS=Selection("PhiKKWS_for"+self._name,
                                 Algorithm=_phi1020WS,
                                 RequiredSelections = [self._kaonForPhiFilter()])
-        
+
         self._phi1020SelWS=_phi1020SelWS
-        
+
         return _phi1020SelWS
 
-    
+
     #####Make the Rho######
     def _Rho02PiPiFilter( self ):
         if self._rho770Sel is not None:
             return self._rho770Sel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770 = CombineParticles(
             DecayDescriptors = ["rho(770)0 -> pi- pi+"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1144,20 +1144,20 @@ class B2XuMuNuBuilder(LineBuilder):
         _rho770Sel=Selection("Rho02PiPi_for"+self._name,
                              Algorithm=_rho770,
                              RequiredSelections = [self._pionFilter()])
-        
+
         self._rho770Sel=_rho770Sel
-        
+
         return _rho770Sel
 
     ######--######
     def _Rho02PiPiFilterNoPID( self ):
         if self._rho770SelNoPID is not None:
             return self._rho770SelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770NoPID = CombineParticles(
             DecayDescriptors = ["rho(770)0 -> pi- pi+"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1174,20 +1174,20 @@ class B2XuMuNuBuilder(LineBuilder):
         _rho770SelNoPID=Selection("Rho02PiPiNoPID_for"+self._name,
                                   Algorithm=_rho770NoPID,
                                   RequiredSelections = [self._pionFilterNoPID()])
-        
+
         self._rho770SelNoPID=_rho770SelNoPID
-        
+
         return _rho770SelNoPID
 
     ######--######
     def _Rho02PiPiWSFilter( self ):
         if self._rho770WSSel is not None:
             return self._rho770WSSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770WS = CombineParticles(
             DecayDescriptors = ["[rho(770)0 -> pi+ pi+]cc"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1203,19 +1203,19 @@ class B2XuMuNuBuilder(LineBuilder):
         _rho770SelWS=Selection("Rho02PiPiWS_for"+self._name,
                              Algorithm=_rho770WS,
                              RequiredSelections = [self._pionFilter()])
-        
+
         self._rho770WSSel=_rho770SelWS
         return _rho770SelWS
-    
+
     ######--######
     def _Rho02PiPiSBFilter( self ):
         if self._rho770SBSel is not None:
             return self._rho770SBSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _rho770SB = CombineParticles(
             DecayDescriptors = ["rho(770)0 -> pi+ pi-"] ,
             DaughtersCuts   = {"pi+":"(PT> %(RhoChPionPT)s *MeV) & (TRCHI2DOF < %(RhoChPionTRCHI2)s )"\
@@ -1223,7 +1223,7 @@ class B2XuMuNuBuilder(LineBuilder):
                                },
             CombinationCut = "((AM > %(RhoMassWindowMin1SB)s) & (AM < %(RhoMassWindowMax1SB)s))"\
             " | ((AM > %(RhoMassWindowMin2SB)s) & (AM < %(RhoMassWindowMax2SB)s))" % self._config,
-            
+
             MotherCut       = "(MAXTREE('pi+'==ABSID,PT )>%(RhoLeadingPionPT)s *MeV )"\
             "& (VFASPF(VCHI2/VDOF) < %(RhoVCHI2DOF)s ) & (PT > %(RhoPT)s *MeV) "\
             "& (MIPCHI2DV(PRIMARY)> %(RhoMINIPCHI2)s ) & (BPVDIRA> %(RhoDIRA)s)"%self._config
@@ -1231,7 +1231,7 @@ class B2XuMuNuBuilder(LineBuilder):
         _rho770SelSB=Selection("Rho02PiPiSB_for"+self._name,
                                Algorithm=_rho770SB,
                                RequiredSelections = [self._pionFilter()])
-        
+
         self._rho770SBSel=_rho770SelSB
         return _rho770SelSB
 
@@ -1239,11 +1239,11 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Omega2PiPiPi0Filter( self ):
         if self._omega782Sel is not None:
             return self._omega782Sel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
-        
+
         _omega782 = DaVinci__N3BodyDecays(
             DecayDescriptor  = "omega(782) -> pi+ pi- pi0" ,
             DaughtersCuts    = {"pi+":"(PT> %(OmegaChPionPT)s *MeV)"\
@@ -1258,20 +1258,20 @@ class B2XuMuNuBuilder(LineBuilder):
         _omega782Sel=Selection("Omega2PiPiPi0_for"+self._name,
                                Algorithm=_omega782,
                                RequiredSelections = [StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0])
-        
+
         self._omega782Sel=_omega782Sel
-        
+
         return _omega782Sel
 
     ######--######
     def _Omega2PiPiPi0FilterNoPID( self ):
         if self._omega782SelNoPID is not None:
             return self._omega782SelNoPID
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdNoPIDsPions, StdLooseResolvedPi0, StdLooseMergedPi0
-        
+
         _omega782NoPID = DaVinci__N3BodyDecays(
             DecayDescriptor  = "omega(782) -> pi+ pi- pi0" ,
             DaughtersCuts    = {"pi+":"(PT> %(OmegaChPionPT)s *MeV)"\
@@ -1286,20 +1286,20 @@ class B2XuMuNuBuilder(LineBuilder):
         _omega782SelNoPID=Selection("Omega2PiPiPi0NoPID_for"+self._name,
                                     Algorithm=_omega782NoPID,
                                     RequiredSelections = [StdNoPIDsPions, StdLooseResolvedPi0, StdLooseMergedPi0])
-        
+
         self._omega782SelNoPID=_omega782SelNoPID
-        
+
         return _omega782SelNoPID
 
     ######--######
     def _Omega2PiPiPi0WSFilter( self ):
         if self._omega782WSSel is not None:
             return self._omega782WSSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
-        
+
         _omega782WS = DaVinci__N3BodyDecays(
             DecayDescriptor   = "[omega(782) -> pi+ pi+ pi0]cc" ,
             DaughtersCuts     = {"pi+":"(PT> %(OmegaChPionPT)s *MeV)"\
@@ -1314,20 +1314,20 @@ class B2XuMuNuBuilder(LineBuilder):
         _omega782WSSel=Selection("Omega2PiPiPi0WS_for"+self._name,
                                Algorithm=_omega782WS,
                                RequiredSelections = [StdLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0])
-        
+
         self._omega782WSSel=_omega782WSSel
-        
+
         return _omega782WSSel
-    
+
     ######Make the Kshort->MuPi Same Sign for Majorana####
     def _KshMajoranaSSMuFilter( self ):
         if self._KshMajoranaSSMuSel is not None:
             return self._KshMajoranaSSMuSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseMuons
-     
+
         _Ksh = CombineParticles(
             DecayDescriptor = "KS0 -> mu- pi+",
             DaughtersCuts   = {"pi+":"(P > %(KS0DaugP)s)& (PT > %(KS0DaugPT)s)"\
@@ -1335,27 +1335,27 @@ class B2XuMuNuBuilder(LineBuilder):
                                "& (MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)"   % self._config
                                },
             CombinationCut  = "(ADOCACHI2CUT(25, ''))"% self._config,
-            
-            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config 
+
+            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config
             )
-        
-        #_Ksh.ReFitPVs = True        
+
+        #_Ksh.ReFitPVs = True
         _KshMajoranaSSMuSel=Selection("KshMajoranaSSMu_for"+self._name,
                                       Algorithm=_Ksh,
                                       RequiredSelections = [StdLoosePions, self._MajoranaLineMuFilter()])
         self._KshMajoranaSSMuSel=_KshMajoranaSSMuSel
-        
+
         return _KshMajoranaSSMuSel
-    
+
     ######Make the Kshort->MuPi Opposite Sign for Majorana####
     def _KshMajoranaOSMuFilter( self ):
         if self._KshMajoranaOSMuSel is not None:
             return self._KshMajoranaOSMuSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseMuons
-        
+
         _Ksh = CombineParticles(
             DecayDescriptor = "KS0 -> mu+ pi-",
             DaughtersCuts   = {"pi-":"(P > %(KS0DaugP)s)& (PT > %(KS0DaugPT)s)"\
@@ -1363,19 +1363,19 @@ class B2XuMuNuBuilder(LineBuilder):
                                "&(MIPCHI2DV(PRIMARY) > %(KS0DaugMIPChi2)s)"   % self._config
                                },
             CombinationCut  = "(ADOCACHI2CUT(25, ''))"% self._config,
-            
-            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config 
+
+            MotherCut       = "(BPVVDCHI2> %(KSMajoranaCutFDChi2)s )& (VFASPF(VCHI2/VDOF) < %(KS0VertexChi2)s)&(PT > %(KS0PT)s*MeV)" % self._config
             )
         # _Ksh.ReFitPVs = True
         _KshMajoranaOSMuSel=Selection("KshMajoranaOSMu_for"+self._name,
                                       Algorithm=_Ksh,
                                       RequiredSelections = [StdLoosePions, self._MajoranaLineMuFilter()])
         self._KshMajoranaOSMuSel=_KshMajoranaOSMuSel
-        
+
         return _KshMajoranaOSMuSel
 
     ## Kstars
-    
+
     # Make the K*+ out of KS and pi+
     def _Kstar2KPiFilter( self ):
         if self._KstarSel is not None:
@@ -1437,7 +1437,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PiMuNu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ mu-]cc"],
             CombinationCut = "(AM>%(KMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1445,7 +1445,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSel=Selection("PiMu_for"+self._name,
                          Algorithm=_KMu,
                          RequiredSelections = [self._muonFilterTOS(), self._pionFilterTight()])
@@ -1455,7 +1455,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PiMuNuNoMuTopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuNoMuTopo = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ mu-]cc"],
             CombinationCut = "(AM>%(KMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1463,7 +1463,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSelNoMuTopo=Selection("PiMuNoMuTopo_for"+self._name,
                          Algorithm=_KMuNoMuTopo,
                          RequiredSelections = [self._muonFilter(), self._pionFilterTight()])
@@ -1473,7 +1473,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PiMuNuNoPIDmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuNoPIDmu = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ mu-]cc"],
             CombinationCut = "(AM>%(KMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1481,7 +1481,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSelNoPIDmu=Selection("PiMuNoPIDmu_for"+self._name,
                                  Algorithm=_KMuNoPIDmu,
                                  RequiredSelections = [self._muonFilterNoPID(), self._pionFilterTight()])
@@ -1491,7 +1491,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PiMuNuNoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuNoPIDhad = CombineParticles(
             DecayDescriptors = ["[B0 -> pi+ mu-]cc"],
             CombinationCut = "(AM>%(KMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1499,17 +1499,17 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSelNoPIDhad=Selection("PiMuNoPIDhad_for"+self._name,
                                   Algorithm=_KMuNoPIDhad,
                                   RequiredSelections = [self._muonFilterTOS(), self._pionFilterTightNoPID()])
         _KMuSelNoPIDhad = tosSelection(_KMuSelNoPIDhad,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _KMuSelNoPIDhad
-    
+
     def _B2PiMuNuSS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuSS = CombineParticles(
             DecayDescriptors = ["[B0 -> pi- mu-]cc"],
             CombinationCut = "(AM>%(KMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1517,7 +1517,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-      
+
         _KMuSelSS=Selection("PiMuSS_for"+self._name,
                           Algorithm=_KMuSS,
                           RequiredSelections = [self._muonFilterTOS(), self._pionFilterTight()])
@@ -1529,7 +1529,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bs2KMuNu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1537,7 +1537,7 @@ class B2XuMuNuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSel=Selection("KMu_for"+self._name,
                          Algorithm=_KMu,
                          RequiredSelections = [self._muonFilterTOS(), self._kaonFilter()])
@@ -1547,7 +1547,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bs2KMuNuNoMuTopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuNoMuTopo = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1555,17 +1555,17 @@ class B2XuMuNuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSelNoMuTopo=Selection("KMuNoMuTopo_for"+self._name,
                          Algorithm=_KMuNoMuTopo,
                          RequiredSelections = [self._muonFilter(), self._kaonFilter()])
         _KMuSelNoMuTopo = tosSelection(_KMuSelNoMuTopo,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _KMuSelNoMuTopo
-    
+
     def _Bs2KMuNuSS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuSS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1584,7 +1584,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bs2KMuNu_NoPIDmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1592,17 +1592,17 @@ class B2XuMuNuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSel=Selection("KMu_NoPIDmu_for"+self._name,
                          Algorithm=_KMu,
                          RequiredSelections = [self._muonFilterNoPID(), self._kaonFilter()])
         _KMuSel = tosSelection(_KMuSel,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _KMuSel
-    
+
     def _Bs2KMuNuSS_NoPIDmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuSS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1621,7 +1621,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bs2KMuNu_NoPIDK( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1629,17 +1629,17 @@ class B2XuMuNuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSel=Selection("KMu_NoPIDK_for"+self._name,
                          Algorithm=_KMu,
                          RequiredSelections = [self._muonFilterTOS(), self._kaonFilterNoPID()])
         _KMuSel = tosSelection(_KMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _KMuSel
-    
+
     def _Bs2KMuNuSS_NoPIDK( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuSS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1658,7 +1658,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bs2KMuNu_NoPIDKmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMu = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K+ mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1666,17 +1666,17 @@ class B2XuMuNuBuilder(LineBuilder):
             % self._config,
             ReFitPVs = True
             )
-        
+
         _KMuSel=Selection("KMu_NoPIDKmu_for"+self._name,
                          Algorithm=_KMu,
                          RequiredSelections = [self._muonFilterNoPID(), self._kaonFilterNoPID()])
         _KMuSel = tosSelection(_KMuSel,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _KMuSel
-    
+
     def _Bs2KMuNuSS_NoPIDKmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KMuSS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K- mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOFTight)s) & (BPVDIRA> %(BDIRAMed)s)"\
@@ -1695,7 +1695,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PhiMuNu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiMu = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) mu+]cc"],
             CombinationCut = "(AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1714,7 +1714,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PhiMuNuNoMuTopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiMuNoMuTopo = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) mu+]cc"],
             CombinationCut = "(AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1734,7 +1734,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PhiMuNuWS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiMuWS = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) mu+]cc"],
             CombinationCut = "(AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1749,13 +1749,13 @@ class B2XuMuNuBuilder(LineBuilder):
             # _KMuSel = tosSelection(_KMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         _PhiMuSelWS = tosSelection(_PhiMuSelWS,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*TopoMu3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _PhiMuSelWS
-   
+
    ######Bu->PhiMuNu Fake Mu ######
-   
+
     def _B2PhiMuNu_NoPIDmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiMu = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) mu+]cc"],
             CombinationCut = "(AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1770,11 +1770,11 @@ class B2XuMuNuBuilder(LineBuilder):
             # _KMuSel = tosSelection(_KMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         _PhiMuNoPIDmuSel = tosSelection(_PhiMuNoPIDmuSel,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*Topo3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _PhiMuNoPIDmuSel
-    
+
     def _B2PhiMuNu_NoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiMuNoPIDHad = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) mu+]cc"],
             CombinationCut = "(AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1793,7 +1793,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _B2PhiMuNuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _PhiMuBadVtx = CombineParticles(
             DecayDescriptors = ["[B+ -> phi(1020) mu+]cc"],
             CombinationCut = "(AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1810,12 +1810,12 @@ class B2XuMuNuBuilder(LineBuilder):
         return _PhiMuSelBadVtx
 
 
-      
+
     ######Bu->RhoMuNu ######
     def _Bu2RhoMuNu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMu = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1833,7 +1833,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2RhoMuNuNoMuTopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMuNoMuTopo = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1847,12 +1847,12 @@ class B2XuMuNuBuilder(LineBuilder):
                             RequiredSelections = [self._muonFilterTight(), self._Rho02PiPiFilter()])
         _RhoMuSelNoMuTopo = tosSelection(_RhoMuSelNoMuTopo,{'Hlt2.*Topo2Body.*Decision%TOS':0,'Hlt2.*Topo3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _RhoMuSelNoMuTopo
-    
+
 
     def _Bu2RhoMuNu_NoPIDmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMu_NoPIDmu = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1870,7 +1870,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2RhoMuNu_NoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMu_NoPIDhad = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1889,7 +1889,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2RhoMuNuWS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMuWS = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1897,7 +1897,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _RhoMuSelWS=Selection("RhoMuWS_for"+self._name,
                          Algorithm=_RhoMuWS,
                          RequiredSelections = [self._muonFilterTight(), self._Rho02PiPiWSFilter()])
@@ -1907,7 +1907,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2RhoMuNuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMuBadVtx = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1915,18 +1915,18 @@ class B2XuMuNuBuilder(LineBuilder):
             " & (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _RhoMuSelBadVtx=Selection("RhoMuBadVtx_for"+self._name,
                                   Algorithm=_RhoMuBadVtx,
                                   RequiredSelections = [self._muonFilterTight(), self._Rho02PiPiFilter()])
         _RhoMuSelBadVtx = tosSelection(_RhoMuSelBadVtx,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*TopoMu3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _RhoMuSelBadVtx
-    
-    ### This is not needed anymore, as long as the pi+pi- mass window is large enough.    
+
+    ### This is not needed anymore, as long as the pi+pi- mass window is large enough.
     def _Bu2RhoMuNuSB( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _RhoMu = CombineParticles(
             DecayDescriptors = ["[B+ -> rho(770)0 mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1935,7 +1935,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
             ReFitPVs = True
             )
-        
+
         _RhoMu.Preambulo = [ "from LoKiPhys.decorators import *",
                            "dx = (VFASPF(VX)-BPV(VX))",
                            "dy = (VFASPF(VY)-BPV(VY))",
@@ -1959,18 +1959,18 @@ class B2XuMuNuBuilder(LineBuilder):
                            "solution_b = ((-quadb - sqrt(max(Discriminant,0)))/(2*quada))",
                            "ratio = (solution_a/solution_b)"
                            ]
-        
+
         _RhoMuSel=Selection("RhoMuSB_for"+self._name,
                          Algorithm=_RhoMu,
                          RequiredSelections = [self._muonFilterTight(), self._Rho02PiPiSBFilter()])
         _RhoMuSel = tosSelection(_RhoMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*TopoMu3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _RhoMuSel
-    
+
     ######Bu->OmegaMuNu ######
     def _Bu2OmegaMuNu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaMu = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -1988,7 +1988,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2OmegaMuNuNoMuTopo( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaMuNoMuTopo = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -2007,7 +2007,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2OmegaMuNu_NoPIDmu( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaMu_NoPIDmu = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -2025,7 +2025,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2OmegaMuNu_NoPIDhad( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaMu_NoPIDhad = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -2044,7 +2044,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2OmegaMuNuWS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaMuWS = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -2052,7 +2052,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _OmegaMuSelWS=Selection("OmegaMuWS_for"+self._name,
                                 Algorithm=_OmegaMuWS,
                                 RequiredSelections = [self._muonFilterTight(), self._Omega2PiPiPi0WSFilter()])
@@ -2062,7 +2062,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bu2OmegaMuNuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _OmegaMuBadVtx = CombineParticles(
             DecayDescriptors = ["[B+ -> omega(782) mu+]cc"],
             CombinationCut = "(AM>%(RhoMuMassLowTight)s*MeV) & (AM<%(XMuMassUpper)s*MeV)" % self._config,
@@ -2070,19 +2070,19 @@ class B2XuMuNuBuilder(LineBuilder):
             " & (BPVVDCHI2 >%(BFDCHI2Tight)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)"% self._config,
             ReFitPVs = True
             )
-        
+
         _OmegaMuSelBadVtx=Selection("OmegaMuBadVtx_for"+self._name,
                                     Algorithm=_OmegaMuBadVtx,
                                     RequiredSelections = [self._muonFilterTight(), self._Omega2PiPiPi0Filter()])
         _OmegaMuSelBadVtx = tosSelection(_OmegaMuSelBadVtx,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*TopoMu3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _OmegaMuSelBadVtx
-    
+
 
     ######Bu->KshMuNu SS & OS######
     def _Bu2KshSSMuNu_SSMuminus( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KshSSMu_SSMuminus = CombineParticles(
             DecayDescriptors = ["[B- -> KS0 mu-]cc"],
             CombinationCut = "(AM>%(KS0MuMassLowTight)s*MeV) & (AM<%(XMuMassUpperHigh)s*MeV)" % self._config,
@@ -2090,17 +2090,17 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (MINTREE( (ABSID=='KS0') , VFASPF(VZ))-VFASPF(VZ) > %(KS0Z)s *mm )" % self._config,
             ReFitPVs = True
             )
-        
+
         _KshSSMu_SSMuminusSel=Selection("KshSSMu_SSMuminus_for"+self._name,
                               Algorithm=_KshSSMu_SSMuminus,
                               RequiredSelections = [self._muonFilter(), self._KshMajoranaSSMuFilter()])
         return _KshSSMu_SSMuminusSel
-    
-    
+
+
     def _Bu2KshOSMuNu_SSMuplus( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KshOSMu_SSMuplus = CombineParticles(
             DecayDescriptors = ["[B- -> KS0 mu-]cc"],
             CombinationCut = "(AM>%(KS0MuMassLowTight)s*MeV) & (AM<%(XMuMassUpperHigh)s*MeV)" % self._config,
@@ -2108,7 +2108,7 @@ class B2XuMuNuBuilder(LineBuilder):
             "& (MINTREE( (ABSID=='KS0') , VFASPF(VZ))-VFASPF(VZ) > %(KS0Z)s *mm )" % self._config,
             ReFitPVs = True
             )
-        
+
         _KshOSMu_SSMuplusSel=Selection("KshOSMu_SSMuplus_for"+self._name,
                               Algorithm=_KshOSMu_SSMuplus,
                               RequiredSelections = [self._muonFilter(), self._KshMajoranaOSMuFilter()])
@@ -2124,7 +2124,7 @@ class B2XuMuNuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarMuSel=Selection("KstarMu_for"+self._name,
                                 Algorithm=_KstarMu,
                                 RequiredSelections = [self._muonFilter(), self._Kstar2KPiFilter()])
@@ -2140,7 +2140,7 @@ class B2XuMuNuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarMuSelNoMuTopo=Selection("KstarMuNoMuTopo_for"+self._name,
                                 Algorithm=_KstarMuNoMuTopo,
                                 RequiredSelections = [self._muonFilter(), self._Kstar2KPiFilter()])
@@ -2157,7 +2157,7 @@ class B2XuMuNuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarMuSelNoPIDmu=Selection("KstarMuNoPIDmu_for"+self._name,
                                 Algorithm=_KstarMuNoPIDmu,
                                 RequiredSelections = [self._muonFilterNoPID(), self._Kstar2KPiFilter()])
@@ -2173,24 +2173,24 @@ class B2XuMuNuBuilder(LineBuilder):
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarMuSelNoPIDhad=Selection("KstarMuNoPIDHad_for"+self._name,
                                       Algorithm=_KstarMuNoPIDhad,
                                       RequiredSelections = [self._muonFilter(), self._Kstar2KPiFilterNoPID()])
         _KstarMuSelNoPIDhad = tosSelection(_KstarMuSelNoPIDhad,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*TopoMu3Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _KstarMuSelNoPIDhad
 
-    
+
     def _Bs2KstarMuNuSS( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KstarMuSS = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K*(892)- mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarMuSSSel=Selection("KstarMuSS_for"+self._name,
                                   Algorithm=_KstarMuSS,
                                   RequiredSelections = [self._muonFilter(), self._Kstar2KPiFilter()])
@@ -2200,13 +2200,13 @@ class B2XuMuNuBuilder(LineBuilder):
     def _Bs2KstarMuNuBadVtx( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _KstarMuBadVtx = CombineParticles(
             DecayDescriptors = ["[B_s~0 -> K*(892)+ mu-]cc"],
             MotherCut = "(VFASPF(VCHI2/VDOF)> %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s) & (BPVCORRM > %(BCorrMLow)s *MeV) & (BPVCORRM < %(BCorrMHigh)s *MeV)" % self._config,
             ReFitPVs = True
             )
-        
+
         _KstarMuSelBadVtx=Selection("KstarMuBadVtx_for"+self._name,
                                 Algorithm=_KstarMuBadVtx,
                                 RequiredSelections = [self._muonFilter(), self._Kstar2KPiFilter()])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index 132b51ebaf7bd84cb29ac199c017b931461d62d1..0c7a01302977b66be709ea48b76f66a446f4735e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -31,18 +31,18 @@ from Configurables import TisTosParticleTagger
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
            'confdict')
-           
+
 default_config = {
   'NAME'        : 'CharmFromBSemiForHadronAsy',
   'WGs'         : ['Semileptonic'],
   'BUILDERTYPE' : 'CharmFromBSemiForHadronAsyAllLinesConf',
   'CONFIG'      : {
     "prescale_LbRS" : 1.0
-    ,"prescale_LbWS" : 0.2 
+    ,"prescale_LbWS" : 0.2
     ,"prescale_D0to3piRS" : 1.0
     ,"prescale_D0to3piWS" : 0.2
     ,"prescale_D0toK2piRS" : 1.0
-    ,"prescale_D0toK2piWS" : 0.2 
+    ,"prescale_D0toK2piWS" : 0.2
     #### common to all modes
     ,"GEC_nLongTrk" : 250. # adimensional
     ,"GHOSTPROB_MAX" : 0.35 #adimensional
@@ -80,7 +80,7 @@ default_config = {
     ,"PiPi_DOCACHI2_MAX" : 15. # adimensional
     ,"PiPi_CHI2NDF" : 3. # adimensional
     ,"PiPi_SUMPT_MIN" : 600.  # MeV
-    ,"MuPiPi_DOCACHI2_MAX" : 15. 
+    ,"MuPiPi_DOCACHI2_MAX" : 15.
     ,"MuPiPi_CHI2NDF": 3.
     ,"MuPiPi_FDCHI2_MIN" : 20. # adimensional
     ,"Lc2Kpi_REQUIRE_TOS" : True # bool
@@ -100,37 +100,37 @@ default_config = {
     ,"Lc2Kpi_B_VCHI2NDF_MAX" : 15. # adimensional
   },
   'STREAMS' : ['BhadronCompleteEvent'],
-}   
+}
 
 class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
     """
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-    
+
     def __init__(self, _name, config) :
 
         LineBuilder.__init__(self, _name, config)
         self.__confdict__=config
-        
+
         ### define the global event cuts
         ### max number of long tracks
         GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" %config ,
                  "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         ### define the muon cuts
         self.MuonCuts = "(PT > %(Mu_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDmu > 0)" %config
-        self.PionCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK < %(Pi_PIDKMax)s)" %config 
-        self.KaonCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK > %(K_PIDKMin)s)" %config 
+        self.PionCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK < %(Pi_PIDKMax)s)" %config
+        self.KaonCuts = "(PT > %(H_PT)s *MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDK > %(K_PIDKMin)s)" %config
         self.SlowpionCuts = "(PT > %(Slowpi_PTMin)s*MeV) & (TRGHOSTPROB < %(GHOSTPROB_MAX)s) & (PIDe < %(Slowpi_PIDeMax)s)"\
                           "& (PIDK < %(Slowpi_PIDKMax)s)" %config
-        
+
         self.Muons = Selection( "Mufor" + _name,
                                 Algorithm = FilterDesktop(name = "MuFilterFor"+_name, Code = self.MuonCuts ),
                                 RequiredSelections = [StdLooseMuons])
-        
+
         self.Pions = Selection( "Pifor" + _name,
                                 Algorithm = FilterDesktop(name = "PiFilterFor"+_name, Code = self.PionCuts),
                                 RequiredSelections = [StdLoosePions])
@@ -143,7 +143,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                     Algorithm = FilterDesktop(name = "SlowpiFilterFor"+_name, Code = self.SlowpionCuts),
                                     RequiredSelections = [StdLoosePions])
         #### D0 -> K3pi lines
-        
+
         self.D0to3pi_RS = D0To3HMaker("D0To3piRSFor"+_name
                                       ,config["D0to3H_3pi_MASS_MIN"],config["D0to3H_3pi_MASS_MAX"]
                                       ,config
@@ -155,7 +155,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                       ,config
                                       ,[self.Pions]
                                       ,['[D0 -> pi+ pi- pi+]cc','[D0 -> pi+ pi+ pi+]cc'])
-        
+
         self.D0toK2pi_RS = D0To3HMaker("D0ToK2piRSFor"+_name
                                        ,config["D0to3H_K2pi_MASS_MIN"],config["D0to3H_K2pi_MASS_MAX"]
                                        ,config,[self.Kaons,self.Pions]
@@ -195,7 +195,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                     ,config
                                                     ,[self.MuPi_WS,self.D0to3pi_WS]
                                                     ,['[B0 -> D~0 K*(892)+]cc'])
-        
+
         self.BtoDstarMuD0toK2pi_RS = BtoDstarMuMaker("BtoDstarMuD0toK2pi_RSFor"+_name
                                                      ,config["D0to3H_K2pi_DeltaMass_MAX"]
                                                      ,config
@@ -207,7 +207,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                      ,config
                                                      ,[self.MuPi_WS,self.D0toK2pi_WS]
                                                      ,['[B0 -> D~0 K*(892)+]cc'])
-        
+
         self.B2DstarMuD0to3piRSLine = StrippingLine(_name+'_B2DstarMuD0to3piRS',
                                                     prescale = config["prescale_D0to3piRS"],
                                                     FILTER=GECs,
@@ -217,7 +217,7 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                     prescale = config["prescale_D0to3piWS"],
                                                     FILTER=GECs,
                                                     selection = self.BtoDstarMuD0to3pi_WS)
-        
+
         self.B2DstarMuD0toK2piRSLine = StrippingLine(_name+'_B2DstarMuD0toK2piRS',
                                                     prescale = config["prescale_D0toK2piRS"],
                                                     FILTER=GECs,
@@ -227,14 +227,14 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                                     prescale = config["prescale_D0toK2piWS"],
                                                     FILTER=GECs,
                                                     selection = self.BtoDstarMuD0toK2pi_WS)
-        
-        
+
+
         ###################### Lambda_c lines ##########################
-        
+
         self.LcToKpi_RS = LcToKpiMaker("LcToKpiRSFor"+_name,config,[self.Kaons,self.Pions],['[Lambda_c+ -> K- pi+]cc'])
         self.LcToKpi_WS = LcToKpiMaker("LcToKpiWSFor"+_name,config,[self.Kaons,self.Pions],
                                         ['[Lambda_c+ -> K- pi+]cc','[Lambda_c+ -> K+ pi-]cc','[Lambda_c+ -> K+ pi+]cc','[Lambda_c+ -> K- pi-]cc'])
-        
+
         self.PiPi_RS = PiPiMaker("PiPiRSFor"+_name,config,[self.Slowpions],['rho(770)0 -> pi+ pi-'])
         self.PiPi_WS = PiPiMaker("PiPiWSFor"+_name,config,[self.Slowpions],['rho(770)0 -> pi+ pi-','rho(770)0 -> pi+ pi+','rho(770)0 -> pi- pi-'])
 
@@ -249,21 +249,21 @@ class CharmFromBSemiForHadronAsyAllLinesConf(LineBuilder) :
                                       prescale = config["prescale_LbRS"],
                                       FILTER=GECs,
                                       selection = self.Lb_RS)
-        
+
         self.LbWSLine = StrippingLine(_name+'_LbToLcStarMuLcToKpiWS',
                                       prescale = config["prescale_LbWS"],
                                       FILTER=GECs,
                                        selection = self.Lb_WS)
 
-        ######## register lines 
-        
-        self.registerLine(self.B2DstarMuD0to3piRSLine)        
-        self.registerLine(self.B2DstarMuD0to3piWSLine)        
-        self.registerLine(self.B2DstarMuD0toK2piRSLine)        
-        self.registerLine(self.B2DstarMuD0toK2piWSLine)        
-        self.registerLine(self.LbRSLine)        
-        self.registerLine(self.LbWSLine)        
-        
+        ######## register lines
+
+        self.registerLine(self.B2DstarMuD0to3piRSLine)
+        self.registerLine(self.B2DstarMuD0to3piWSLine)
+        self.registerLine(self.B2DstarMuD0toK2piRSLine)
+        self.registerLine(self.B2DstarMuD0toK2piWSLine)
+        self.registerLine(self.LbRSLine)
+        self.registerLine(self.LbWSLine)
+
 def MuPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
     _CombinationCut = "(ACHILD(PT,1)+ACHILD(PT,2) > %(MuPi_SUMPT_MIN)s *MeV)"\
                       "& (ADOCACHI2CUT(%(MuPi_DOCACHI2_MAX)s, ''))" %config
@@ -291,7 +291,7 @@ def BtoDstarMuMaker(_combName,DeltaMass_MAX,config,_RequiredSelections,_decayDes
                  'MD0PI = sqrt((EPI+ED0)**2 - (PXPI+PXD0)**2 - (PYPI+PYD0)**2 - (PZPI+PZD0)**2)',
                  'DELTA_MASS = MD0PI - ACHILD(M,1)']
     _CombinationCut = "(DELTA_MASS < %s *MeV)" %DeltaMass_MAX
-    _CombinationCut += "& (ADOCACHI2CUT(%(D0to3H_B_DOCACHI2_MAX)s, ''))" %config 
+    _CombinationCut += "& (ADOCACHI2CUT(%(D0to3H_B_DOCACHI2_MAX)s, ''))" %config
     _MotherCut = "(M > %(D0to3H_B_MASS_MIN)s *MeV) & (M < %(D0to3H_B_MASS_MAX)s *MeV)"\
                  "& (MINTREE((ABSID=='D0'),VFASPF(VZ)) - MINTREE((ABSID=='K*(892)+'),VFASPF(VZ)) > %(D0to3H_DZ)s *mm )"\
                  "& (VFASPF(VCHI2/VDOF) < %(D0to3H_B_VCHI2NDF_MAX)s)"\
@@ -321,7 +321,7 @@ def D0To3HMaker(_combName,MASS_MIN,MASS_MAX,config,_RequiredSelections,_decayDes
                       "& (ACHILD(PT,1) + ACHILD(PT,2) + ACHILD(PT,3) > %(D0to3H_SUMPT_MIN)s)" %config
     ### different mass cut depending on whether we miss a pion or a kaon
     _MotherCut = "(M > %s *MeV) & (M < %s *MeV)" %(MASS_MIN,MASS_MAX)
-    _MotherCut = _MotherCut + "& (VFASPF(VCHI2/VDOF)< %(D0to3H_VCHI2NDF_MAX)s)" %config 
+    _MotherCut = _MotherCut + "& (VFASPF(VCHI2/VDOF)< %(D0to3H_VCHI2NDF_MAX)s)" %config
     _comb = CombineParticles( name = "Comb"+_combName,
                               DecayDescriptors = _decayDescriptors,
                               CombinationCut = _CombinationCut,
@@ -335,11 +335,11 @@ def D0To3HMaker(_combName,MASS_MIN,MASS_MAX,config,_RequiredSelections,_decayDes
 
 def PiPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
     comb = CombineParticles(name="Comb"+_combName,
-                            DecayDescriptors = _decayDescriptors, 
+                            DecayDescriptors = _decayDescriptors,
                             CombinationCut = "(AM < %(PiPi_MASS_MAX)s*MeV)"\
                             "& (ACUTDOCACHI2(%(PiPi_DOCACHI2_MAX)s,''))"\
-                            "& (ACHILD(PT,1) + ACHILD(PT,2) > %(PiPi_SUMPT_MIN)s *MeV)" % config, 
-                            MotherCut = "(VFASPF(VCHI2/VDOF)< %(PiPi_CHI2NDF)s)" % config)        
+                            "& (ACHILD(PT,1) + ACHILD(PT,2) > %(PiPi_SUMPT_MIN)s *MeV)" % config,
+                            MotherCut = "(VFASPF(VCHI2/VDOF)< %(PiPi_CHI2NDF)s)" % config)
     sel = Selection("Sel"+_combName,
                     Algorithm = comb,
                     RequiredSelections = _RequiredSelections)
@@ -347,7 +347,7 @@ def PiPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
 
 def MuPiPiMaker(_combName,config,_RequiredSelections,_decayDescriptors):
     comb = CombineParticles(name="Comb"+_combName,
-                            DecayDescriptors = _decayDescriptors, 
+                            DecayDescriptors = _decayDescriptors,
                             CombinationCut = "(ACUTDOCACHI2(%(MuPiPi_DOCACHI2_MAX)s,''))" % config,
                             MotherCut = "(VFASPF(VCHI2/VDOF)< %(MuPiPi_CHI2NDF)s)"\
                             "& (BPVVDCHI2 > %(MuPiPi_FDCHI2_MIN)s)" %config)
@@ -412,7 +412,7 @@ def LbMaker(_combName,config,_RequiredSelections,_decayDescriptors):
         return sel_Hlt2TOS
     else:
         return sel
-        
+
 def TOSFilter( name, _input, _trigger ) :
     from Configurables import TisTosParticleTagger
     _tisTosFilter = TisTosParticleTagger( name + "Tagger" )
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py
index 0c841416c8d55c07dde180392192efff595a9215..4df55899d33629f0e0ced7874dfaa43148ed6a8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py
@@ -18,45 +18,45 @@ Lb->p mu nu exclusive reconstruction
 '''
 # =============================================================================
 ##
-#  Lb->p mu nu exclusive reconstruction. 
+#  Lb->p mu nu exclusive reconstruction.
 #
 #  Stripping lines for the charmless semileptonic decay Lambda_b -> p mu nu.
 #
 #  The lines will lead to a  measurement of the differential branching
-#  of Lb -> p mu nu as a function of q^2. 
+#  of Lb -> p mu nu as a function of q^2.
 #
 #  This together with form factor predictions from either light cone
 #  sum rules or lattice QCD will allow an exclusive determination of |Vub|.
-# 
+#
 #  Three lines are included:
 #  Two of which strip the opposite sign (right sign) proton and muon and combinations.
 #  One of which has no prescale and strips protons and muons with a corrected mass >
 #  4 GeV.  The other line is prescaled by a factor of 0.5 and strips < 4 GeV in corrected
 #  mass.  This exploits the fact that the corrected mass for Lb->pmunu peaks at the Lambda_b
-#  mass.  The final line strips same sign proton and muon cominations over the whole corrected 
+#  mass.  The final line strips same sign proton and muon cominations over the whole corrected
 #  mass region.  This will be ussed to extract shapes for the combinatorial background.
 #
 #  Stripping XX, with requirements that the
 #  rate <0.05% and timing <0.5ms/evt.
-## 
+##
 
 """
-  Lb->p mu nu exclusive reconstruction. 
+  Lb->p mu nu exclusive reconstruction.
 
   Stripping lines for the charmless semileptonic decay Lambda_b -> p mu nu.
 
   The lines will lead to a  measurement of the differential branching
-  of Lb -> p mu nu as a function of q^2. 
+  of Lb -> p mu nu as a function of q^2.
 
   This together with form factor predictions from either light cone
   sum rules or lattice QCD will allow an exclusive determination of |Vub|.
- 
+
   Three lines are included:
   Two of which strip the opposite sign (right sign) proton and muon and combinations.
   One of which has no prescale and strips protons and muons with a corrected mass >
   4 GeV.  The other line is prescaled by a factor of 0.5 and strips < 4 GeV in corrected
   mass.  This exploits the fact that the corrected mass for Lb->pmunu peaks at the Lambda_b
-  mass.  The final line strips same sign proton and muon cominations over the whole corrected 
+  mass.  The final line strips same sign proton and muon cominations over the whole corrected
   mass region.  This will be ussed to extract shapes for the combinatorial background.
 
   Stripping XX, with requirements that the
@@ -79,11 +79,11 @@ default_config = {
 	  "MuonP"               : 3000.  ,#MeV
 	  "MuonPT"              : 1500.  ,#MeV
 	  "MuonMINIPCHI2"       : 16.    ,#adminensional
-	  #Proton Cuts 
+	  #Proton Cuts
 	  "ProtonTRCHI2"        : 6.     ,#adimensional
 	  "ProtonP"             : 15000. ,#MeV
 	  "ProtonPT"            : 1000.  ,#MeV
-	  "ProtonPIDK"          : 10.     ,#adimensional 
+	  "ProtonPIDK"          : 10.     ,#adimensional
 	  "ProtonPIDp"          : 10.     ,#adimensional
 	  "ProtonMINIPCHI2"     : 16.    ,#adminensional
 	  #B Mother Cuts
@@ -93,7 +93,7 @@ default_config = {
 	  "pMuMassLower"        : 1000.  ,#MeV
 	  "pMuPT"               : 1500.  #MeV
 	},
-       'STREAMS'     : ['Semileptonic']	  
+       'STREAMS'     : ['Semileptonic']
       }
     }
 
@@ -126,26 +126,26 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     """
     Definition of Lb->p mu nu stripping
     """
-    
+
     __configuration_keys__ = [
         "GEC_nLongTrk"
-        ,"TRGHOSTPROB"          
+        ,"TRGHOSTPROB"
         ,"MuonGHOSTPROB"
-        ,"MuonTRCHI2"          
-        ,"MuonP"               
-        ,"MuonPT"              
-        ,"MuonMINIPCHI2"       
-        ,"ProtonTRCHI2"          
-        ,"ProtonP"               
-        ,"ProtonPT"              
-        ,"ProtonPIDK"             
-        ,"ProtonPIDp"            
+        ,"MuonTRCHI2"
+        ,"MuonP"
+        ,"MuonPT"
+        ,"MuonMINIPCHI2"
+        ,"ProtonTRCHI2"
+        ,"ProtonP"
+        ,"ProtonPT"
+        ,"ProtonPIDK"
+        ,"ProtonPIDp"
         ,"ProtonMINIPCHI2"
         ,"BVCHI2DOF"
-        ,"BDIRA"               
-        ,"BFDCHI2HIGH"         
-        ,"pMuMassLower"     
-	,"pMuPT"     
+        ,"BDIRA"
+        ,"BFDCHI2HIGH"
+        ,"pMuMassLower"
+	,"pMuPT"
         ]
 
     def __init__(self,name,config):
@@ -155,7 +155,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
 
         self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                       "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         self._muonSel=None
         self._muonFilter()
 
@@ -176,7 +176,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
         self.registerLine(self._fakep_SS_Lb_line())
         self.registerLine(self._fakemu_Lb_line())
         self.registerLine(self._fakemu_SS_Lb_line())
-        
+
     def _NominalMuSelection( self ):
         return "(TRCHI2DOF < %(MuonTRCHI2)s ) &  (P> %(MuonP)s *MeV) &  (PT> %(MuonPT)s* MeV)"\
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
@@ -187,7 +187,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
 	       "& (~ISMUON) & (INMUON)"\
                "& (MIPCHI2DV(PRIMARY)> %(MuonMINIPCHI2)s )"
-    
+
     def _NominalPSelection( self ):
         return "(TRCHI2DOF < %(ProtonTRCHI2)s )&  (P> %(ProtonP)s *MeV) &  (PT> %(ProtonPT)s *MeV)"\
                "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
@@ -208,7 +208,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+'Line', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._Lb2pMuNuVub_Lb()], HLT2 = hlt, L0DU = ldu)
@@ -218,16 +218,16 @@ class Lb2pMuNuVubBuilder(LineBuilder):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+'SSLine', prescale = 1.0,
-                             FILTER=self.GECs, 
+                             FILTER=self.GECs,
                              algos = [ self._Lb2pMuNuVubSS_Lb()], HLT2 = hlt, L0DU = ldu)
 
     def _fakep_Lb_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+ 'FakepLine', prescale = 0.02,
                              FILTER=self.GECs,
                              algos = [ self._Lb2pMuNuVub_fakep_Lb()], HLT2 = hlt, L0DU = ldu)
@@ -235,7 +235,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+ 'FakeSSpLine', prescale = 0.02,
                              FILTER=self.GECs,
                              algos = [ self._Lb2pMuNuVubSS_fakep_Lb()], HLT2 = hlt, L0DU = ldu)
@@ -256,7 +256,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def _muonFilter( self ):
         if self._muonSel is not None:
             return self._muonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -266,16 +266,16 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                          Algorithm=_mu,
                          RequiredSelections = [StdLooseMuons])
         _muSel = tosSelection(_muSel,{'L0.*Muon.*Decision%TOS':0})
-        
+
         self._muonSel=_muSel
-        
+
         return _muSel
 
     ##### Fake Muon Filter ######
     def _fakemuonFilter( self ):
         if self._fakemuonSel is not None:
             return self._fakemuonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllNoPIDsMuons
@@ -284,49 +284,49 @@ class Lb2pMuNuVubBuilder(LineBuilder):
         _muSel=Selection("fakeMu_for"+self._name,
                          Algorithm=_mu,
                          RequiredSelections = [StdAllNoPIDsMuons])
-        
+
         self._fakemuonSel=_muSel
-        
+
         return _muSel
 
     ###### Proton Filter ######
     def _protonFilter( self ):
         if self._protonSel is not None:
             return self._protonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseProtons
-        
+
         _pr = FilterDesktop( Code = self._NominalPSelection() % self._config )
         _prSel=Selection("p_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdLooseProtons])
-        
+
         self._protonSel=_prSel
-        
+
         return _prSel
 
     ##### Fake Proton Filter ######
     def _fakeprotonFilter( self ):
         if self._fakeprotonSel is not None:
             return self._fakeprotonSel
-	
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllNoPIDsProtons
-        
+
         _pr = FilterDesktop( Code = self._FakePSelection() % self._config )
         _prSel=Selection("fakep_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdAllNoPIDsProtons])
-        
+
         self._fakeprotonSel=_prSel
-        
+
         return _prSel
 
     def _Definitions(self):
-        return [ 
+        return [
             "from LoKiPhys.decorators import *",
             "Lb_PT = PT"
                            ]
@@ -336,7 +336,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def _Lb2pMuNuVub_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = ["[Lambda_b0 -> p+ mu-]cc"], ReFitPVs = True
 )
         _pMu.Preambulo = self._Definitions()
@@ -345,11 +345,11 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                     "& (Lb_PT > %(pMuPT)s)"\
                     "& (BPVVDCHI2 >%(BFDCHI2HIGH)s)" % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("pMu_Lb_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._protonFilter()])
-         
+
         _LbSel = tosSelection(_pMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _LbSel
 
@@ -359,29 +359,29 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def _Lb2pMuNuVubSS_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMuSS = CombineParticles(DecayDescriptors = ["[Lambda_b0 -> p+ mu+]cc"], ReFitPVs = True
 )
-        _pMuSS.Preambulo = self._Definitions() 
+        _pMuSS.Preambulo = self._Definitions()
         _pMuSS.CombinationCut = "(AM>%(pMuMassLower)s*MeV)"  % self._config
         _pMuSS.MotherCut = "(VFASPF(VCHI2/VDOF)< %(BVCHI2DOF)s) & (BPVDIRA> %(BDIRA)s)"\
                     "& (Lb_PT > %(pMuPT)s)"\
 		    "& (BPVVDCHI2 >%(BFDCHI2HIGH)s)" % self._config
         _pMuSS.ReFitPVs = True
-            
+
         _pMuSSSel=Selection("pMuSS_Lb_for"+self._name,
                          Algorithm=_pMuSS,
                          RequiredSelections = [self._muonFilter(), self._protonFilter()])
         _pMuSSSel = tosSelection(_pMuSSSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _pMuSSSel
-	    
 
-    
+
+
     ###### Lb->pMuNu Fake Proton ######
     def _Lb2pMuNuVub_fakep_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = ["[Lambda_b0 -> p+ mu-]cc"], ReFitPVs = True
 )
         _pMu.Preambulo = self._Definitions()
@@ -390,11 +390,11 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                     "& (Lb_PT > %(pMuPT)s)"\
                     "& (BPVVDCHI2 >%(BFDCHI2HIGH)s)" % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("pMu_fakep_Lb_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._fakeprotonFilter()])
-         
+
         _LbSel = tosSelection(_pMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _LbSel
 
@@ -402,7 +402,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def _Lb2pMuNuVubSS_fakep_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMuSS = CombineParticles(DecayDescriptors = ["[Lambda_b0 -> p+ mu+]cc"], ReFitPVs = True
 )
         _pMuSS.Preambulo = self._Definitions()
@@ -411,11 +411,11 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                     "& (Lb_PT > %(pMuPT)s)"\
                     "& (BPVVDCHI2 >%(BFDCHI2HIGH)s)" % self._config
         _pMuSS.ReFitPVs = True
-            
+
         _pMuSSSel=Selection("pMuSS_fakep_Lb_for"+self._name,
                          Algorithm=_pMuSS,
                          RequiredSelections = [self._muonFilter(), self._fakeprotonFilter()])
-         
+
         _LbSSSel = tosSelection(_pMuSSSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _LbSSSel
 
@@ -425,7 +425,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def _Lb2pMuNuVub_fakemu_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = ["[Lambda_b0 -> p+ mu-]cc"], ReFitPVs = True
 )
         _pMu.Preambulo = self._Definitions()
@@ -434,11 +434,11 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                     "& (Lb_PT > %(pMuPT)s)"\
                     "& (BPVVDCHI2 >%(BFDCHI2HIGH)s)" % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("pMu_fakemu_Lb_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._fakemuonFilter(), self._protonFilter()])
-         
+
         _LbSel = tosSelection(_pMuSel,{'Hlt2.*Topo2Body.*Decision%TOS':0})
         return _LbSel
 
@@ -446,7 +446,7 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def _Lb2pMuNuVubSS_fakemu_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMuSS = CombineParticles(DecayDescriptors = ["[Lambda_b0 -> p+ mu+]cc"], ReFitPVs = True
 )
         _pMuSS.Preambulo = self._Definitions()
@@ -455,10 +455,10 @@ class Lb2pMuNuVubBuilder(LineBuilder):
                     "& (Lb_PT > %(pMuPT)s)"\
                     "& (BPVVDCHI2 >%(BFDCHI2HIGH)s)" % self._config
         _pMuSS.ReFitPVs = True
-            
+
         _pMuSSSel=Selection("pMuSS_fakemu_Lb_for"+self._name,
                          Algorithm=_pMuSS,
                          RequiredSelections = [self._fakemuonFilter(), self._protonFilter()])
-         
+
         _LbSSSel = tosSelection(_pMuSSSel,{'Hlt2.*Topo2Body.*Decision%TOS':0})
         return _LbSSSel
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingTrackEffD0ToK3Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingTrackEffD0ToK3Pi.py
index a5d7aa0e79e388f063e6511aadefa9e9e611c74f..4ec786bdc87c3e9b90b4d8de778a3ee4ce0e3907 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingTrackEffD0ToK3Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingTrackEffD0ToK3Pi.py
@@ -22,13 +22,13 @@ from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from SelPy.utils import ( UniquelyNamedObject,
                           ClonableObject,
                           SelectionBase )
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo, 
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker, 
+from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
+                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
                            PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                          TrackStateInitAlg, TrackStateInitTool) 
+                          TrackStateInitAlg, TrackStateInitTool)
 from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
                                            ConfiguredForwardStraightLineEventFitter)
-    
+
 
 __all__ = ('TrackEffD0ToK3PiAllLinesConf',
            'TOSFilter',
@@ -56,48 +56,48 @@ default_config = {
       "Kaon_MIN_PIDK"     : 7,
       "Pion_MAX_PIDK"     : 4
   },
-  'STREAMS'     : ['Semileptonic']   
+  'STREAMS'     : ['Semileptonic']
 }
 
 class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
-    
+
     __confdict__={}
-        
+
     def __init__(self, name, config) :
 
         LineBuilder.__init__(self, name, config)
         self.__confdict__=config
         self.name = name
-        
+
 
         ##### long track kaons and pions
         self.PionCuts = "(PIDK < %(Pion_MAX_PIDK)s) & (TRGHOSTPROB < 0.35)" %config
         self.KaonCuts = "(PIDK > %(Kaon_MIN_PIDK)s) & (TRGHOSTPROB < 0.35)" %config
-        
+
         SelLongPions = Selection("SelLongPionsFor"+name,
                                  Algorithm = FilterDesktop(name="LongPionFilterFor"+name,
                                                            Code=self.PionCuts),
                                  RequiredSelections = [StdLoosePions])
-        
+
         SelLongKaons = Selection("SelLongKaonsFor"+name,
                                  Algorithm = FilterDesktop(name="LongKaonFilterFor"+name,
                                                            Code=self.KaonCuts),
                                  RequiredSelections = [StdLooseKaons])
-        
+
         ###### the velo tracking
         self.VeloProtoOutputLocation = 'Rec/ProtoP/VeloProtosFor%s'%self.name
         self.VeloTrackOutputLocation="Rec/Track/MyVeloFor%s"%self.name
         self.FittedVeloTrackOutputLocation = "Rec/Track/PreparedVeloFor%s"%self.name
-        
-        self.VeloTracks = self.MakeVeloTracks([]) 
+
+        self.VeloTracks = self.MakeVeloTracks([])
         self.VeloPions = self.MakeVeloParticles("VeloPions","pion",self.VeloTracks)
         self.VeloKaons = self.MakeVeloParticles("VeloKaons","kaon",self.VeloTracks)
         self.VeloProtons = self.MakeVeloParticles("VeloProtons","proton",self.VeloTracks)
-        
+
         ##################### MAKE THE LINES #############
-        
+
         self.MissingPion4BodyLine = self.MakeLine("%sMissingPion4Body"%self.name,
                                                   ['[K*(892)+ -> K- pi+ pi+]cc','[K*(892)+ -> K- pi+ pi-]cc','[K*(892)+ -> K- pi- pi-]cc'],## RS-A, RS-B , SS
                                                   [SelLongKaons,SelLongPions],
@@ -113,7 +113,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                                                   ["[D*(2010)+ -> D0 pi+]cc","[D*(2010)+ -> D~0 pi+]cc"], ## add also wrong sign
                                                   ['[K*_0(1430)0 -> K*(892)+ pi-]cc','[K*_0(1430)0 -> K*(892)+ pi+]cc'], ## allow also wrong sign StdAllNoPIDs "pions"
                                                   self.VeloKaons)
-        
+
         self.MissingProtonLine = self.MakeLine("%sMissingProton"%self.name,
                                                ['[K*(892)+ -> K- pi+]cc','[K*(892)+ -> K- pi-]cc'], ## RS, SS
                                                [SelLongKaons, SelLongPions],
@@ -124,18 +124,18 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
 
         if config["VeloLineForTiming"] == True:
             self.registerLine(StrippingLine("VeloLine"+name,selection=self.VeloPions))
-            
+
         ### these are the partially reconstructed signals
         self.registerLine(self.MissingKaon4BodyLine[0])
         self.registerLine(self.MissingPion4BodyLine[0])
         self.registerLine(self.MissingProtonLine[0])
-        
+
         ### and these contain the candidate matching long tracks
         self.registerLine(self.MissingPion4BodyLine[1])
         self.registerLine(self.MissingKaon4BodyLine[1])
         self.registerLine(self.MissingProtonLine[1])
 
-    
+
     #### function to make the stripping line
     def MakeLine(self,
                  name,
@@ -145,11 +145,11 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                  DstDecayDescriptors,
                  MatchDecayDescriptor,
                  Probes):
-        
+
         #########################################################
         ## DEFINE ALL OF THE CUTS
         #########################################################
-        
+
         MatchingLongTrackCuts = "(ISLONG) & (TRGHOSTPROB < 0.35)"
         D0CombinationCut = "(AMAXDOCA('') < %(D0_MAX_DOCA)s )" %self.__confdict__
         SlowpionCuts = "(MIPCHI2DV(PRIMARY) < 9) & (PIDe < 5) & (PT > 300*MeV)"
@@ -179,23 +179,23 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             DstMotherCut = "(in_range ( 2.4 * GeV , mfit , %(Sc_MAX_M)s )) & (DTF_CHI2NDOF(True,'Lambda_c+') < %(Sc_MAX_DTFCHI2)s)" %self.__confdict__
         else:
             print name + ' = Bad line name'
-        
+
         #########################################################
-        ## STEP 1: 
+        ## STEP 1:
         ## make the partially reconstructed D0/Lamda_c candidate
         #########################################################
-            
+
         CombKst = CombineParticles(name="For%sCombKst"%name,
                                    DecayDescriptors = KstDecayDescriptors,
                                    CombinationCut = KstCombinationCut,
                                    MotherCut = KstMotherCut)
-        
+
         SelKst = Selection('For%sSelKst'%name,
                            Algorithm = CombKst,
                            RequiredSelections = KstRequirements)
-    
+
         #########################################################
-        ## STEP 2 (OPTIONAL): 
+        ## STEP 2 (OPTIONAL):
         ## Does this make an "inclusive D*" candidate?
         #########################################################
         if self.__confdict__["RequireDstFirst"]:
@@ -208,22 +208,22 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             SelDstarPrelim = Selection("For%sSelDstarPrelimfor"%name,
                                        Algorithm = CombDstarPrelim,
                                        RequiredSelections = [SelKst,StdAllLoosePions])
-        
+
             SelDstarPrelimTOS = TOSFilter( "For%sSelDstarPrelimTOS"%name
                                            ,SelDstarPrelim
                                            ,self.__confdict__["TTSpecs"])
 
         #########################################################
-        ## STEP 3: 
+        ## STEP 3:
         ## Add the probe velo track to the D0
         #########################################################
-    
+
         CombD0 = CombineParticles(name="For%sCombD0"%name,
                                   Preambulo = D0Preambulo,
                                   DecayDescriptors = D0DecayDescriptor,
                                   CombinationCut = D0CombinationCut,
                                   MotherCut = D0MotherCut)
-    
+
         if self.__confdict__["RequireDstFirst"]:
             SelD0 = Selection('For%sSelD0'%name,
                               Algorithm = CombD0,
@@ -232,31 +232,31 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             SelD0 = Selection('For%sSelD0'%name,
                               Algorithm = CombD0,
                               RequiredSelections = [SelKst,Probes])
-            
+
         #########################################################
-        ## STEP 4: 
+        ## STEP 4:
         ## Build a D* candidate
         #########################################################
-            
-        
+
+
 
         CombDstar = CombineParticles(name = "For%sCombDstar"%name,
                                      DecayDescriptors = DstDecayDescriptors,
                                      DaughtersCuts = {"pi+": SlowpionCuts},
                                      CombinationCut = DstPrelimComboCuts,
                                      MotherCut = DstMotherCut)
-        
+
         SelDstar = Selection("For%sSelDstarf"%name,
                              Algorithm = CombDstar,
                              RequiredSelections = [SelD0,StdAllLoosePions])
-        
+
         SelDstarTOS = TOSFilter( "For%sSelDstarTOS"%name
                                  ,SelDstar
                                  ,self.__confdict__["TTSpecs"])
-        
-        
+
+
         #########################################################
-        ## STEP 5: 
+        ## STEP 5:
         ## Find any interesting matching long tracks
         #########################################################
 
@@ -265,23 +265,23 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                                            DecayDescriptors = MatchDecayDescriptor,
                                            CombinationCut = "(AMAXDOCA('') < 0.10 * mm )",
                                            MotherCut = "ALL")
-        
+
         SelD0MatchLong = Selection('For%sSelD0MatchLong'%name,
                                    Algorithm = CombD0MatchLong,
                                    RequiredSelections = [SelDstarTOS,SelKst,StdAllNoPIDsPions])
 
         #########################################################
-        ## STEP 6: 
+        ## STEP 6:
         ## Make the stripping lines
         #########################################################
-        
-        LineDstar = StrippingLine(name, 
+
+        LineDstar = StrippingLine(name,
                                   FILTER = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 180 )",
                                              "Preambulo": ["from LoKiTracks.decorators import *"]},
                                   HLT2 = self.__confdict__["HLT"],
-                                  selection = SelDstarTOS) 
-        
-        LineMatchLong = StrippingLine(name+'MatchLong', 
+                                  selection = SelDstarTOS)
+
+        LineMatchLong = StrippingLine(name+'MatchLong',
                                       FILTER = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < 180 )",
                                                  "Preambulo": ["from LoKiTracks.decorators import *"]},
                                       HLT2 = self.__confdict__["HLT"],
@@ -290,7 +290,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
 
 
     def MakeVeloTracks(self,prefilter):
-        
+
         if self.__confdict__["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
             from DAQSys.DecoderClass import decodersForBank
@@ -302,7 +302,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
             decs=decs+[vdec]
             VeloDecoding = GaudiSequencer("RecoDecodingSeq")
             VeloDecoding.Members += [d.setup() for d in decs ]
-        
+
         MyFastVeloTracking = FastVeloTracking("For%sFastVelo"%self.name,OutputTracksName=self.VeloTrackOutputLocation)
         MyFastVeloTracking.OnlyForward = True
         MyFastVeloTracking.ResetUsedFlags = True
@@ -312,7 +312,7 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
         copyVelo = TrackContainerCopy( "For%sCopyVelo"%self.name )
         copyVelo.inputLocations = [self.VeloTrackOutputLocation]
         copyVelo.outputLocation = self.FittedVeloTrackOutputLocation
-        
+
         ### fitting
         if self.__confdict__["VeloFitter"] == "ForwardStraightLine":
             MyVeloFit = ConfiguredForwardStraightLineEventFitter(Name="For%sVeloRefitterAlg"%self.name,
@@ -324,24 +324,24 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
         else:
             MyVeloFit = ConfiguredEventFitter(Name="For%sVeloRefitterAlg"%self.name,
                                               TracksInContainer=self.FittedVeloTrackOutputLocation)
-            
+
         #### making the proto particles
         MakeVeloProtos = ChargedProtoParticleMaker('For%sVeloProtoMaker'%self.name)
         MakeVeloProtos.Inputs=[self.FittedVeloTrackOutputLocation]
         MakeVeloProtos.Output = self.VeloProtoOutputLocation
         MakeVeloProtos.addTool( DelegatingTrackSelector, name="TrackSelector" )
         MakeVeloProtos.TrackSelector.TrackTypes = [ "Velo" ]
-    
+
         #### the full sequence
         makeparts = GaudiSequencer('For%sMakeVeloTracksGS'%self.name)
         if self.__confdict__["DoVeloDecoding"]:
-            makeparts.Members += [ VeloDecoding ] 
-        makeparts.Members += [ MyFastVeloTracking ] 
-        makeparts.Members += [ preve ] 
-        makeparts.Members += [ copyVelo ] 
-        makeparts.Members += [ MyVeloFit ] 
-        makeparts.Members += [ MakeVeloProtos ] 
-    
+            makeparts.Members += [ VeloDecoding ]
+        makeparts.Members += [ MyFastVeloTracking ]
+        makeparts.Members += [ preve ]
+        makeparts.Members += [ copyVelo ]
+        makeparts.Members += [ MyVeloFit ]
+        makeparts.Members += [ MakeVeloProtos ]
+
         #### some python magic to maek this appear like a "Selection"
         return GSWrapper(name="For%sWrappedVeloTrackingFor"%self.name,
                          sequencer=makeparts,
@@ -349,32 +349,32 @@ class TrackEffD0ToK3PiAllLinesConf(LineBuilder) :
                          requiredSelections =  prefilter)
 
     def MakeVeloParticles(self,name,
-                          particle, 
+                          particle,
                           protoParticlesMaker):
-        
+
         particleMaker =  NoPIDsParticleMaker("For%sParticleMaker%s"%(self.name,name) , Particle = particle)
         particleMaker.Input = self.VeloProtoOutputLocation
-        
+
         DataOnDemandSvc().AlgMap.update( {
                 "/Event/Phys/" + particleMaker.name() + '/Particles' : particleMaker.getFullName(),
                 "/Event/Phys/" + particleMaker.name() + '/Vertices'  : particleMaker.getFullName()
                 } )
-        
-        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name,name), 
-                                     Algorithm = particleMaker, 
+
+        AllVeloParticles = Selection("For%sSelAllVeloParts%s"%(self.name,name),
+                                     Algorithm = particleMaker,
                                      RequiredSelections = [protoParticlesMaker], InputDataSetter=None)
-        
+
         ### filter on the IP of the velo tracks
-        return Selection("For%sSelVeloParts%s"%(self.name,name), 
-                         Algorithm = FilterDesktop(name+"For%sFilterVeloTrackIP%s"%(self.name,name), 
+        return Selection("For%sSelVeloParts%s"%(self.name,name),
+                         Algorithm = FilterDesktop(name+"For%sFilterVeloTrackIP%s"%(self.name,name),
                                                    Code="(MIPDV(PRIMARY) > %(VeloMINIP)s)" %self.__confdict__),
                          RequiredSelections = [AllVeloParticles])
-    
+
 ###### OTHER FUNCTIONS ###############
 class GSWrapper(UniquelyNamedObject,
                 ClonableObject,
                 SelectionBase) :
-    
+
     def __init__(self, name, sequencer, output, requiredSelections) :
         UniquelyNamedObject.__init__(self, name)
         ClonableObject.__init__(self, locals())
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py
index 0ab932ad75341a83a1406a49ebcf81683b8ff52e..632cfab517ce7c7cd60ff9180ef432cfb0b88008 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py
@@ -18,39 +18,39 @@ Lb->p mu nu exclusive reconstruction
 '''
 # =============================================================================
 ##
-#  Lb->p mu nu exclusive reconstruction. 
+#  Lb->p mu nu exclusive reconstruction.
 #
 #  Stripping lines for the charmless semileptonic decay Lambda_b -> p mu nu.
 #
 #  The lines will lead to a  measurement of the differential branching
-#  of Lb -> p mu nu as a function of q^2. 
+#  of Lb -> p mu nu as a function of q^2.
 #
 #  This together with form factor predictions from either light cone
 #  sum rules or lattice QCD will allow an exclusive determination of |Vub|.
-# 
+#
 #  Three lines are included:
 #  Two of which strip the opposite sign (right sign) proton and muon and combinations.
 #  One of which has no prescale and strips protons and muons with a corrected mass >
 #  4 GeV.  The other line is prescaled by a factor of 0.5 and strips < 4 GeV in corrected
 #  mass.  This exploits the fact that the corrected mass for Lb->pmunu peaks at the Lambda_b
-#  mass.  The final line strips same sign proton and muon cominations over the whole corrected 
+#  mass.  The final line strips same sign proton and muon cominations over the whole corrected
 #  mass region.  This will be ussed to extract shapes for the combinatorial background.
 #
 #  Stripping XX, with requirements that the
 #  rate <0.05% and timing <0.5ms/evt.
-## 
+##
 
 """
-  b->p mu nu X inclusive reconstruction. 
+  b->p mu nu X inclusive reconstruction.
 
   Stripping lines for the charmless semileptonic decay Lambda_b -> p mu nu.
 
   The lines will lead to a  measurement of the differential branching
-  of Lb -> p mu nu as a function of q^2. 
+  of Lb -> p mu nu as a function of q^2.
 
   This together with form factor predictions from either light cone
   sum rules or lattice QCD will allow an exclusive determination of |Vub|.
- 
+
   Last modification $Date: 2014-January-19 $
                by $Author: William $
 """
@@ -68,11 +68,11 @@ default_config = {
     "MuonP"               : 3000.  ,#MeV
     "MuonPT"              : 1500.  ,#MeV
     "MuonMINIPCHI2"       : 16.    ,#adminensional
-    #Proton Cuts 
+    #Proton Cuts
     "ProtonTRCHI2"        : 6.     ,#adimensional
     "ProtonP"             : 15000. ,#MeV
     "ProtonPT"            : 1000.  ,#MeV
-    "ProtonPIDK"          : 10.     ,#adimensional 
+    "ProtonPIDK"          : 10.     ,#adimensional
     "ProtonPIDp"          : 10.     ,#adimensional
     "ProtonMINIPCHI2"     : 16.    ,#adminensional
     #B Mother Cuts
@@ -91,7 +91,7 @@ default_config = {
     "DECAYS"               : ["[Lambda_b0 -> p+ mu-]cc"],
     "SSDECAYS"               : ["[Lambda_b0 -> p+ mu+]cc"]
   },
-  'STREAMS'     : ['Semileptonic']   
+  'STREAMS'     : ['Semileptonic']
 }
 
 from Gaudi.Configuration import *
@@ -123,7 +123,7 @@ class bhad2PMuXBuilder(LineBuilder):
     """
     Definition of Lb->p mu nu stripping
     """
-    
+
     __configuration_keys__ = default_config['CONFIG'].keys()
 
     def __init__(self,name,config):
@@ -133,7 +133,7 @@ class bhad2PMuXBuilder(LineBuilder):
 
         self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                       "Preambulo": ["from LoKiTracks.decorators import *"]}
-        
+
         self._muonSel=None
         self._muonFilter()
 
@@ -164,7 +164,7 @@ class bhad2PMuXBuilder(LineBuilder):
         self.registerLine(self._fakep_SS_Lb_line())
         self.registerLine(self._fakemu_Lb_line())
         self.registerLine(self._fakemu_SS_Lb_line())
-        
+
     def _NominalMuSelection( self ):
         return "(TRCHI2DOF < %(MuonTRCHI2)s ) &  (P> %(MuonP)s *MeV) &  (PT> %(MuonPT)s* MeV)"\
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
@@ -175,7 +175,7 @@ class bhad2PMuXBuilder(LineBuilder):
                "& (TRGHOSTPROB < %(MuonGHOSTPROB)s)"\
          "& (~ISMUON) & (INMUON)"\
                "& (MIPCHI2DV(PRIMARY)> %(MuonMINIPCHI2)s )"
-    
+
     def _NominalPSelection( self ):
         return "(TRCHI2DOF < %(ProtonTRCHI2)s )&  (P> %(ProtonP)s *MeV) &  (PT> %(ProtonPT)s *MeV)"\
                "& (TRGHOSTPROB < %(TRGHOSTPROB)s)"\
@@ -225,7 +225,7 @@ class bhad2PMuXBuilder(LineBuilder):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+'Line', prescale = 1.0,
                              FILTER=self.GECs,
                              algos = [ self._bhad2PMuX_Lb()], HLT2 = hlt, L0DU = ldu)
@@ -234,16 +234,16 @@ class bhad2PMuXBuilder(LineBuilder):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+'SSLine', prescale = 0.20,
-                             FILTER=self.GECs, 
+                             FILTER=self.GECs,
                              algos = [ self._bhad2PMuXSS_Lb()], HLT2 = hlt, L0DU = ldu)
 
     def _fakep_Lb_line( self ):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+ 'FakepLine', prescale = 0.02,
                              FILTER=self.GECs,
                              algos = [ self._bhad2PMuX_fakep_Lb()], HLT2 = hlt, L0DU = ldu)
@@ -251,7 +251,7 @@ class bhad2PMuXBuilder(LineBuilder):
         from StrippingConf.StrippingLine import StrippingLine
         hlt = "HLT_PASS_RE('Hlt2.*SingleMuon.*Decision')"\
               "| HLT_PASS_RE('Hlt2TopoMu2Body.*Decision')"
-        ldu = "L0_CHANNEL_RE('Muon')" 
+        ldu = "L0_CHANNEL_RE('Muon')"
         return StrippingLine(self._name+ 'FakeSSpLine', prescale = 0.005,
                              FILTER=self.GECs,
                              algos = [ self._bhad2PMuXSS_fakep_Lb()], HLT2 = hlt, L0DU = ldu)
@@ -272,7 +272,7 @@ class bhad2PMuXBuilder(LineBuilder):
     def _muonFilter( self ):
         if self._muonSel is not None:
             return self._muonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseMuons
@@ -282,16 +282,16 @@ class bhad2PMuXBuilder(LineBuilder):
                          Algorithm=_mu,
                          RequiredSelections = [StdLooseMuons])
         _muSel = tosSelection(_muSel,{'L0.*Muon.*Decision%TOS':0})
-        
+
         self._muonSel=_muSel
-        
+
         return _muSel
 
     ##### Fake Muon Filter ######
     def _fakemuonFilter( self ):
         if self._fakemuonSel is not None:
             return self._fakemuonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllNoPIDsMuons
@@ -300,68 +300,68 @@ class bhad2PMuXBuilder(LineBuilder):
         _muSel=Selection("fakeMu_for"+self._name,
                          Algorithm=_mu,
                          RequiredSelections = [StdAllNoPIDsMuons])
-        
+
         self._fakemuonSel=_muSel
-        
+
         return _muSel
 
     ###### Proton Filter ######
     def _protonFilter( self ):
         if self._protonSel is not None:
             return self._protonSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseProtons
-        
+
         _pr = FilterDesktop( Code = self._NominalPSelection() % self._config )
         _prSel=Selection("p_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdLooseProtons])
-        
+
         self._protonSel=_prSel
-        
+
         return _prSel
 
     ##### Pion Filter ######
     def _pionFilter( self ):
         if self._pionSel is not None:
             return self._pionSel
-        
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
-        
+
         _pr = FilterDesktop( Code = self._PiSelection() % self._config )
         _prSel=Selection("pi_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdLoosePions])
-        
+
         self._pionSel=_prSel
-        
+
         return _prSel
 
     ##### Fake Proton Filter ######
     def _fakeprotonFilter( self ):
         if self._fakeprotonSel is not None:
             return self._fakeprotonSel
-  
+
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllNoPIDsProtons
-        
+
         _pr = FilterDesktop( Code = self._FakePSelection() % self._config )
         _prSel=Selection("fakep_for"+self._name,
                          Algorithm=_pr,
                          RequiredSelections = [StdAllNoPIDsProtons])
-        
+
         self._fakeprotonSel=_prSel
-        
+
         return _prSel
 
 
     def _Definitions(self):
-        return [ 
+        return [
             "from LoKiPhys.decorators import *",
             "Lb_PT = PT"
                            ]
@@ -370,63 +370,63 @@ class bhad2PMuXBuilder(LineBuilder):
     def _PPbar( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         PPbar = CombineParticles(DecayDescriptors = ["J/psi(1S) -> p+ p~-","[J/psi(1S) -> p+ p+]cc"], ReFitPVs = True)
         PPbar.Preambulo = self._Definitions()
         PPbar.MotherCut = self._PPbarSelection() % self._config
         PPbar.ReFitPVs = True
-            
+
         PPbarSel=Selection("PPbar_Lb_for"+self._name,
                          Algorithm=PPbar,
                          RequiredSelections = [self._protonFilter()])
-         
+
         return PPbarSel
 
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _fakePPbar( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         PPbar = CombineParticles(DecayDescriptors = ["J/psi(1S) -> p+ p~-","[J/psi(1S) -> p+ p+]cc"], ReFitPVs = True)
         PPbar.Preambulo = self._Definitions()
         PPbar.MotherCut = self._fakePPbarSelection() % self._config
         PPbar.ReFitPVs = True
-            
+
         PPbarSel=Selection("fakePPbar_Lb_for"+self._name,
                          Algorithm=PPbar,
                          RequiredSelections = [self._fakeprotonFilter()])
-         
+
         return PPbarSel
 
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _Ppipi( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         Ppipi = CombineParticles(DecayDescriptors = ["[N(1440)+ -> p+ pi+ pi-]cc"], ReFitPVs = True)
         Ppipi.Preambulo = self._Definitions()
         Ppipi.MotherCut = self._NstarSelection() % self._config
         Ppipi.ReFitPVs = True
-            
+
         PpipiSel=Selection("Ppipi_Lb_for"+self._name,
                          Algorithm=Ppipi,
                          RequiredSelections = [self._protonFilter(),self._pionFilter()])
-         
+
         return PpipiSel
 
     def _fakePpipi( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         Ppipi = CombineParticles(DecayDescriptors = ["[N(1440)+ -> p+ pi+ pi-]cc"], ReFitPVs = True)
         Ppipi.Preambulo = self._Definitions()
         Ppipi.MotherCut = self._NstarSelection() % self._config
         Ppipi.ReFitPVs = True
-            
+
         PpipiSel=Selection("fakePpipi_Lb_for"+self._name,
                          Algorithm=Ppipi,
                          RequiredSelections = [self._fakeprotonFilter(),self._pionFilter()])
-         
+
         return PpipiSel
 
     def _daughters( self ):
@@ -451,17 +451,17 @@ class bhad2PMuXBuilder(LineBuilder):
     def _bhad2PMuX_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection,MergedSelection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._LbMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("pMu_Lb_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._daughters()])
-         
+
         _LbSel = tosSelection(_pMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _LbSel
 
@@ -471,36 +471,36 @@ class bhad2PMuXBuilder(LineBuilder):
     def _bhad2PMuXSS_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMuSS = CombineParticles(DecayDescriptors = self._config["SSDECAYS"], ReFitPVs = True)
-        _pMuSS.Preambulo = self._Definitions() 
+        _pMuSS.Preambulo = self._Definitions()
         _pMuSS.CombinationCut = "(AM>%(pMuMassLower)s*MeV)"  % self._config
         _pMuSS.MotherCut = self._LbMotherSelection() % self._config
         _pMuSS.ReFitPVs = True
-            
+
         _pMuSSSel=Selection("pMuSS_Lb_for"+self._name,
                          Algorithm=_pMuSS,
                          RequiredSelections = [self._muonFilter(), self._daughters()])
         _pMuSSSel = tosSelection(_pMuSSSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _pMuSSSel
-      
 
-    
+
+
     ###### Lb->pMuNu Fake Proton ######
     def _bhad2PMuX_fakep_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._LbMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("pMu_fakep_Lb_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._muonFilter(), self._fakedaughters()])
-         
+
         _LbSel = tosSelection(_pMuSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _LbSel
 
@@ -508,17 +508,17 @@ class bhad2PMuXBuilder(LineBuilder):
     def _bhad2PMuXSS_fakep_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMuSS = CombineParticles(DecayDescriptors = self._config["SSDECAYS"], ReFitPVs = True)
         _pMuSS.Preambulo = self._Definitions()
         _pMuSS.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMuSS.MotherCut = self._LbMotherSelection() % self._config
         _pMuSS.ReFitPVs = True
-            
+
         _pMuSSSel=Selection("pMuSS_fakep_Lb_for"+self._name,
                          Algorithm=_pMuSS,
                          RequiredSelections = [self._muonFilter(), self._fakedaughters()])
-         
+
         _LbSSSel = tosSelection(_pMuSSSel,{'Hlt2.*TopoMu2Body.*Decision%TOS':0,'Hlt2.*SingleMuon.*Decision%TOS':0})
         return _LbSSSel
 
@@ -528,17 +528,17 @@ class bhad2PMuXBuilder(LineBuilder):
     def _bhad2PMuX_fakemu_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMu = CombineParticles(DecayDescriptors = self._config["DECAYS"], ReFitPVs = True)
         _pMu.Preambulo = self._Definitions()
         _pMu.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMu.MotherCut = self._LbMotherSelection() % self._config
         _pMu.ReFitPVs = True
-            
+
         _pMuSel=Selection("pMu_fakemu_Lb_for"+self._name,
                          Algorithm=_pMu,
                          RequiredSelections = [self._fakemuonFilter(), self._daughters()])
-         
+
         _LbSel = tosSelection(_pMuSel,{'Hlt2.*Topo2Body.*Decision%TOS':0})
         return _LbSel
 
@@ -546,16 +546,16 @@ class bhad2PMuXBuilder(LineBuilder):
     def _bhad2PMuXSS_fakemu_Lb( self ):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        
+
         _pMuSS = CombineParticles(DecayDescriptors = self._config["SSDECAYS"], ReFitPVs = True)
         _pMuSS.Preambulo = self._Definitions()
         _pMuSS.CombinationCut = "(AM>%(pMuMassLower)s*MeV)" % self._config
         _pMuSS.MotherCut = self._LbMotherSelection() % self._config
         _pMuSS.ReFitPVs = True
-            
+
         _pMuSSSel=Selection("pMuSS_fakemu_Lb_for"+self._name,
                          Algorithm=_pMuSS,
                          RequiredSelections = [self._fakemuonFilter(), self._daughters()])
-         
+
         _LbSSSel = tosSelection(_pMuSSSel,{'Hlt2.*Topo2Body.*Decision%TOS':0})
-        return _LbSSSel
\ No newline at end of file
+        return _LbSSSel
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/Utils.py
index 07b4e71d5ed200f341aebdb38e682815d620e6c5..a2c329a08d8ddb2622c2153d16cee75d5190f675 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/Utils.py
@@ -248,7 +248,7 @@ def buildStreamsFromBuilder(conf, names ):
 
     >>> streams = buildStreamsFromBuilder(somelinebuilder, 'B2ppipiSigmacmm_Lcpi')
     """
-    
+
     from StrippingConf.StrippingStream import StrippingStream
     from StrippingSettings.Utils import strippingConfiguration
     from StrippingSelections import lineBuilders
@@ -257,14 +257,14 @@ def buildStreamsFromBuilder(conf, names ):
 
     if not isinstance(names, list):
       names = [names]
-    
+
     for name in names:
       _conf = {}
       if conf.has_key(name) :
         _conf[name] = conf[name]
       else:
-        log.error("The requested name %s is not present in the default_config of any LineBuilder" %name) 
-    
+        log.error("The requested name %s is not present in the default_config of any LineBuilder" %name)
+
       #_conf=lb.default_config
       #if isinstance(stripping, basestring) :
           #scdb = strippingConfiguration(stripping)
@@ -273,7 +273,7 @@ def buildStreamsFromBuilder(conf, names ):
 
       for k, v in _conf.iteritems() :
           if 'STREAMS' in v.keys():
-            
+
               try:
                   lb = lineBuilders()[v['BUILDERTYPE']](k,v['CONFIG'])
               except Exception, x:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Utils.py
index 2ab6b1b71bd2759749b8320870da273bdc1e1762..1489508e125468d055460de2a105a7bf39e7e7e9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Utils.py
@@ -168,7 +168,7 @@ def buildStream(stripping, streamName = '', archive=None, WGs = None ):
                 raise Exception( 'Unsupported type, expected list ' +
                                  'or dict for line-to-STREAM mapping' )
 
-            
+
     return stream
 
 def streamNames(stripping) :
@@ -329,9 +329,9 @@ def _replace_lines(substr, fname, startstr, endstr) :
     sublines = [line + '\n' for line in substr.split('\n')]
     with open(fname) as fin :
         lines = fin.readlines()
-    istart = filter(lambda pair : startstr in pair[1], 
+    istart = filter(lambda pair : startstr in pair[1],
                     enumerate(lines))[0][0]
-    iend = filter(lambda pair : endstr in pair[1], 
+    iend = filter(lambda pair : endstr in pair[1],
                   enumerate(lines[istart:]))[0][0]
     lines[istart:istart+iend+1] = sublines
     with open(fname, 'w') as fin :
@@ -340,12 +340,12 @@ def _replace_lines(substr, fname, startstr, endstr) :
 def _format_content(name, obj) :
     return name + ' = ' + pformat(obj).replace('\n', '\n' + (' ' * (len(name) + 3)))
 
-initname = os.path.join(os.environ['STRIPPINGARCHIVEROOT'], 'python', 
+initname = os.path.join(os.environ['STRIPPINGARCHIVEROOT'], 'python',
                         'StrippingArchive', '__init__.py')
 
 def add_to_known_strippings(stripping) :
     if stripping in _known_strippings :
-        return 
+        return
     _known_strippings.append(stripping)
     _known_strippings.sort()
     content = _format_content('_known_strippings', _known_strippings)
@@ -364,7 +364,7 @@ def add_to_relinfo_obsolete_strippings(stripping) :
         return
     _relinfo_obsolete_strippings.append(stripping)
     _relinfo_obsolete_strippings.sort()
-    content = _format_content('_relinfo_obsolete_strippings', 
+    content = _format_content('_relinfo_obsolete_strippings',
                               _relinfo_obsolete_strippings)
     _replace_lines(content, initname, '_relinfo_obsolete_strippings', ']')
 
@@ -375,14 +375,14 @@ def add_to_duplicate_strippings(stripping, duplicateof) :
         return
     content = _format_content('_duplicate_strippings', _duplicate_strippings)
     _replace_lines(content, initname, '_duplicate_strippings', '}')
-    
+
 def create_stripping_archive(stripping, helpstr) :
     add_to_known_strippings(stripping)
     add_to_stripping_help(stripping, helpstr)
 
     source = os.path.join(os.environ['STRIPPINGSELECTIONSROOT'], 'python',
                           'StrippingSelections')
-    dest = os.path.join(os.environ['STRIPPINGARCHIVEROOT'], 'python', 
+    dest = os.path.join(os.environ['STRIPPINGARCHIVEROOT'], 'python',
                         'StrippingArchive', stripping)
     status = create_archive(source, dest)
 
@@ -509,4 +509,3 @@ _strippingModules = [getattr(_this, _k) for _k in _strippingKeys]
 '''.format(tuple(mods)))
 
     return status
-                    
diff --git a/Phys/StrippingArchive/python/StrippingArchive/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/__init__.py
index 290d3f11693b70a23dd74520d6da1627aafaa24e..b6f1a93a979fef28084067653b2b6b43abe43904 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/__init__.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/__init__.py
@@ -56,7 +56,7 @@ for _k in _duplicate_strippings:
         raise KeyError, _k+' already defined as a StrippingArchive. check _duplicate_strippings'
     if _duplicate_strippings[_k] not in _known_strippings:
         raise KeyError, _duplicate_strippings[_k]+' is not defined as a StrippingArchive. check _duplicate_strippings'
-    if _duplicate_strippings[_k] in _strippingKeys : 
+    if _duplicate_strippings[_k] in _strippingKeys :
         _strippingKeys[_k]=_strippingKeys[_duplicate_strippings[_k]]
 
 
@@ -65,9 +65,9 @@ def _listofStrippings():
     for _k in _known_strippings:
         module_name = __name__ + "." + _k
         print "Trying to import module", module_name
-        try : 
+        try :
             __import__(module_name)
-        except Exception, _k: 
+        except Exception, _k:
             print "  -> Cannot be loaded with this version of DaVinci (%s)" % str(_k)
         else:
             _l.append(_k)
@@ -81,10 +81,10 @@ def _listofStrippings():
 def _importArchive(stripping):
     if type(stripping) is not str:
         raise TypeError, "Strippings must be strings, like Stripping15 for example"
-        
+
     print "Requested "+stripping
     _tmpstrip=str(stripping)
-    
+
     if stripping not in _strippingKeys.keys():
         raise KeyError, stripping + ' is not known, call strippingArchive() with no argument to get the full dictionary'
     if  _strippingKeys[stripping]!=stripping:
@@ -94,14 +94,14 @@ def _importArchive(stripping):
 
     module_name = __name__ + "." + _tmpstrip
     print "Trying to import module", module_name
-    try : 
+    try :
         __import__(module_name)
-    except Exception, _tmpstrip: 
+    except Exception, _tmpstrip:
         print " -> Cannot be loaded with this version of DaVinci (%s)" % str(_tmpstrip)
-    
+
     from sys import modules as _modules
     _this = _modules[__name__]
-    
+
     _stripping = getattr(_this, _tmpstrip)
     return _stripping
 
@@ -118,21 +118,21 @@ def strippingArchive(stripping=None):
     strippingArchive(stripping): return the line builder module for that stripping'''
     if stripping is None:
         return list(_listofStrippings())
-    
+
     strippingname=""
-    
+
     for _k in _strippingKeys:
         if _k.lower()==stripping.lower():
             strippingname=_k
             break
     if strippingname=="":
         raise KeyError, stripping + ' is not known, call strippingArchive() with no argument to get the full dictionary'
-    
-    
-    
+
+
+
     strip = _importArchive(strippingname)
     return strip
-    
+
 
 def strippingDescription(stripping=None):
     '''Return the description of the stripping pass
@@ -140,7 +140,7 @@ def strippingDescription(stripping=None):
     strippingDescription(stripping): return the description for that stripping'''
     if stripping is None:
         return list(_listofStrippings())
- 
+
     strippingname=""
 
     for _k in _strippingKeys:
@@ -149,7 +149,7 @@ def strippingDescription(stripping=None):
             break
     if strippingname=="":
         raise KeyError, stripping + ' is not known, call strippingArchive() with no argument to get the full dictionary'
-    
+
     strip = _importArchive(strippingname)
-    
+
     return _stripping_help[strippingname]
diff --git a/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/check-hlt-filters.qmt b/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/check-hlt-filters.qmt
index ab75cf2af711b7a79b1272cbbee766abf19078ec..7777dcacb5e42da503766a8858840ecef4fcaa6f 100755
--- a/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/check-hlt-filters.qmt
+++ b/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/check-hlt-filters.qmt
@@ -11,7 +11,7 @@
 -->
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
-  <argument name="program"> 
+  <argument name="program">
 	<text>$STRIPPINGARCHIVEROOT/tests/test_archive_hlt_filters.py</text>
   </argument>
 </extension>
diff --git a/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/instantiate-all-strip.qmt b/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/instantiate-all-strip.qmt
index e8bb2ae7b681eae5f3d6924ba297056f65abe2b0..cb6bd98ffb02d5a47372e640e2d2aada837e1580 100755
--- a/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/instantiate-all-strip.qmt
+++ b/Phys/StrippingArchive/tests/qmtest/strippingarchive.qms/instantiate-all-strip.qmt
@@ -16,7 +16,7 @@
 # Author: rlambert
 # Purpose: Simple unit test, minal unit test of this package, just test that the strippings in the stripping archive can be instantiated, not run, just instantiated
 # Prerequisites: None
-# Common failure modes, severities and cures: 
+# Common failure modes, severities and cures:
 #               . MAJOR: All failures of this test are pretty much major, and represent a major problem in an old or new stripping line which will cause headaches for everyone concerned.
 #######################################################
 -->
diff --git a/Phys/StrippingArchive/tests/test_archive_hlt_filters.py b/Phys/StrippingArchive/tests/test_archive_hlt_filters.py
index 9357f3f4872d0141d4720a7f22d22138e364274a..40212c241421c44bfbe2840ed2da9f10d210f84e 100644
--- a/Phys/StrippingArchive/tests/test_archive_hlt_filters.py
+++ b/Phys/StrippingArchive/tests/test_archive_hlt_filters.py
@@ -13,7 +13,7 @@ import subprocess, sys
 
 # Dict of HLT lines for each stripping campaign.
 hltlines = {
-    # TCKs 0x117118a1 and 0x217118a1 
+    # TCKs 0x117118a1 and 0x217118a1
     'Stripping34' : {'hlt1' : ['Hlt1TrackMVA',
                                'Hlt1TwoTrackMVA',
                                'Hlt1TrackMVATight',
diff --git a/Phys/StrippingUtils/CMakeLists.txt b/Phys/StrippingUtils/CMakeLists.txt
index 74c7276f899f1d5359e83809776ec1928e3fe0ce..1d66bae5aa3b0b20eff239e9c4bf46fb75e04c65 100644
--- a/Phys/StrippingUtils/CMakeLists.txt
+++ b/Phys/StrippingUtils/CMakeLists.txt
@@ -19,4 +19,3 @@ gaudi_depends_on_subdirs(Phys/StrippingConf
 find_package(pytools)
 
 gaudi_install_python_modules()
-
diff --git a/Phys/StrippingUtils/doc/release.notes b/Phys/StrippingUtils/doc/release.notes
index 18fa344ae84bff1d19df4eff22502bc3091f4bf4..8755c5a00aac09b4191ff364f2236728a47bb758 100644
--- a/Phys/StrippingUtils/doc/release.notes
+++ b/Phys/StrippingUtils/doc/release.notes
@@ -12,7 +12,7 @@
 !========================= StrippingUtils v1r15 2017-07-04 =========================
 
 ! 2017-07-01 - Michael Alexander
- - Tweaking StrippingDoc 
+ - Tweaking StrippingDoc
 
 ! 2017-06-22 - Michael Alexander
  - Adding a registry of builder instances to the LineBuilder class so they're kept
@@ -23,13 +23,13 @@
 !========================= StrippingUtils v1r14 2017-06-07 =========================
 
 ! 2017-05-27 - Michael Alexander
- - Modified key checks in StrippingUtils/Utils.py 
+ - Modified key checks in StrippingUtils/Utils.py
 
 !========================= StrippingUtils v1r13 2017-05-08 =========================
 
 ! 2017-04-03 - Michael Alexander
  - Adding functionality to automatically generate StrippingArchive, CommonParticlesArchive
-   and StrippingSettings archives. 
+   and StrippingSettings archives.
 
 !========================= StrippingUtils v1r12 2017-01-31 =========================
 
diff --git a/README.md b/README.md
index 0944f23be74c11729a0364982289733d08ac61d7..1f24dd8090304f9c0c58293fb459552850317e8d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Before creating a merge request, please consider the following guidelines:
 
 We will propagate those changes to master if relevant for the upgrade or run2-patches if appropriate.
 
-Please contact the Stripping coordinators if you are unsure which target branch to choose. 
+Please contact the Stripping coordinators if you are unsure which target branch to choose.
 
 For new campaigns, we will inform you of the dedicated branches.
 
diff --git a/StrippingSys/doc/DoxyFile.cfg b/StrippingSys/doc/DoxyFile.cfg
index 899cfdbfcdd2537d419b4f8c94f47bb3f15369d7..e93de290b75b950f80207ffff936330d48aa516a 100755
--- a/StrippingSys/doc/DoxyFile.cfg
+++ b/StrippingSys/doc/DoxyFile.cfg
@@ -8,11 +8,11 @@ INPUT            = $(STRIPPINGSYSROOT)/..
 @INCLUDE         = DoxyCommon.cfg
 @INCLUDE         = dottool.cfg
 HTML_HEADER      = $(LHCB_HOME)/LHCbSys/doc/Doxyheader.html
-   
+
 @INCLUDE         = DoxyTags.cfg
 TAGFILES        += $(Gaudi_release_area)/GAUDI/GAUDI_$(GAUDIVERS)/doc/Gaudi.tag=http://cern.ch/proj-gaudi/releases/GAUDI/GAUDI_$(GAUDIVERS)/doc/html \
                    $(LHCb_release_area)/LHCB/LHCB_$(LHCBVERS)/doc/LHCb.tag=http://cern.ch/LHCb-release-area/LHCB/LHCB_$(LHCBVERS)/doc/html
-                                                                                                                                                        
+
 EXAMPLE_PATH     = $(STRIPPINGSYSROOT)/doc
 FILE_PATTERNS    += *.cpp *.h *StrippingSys*requirements *$(COMMONPARTICLESROOT)*.opts
 # Following files make default doxygen crash