diff --git a/bin/ma5 b/bin/ma5 index e26000896..3e50a5d5a 100755 --- a/bin/ma5 +++ b/bin/ma5 @@ -74,8 +74,8 @@ sys.path.insert(0, servicedir) # Release version # Do not touch it !!!!! -version = "1.11.2" -date = "2026/09/25" +version = "1.11.3" +date = "2026/10/12" # Loading the MadAnalysis session import madanalysis.core.launcher diff --git a/doc/releases/changelog-v1.11.md b/doc/releases/changelog-v1.11.md index 412343acd..35afb967b 100644 --- a/doc/releases/changelog-v1.11.md +++ b/doc/releases/changelog-v1.11.md @@ -8,11 +8,13 @@ * Statistical inference has been moved to Spey * The validation module has been rebranded (for now) +* Moving the file incuding the link to all PAD analyses to github (see [PR321](https://github.com/MadAnalysis/madanalysis5/pull/321)) ## Bug fixes * Bug fix in the HistFrequency module of SampleAnalyzer (The first time an entry was found, it was not added to the histo) * Fixing the PAD installation due to change in the metadata management of the dataverse (see [PR319](https://github.com/MadAnalysis/madanalysis5/pull/319)) +* Region removal was missing from the CLI (see [PR321](https://github.com/MadAnalysis/madanalysis5/pull/321)) ## Contributors diff --git a/madanalysis/install/install_pad.py b/madanalysis/install/install_pad.py index 8808d129b..71905c340 100644 --- a/madanalysis/install/install_pad.py +++ b/madanalysis/install/install_pad.py @@ -42,7 +42,7 @@ def __init__(self,main, padname): self.untardir = "" self.ncores = 1 self.files= { - "pad.dat" : "http://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/pad3.dat", + "pad.dat" : "https://raw.githubusercontent.com/MadAnalysis/PAD_files/main/pad_main.dat", "bib_pad.dat": "http://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/bib_pad3.dat", "json_pad.dat":"http://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/json_pad3.dat" } diff --git a/madanalysis/interpreter/cmd_remove.py b/madanalysis/interpreter/cmd_remove.py index d9c38d0bf..808b66a5e 100644 --- a/madanalysis/interpreter/cmd_remove.py +++ b/madanalysis/interpreter/cmd_remove.py @@ -53,6 +53,21 @@ def remove_input(self,name): logging.getLogger('MA5').error(" - "+self.main.selection[item].GetStringDisplay()) logging.getLogger('MA5').error("Please remove these plots/cuts before removing the Particle/Multiparticle "+ name +".") return + + # Region removal + if self.main.regions.Find(name): + for index in range(len(self.main.selection) - 1, -1, -1): + item = self.main.selection[index] + if name not in item.regions: + continue + item.regions = [ + region for region in item.regions if region != name + ] + if not item.regions: + self.main.selection.Remove(index + 1) + self.main.regions.Remove(name) + return + # No object found logging.getLogger('MA5').error("No object called '"+name+"' found.") diff --git a/madanalysis/interpreter/cmd_submit.py b/madanalysis/interpreter/cmd_submit.py index 41b5b64af..8237cb505 100644 --- a/madanalysis/interpreter/cmd_submit.py +++ b/madanalysis/interpreter/cmd_submit.py @@ -101,7 +101,7 @@ def do_resubmit(self,args,history): ReAnalyzeCmdList = ['plot','select','reject','set main.clustering', 'set main.merging', 'define', 'set main.recast', - 'import', 'set main.isolation'] + 'import', 'set main.isolation', 'remove', 'swap'] # Determining if we have to resubmit the job for cmd in newhistory: diff --git a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp index 426698eba..e5eb50f48 100644 --- a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp +++ b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp @@ -37,8 +37,8 @@ using namespace MA5; // Initializing static data members // ----------------------------------------------------------------------------- // DO NOT TOUCH THESE LINES -const std::string Configuration::sampleanalyzer_version_ = "1.11.2"; -const std::string Configuration::sampleanalyzer_date_ = "2026/09/25"; +const std::string Configuration::sampleanalyzer_version_ = "1.11.3"; +const std::string Configuration::sampleanalyzer_date_ = "2026/10/12"; // DO NOT TOUCH THESE LINES // -----------------------------------------------------------------------------