From 5a02cc0c88552baf77e854991dfbbdf330128a21 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Fri, 20 Oct 2023 13:46:37 +0200 Subject: [PATCH] Merge branch 'docFixes' into 'Rel-v34r0' Doc fixes See merge request CLICdp/iLCDirac/ILCDIRAC!480 (cherry picked from commit f32386e36d0b6d3f5d7cb337737c71acac3dabfb) 78f7c891 Docs: update copyright years and authors 55e2a79e Docs: fix release notes tag 020e501e Docs: example ddsim job: use clicconfig working with the software version a9b013e1 docs: fix copy/paste leftover --- docs/Files/UserGuide/ExampleJobs/ddsimGun.py | 2 +- docs/Files/UserGuide/examplejobs.rst | 2 +- docs/source/conf.py | 4 ++-- release.notes | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Files/UserGuide/ExampleJobs/ddsimGun.py b/docs/Files/UserGuide/ExampleJobs/ddsimGun.py index c556de6b9..bf373ef21 100644 --- a/docs/Files/UserGuide/ExampleJobs/ddsimGun.py +++ b/docs/Files/UserGuide/ExampleJobs/ddsimGun.py @@ -12,7 +12,7 @@ job.setName("MuonSim_%n") # %n will be replaced by the task number job.setOutputSandbox("*.log") # output data name is automatically changed to, e.g., ddsimout_5.slcio job.setOutputData("ddsimout.slcio", OutputPath="sim1") -job.setCLICConfig("ILCSoft-2017-07-27") +job.setCLICConfig("ILCSoft-2020-02-07") # creates 10 jobs with 100 events each job.setSplitEvents(eventsPerJob=100, numberOfJobs=10) diff --git a/docs/Files/UserGuide/examplejobs.rst b/docs/Files/UserGuide/examplejobs.rst index 5832c3295..edd8e8b49 100644 --- a/docs/Files/UserGuide/examplejobs.rst +++ b/docs/Files/UserGuide/examplejobs.rst @@ -30,7 +30,7 @@ Further information can be found here: - a list of files across many jobs, see :func:`~ILCDIRAC.Interfaces.API.NewInterface.UserJob.UserJob.setSplitInputData`. - a file across many jobs, see :func:`~ILCDIRAC.Interfaces.API.NewInterface.UserJob.UserJob.setSplitFilesAcrossJobs`. - arbitrary application parameters, see :func:`~ILCDIRAC.Interfaces.API.NewInterface.UserJob.UserJob.setSplitParameter`. -- arbitrary application parameters, see :func:`~ILCDIRAC.Interfaces.API.NewInterface.UserJob.UserJob.setSplitOutputData`. +- controlling output file names, see :func:`~ILCDIRAC.Interfaces.API.NewInterface.UserJob.UserJob.setSplitOutputData`. DDSIM diff --git a/docs/source/conf.py b/docs/source/conf.py index 1ba695126..b6ef085c9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -66,8 +66,8 @@ master_doc = 'index' # General information about the project. project = u'ILCDIRAC' -copyright = u'2010--2019,CERN' -author = u'S.Sposs,R.Ete,C.Grefe,P.Majewski,A.Sailer,M.Petric,J.Ebbing' +copyright = u'2010--2023,CERN' +author = u'S.Sposs,R.Ete,C.Grefe,P.Majewski,A.Sailer,M.Petric,J.Ebbing,L.Valentini' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/release.notes b/release.notes index dc37137f7..1952bbcf8 100644 --- a/release.notes +++ b/release.notes @@ -1,4 +1,4 @@ -[v34.0] +[34.0] Release date: 2023-09-06 *Core -- GitLab