Skip to content

Commit

Permalink
Merge pull request #675 from kochebina/cosmetics9.4
Browse files Browse the repository at this point in the history
cosmetics for 9.4
  • Loading branch information
tbaudier authored Apr 4, 2024
2 parents 9865844 + a208fcb commit 86e2ac3
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 235 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ jobs:
t29_optical_digi,
t30_dna,
t31_vpgTLE-tt,
t32_isotopes,
t33_invert_filter,
t34_biodose_actor]

Expand Down
10 changes: 3 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ ELSE()
ENDIF()
set(CMAKE_CXX_STANDARD ${Geant4_CXX_STANDARD})

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

#=========================================================
# Refuse to build with MT geant4, allow dev override
IF(Geant4_multithreaded_FOUND)
Expand Down Expand Up @@ -315,15 +312,14 @@ MESSAGE("Your current Geant4 version is ${Geant4_VERSION}")

#=========================================================
# Display message about this version
MESSAGE("IMPORTANT! This version of GATE (9.3) is version of passage for new digitizer.")
MESSAGE("IMPORTANT! This version of GATE (9.4) has still some traces of passage for new digitizer.")
MESSAGE("Please, be aware that some of functionalities are NOT YET re-implemented: ")
MESSAGE("- Coincidence digitizer modules (combining of several Coincidence Sorters)")
MESSAGE("- Compton Camera digitizer modules and output")
MESSAGE("- Output: Sinogram, Ecat7, LMF")
MESSAGE("- ARF may work not properly yet")
MESSAGE("We apologize for this inconvenience and kindly ask for your patience.")
MESSAGE("This functionalities will be added during 2023.")
MESSAGE("Meanwhile, please, use Gate 9.2")
MESSAGE("This functionalities will be added during 2024.")
MESSAGE("Meanwhile, please, use Gate 9.3")



