Import Geant4 11.2.2 source tree

This commit is contained in:
Gabriele Cosmo
2024-06-21 15:46:33 +02:00
parent dda54bbdcf
commit f7b23877ed
411 changed files with 22817 additions and 21317 deletions
+8
View File
@@ -6,6 +6,14 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2024-03-13 Gabriele Cosmo (g4tools-V11-01-07)
- Fixed string assignments in 'window' and 'pixwin', to support either UNICODE
or UTF-16 encoding on Windows. Addressing problem report #2599.
## 2024-02-15 Gabriele Cosmo
- Fixed compilation warnings in ccontour and gl2ps on gcc when LTO settings
are enabled.
## 2023-11-09 Guy Barrand (g4tools-V11-01-06)
- tools/wroot/file: in the constructor, for the streaming of the root directory, take into account the streaming of what would be
the fUUID (a TUUID in ROOT) field of the TDirectory version 4. This permits to fix the "G4AnalysisManager creates ROOT files
+9 -10
View File
@@ -168,8 +168,8 @@ protected:
double m_pLimits[4]; // left, right, bottom, top
int m_iColFir; // primary grid, number of columns
int m_iRowFir; // primary grid, number of rows
int m_iColSec; // secondary grid, number of columns
int m_iRowSec; // secondary grid, number of rows
unsigned int m_iColSec; // secondary grid, number of columns
unsigned int m_iRowSec; // secondary grid, number of rows
void* m_pFieldFcnData; // G.Barrand : handle a user data pointer.
double (*m_pFieldFcn)(double x, double y,void*); // pointer to F(x,y) function
@@ -252,7 +252,7 @@ inline void ccontour::InitMemory()
if (!m_ppFnData)
{
m_ppFnData=new CFnStr*[m_iColSec+1];
for (int i=0;i<m_iColSec+1;i++)
for (unsigned int i=0;i<m_iColSec+1;i++)
{
m_ppFnData[i]=NULL;
}
@@ -263,8 +263,7 @@ inline void ccontour::CleanMemory()
{
if (m_ppFnData)
{
int i;
for (i=0;i<m_iColSec+1;i++)
for (unsigned int i=0;i<m_iColSec+1;i++)
{
if (m_ppFnData[i])
delete[] (m_ppFnData[i]);
@@ -279,8 +278,8 @@ inline void ccontour::generate()
int i, j;
int x3, x4, y3, y4, x, y, oldx3, xlow;
const int cols=m_iColSec+1;
const int rows=m_iRowSec+1;
const unsigned int cols=m_iColSec+1;
const unsigned int rows=m_iRowSec+1;
//double xoff,yoff;
// Initialize memroy if needed
@@ -298,12 +297,12 @@ inline void ccontour::generate()
for (x = oldx3; x <= x4; x++)
{ /* allocate new columns needed
*/
if (x >= cols)
if (x >= (int)cols)
break;
if (m_ppFnData[x]==NULL)
m_ppFnData[x] = new CFnStr[rows];
for (y = 0; y < rows; y++)
for (y = 0; y < (int)rows; y++)
FnctData(x,y)->m_sTopLen = -1;
}
@@ -351,7 +350,7 @@ inline void ccontour::generate()
if (m_ppFnData[x]==NULL)
m_ppFnData[x] = new CFnStr[rows];
for (y = 0; y < rows; y++)
for (y = 0; y < (int)rows; y++)
FnctData(x,y)->m_sTopLen = -1;
}
}
+1 -1
View File
@@ -1638,7 +1638,7 @@ inline tools_GLint tools_gl2psSplitPrimitive(tools_GL2PSprimitive *prim, tools_G
{
tools_GLshort i, j, in = 0, out = 0, in0[5], in1[5], out0[5], out1[5];
tools_GLint type;
tools_GLfloat d[5];
tools_GLfloat d[5] = {0.0};
type = TOOLS_GL2PS_COINCIDENT;
+4 -4
View File
@@ -50,8 +50,8 @@ class pixwin {
wc.hIcon = LoadIcon(NULL,IDI_APPLICATION);
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
wc.lpszMenuName = s_class().c_str();
wc.lpszClassName = s_class().c_str();
wc.lpszMenuName = (PTSTR)s_class().c_str();
wc.lpszClassName = (PTSTR)s_class().c_str();
::RegisterClass(&wc);
s_done = true;
}
@@ -73,7 +73,7 @@ public:
,m_interactor(0)
{
register_class();
m_hwnd = ::CreateWindow(s_class().c_str(),
m_hwnd = ::CreateWindow((PTSTR)s_class().c_str(),
//m_hwnd = ::CreateWindowEx(WS_EX_LAYERED,s_class().c_str(),
NULL,
WS_CHILD | WS_VISIBLE,
@@ -115,7 +115,7 @@ protected:
register_class();
RECT rect;
::GetClientRect(m_parent,&rect);
m_hwnd = ::CreateWindow(s_class().c_str(),
m_hwnd = ::CreateWindow((PTSTR)s_class().c_str(),
NULL,
WS_CHILD | WS_VISIBLE,
0,0,
+4 -4
View File
@@ -28,8 +28,8 @@ class window {
wc.hIcon = LoadIcon(NULL,IDI_APPLICATION);
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
wc.lpszMenuName = s_class().c_str();
wc.lpszClassName = s_class().c_str();
wc.lpszMenuName = (PTSTR)s_class().c_str();
wc.lpszClassName = (PTSTR)s_class().c_str();
::RegisterClass(&wc);
s_done = true;
}
@@ -54,7 +54,7 @@ public:
// WARNING : given a_w,a_h may not be the client area because of various decorations.
// See set_client_area_size() method to enforce a client area size.
register_class();
m_hwnd = ::CreateWindow(s_class().c_str(),
m_hwnd = ::CreateWindow((PTSTR)s_class().c_str(),
NULL,
a_mask,
a_x,a_y,
@@ -63,7 +63,7 @@ public:
::GetModuleHandle(NULL),
NULL);
if(!m_hwnd) return;
::SetWindowText(m_hwnd,a_title);
::SetWindowText(m_hwnd,(PTSTR)a_title);
::SetWindowLongPtr(m_hwnd,GWLP_USERDATA,LONG_PTR(this));
}
virtual ~window(){
+3
View File
@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2024-04-24 Pere Mato (ptl-V11-01-01)
- Changed Windows.h to windows.h since for MinGW always seems to be lower case, not relevant for native builds.
## 2023-10-11 Ben Morgan (ptl-V11-01-00)
- Disable optimization of ThreadPool::execute_thread on Apple/Intel/AppleClang builds
- Workaround for Bugzilla 2564
+1 -1
View File
@@ -27,7 +27,7 @@
#include "PTL/Utility.hh"
#if defined(PTL_WINDOWS)
# include <Windows.h>
# include <windows.h>
#endif
#if defined(PTL_MACOS)