Merge branch 'release/06-00' of ssh://stash.desy.de:7999/b2/basf2 into bugfix/BII-8727-tracking-dqm-patch03

Author: GiacomoXT

analysis/examples/FEI/B_converted_apply.py

@@ -34,6 +34,8 @@
     # Actually, the KS finder should be set to True.
     # However, here it's set to False because the necessary library is only present on kekcc and not on the build server.
     enableNisKsFinder=False,
+    # Set this argument to True (default value) so that the local database on KEKCC is used.
+    # It's only set to False here so that this example can be run on bamboo.
     enableLocalDB=False,
     path=path)
 ma.setAnalysisConfigParams({'mcMatchingVersion': 'Belle'}, path)

analysis/examples/FEI/B_converted_train.py

@@ -42,7 +42,11 @@
             'validation',
             False),
         applySkim=True,
+        # Actually, the KS finder should be set to True.
+        # However, here it's set to False because the necessary library is only present on kekcc and not on the build server.
         enableNisKsFinder=False,
+        # Set this argument to True (default value) so that the local database on KEKCC is used.
+        # It's only set to False here so that this example can be run on bamboo.
         enableLocalDB=False,
         path=path)
 else:

analysis/modules/BremsCorrection/src/BremsFinderModule.cc

@@ -56,9 +56,9 @@ namespace Belle2 {
     in the analysis scripts.
 
     The **eclTrackBremFinder** module uses the lepton track PXD and SVD hits and extrapolates them to the ECL; 
-    then looks for ECL clusters with energies between 0.2 and 1 times the track energy and without associated 
-    tracks, and checks if the distance between each of these clusters 
-    and the extrapolated hit is smaller than 0.5 mm. If it is, a *Bremsstrahlung* weighted relation 
+    then looks for ECL clusters with energies between 0.02 and 1 times the track energy and without associated 
+    tracks, and checks if the normalized distance between each of these clusters 
+    and the extrapolated hit is smaller than 0.05. If it is, a *Bremsstrahlung* weighted relation 
     between said cluster and the track is established. The weight is determined as
 
     .. math:: 

analysis/scripts/modularAnalysis.py

@@ -55,7 +55,7 @@ def setAnalysisConfigParams(configParametersAndValues, path):
     path.add_module(conf)
 
 
-def inputMdst(environmentType, filename, path, skipNEvents=0, entrySequence=None, *, parentLevel=0):
+def inputMdst(environmentType, filename, path, skipNEvents=0, entrySequence=None, *, parentLevel=0, **kwargs):
     """
     Loads the specified ROOT (DST/mDST/muDST) file with the RootInput module.
 
@@ -74,10 +74,18 @@ def inputMdst(environmentType, filename, path, skipNEvents=0, entrySequence=None
     if entrySequence is not None:
         entrySequence = [entrySequence]
 
-    inputMdstList(environmentType, [filename], path, skipNEvents, entrySequence, parentLevel=parentLevel)
+    inputMdstList(environmentType, [filename], path, skipNEvents, entrySequence, parentLevel=parentLevel, **kwargs)
 
 
-def inputMdstList(environmentType, filelist, path, skipNEvents=0, entrySequences=None, *, parentLevel=0):
+def inputMdstList(
+        environmentType,
+        filelist,
+        path,
+        skipNEvents=0,
+        entrySequences=None,
+        *,
+        parentLevel=0,
+        useB2BIIDBCache=True):
     """
     Loads the specified ROOT (DST/mDST/muDST) files with the RootInput module.
 
@@ -108,6 +116,7 @@ def inputMdstList(environmentType, filelist, path, skipNEvents=0, entrySequences
         entrySequences (list(str)): The number sequences (e.g. 23:42,101) defining
             the entries which are processed for each inputFileName.
         parentLevel (int): Number of generations of parent files (files used as input when creating a file) to be read
+        useB2BIIDBCache (bool): Loading of local KEKCC database (only to be deactivated in very special cases)
     """
 
     roinput = register_module('RootInput')
@@ -156,6 +165,10 @@ def inputMdstList(environmentType, filelist, path, skipNEvents=0, entrySequences
         setAnalysisConfigParams({'mcMatchingVersion': 'Belle'}, path)
         import b2bii
         b2bii.setB2BII()
+        if useB2BIIDBCache:
+            basf2.conditions.metadata_providers = ["/sw/belle/b2bii/database/conditions/b2bii.sqlite"]
+            basf2.conditions.payload_locations = ["/sw/belle/b2bii/database/conditions/"]
+
     if environmentType == 'MC5':
         setAnalysisConfigParams({'mcMatchingVersion': 'MC5'}, path)
 

analysis/scripts/variables/collections.py

@@ -140,7 +140,7 @@
 ]
 
 #: PID variables
-pid = ['kaonID', 'pionID', 'protonID', 'muonID', 'electronID', 'deuteronID',
+pid = ['kaonID', 'pionID', 'protonID', 'muonID', 'electronID', 'electronID_noTOP', 'deuteronID',
        'binaryPID(211, 13)', 'binaryPID(211, 321)', 'binaryPID(211, 2212)', 'binaryPID(321, 2212)']
 
 #: Replacement for ROEMultiplicities tool

analysis/variables/include/PIDVariables.h

@@ -148,6 +148,12 @@ namespace Belle2 {
      */
     double binaryPID_noSVD(const Particle* part, const std::vector<double>& arguments);
 
+    /**
+     * SPECIAL (TEMP) variable (BII-8444)
+     * @return electron ID without TOP information
+     */
+    double electronID_noTOP(const Particle* part);
+
     /**
     * returns the MVA score for anti-neutron PID (not for neutron)
     * -1 means invalid

analysis/variables/src/PIDVariables.cc

@@ -359,6 +359,12 @@ namespace Belle2 {
                                                pdgCodeTest) + ", CDC, TOP, ARICH, ECL, KLM)")->function(part);
     }
 
+    double electronID_noTOP(const Particle* part)
+    {
+      // Excluding TOP for electron ID. This variable is temporary. BII-8444
+      return Manager::Instance().getVariable("pidProbabilityExpert(11, CDC, SVD, ARICH, ECL, KLM)")->function(part);
+    }
+
     double antineutronID(const Particle* particle)
     {
       if (particle->hasExtraInfo("nbarID")) {
@@ -595,6 +601,8 @@ namespace Belle2 {
                       "(SPECIAL (TEMP) variable) deuteron identification probability defined as :math:`\\mathcal{L}_d/(\\mathcal{L}_e+\\mathcal{L}_\\mu+\\mathcal{L}_\\pi+\\mathcal{L}_K+\\mathcal{L}_p+\\mathcal{L}_d)`, using info from all available detectors *excluding the SVD*");
     REGISTER_VARIABLE("binaryPID_noSVD(pdgCode1, pdgCode2)", binaryPID_noSVD,
                       "Returns the binary probability for the first provided mass hypothesis with respect to the second mass hypothesis using all detector components, *excluding the SVD*.");
+    REGISTER_VARIABLE("electronID_noTOP", electronID_noTOP,
+                      "(SPECIAL (TEMP) variable) electron identification probability defined as :math:`\\mathcal{L}_e/(\\mathcal{L}_e+\\mathcal{L}_\\mu+\\mathcal{L}_\\pi+\\mathcal{L}_K+\\mathcal{L}_p+\\mathcal{L}_d)`, using info from all available detectors *excluding the TOP*");
     REGISTER_VARIABLE("nbarID", antineutronID, R"DOC(
 Returns MVA classifier for antineutron PID.
 

b2bii/examples/BelleMCGeneration.py

@@ -14,6 +14,10 @@
 import basf2
 from generators import add_evtgen_generator
 
+# Use B2BII local cache
+basf2.conditions.metadata_providers = ["/sw/belle/b2bii/database/conditions/b2bii.sqlite"]
+basf2.conditions.payload_locations = ["/sw/belle/b2bii/database/conditions/"]
+
 # Use B2BII global tag.
 basf2.conditions.prepend_globaltag('B2BII_MC')
 

b2bii/scripts/b2biiConversion.py

@@ -105,12 +105,15 @@ def convertBelleMdstToBelleIIMdst(inputBelleMDSTFile, applySkim=True,
     b2bii.setB2BII()
 
     if enableLocalDB is True:
-        b2.B2WARNING("B2BII is accessing the payloads from the local database.\n"
-                     "This is the recommended procedure and significantly faster than using the global database.\n"
-                     "Only if you need the latest payloads of the flavor tagging or the FEI,\n"
-                     "you should turn off this feature and set enableLocalDB to True.")
         b2.conditions.metadata_providers = ["/sw/belle/b2bii/database/conditions/b2bii.sqlite"]
         b2.conditions.payload_locations = ["/sw/belle/b2bii/database/conditions/"]
+    else:
+        b2.B2WARNING(
+            "B2BII is accessing the payloads from the conditions database.\n"
+            "The recommended procedure is to use the offline database and it is significantly\n"
+            "faster than using the global database.\n"
+            "If you need the payloads which are not included in the current offline database,\n"
+            "please contact b2bii librarian.")
 
     input = b2.register_module('B2BIIMdstInput')
     if inputBelleMDSTFile is not None:

calibration/scripts/prompt/__init__.py

@@ -15,7 +15,7 @@
 prompt_validation_script_package = "prompt.validations."
 prompt_validation_script_dir = "calibration/scripts/prompt/validations"
 
-input_data_filters = {"Magnet": {"On": "On",
+INPUT_DATA_FILTERS = {"Magnet": {"On": "On",
                                  "Off": "Off",
                                  "Either": "Either"},
                       "Beam Energy": {"No Beam": "No Beam",
@@ -31,7 +31,7 @@
                                    "cosmic_calib": "cosmic_calib",
                                    "gamma_gamma_calib": "gamma_gamma_calib",
                                    "hadron_calib": "hadron_calib",
-                                   "mumutight_calib": "mumutight_calib",
+                                   "mumutight_or_highm_calib": "mumutight_or_highm_calib",
                                    "offip_calib": "offip_calib",
                                    "radmumu_calib": "radmumu_calib",
                                    "random_calib": "random_calib",
@@ -81,7 +81,7 @@ class CalibrationSettings(namedtuple('CalSet_Factory',
             input_data_filters dictionary e.g. from prompt import input_data_filters with details about data tags and run quality
             tags found at: https://calibration.belle2.org/belle2/data_tags/list/.
             To exclude specific filters, pre-append with *NOT* e.g.
-            {"all_events": ["mumutight_calib", "hadron_calib", "Good", "On"],
+            {"all_events": ["mumutight_or_highm_calib", "hadron_calib", "Good", "On"],
             "offres_photon_events": ["gamma_gamma_calib", "Good", "NOT On"]}.
             Not selecting a specfic filters (e.g. Magnet) is equivalent to not having any requirements, e.g. (Either)
 
@@ -121,6 +121,20 @@ def __new__(cls, name, expert_username, description,
             raise ValueError("You must specify at least one input data name")
         input_data_names = frozenset(input_data_names)
 
+        # The input data names in the filters MUST correspond to the input data names for the calibration.
+        if input_data_filters:
+            if set(input_data_filters.keys()) != input_data_names:
+                raise ValueError("The 'input_data_filters' keys don't match the 'input_data_names'!")
+            # Requested input data filters MUST exist in the ones we defined in the global dictionary.
+            allowed_filters = {filter_name for category in INPUT_DATA_FILTERS.values() for filter_name in category}
+            requested_filters = {filter_name.replace("NOT", "", 1).lstrip() for filters in input_data_filters.values()
+                                 for filter_name in filters}
+            if not allowed_filters.issuperset(requested_filters):
+                raise ValueError("The 'input_data_filters' contains unknown filter names:"
+                                 f"{requested_filters.difference(allowed_filters)}")
+        else:
+            input_data_filters = {}
+
         if expert_config:
             # Check that it's a dictionary and not some other valid JSON object
             if not isinstance(expert_config, dict):