Expand Down
3 changes: 2 additions & 1 deletion Gate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,13 @@ void welcome()
{
GateMessage("Core", 0, G4endl);
GateMessage("Core", 0, "*******************************************************" << G4endl);
GateMessage("Core", 0, " GATE version 9.3 (2023)" << G4endl);
GateMessage("Core", 0, " GATE version 9.4 (2024)" << G4endl);
GateMessage("Core", 0, " Copyright : OpenGATE Collaboration" << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 49(19) 4543-4561 2004 " << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 56(4) 881-901 2011 " << G4endl);
GateMessage("Core", 0, " Reference : Med. Phys. 41(6) 1-14 2014" << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 66(10) 1-23 2021" << G4endl);
GateMessage("Core", 0, " Reference : Frontiers in Physics, 12 2024" << G4endl);
GateMessage("Core", 0, " http://www.opengatecollaboration.org " << G4endl);
GateMessage("Core", 0, "*******************************************************" << G4endl);
#ifdef GATE_USE_GPU
Expand Down
204 changes: 0 additions & 204 deletions GateHitConvertor.cc

This file was deleted.

30 changes: 15 additions & 15 deletions docs/compilation_instructions.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _compilation_instructions-label:

Compiling GATE V9.2
Compiling GATE V9.4
=====================


Expand Down Expand Up @@ -35,9 +35,9 @@ Direct dependencies of GATE
---------------------------


For compiling GATE V9.2, the required dependencies are
For compiling GATE V9.4, the required dependencies are

* Geant4 11 (available in http://geant4.web.cern.ch/geant4/support/download.shtml), but remains backward compatible with 10.7 also.
* Geant4 11.2.1 (available in http://geant4.web.cern.ch/geant4/support/download.shtml).
* ROOT (ROOT 6.xx) # still required, but it may become optional in the future

Geant4 needs to be compiled. ROOT is avalaible as binary on some platform (or has to be compiled)
Expand Down Expand Up @@ -133,19 +133,19 @@ In some configuration, the following path should also be set ::

We recommend you to use libtorch version 1.10.1 but other version may works. You can download libtorch from (pytorch)[https://pytorch.org/get-started/locally], select "LibTorch" in the matrix.

GATE V9.2
GATE V9.4
---------

First, download the GATE sources at this address: https://github.com/OpenGATE/Gate/archive/v9.2.zip
First, download the GATE sources at this address: https://github.com/OpenGATE/Gate/archive/v9.4.zip
Unzip the downloaded file::

unzip Gate-9.2.zip
unzip Gate-9.4.zip

Alternatively, if you are familiar with git, then instead of downloading and extracting the tar file, you can also clone the sources from github and check out the *v9.2* release tag.
Alternatively, if you are familiar with git, then instead of downloading and extracting the tar file, you can also clone the sources from github and check out the *v9.4* release tag.

git clone https://github.com/OpenGATE/Gate.git Gate
cd Gate
git checkout v9.2
git checkout v9.4

Create two directories to build and install GATE::

Expand All @@ -158,7 +158,7 @@ Move into the GATE build directory::

Run ccmake as follows::

ccmake ../Gate-9.2
ccmake ../Gate-9.4

You need to change the *CMAKE_INSTALL_PREFIX*, it should be set to the install directory (defined above). The default given by CMake is */usr/local*; if you have root/sudo permissions on your machine then it's possible to install Gate there, but it's not recommended, especially if you need to work with more than one version of Gate (for instance, if you want to do development on Gate, or if you want to verify that a new release is compatible with the old release that you have been using).
You should get something like this (the screen shot is taken from the 8.0 release, the only difference is the version number):
Expand Down Expand Up @@ -221,7 +221,7 @@ This file should be defined as follows:
setenv PATH ${PATH}:/PATH_TO/2.3.4.3/CLHEP/bin
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/PATH_TO/2.3.4.3/CLHEP/lib

Save this file in */PATH_TO/gate_v9.2-install/bin*. Finally, before to start a GATE session::
Save this file in */PATH_TO/gate_v9.4-install/bin*. Finally, before to start a GATE session::

source /PATH_TO/gate-install/bin/gate_env.sh

Expand Down Expand Up @@ -361,9 +361,9 @@ Installation of cluster tools
jobsplitter
~~~~~~~~~~~

Go to /PATH_TO/gate_v9.2/cluster_tools/jobsplitter::
Go to /PATH_TO/gate_v9.4/cluster_tools/jobsplitter::

cd /PATH_TO/gate_v9.2/cluster_tools/jobsplitter
cd /PATH_TO/gate_v9.4/cluster_tools/jobsplitter

Make sure ROOT and Geant4 environment variables are set::

Expand All @@ -376,12 +376,12 @@ Compile::

Copy the gjs executable file to the correct place::

cp /PATH_TO/gate_v9.2/cluster_tools/jobsplitter/gjs /PATH_TO/gate_v9.1-install/bin
cp /PATH_TO/gate_v9.4/cluster_tools/jobsplitter/gjs /PATH_TO/gate_v9.4-install/bin

filemerger
~~~~~~~~~~~

Go to /PATH_TO/gate_v9.2/cluster_tools/filemerger
Go to /PATH_TO/gate_v9.4/cluster_tools/filemerger
Make sure ROOT and Geant4 environment variables are set::

source /PATH_TO/root_v6.XX/bin/thisroot.sh
Expand All @@ -393,6 +393,6 @@ Compile::

Copy the gjs executable file to the correct place::

cp /PATH_TO/gate_v9.2/cluster_tools/filemerger/gjm /PATH_TO/gate_v9.1-install/bin
cp /PATH_TO/gate_v9.4/cluster_tools/filemerger/gjm /PATH_TO/gate_v9.4-install/bin


7 changes: 1 addition & 6 deletions docs/installation.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _installation_guide-label:

Installation Guide V9.2
Installation Guide V9.4
=======================

.. contents:: Table of Contents
Expand Down Expand Up @@ -42,11 +42,6 @@ With Docker
See :ref:`docker_gate-label`


With Singularity
~~~~~~~~~~~~~~~~

To be written

Via virtual machine
~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ More details : http://www.opengatecollaboration.org

Documentation : https://opengate.readthedocs.io

* The stable version is tag 9.3: https://github.com/OpenGATE/Gate/tree/v9.3 with Geant4 11.1
* The stable version is tag 9.4: https://github.com/OpenGATE/Gate/tree/v9.4 with Geant4 11.2.1
* The current development version is branch 'develop' (default): http://github.com/OpenGATE/Gate/tree/develop
* [Benchmarks](https://github.com/OpenGATE/GateBenchmarks)
* [Examples](https://github.com/OpenGATE/GateContrib)
Expand Down
Loading

0 comments on commit 86e2ac3

Please sign in to comment.