Skip to content

Commit

Permalink
Merge pull request #451 from rest-for-physics/release_v2.4
Browse files Browse the repository at this point in the history
Release v2.4
  • Loading branch information
jgalan authored Jun 16, 2023
2 parents 2e6f7e1 + 075f65d commit 09688f7
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/pr-badge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,5 @@
message: "Ok: $additions"
color: "green"
when: "$additions < 100"
- imageUrl: "https://gitlab.cern.ch/rest-for-physics/framework/badges/$branchName/pipeline.svg"
url: "https://gitlab.cern.ch/rest-for-physics/framework/-/commits/$branchName"
- imageUrl: "https://github.com/rest-for-physics/framework/actions/workflows/validation.yml/badge.svg?branch=$branchName"
url: "https://github.com/rest-for-physics/framework/commits/$branchName"
24 changes: 24 additions & 0 deletions cmake/LibraryVersion.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
function (set_library_version TAG_VARIABLE)
execute_process(
COMMAND git describe --abbrev=0 --tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)

if (NOT GIT_TAG)
message(
WARNING
"Failed to retrieve Git tag for ${CMAKE_CURRENT_SOURCE_DIR}. Probably the '.git' directory is missing. This may happen in remote development environments. To fix this configure the syncing of the '.git' directory."
)
return()
endif ()

string(REGEX REPLACE "^v(.*)" "\\1" LIB_VERSION ${GIT_TAG})

set(${TAG_VARIABLE}
${LIB_VERSION}
PARENT_SCOPE)

message(
STATUS "${CMAKE_CURRENT_SOURCE_DIR} library version: ${LIB_VERSION}")
endfunction ()
2 changes: 2 additions & 0 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
set(rest_macros)
set(rest_macros_str)

include(${CMAKE_SOURCE_DIR}/cmake/LibraryVersion.cmake)

add_subdirectory(framework)
add_subdirectory(../macros tasks.out)

