MadAnalysis · jackaraz · Oct 29, 2025 · Oct 29, 2025 · Oct 29, 2025 · Oct 29, 2025
diff --git a/bin/ma5 b/bin/ma5
@@ -2,7 +2,7 @@
 
 ################################################################################
 #
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #
 #  This file is part of MadAnalysis 5.
@@ -74,8 +74,8 @@ sys.path.insert(0, servicedir)
 
 # Release version
 # Do not touch it !!!!!
-version = "2.0.9"
-date = "2025/10/29"
+version = "2.1.0"
+date = "2026/04/02"
 
 # Loading the MadAnalysis session
 import madanalysis.core.launcher

diff --git a/madanalysis/IOinterface/delphescard_checker.py b/madanalysis/IOinterface/delphescard_checker.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/folder_writer.py b/madanalysis/IOinterface/folder_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/histo_matplotlib_producer.py b/madanalysis/IOinterface/histo_matplotlib_producer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/histo_root_producer.py b/madanalysis/IOinterface/histo_root_producer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/html_report_writer.py b/madanalysis/IOinterface/html_report_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/html_style_writer.py b/madanalysis/IOinterface/html_style_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/job_reader.py b/madanalysis/IOinterface/job_reader.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.
@@ -244,6 +244,7 @@ def ExtractGeneral(self,dataset):
         endTag         = SafBlockStatus()
         globalTag      = SafBlockStatus()
         detailTag      = SafBlockStatus()
+        weightnamesTag = SafBlockStatus()
 
         # Loop over the lines
         numline=0
@@ -282,13 +283,17 @@ def ExtractGeneral(self,dataset):
                     detailTag.activate()
                 elif words[0].lower()=='</sampledetailedinfo>':
                     detailTag.desactivate()
+                elif words[0].lower()=='<weightnames>':
+                    weightnamesTag.activate()
+                elif words[0].lower()=='</weightnames>':
+                    weightnamesTag.desactivate()
 
             # Looking for summary sample info
-            elif globalTag.activated and len(words)==5:
+            elif globalTag.activated and len(words)==5 and (not weightnamesTag.activated):
                 dataset.measured_global = self.ExtractSampleInfo(words,numline,filename)
 
             # Looking for detail sample info (one line for each file)
-            elif detailTag.activated and len(words)==5:
+            elif detailTag.activated and len(words)==5 and (not weightnamesTag.activated):
                 dataset.measured_detail.append(self.ExtractSampleInfo(words,numline,filename))
 
         # Information found ?
@@ -544,24 +549,28 @@ def ExtractHistos(self,dataset,plot,merging=False):
                 statisticsTag.newline()
 
             # Looking from histogram data [ histo and histoLogX ]
-            elif dataTag.activated and len(words)==2 and (histoTag.activated or histoLogXTag.activated):
-                results = self.ExtractStatisticsFloat(words,numline,filename)
+            # For multiweight histograms, the SAF line contains 2*Nweights columns:
+            #   w1_pos w1_neg w2_pos w2_neg ...
+            # For the standard Python plotting machinery, keep only the nominal pair,
+            # i.e. the first two columns.
+            elif dataTag.activated and len(words)>=2 and (histoTag.activated or histoLogXTag.activated):
+                results = self.ExtractStatisticsFloat(words[:2],numline,filename)
+                nbins = histoinfo.nbins if histoTag.activated else histologxinfo.nbins
                 if dataTag.Nlines==0:
                     if histoTag.activated:
                         histoinfo.positive.underflow=results[0]
                         histoinfo.negative.underflow=results[1]
-                    elif histoLogXTag.activated:
+                    else:
                         histologxinfo.positive.underflow=results[0]
                         histologxinfo.negative.underflow=results[1]
-                elif dataTag.Nlines==(histoinfo.nbins+1):
+                elif dataTag.Nlines==(nbins+1):
                     if histoTag.activated:
                         histoinfo.positive.overflow=results[0]
                         histoinfo.negative.overflow=results[1]
-                    elif histoLogXTag.activated:
+                    else:
                         histologxinfo.positive.overflow=results[0]
                         histologxinfo.negative.overflow=results[1]
-                elif dataTag.Nlines>=1 and dataTag.Nlines<=histoinfo.nbins:
-                    if histoTag.activated or histoLogXTag.activated:
+                elif dataTag.Nlines>=1 and dataTag.Nlines<=nbins:
                         data_positive.append(results[0])
                         data_negative.append(results[1])
                 else:

diff --git a/madanalysis/IOinterface/job_writer.py b/madanalysis/IOinterface/job_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #
 #  This file is part of MadAnalysis 5.
@@ -667,7 +667,7 @@ def CreateMainFct(self, file, analysisName, outputName):
 
             file.write("  if (fastsim1==0) return 1;\n\n")
 
-        # Post intialization (crating the output directory structure)
+        # Post intialization (creating the output directory structure)
         file.write(
             "  // Post initialization (creates the new output directory structure)\n"
         )
