From cecde21e56a0944349918e1c854becfb0fc664c8 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Mon, 14 Sep 2009 17:09:17 +0000
Subject: [PATCH] * Add a header file in TGaspardTrackerPhysics.cxx
* Change ushort for unsigned short in *.cc files
---
NPLib/GASPARD/TGaspardTrackerPhysics.cxx | 1 +
NPSimulation/src/DetectorConstruction.cc | 2 +-
NPSimulation/src/Plastic.cc | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
index 69340326c..921d30947 100644
--- a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
+++ b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
@@ -23,6 +23,7 @@
#include "TGaspardTrackerPhysics.h"
#include <iostream>
+#include <cstdlib>
ClassImp(TGaspardTrackerPhysics)
diff --git a/NPSimulation/src/DetectorConstruction.cc b/NPSimulation/src/DetectorConstruction.cc
index a09b3a79a..40f19eadb 100644
--- a/NPSimulation/src/DetectorConstruction.cc
+++ b/NPSimulation/src/DetectorConstruction.cc
@@ -288,7 +288,7 @@ void DetectorConstruction::ReadAllSensitive(const G4Event* event)
if(m_Detectors.size()>0)
m_Detectors[0]->GetInterCoordPointer()->Clear();
- for (ushort i = 0 ; i < m_Detectors.size() ; i++) {
+ for (unsigned short i = 0 ; i < m_Detectors.size() ; i++) {
m_Detectors[i]->ReadSensitive(event);
}
}
diff --git a/NPSimulation/src/Plastic.cc b/NPSimulation/src/Plastic.cc
index 1f95f4954..eaca6cdf4 100644
--- a/NPSimulation/src/Plastic.cc
+++ b/NPSimulation/src/Plastic.cc
@@ -241,7 +241,7 @@ void Plastic::ConstructDetector(G4LogicalVolume* world)
{
G4ThreeVector Det_pos = G4ThreeVector(0, 0, 0) ;
- for (ushort i = 0 ; i < m_R.size() ; i++)
+ for (unsigned short i = 0 ; i < m_R.size() ; i++)
{
G4double wX = m_R[i] * sin(m_Theta[i] ) * cos(m_Phi[i] ) ;
G4double wY = m_R[i] * sin(m_Theta[i] ) * sin(m_Phi[i] ) ;
--
GitLab