Expand Down
12 changes: 6 additions & 6 deletions source/framework/core/inc/TRestVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
* #endif
*
*/
#define REST_RELEASE "2.3.15"
#define REST_RELEASE_DATE "Fri 30 Dec"
#define REST_RELEASE_TIME "2022 08:49:05 AM CET"
#define REST_RELEASE_NAME "David R. Nygren"
#define REST_GIT_COMMIT "ed155a15"
#define REST_VERSION_CODE 131855
#define REST_RELEASE "2.4.0"
#define REST_RELEASE_DATE "Fri 16 Jun"
#define REST_RELEASE_TIME "2023 03:03:21 PM CEST"
#define REST_RELEASE_NAME "Alexander Friedmann"
#define REST_GIT_COMMIT "9ef81f6e"
#define REST_VERSION_CODE 131856
#define REST_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
#define REST_SCHEMA_EVOLUTION "ON"
#endif
2 changes: 1 addition & 1 deletion source/libraries/axion
Submodule axion updated 73 files
+1 −1 .clang-format
+6 −0 .cmake-format.yaml
+1 −3 .github/pr-badge.yml
+23 −0 .github/workflows/frameworkValidation.yml
+90 −37 .github/workflows/validation.yml
+35 −0 .pre-commit-config.yaml
+52 −40 CMakeLists.txt
+1 −1 README.md
+231 −218 cmake/CompileDir.cmake
+31 −31 cmake/FindGarfield.cmake
+187 −188 cmake/FindROOT.cmake
+126 −114 cmake/MacroRootDict.cmake
+1 −1 data
+1 −1 examples/old/axionGenerator.rml
+2 −2 examples/old/axionSpectrum.xml
+4 −4 examples/old/axionlib.xml
+1 −1 images/Logo_REST_full_doxygen.svg
+0 −1 inc/TRestAxionDetectorResponseProcess.h
+0 −1 inc/TRestAxionDeviationProcess.h
+1 −2 inc/TRestAxionEvent.h
+25 −11 inc/TRestAxionEventProcess.h
+2 −3 inc/TRestAxionFieldPropagationProcess.h
+2 −4 inc/TRestAxionGeneratorProcess.h
+1 −2 inc/TRestAxionLikelihood.h
+1 −0 inc/TRestAxionMCPLOptics.h
+2 −2 inc/TRestAxionMagneticField.h
+1 −0 inc/TRestAxionOptics.h
+2 −2 inc/TRestAxionOpticsMirror.h
+1 −27 inc/TRestAxionOpticsProcess.h
+27 −82 inc/TRestAxionSolarFlux.h
+130 −0 inc/TRestAxionSolarQCDFlux.h
+1 −0 inc/TRestAxionTrueWolterOptics.h
+1 −0 inc/TRestAxionWolterOptics.h
+26 −21 macros/REST_Axion_XMMAngleEffCSV.C
+0 −1 pipeline/README.md
+0 −1 pipeline/clang-format/clang-format.sh
+0 −1 pipeline/clang-format/clangformattest.sh
+27 −34 pipeline/likelihood/babyIAXO.rml
+4 −4 pipeline/metadata/magneticField/boundary/README.md
+46 −44 pipeline/metadata/magneticField/magneticField.py
+0 −1 pipeline/metadata/magneticField/trilinear/GetMagneticField_test_output.txt
+10 −11 pipeline/metadata/magneticField/trilinear/README.md
+88 −71 pipeline/metadata/optics/basic.py
+5 −5 pipeline/metadata/optics/mcpl.py
+51 −51 pipeline/metadata/optics/mirrors.py
+57 −42 pipeline/metadata/solarFlux/compare.py
+88 −56 pipeline/metadata/solarFlux/solarPlot.py
+38 −23 pipeline/metadata/solarFlux/solarTests.py
+89 −68 pipeline/metadata/transmission/windowPlot.py
+3 −1 pipeline/ray-tracing/axion-field/Validate.C
+7 −5 pipeline/ray-tracing/axion-field/validateStreamer.py
+92 −0 pipeline/ray-tracing/full-chain/BabyIAXO_Micromegas_XMM.rml
+66 −0 pipeline/ray-tracing/full-chain/ValidateChain.C
+34 −0 pipeline/ray-tracing/full-chain/bufferGases.rml
+115 −109 pipeline/validateLibrary.py
+1 −1 pipeline/validateMacros.py
+39 −29 scripts/fluxToTables.py
+55 −36 scripts/xlsToBin.py
+2 −1 src/TRestAxionBufferGas.cxx
+5 −1 src/TRestAxionDeviationProcess.cxx
+1 −0 src/TRestAxionEvent.cxx
+26 −7 src/TRestAxionEventProcess.cxx
+2 −0 src/TRestAxionField.cxx
+1 −0 src/TRestAxionFieldPropagationProcess.cxx
+2 −2 src/TRestAxionGeneratorProcess.cxx
+3 −1 src/TRestAxionOptics.cxx
+4 −1 src/TRestAxionOpticsMirror.cxx
+0 −11 src/TRestAxionOpticsProcess.cxx
+39 −662 src/TRestAxionSolarFlux.cxx
+802 −0 src/TRestAxionSolarQCDFlux.cxx
+0 −3 src/TRestAxionTransmissionProcess.cxx
+2 −0 src/TRestAxionTrueWolterOptics.cxx
+2 −0 src/TRestAxionWolterOptics.cxx
2 changes: 1 addition & 1 deletion source/libraries/detector
Submodule detector updated 62 files
+1 −1 .clang-format
+6 −0 .cmake-format.yaml
+2 −4 .github/pr-badge.yml
+23 −0 .github/workflows/frameworkValidation.yml
+92 −12 .github/workflows/validation.yml
+0 −2 .gitlab-ci.yml
+35 −0 .pre-commit-config.yaml
+18 −12 CMakeLists.txt
+ images/smear.png
+2 −1 inc/TRestDetectorDaqChannelSwitchingProcess.h
+0 −2 inc/TRestDetectorElectronDiffusionProcess.h
+0 −2 inc/TRestDetectorGas.h
+4 −2 inc/TRestDetectorHitsAnalysisProcess.h
+9 −3 inc/TRestDetectorHitsEvent.h
+7 −3 inc/TRestDetectorHitsGaussAnalysisProcess.h
+1 −4 inc/TRestDetectorHitsShuffleProcess.h
+42 −29 inc/TRestDetectorHitsSmearingProcess.h
+4 −4 inc/TRestDetectorPositionMappingProcess.h
+3 −6 inc/TRestDetectorReadout.h
+3 −4 inc/TRestDetectorReadoutChannel.h
+8 −10 inc/TRestDetectorReadoutEventViewer.h
+4 −5 inc/TRestDetectorReadoutMapping.h
+44 −84 inc/TRestDetectorReadoutModule.h
+9 −10 inc/TRestDetectorReadoutPixel.h
+73 −65 inc/TRestDetectorReadoutPlane.h
+4 −16 inc/TRestDetectorSignal.h
+2 −5 inc/TRestDetectorSignalEvent.h
+84 −0 inc/TRestDetectorSignalRecoveryProcess.h
+5 −9 inc/TRestDetectorSingleChannelAnalysisProcess.h
+1 −1 macros/REST_Detector_CheckReadout.C
+1 −1 macros/REST_Detector_ViewHitsEvent.C
+0 −1 pipeline/clang-format/clang-format.sh
+0 −1 pipeline/clang-format/clangformattest.sh
+35 −0 pipeline/readout/PrintReadout.C
+57 −0 pipeline/readout/compareFiles.py
+128 −0 pipeline/readout/dummy.dec
+55 −0 pipeline/readout/generateReadout.rml
+23 −0 pipeline/readout/microbulkModule.rml
+2,772 −0 pipeline/readout/validation.txt
+115 −109 pipeline/validateLibrary.py
+4 −4 src/TRestDetectorDaqChannelSwitchingProcess.cxx
+14 −11 src/TRestDetectorElectronDiffusionProcess.cxx
+2 −2 src/TRestDetectorGainMap.cxx
+2 −2 src/TRestDetectorGarfieldDriftProcess.cxx
+1 −1 src/TRestDetectorHitsEvent.cxx
+12 −13 src/TRestDetectorHitsGaussAnalysisProcess.cxx
+88 −80 src/TRestDetectorHitsSmearingProcess.cxx
+1 −1 src/TRestDetectorHitsToSignalProcess.cxx
+83 −92 src/TRestDetectorReadout.cxx
+2 −1 src/TRestDetectorReadoutChannel.cxx
+2 −2 src/TRestDetectorReadoutEventViewer.cxx
+81 −82 src/TRestDetectorReadoutModule.cxx
+15 −14 src/TRestDetectorReadoutPixel.cxx
+172 −82 src/TRestDetectorReadoutPlane.cxx
+51 −25 src/TRestDetectorSignal.cxx
+6 −3 src/TRestDetectorSignalChannelActivityProcess.cxx
+13 −42 src/TRestDetectorSignalEvent.cxx
+321 −0 src/TRestDetectorSignalRecoveryProcess.cxx
+3 −5 src/TRestDetectorSignalToHitsProcess.cxx
+2 −2 src/TRestDetectorSignalViewerProcess.cxx
+2 −2 src/TRestDetectorSingleChannelAnalysisProcess.cxx
+96 −0 test/src/TRestDetectorReadout.cxx
2 changes: 1 addition & 1 deletion source/libraries/raw
Submodule raw updated 38 files
+6 −0 .cmake-format.yaml
+1 −1 .github/pr-badge.yml
+24 −0 .github/workflows/frameworkValidation.yml
+44 −22 .github/workflows/validation.yml
+35 −0 .pre-commit-config.yaml
+14 −10 CMakeLists.txt
+24 −33 examples/tdsAQS.rml
+2 −1 inc/TRestRawBaseLineCorrectionProcess.h
+1 −1 inc/TRestRawFEUDreamToSignalProcess.h
+15 −10 inc/TRestRawSignalAddNoiseProcess.h
+8 −3 inc/TRestRawSignalAnalysisProcess.h
+1 −55 inc/TRestRawSignalChannelActivityProcess.h
+0 −88 inc/TRestRawSignalRecoverChannelsProcess.h
+5 −0 inc/TRestRawToSignalProcess.h
+2 −2 inc/TRestRawUSTCToSignalProcess.h
+0 −1 pipeline/clang-format/clang-format.sh
+0 −1 pipeline/clang-format/clangformattest.sh
+7 −7 pipeline/processes/analysis/globals.xml
+10 −10 pipeline/processes/analysis/veto.rml
+6 −6 pipeline/processes/noise/addNoise.py
+8 −8 pipeline/processes/shaping/shaping.C
+47 −65 pipeline/processes/veto/veto.rml
+11 −11 pipeline/processes/veto/vetoValidation.py
+115 −109 pipeline/validateLibrary.py
+8 −4 src/TRestRawBaseLineCorrectionProcess.cxx
+4 −0 src/TRestRawMemoryBufferToSignalProcess.cxx
+1 −0 src/TRestRawMultiFEMINOSToSignalProcess.cxx
+63 −29 src/TRestRawSignalAddNoiseProcess.cxx
+7 −1 src/TRestRawSignalAnalysisProcess.cxx
+1 −82 src/TRestRawSignalChannelActivityProcess.cxx
+3 −3 src/TRestRawSignalConvolutionFittingProcess.cxx
+4 −4 src/TRestRawSignalFittingProcess.cxx
+3 −2 src/TRestRawSignalGeneralFitProcess.cxx
+0 −249 src/TRestRawSignalRecoverChannelsProcess.cxx
+2 −1 src/TRestRawSignalRemoveChannelsProcess.cxx
+1 −1 src/TRestRawSignalShapingProcess.cxx
+3 −3 src/TRestRawSignalViewerProcess.cxx
+1 −1 src/TRestRawTDSToSignalProcess.cxx
2 changes: 1 addition & 1 deletion source/packages/restG4
Submodule restG4 updated 66 files
+10 −0 .clang-format
+6 −0 .cmake-format.yaml
+0 −2 .github/pr-badge.yml
+24 −0 .github/workflows/frameworkValidation.yml
+100 −145 .github/workflows/validation.yml
+35 −0 .pre-commit-config.yaml
+43 −28 CMakeLists.txt
+1 −1 examples/01.NLDBD/NLDBD.rml
+1 −1 examples/01.NLDBD/geometry/myGeometryTemplate.gdml
+1 −1 examples/01.NLDBD/geometry/mySetupTemplate.gdml
+2 −3 examples/02.TREXDM/g4Analysis.rml
+2 −2 examples/02.TREXDM/geometry/README.md
+1 −1 examples/03.Fluorescence/electron.rml
+2 −3 examples/03.Fluorescence/g4Analysis.rml
+1 −1 examples/03.Fluorescence/gamma.rml
+1 −1 examples/03.Fluorescence/geometry/setup.gdml
+3 −4 examples/05.PandaXIII/README.md
+0 −1 examples/05.PandaXIII/geometry/AcrylicPart.gdml
+1 −1 examples/05.PandaXIII/geometry/CopperRings.gdml
+0 −1 examples/05.PandaXIII/geometry/LeadShelding.gdml
+0 −1 examples/05.PandaXIII/geometry/OtherXeTMAGas.gdml
+1 −1 examples/05.PandaXIII/geometry/Resistance.gdml
+2 −2 examples/05.PandaXIII/geometry/Th232_SS_01.rml
+0 −1 examples/05.PandaXIII/geometry/XeTMAGas_new.gdml
+0 −1 examples/06.IonRecoils/README.md
+1 −1 examples/06.IonRecoils/geometry/setup.gdml
+1 −1 examples/06.IonRecoils/recoils.rml
+0 −1 examples/07.FullChainDecay/README.md
+1 −1 examples/07.FullChainDecay/fullChain.rml
+1 −1 examples/07.FullChainDecay/geometry/setup.gdml
+1 −1 examples/07.FullChainDecay/singleDecay.rml
+1 −1 examples/08.Alphas/alphas.rml
+2 −3 examples/08.Alphas/analysis.rml
+1 −1 examples/09.Pb210_Shield/Pb210.rml
+0 −1 examples/09.Pb210_Shield/README.md
+1 −1 examples/09.Pb210_Shield/geometry/setup.gdml
+1 −1 examples/10.Geometries/Assembly.rml
+1 −1 examples/10.Geometries/Validate.C
+1 −1 examples/10.Geometries/geometry/assemblyDepthOne/geometry.gdml
+1 −1 examples/10.Geometries/geometry/noAssembly/geometry.gdml
+1 −1 examples/11.Xrays/Fe55.rml
+2 −3 examples/11.Xrays/analysis.rml
+1 −3 examples/11.Xrays/geometry/setup.gdml
+2 −2 examples/11.Xrays/xrays.rml
+1 −1 examples/12.Generators/geometry/setup.gdml
+1 −2 examples/14.DetectorResponse/README.md
+2 −2 examples/14.DetectorResponse/analysis.rml
+1 −1 examples/14.DetectorResponse/geometry.gdml
+1 −1 examples/v2.1.7/pandaXIII/biasing/externalTh232.rml
+3 −3 examples/v2.1.7/pandaXIII/biasing/externalU238.rml
+4 −5 examples/v2.1.7/pandaXIII/generateExamples.sh
+4 −4 examples/v2.1.7/pandaXIII/geometry/resistive/pandaXIII_Geometry.gdml
+0 −1 examples/v2.1.7/pandaXIII/geometry/resistive/pandaXIII_Setup.gdml
+5 −5 examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Geometry.gdml
+25 −26 examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT12m.gdml
+25 −26 examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT6m.gdml
+2 −2 examples/v2.1.7/pandaXIII/templates/biasedIsotopeFromVirtualBox.rml
+2 −2 examples/v2.1.7/pandaXIII/templates/decay0FromVolume.rml
+2 −2 examples/v2.1.7/pandaXIII/templates/isotopeFromPoint.rml
+1 −1 examples/v2.1.7/pandaXIII/templates/isotopeFromVCylinder.rml
+2 −2 examples/v2.1.7/pandaXIII/templates/isotopeFromVolume.rml
+41 −40 examples/v2.1.7/replaceRMLVars.py
+0 −1 mac/visualtrack.mac
+1 −1 src/ActionInitialization.cxx
+30 −17 src/DetectorConstruction.cxx
+12 −0 src/PhysicsList.cxx

0 comments on commit 09688f7

Please sign in to comment.