diff --git a/.gitignore b/.gitignore index 937ea061..ee0f53dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + .github_meta.log */*.pyc */*/*.pyc */*/*/*.pyc @@ -12,3 +13,5 @@ tools/SampleAnalyzer/Test/Makefile_* */*/*.log doc/??????_mode.log doc/??????_mode.pdf +.DS_Store +ANALYSIS_* diff --git a/bin/ma5 b/bin/ma5 index af7c02b6..c3abe289 100755 --- a/bin/ma5 +++ b/bin/ma5 @@ -68,8 +68,8 @@ sys.path.insert(0, servicedir) # Release version # Do not touch it !!!!! -version = "1.10.8" -date = "2023/02/02" +version = "1.10.9" +date = "2023/02/07" # Loading the MadAnalysis session import madanalysis.core.launcher diff --git a/doc/releases/changelog-v1.10.md b/doc/releases/changelog-v1.10.md index bbf85094..5e11b6eb 100644 --- a/doc/releases/changelog-v1.10.md +++ b/doc/releases/changelog-v1.10.md @@ -119,6 +119,10 @@ * Fixed an attribute misspelling in `ObservableBase`. ([#171](https://github.com/MadAnalysis/madanalysis5/pull/171)) + * Update of the version of Delphes/DelphesMa5tune + compatibility with M1 chips and Mac OS 13.0. + ([#173](https://github.com/orgs/MadAnalysis/discussions/173)) + + ## Contributors This release contains contributions from (in alphabetical order): diff --git a/madanalysis/install/install_delphes.py b/madanalysis/install/install_delphes.py index e82bbf7c..a4329f86 100644 --- a/madanalysis/install/install_delphes.py +++ b/madanalysis/install/install_delphes.py @@ -50,11 +50,9 @@ def __init__(self,main,package): self.untardir = os.path.join(self.tmpdir, 'MA5_'+self.package) self.ncores = 1 if package == 'delphesma5tune': - self.files = {package+".tar.gz" : "https://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/delphes-3.5.0.tar.gz"} + self.files = {package+".tar.gz" : "https://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/delphes3.5.0.tar.gz"} else: -# self.files = {package+".tar.gz" : "https://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/WikiStart/delphes342pre.tar.gz"} # Delphes for LLP not release yet -# self.files = {package+".tar.gz" : "http://cp3.irmp.ucl.ac.be/downloads/Delphes-3.4.2.tar.gz"} - self.files = {package+".tar.gz" : "https://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/delphes3.4.3.tar.gz"} + self.files = {package+".tar.gz" : "https://madanalysis.irmp.ucl.ac.be/raw-attachment/wiki/MA5SandBox/delphes3.5.0.tar.gz"} self.logger = logging.getLogger('MA5') @@ -119,7 +117,7 @@ def Unpack(self): if self.package == 'delphesMA5tune': # Copying the patch self.logger.debug('Copying the patch ...') - input=self.toolsdir+'/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune.tgz' + input=self.toolsdir+'/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune_v35.tgz' output=packagedir+'/patch_delphesMA5tune.tgz' try: shutil.copy(input,output) diff --git a/madanalysis/system/checkup.py b/madanalysis/system/checkup.py index 71f675f0..9b797251 100644 --- a/madanalysis/system/checkup.py +++ b/madanalysis/system/checkup.py @@ -532,6 +532,13 @@ def SetFolder(self): self.logger.debug('after DYLD_LIBRARY_PATH='+str(os.environ['DYLD_LIBRARY_PATH'])) self.logger.debug('--------') + # ROOT INCLUDE PATH + if self.archi_info.has_delphes: + os.environ['ROOT_INCLUDE_PATH']=os.path.join(self.archi_info.ma5dir,'tools','delphes','external'); + if self.archi_info.has_delphesMA5tune: + os.environ['ROOT_INCLUDE_PATH']=os.path.join(self.archi_info.ma5dir,'tools','delphesMA5tune','external'); + + self.logger.debug('-------- END: set environment variables --------') return True diff --git a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp index d084695e..49bcfd71 100644 --- a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp +++ b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp @@ -40,8 +40,8 @@ using namespace MA5; // Initializing static data members // ----------------------------------------------------------------------------- // DO NOT TOUCH THESE LINES -const std::string Configuration::sampleanalyzer_version_ = "1.10.8"; -const std::string Configuration::sampleanalyzer_date_ = "2023/02/02"; +const std::string Configuration::sampleanalyzer_version_ = "1.10.9"; +const std::string Configuration::sampleanalyzer_date_ = "2023/02/07"; // DO NOT TOUCH THESE LINES // ----------------------------------------------------------------------------- diff --git a/tools/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune.tgz b/tools/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune.tgz deleted file mode 100644 index 94e2c138..00000000 Binary files a/tools/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune.tgz and /dev/null differ diff --git a/tools/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune_v35.tgz b/tools/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune_v35.tgz new file mode 100644 index 00000000..153698d6 Binary files /dev/null and b/tools/SampleAnalyzer/Interfaces/delphesMA5tune/patch_delphesMA5tune_v35.tgz differ