@@ -676,15 +676,16 @@ def CreateMainFct(self, file, analysisName, outputName):
             file.write("\n\n  /// Setting the random seed\n")
             file.write(f"  RANDOM->SetSeed({self.main.random_seed});\n\n")
 
-        # Add default hadrons and invisible particles for Reco mode
-        if self.main.mode == MA5RunningType.RECO:
+        # Add default hadrons and invisible particles for RECO and HADRON mode
+        # The invisible container may also be changed when runnign the code in HADRON mode.
+        if self.main.mode in [MA5RunningType.RECO, MA5RunningType.HADRON]:
             file.write("\n  // Initializing PhysicsService for MC\n")
             file.write("  PHYSICS->mcConfig().Reset();\n")
             file.write('  // definition of the multiparticle "hadronic"\n')
             file.write("  manager.AddDefaultHadronic();\n")
             file.write('  // definition of the multiparticle "invisible"\n')
             file.write("  manager.AddDefaultInvisible();\n")
-            # If expert mode is initiated without an SFS card "invisible"
+            # If expert mode is initiated without an SFS card, then the "invisible"
             # collection does not exist. Thus just initiate with default config.
             if self.main.multiparticles.Find("invisible"):
                 for item in self.main.multiparticles.Get("invisible"):
@@ -695,6 +696,17 @@ def CreateMainFct(self, file, analysisName, outputName):
                         file.write(f"  PHYSICS->mcConfig().RemoveInvisibleId({item});\n")
             file.write("\n")
 
+        # Instead, if PARTON mode
+        else:
+            file.write('\n  // definition of the multiparticle "hadronic"\n')
+            for item in self.main.multiparticles.Get("hadronic"):
+                file.write('  PHYSICS->mcConfig().AddHadronicId('+str(item)+');\n')
+            file.write('\n')
+            file.write('  // definition of the multiparticle "invisible"\n')
+            for item in self.main.multiparticles.Get("invisible"):
+                file.write('  PHYSICS->mcConfig().AddInvisibleId('+str(item)+');\n')
+            file.write('\n')
+
         # Loop
         file.write("  // ---------------------------------------------------\n")
         file.write("  //                      EXECUTION\n")
@@ -735,6 +747,7 @@ def CreateMainFct(self, file, analysisName, outputName):
             file.write("      fastsim1->Execute(mySample,myEvent);\n")
         elif self.main.fastsim.package == "delphesMA5tune":
             file.write("      fastsim1->Execute(mySample,myEvent);\n")
+        file.write("      manager.PrepareForExecution(mySample, myEvent);\n")
         file.write("      if (!analyzer1->Execute(mySample,myEvent)) continue;\n")
         if self.output != "" and not self.output.lower().endswith("root"):
             file.write("      writer1->WriteEvent(myEvent,mySample);\n")

diff --git a/madanalysis/IOinterface/latex_report_writer.py b/madanalysis/IOinterface/latex_report_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/layout_writer.py b/madanalysis/IOinterface/layout_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/library_writer.py b/madanalysis/IOinterface/library_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/madgraph_interface.py b/madanalysis/IOinterface/madgraph_interface.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/multiparticle_reader.py b/madanalysis/IOinterface/multiparticle_reader.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/particle_reader.py b/madanalysis/IOinterface/particle_reader.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/png_reader.py b/madanalysis/IOinterface/png_reader.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/saf_block_status.py b/madanalysis/IOinterface/saf_block_status.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/text_file_reader.py b/madanalysis/IOinterface/text_file_reader.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/text_file_writer.py b/madanalysis/IOinterface/text_file_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/text_report.py b/madanalysis/IOinterface/text_report.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/IOinterface/ufo_reader.py b/madanalysis/IOinterface/ufo_reader.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/build/makefile_writer.py b/madanalysis/build/makefile_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/build/setup_writer.py b/madanalysis/build/setup_writer.py
@@ -1,6 +1,6 @@
 ################################################################################
 #
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/beauty_identification.py b/madanalysis/configuration/beauty_identification.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_antikt.py b/madanalysis/configuration/clustering_antikt.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_cambridge.py b/madanalysis/configuration/clustering_cambridge.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_cdfjetclu.py b/madanalysis/configuration/clustering_cdfjetclu.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_cdfmidpoint.py b/madanalysis/configuration/clustering_cdfmidpoint.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_configuration.py b/madanalysis/configuration/clustering_configuration.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_genkt.py b/madanalysis/configuration/clustering_genkt.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_gridjet.py b/madanalysis/configuration/clustering_gridjet.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_kt.py b/madanalysis/configuration/clustering_kt.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.

diff --git a/madanalysis/configuration/clustering_siscone.py b/madanalysis/configuration/clustering_siscone.py
@@ -1,6 +1,6 @@
 ################################################################################
 #  
-#  Copyright (C) 2012-2025 Jack Araz, Eric Conte & Benjamin Fuks
+#  Copyright (C) 2012-2026 Jack Araz, Eric Conte & Benjamin Fuks
 #  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
 #  
 #  This file is part of MadAnalysis 5.