From 01a62e80aae23e830797747e4da99326d1fa5fc9 Mon Sep 17 00:00:00 2001 From: hristov Date: Sat, 13 Dec 2003 17:00:47 +0000 Subject: [PATCH] Removing warnings (Sun) --- STRUCT/AliALIFE.cxx | 25 ++++++++++++++++--------- STRUCT/AliALIFE.h | 26 +++++++++++++++++++------- STRUCT/AliFRAMEv2.cxx | 2 +- STRUCT/AliSHILv2.cxx | 18 +++++++++--------- STRUCT/AliSHILvF.cxx | 18 +++++++++--------- 5 files changed, 54 insertions(+), 35 deletions(-) diff --git a/STRUCT/AliALIFE.cxx b/STRUCT/AliALIFE.cxx index f33b237b2c1..971f70d88ca 100644 --- a/STRUCT/AliALIFE.cxx +++ b/STRUCT/AliALIFE.cxx @@ -78,7 +78,9 @@ void AliALIFE::VolumeHeader() void AliALIFE:: Cylinder(Float_t rmin, Float_t rmax, Float_t zmin, Float_t zmax, Float_t pos[3], - char* Material, char* Field, char* Cuts) + const char* Material, + const char* Field, + const char* Cuts) { // Simple cylinder // @@ -114,8 +116,8 @@ void AliALIFE:: Cylinder(Float_t rmin, Float_t rmax, } void AliALIFE::OnionCylinder(Float_t* r, Int_t nr, Float_t zmin, Float_t zmax, - Float_t pos[3], char** Materials, - char** Fields, char** Cuts) + Float_t pos[3], const char** Materials, + const char** Fields, const char** Cuts) { // // Concentric cylinders @@ -174,7 +176,9 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2, Float_t rmax1, Float_t rmax2, Float_t zmin, Float_t zmax, Float_t pos[3], - char* Material, char* Field, char* Cuts) + const char* Material, + const char* Field, + const char* Cuts) { // Simple cone @@ -265,8 +269,8 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2, void AliALIFE::OnionCone (Float_t* r1, Float_t* r2, Int_t nr, Float_t zmin, Float_t zmax, - Float_t pos[3], char** Materials, char** Fields, - char** Cuts) + Float_t pos[3], const char** Materials, + const char** Fields, const char** Cuts) { // Concentric cones // @@ -381,7 +385,9 @@ void AliALIFE::OnionCone (Float_t* r1, Float_t* r2, Int_t nr, void AliALIFE::PolyCone(Float_t* rmin, Float_t* rmax, Float_t* z, Int_t nz, Float_t pos[3], - char* Material, char* Field, char* Cuts) + const char* Material, + const char* Field, + const char* Cuts) { // // Equivalent to the Geant3 PCON @@ -397,7 +403,8 @@ void AliALIFE::PolyCone(Float_t* rmin, Float_t* rmax, Float_t* z, void AliALIFE::OnionPolyCone(Float_t** r, Float_t* z, Int_t nr, Int_t nz, Float_t pos[3], - char** Materials, char** Fields, char** Cuts) + const char** Materials, + const char** Fields,const char** Cuts) { // // Concentric PCONS @@ -419,7 +426,7 @@ void AliALIFE::OnionPolyCone(Float_t** r, Float_t* z, } } -void AliALIFE::Comment(char* Comment) +void AliALIFE::Comment(const char* Comment) { // Insert comment line fprintf(fFile1,"*%s\n", Comment); diff --git a/STRUCT/AliALIFE.h b/STRUCT/AliALIFE.h index aabeb5a8cc7..1289cce158b 100644 --- a/STRUCT/AliALIFE.h +++ b/STRUCT/AliALIFE.h @@ -19,31 +19,43 @@ class AliALIFE : public TObject { void Cylinder(Float_t rmin, Float_t rmax, Float_t zmin, Float_t zmax, Float_t pos[3], - char* Material, char* Field="MF", char* Cuts="$UNSHIELDED"); + const char* Material, + const char* Field="MF", + const char* Cuts="$UNSHIELDED"); void OnionCylinder(Float_t* r, Int_t nr, Float_t zmin, Float_t zmax, Float_t pos[3], - char** Materials, char** Fields=0, char** Cuts=0); + const char** Materials, + const char** Fields=0, + const char** Cuts=0); void Cone(Float_t rmin1, Float_t rmin2, Float_t rmax1, Float_t rmax2, Float_t zmin, Float_t zmax, Float_t pos[3], - char* Material, char* Field="MF", char* Cuts="$UNSHIELDED"); + const char* Material, + const char* Field="MF", + const char* Cuts="$UNSHIELDED"); void OnionCone(Float_t* r1, Float_t* r2, Int_t nr, Float_t zmin, Float_t zmax, Float_t pos[3], - char** Materials, char** Fields=0, char** Cuts=0); + const char** Materials, + const char** Fields=0, + const char** Cuts=0); void PolyCone(Float_t* rmin, Float_t* rmax, Float_t* z, Int_t nz, Float_t pos[3], - char* Material, char* Field="MF", char* Cuts="$UNSHIELDED"); + const char* Material, + const char* Field="MF", + const char* Cuts="$UNSHIELDED"); void OnionPolyCone(Float_t** r , Float_t* z, Int_t nr, Int_t nz, Float_t pos[3], - char** Materials, char** Fields=0, char** Cuts=0); + const char** Materials, + const char** Fields=0, + const char** Cuts=0); - void Comment(char* Comment); + void Comment(const char* Comment); void Finish(Bool_t remove = 0); diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx index c356c341afb..f30f0e952b3 100644 --- a/STRUCT/AliFRAMEv2.cxx +++ b/STRUCT/AliFRAMEv2.cxx @@ -463,7 +463,7 @@ void AliFRAMEv2::CreateGeometry() // The internal frame // - char* module[3] = {"B071\0", "B074\0", "B075\0"}; + const char* module[3] = {"B071\0", "B074\0", "B075\0"}; // // // Mother Volumes diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx index 4d3fe334da3..e945c030dd8 100644 --- a/STRUCT/AliSHILv2.cxx +++ b/STRUCT/AliSHILv2.cxx @@ -624,11 +624,11 @@ void AliSHILv2::CreateGeometry() rf2[5]=par1[7]; rf2[6]=0.; //PH This has to be checked - char* materialsA[7] + const char* materialsA[7] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "AIR"}; - char* fieldsA[7] + const char* fieldsA[7] = {"MF", "MF", "MF", "MF", "MF", "MF"}; - char* cutsA[7] + const char* cutsA[7] = {"$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH"}; flukaGeom->Comment("1st part: Beam pipe lateral struture (left)"); @@ -667,13 +667,13 @@ void AliSHILv2::CreateGeometry() // // begin Fluka - char* materialsB[5] + const char* materialsB[5] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR"}; - char* fieldsB[5] + const char* fieldsB[5] = {"MF", "MF", "MF", "MF", "MF"}; - char* cutsB[5] + const char* cutsB[5] = {"$SHH","$SHH","$SHH","$SHH","$SHH"}; rf1[0]=rf2[0]=0.; @@ -756,11 +756,11 @@ void AliSHILv2::CreateGeometry() // // begin Fluka - char* materials1[8] + const char* materials1[8] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "NIW", "NIW", "STEEL"}; - char* fields1[8] + const char* fields1[8] = {"MF", "MF", "MF", "MF", "MF", "MF", "MF", "MF"}; - char* cuts1[8] + const char* cuts1[8] = {"$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH"}; flukaGeom->Comment("2nd part: Beam shield lateral struture (0)"); diff --git a/STRUCT/AliSHILvF.cxx b/STRUCT/AliSHILvF.cxx index d7ab57ef6a8..eefd3eb33fb 100644 --- a/STRUCT/AliSHILvF.cxx +++ b/STRUCT/AliSHILvF.cxx @@ -599,11 +599,11 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712, // begin Fluka // Float_t rf1[10], rf2[10]; - char* materialsA[7] + const char* materialsA[7] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "AIR"}; - char* fieldsA[7] + const char* fieldsA[7] = {"MF", "MF", "MF", "MF", "MF", "MF"}; - char* cutsA[7] + const char* cutsA[7] = {"$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH"}; if (fWriteGeometry) { @@ -656,13 +656,13 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712, // // begin Fluka - char* materialsB[5] + const char* materialsB[5] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR"}; - char* fieldsB[5] + const char* fieldsB[5] = {"MF", "MF", "MF", "MF", "MF"}; - char* cutsB[5] + const char* cutsB[5] = {"$SHH","$SHH","$SHH","$SHH","$SHH"}; if (fWriteGeometry) { @@ -750,11 +750,11 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712, Float_t r3V = 0.; if (fWriteGeometry) { - char* materials1[8] + const char* materials1[8] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "NIW", "NIW", "STEEL"}; - char* fields1[8] + const char* fields1[8] = {"MF", "MF", "MF", "MF", "MF", "MF", "MF", "MF"}; - char* cuts1[8] + const char* cuts1[8] = {"$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH"}; flukaGeom->Comment("2nd part: Beam shield lateral struture (0)"); -- 2.43.0