Skip to content

Commit

Permalink
towards 8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dsarrut committed Mar 22, 2018
1 parent 0fe04a8 commit 17a3400
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 37 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ STRING(REGEX REPLACE "(.*)[.](.*)[.](.*)" "\\3" G4VERSION_PATCH ${Geant4_VERSION
#MESSAGE(${G4VERSION_MAJOR})
#MESSAGE(${G4VERSION_MINOR})
#MESSAGE(${G4VERSION_PATCH})
IF(NOT ${G4VERSION_MAJOR}.${G4VERSION_MINOR} EQUAL 10.2 AND NOT ${G4VERSION_MAJOR}.${G4VERSION_MINOR} EQUAL 10.3)
MESSAGE("Warning! GATE version 8.0 is not validated for Geant4 ${G4VERSION_MAJOR}.${G4VERSION_MINOR} distribution. Please use Geant4 10.2 or 10.3 distribution instead.")
IF(NOT ${G4VERSION_MAJOR}.${G4VERSION_MINOR} EQUAL 10.4 AND NOT ${G4VERSION_MAJOR}.${G4VERSION_MINOR} EQUAL 10.4)
MESSAGE("Warning! GATE version 8.1 is not validated for Geant4 ${G4VERSION_MAJOR}.${G4VERSION_MINOR} distribution. Please use Geant4 10.4 or 10.4 distribution instead.")

This comment has been minimized.

Copy link
@djboersma

djboersma Mar 24, 2018

Contributor

You are checking for version 10.4 TWICE. Also the message mentions 10.4 twice. Is this a typo, did you maybe actually mean to check for 10.3 and 10.4?

This comment has been minimized.

Copy link
@dsarrut

dsarrut Mar 27, 2018

Author Contributor

oops sorry ! corrected ...

ENDIF()

#=========================================================
Expand Down
70 changes: 35 additions & 35 deletions Gate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,14 @@ void executeCommandQueue( std::queue< G4String > commandQueue, G4UImanager* UIma
void welcome()
{
GateMessage("Core", 0, G4endl);
GateMessage("Core", 0, "**********************************************************************" << G4endl);
GateMessage("Core", 0, " GATE version name: gate_v8.0 " << G4endl);
GateMessage("Core", 0, " Copyright : OpenGATE Collaboration " << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 49 (2004) 4543-4561 " << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 56 (2011) 881-901 " << G4endl);
GateMessage("Core", 0, " WWW : http://www.opengatecollaboration.org " << G4endl);
GateMessage("Core", 0, "**********************************************************************" << G4endl);
GateMessage("Core", 0, "*************************************************" << G4endl);
GateMessage("Core", 0, " GATE version 8.1 (April 2018)" << G4endl);
GateMessage("Core", 0, " Copyright : OpenGATE Collaboration" << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 49 (2004) 4543-4561" << G4endl);
GateMessage("Core", 0, " Reference : Phys. Med. Biol. 56 (2011) 881-901" << G4endl);
GateMessage("Core", 0, " Reference : Med. Phys. 41(6) (2014)" << G4endl);
GateMessage("Core", 0, " http://www.opengatecollaboration.org " << G4endl);
GateMessage("Core", 0, "*************************************************" << G4endl);
#ifdef GATE_USE_GPU
GateMessage("Core", 0, "GPU support activated" << G4endl );
#endif
Expand Down Expand Up @@ -218,25 +219,25 @@ int main( int argc, char* argv[] )
};

#ifdef __APPLE__
/*
* If the program was started by double-clicking on the application bundle on Mac OS X
* rather than from the command-line, enable Qt and don't try to process other options;
* argv[1] contains a process serial number in the form -psn_0_1234567
* OS X <= 10.8 have a -psn_XXX argument given by the system
* OS X >= 10.9 does not have one, so we use the "TERM" environment variable
* to distinguish between launched by the Terminal or by the system.
*/
/*
* If the program was started by double-clicking on the application bundle on Mac OS X
* rather than from the command-line, enable Qt and don't try to process other options;
* argv[1] contains a process serial number in the form -psn_0_1234567
* OS X <= 10.8 have a -psn_XXX argument given by the system
* OS X >= 10.9 does not have one, so we use the "TERM" environment variable
* to distinguish between launched by the Terminal or by the system.
*/
if ( (argc>1 && strncmp( argv[1], "-psn", 4 ) == 0) || getenv("TERM") == NULL ) {
argc = 1;
isQt = 1;
break;
}
else
#endif
{
// Getting the option
c = getopt_long( argc, argv, "hva:", longOptions, &optionIndex );
}
{
// Getting the option
c = getopt_long( argc, argv, "hva:", longOptions, &optionIndex );
}

// Exit the loop if -1
if( c == -1 ) break;
Expand Down Expand Up @@ -339,15 +340,15 @@ int main( int argc, char* argv[] )
if( isQt )
{
#ifdef G4UI_USE
#ifdef G4UI_USE_QT
#if (QT_VERSION >= QT_VERSION_CHECK(4, 0, 0))
ui = new G4UIExecutive( argc, argv );
G4UIQt* qui = static_cast<G4UIQt*> (UImanager->GetG4UIWindow());
if (qui) {
#ifdef G4UI_USE_QT
#if (QT_VERSION >= QT_VERSION_CHECK(4, 0, 0))
ui = new G4UIExecutive( argc, argv );
G4UIQt* qui = static_cast<G4UIQt*> (UImanager->GetG4UIWindow());
if (qui) {
qui->GetMainWindow()->setVisible(true);
}
#endif
#endif
}
#endif
#endif
#else
#ifdef G4UI_USE_TCSH
session = new GateUIterminal( new G4UItcsh );
Expand Down Expand Up @@ -403,14 +404,14 @@ int main( int argc, char* argv[] )
}

#ifdef G4UI_USE
if (ui) // Launching interactive mode // Qt
{
ui->SessionStart();
delete ui;
}
else
if (ui) // Launching interactive mode // Qt
{
ui->SessionStart();
delete ui;
}
else
#endif
{
{
if (session && !isMacroFile) { // Terminal
session->SessionStart();
delete session;
Expand All @@ -434,7 +435,6 @@ int main( int argc, char* argv[] )
delete myRecords;
#endif
delete verbosity;


delete runManager;

Expand Down
84 changes: 84 additions & 0 deletions ReleaseNotesV8.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# *ooooOOOO0000OOOOoooooo* #
# * * #
# * GATE_v8.1 * #
# * * #
# *ooooOOOO0000OOOOoooooo* #

# *--------------* #
# * 03/19/2018 * #
# *--------------* #


-------------------------------
General set-up and installation:
-------------------------------

Check the README file to have all informations related to the installation and compilation for this version.

----------------------
--I M P O R T A N T --
----------------------

-> In the main macro file configuration, the sources MUST be define AFTER /gate/run/initialize command line <-

-> For collimator design, the Fan Beam option is out of order and should be debug ASAP <-

-----------------------------
New developments and features:
-----------------------------

- DOSE BY REGION
#http://wiki.opengatecollaboration.org/index.php/Users_Guide:Tools_to_Interact_with_the_Simulation_:_Actors#Dose_by_regions

- TETRAHEDRON MESH VOLUME AND DOSE ACTOR ASSOCIATED
#http://wiki.opengatecollaboration.org/index.php/Users_Guide:Defining_a_geometry#How_to_build_a_.22TetMeshBox.22_volume
#http://wiki.opengatecollaboration.org/index.php/Users_Guide:Tools_to_Interact_with_the_Simulation_:_Actors#Tet-Mesh_Dose_Actor

- GENERIC VOLUME REPEATER
#http://wiki.opengatecollaboration.org/index.php/Users_Guide:Defining_a_geometry#Generic_repeater

- X-RAY AT BOUNDARY
#http://wiki.opengatecollaboration.org/index.php/Users_Guide:Setting_up_the_physics#X-ray_at_boundary

- X-RAY PHASE CONTRAST
#For details:
#https://github.com/OpenGATE/GateContrib/tree/master/imaging/CT/Fresnel_FFD


-----------------------------
Major bugs fixes
-----------------------------

- doseToWater code cleaned in GateDoseActor
- Divers corrected bugs: see the "issues" section on the GitHub
- DoseActor NumberOfHits + setOverWriteFilesFlag now corrected
- Licence files updated
- Volume rotation with isocenter (isocenter rotation is now optional via messenger)
- allow GPS energy range with ene/min & ene/max
- PhaseSpace : no branch PDGCode if not needed
- Revisited voxellized source
- PhaseSpace: allow to start with a given particle id
- PhaseSpace: add option to project particle on a sphere
- write head/energy/run info in mhd header of interfile projection
- allow to perform volume rotation *before* repeater rotation (messenger)
- default voxel source scale is 1.0



---------------------
Documentation updates:
---------------------

Generic page: http://www.opengatecollaboration.org/index.php/Main_Page
Dedicated wiki page: http://wiki.opengatecollaboration.org/index.php/Users_Guide_V8.1
Installation guide: http://wiki.opengatecollaboration.org/index.php/Installation_Guide_V8.0


-------------------------
Examples and other stuffs:
-------------------------

All examples are available on the github repository:
https://github.com/OpenGATE/GateContrib


0 comments on commit 17a3400

Please sign in to comment.