]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cbd70aa)
Removing warnings (Sun)
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 13 Dec 2003 17:00:47 +0000 (17:00 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 13 Dec 2003 17:00:47 +0000 (17:00 +0000)
STRUCT/AliALIFE.cxx patch | blob | blame | history
STRUCT/AliALIFE.h patch | blob | blame | history
STRUCT/AliFRAMEv2.cxx patch | blob | blame | history
STRUCT/AliSHILv2.cxx patch | blob | blame | history
STRUCT/AliSHILvF.cxx patch | blob | blame | history

diff --git a/STRUCT/AliALIFE.cxx b/STRUCT/AliALIFE.cxx
index f33b237b2c1b55fb2af04777b4cd6055f3986c24..971f70d88caccb60d6e9dbe08015078bcdc45aa2 100644 (file)
--- 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], 
 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
 //
 {
 // 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,
 }
 
 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
 {
 //
 // 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], 
                     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 
 
 {
 // 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,
 
 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
 //
 {
 // 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], 
 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
 {
 //
 // 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], 
 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
 {
 //
 // 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);        
 {
 // Insert comment line
     fprintf(fFile1,"*%s\n", Comment);        
diff --git a/STRUCT/AliALIFE.h b/STRUCT/AliALIFE.h
index aabeb5a8cc7d3ea2592863286c233b116ec7bca7..1289cce158bd7adeb31b0d6141bbd89484e1b0db 100644 (file)
--- 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],
     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],
     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],
     
     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],
     
     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], 
 
     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], 
 
     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);
 
 
     void Finish(Bool_t remove = 0);
 
diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx
index c356c341afb9e21b4e1ce5703b1e74b085fdf810..f30f0e952b3cc2261c75185e4a87e309c3b93076 100644 (file)
--- a/STRUCT/AliFRAMEv2.cxx
+++ b/STRUCT/AliFRAMEv2.cxx
@@ -463,7 +463,7 @@ void AliFRAMEv2::CreateGeometry()
 
 // The internal frame
 //
 
 // The internal frame
 //
-  char*  module[3] = {"B071\0", "B074\0", "B075\0"};
+  const char*  module[3] = {"B071\0", "B074\0", "B075\0"};
 //
 //
 //  Mother Volumes
 //
 //
 //  Mother Volumes
diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx
index 4d3fe334da3dbcbccd9199f7f78273d6337bba69..e945c030dd81b8a42ecae0e57c298d935359817a 100644 (file)
--- 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
   
   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"};
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "AIR"};
-  char* fieldsA[7] 
+  const char* fieldsA[7] 
       = {"MF", "MF", "MF", "MF", "MF", "MF"};
       = {"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)");
       = {"$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
 
 //
 // begin Fluka
-  char* materialsB[5] 
+  const char* materialsB[5] 
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR"};
   
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR"};
   
-  char* fieldsB[5] 
+  const char* fieldsB[5] 
       = {"MF", "MF", "MF", "MF", "MF"};
  
       = {"MF", "MF", "MF", "MF", "MF"};
  
-  char* cutsB[5] 
+  const char* cutsB[5] 
       = {"$SHH","$SHH","$SHH","$SHH","$SHH"};
 
   rf1[0]=rf2[0]=0.;
       = {"$SHH","$SHH","$SHH","$SHH","$SHH"};
 
   rf1[0]=rf2[0]=0.;
@@ -756,11 +756,11 @@ void AliSHILv2::CreateGeometry()
 //
 // begin Fluka
 
 //
 // begin Fluka
 
-  char* materials1[8] 
+  const char* materials1[8] 
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "NIW", "NIW", "STEEL"};
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "NIW", "NIW", "STEEL"};
-  char* fields1[8] 
+  const char* fields1[8] 
       = {"MF", "MF", "MF", "MF", "MF", "MF", "MF", "MF"};
       = {"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)");
       = {"$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 d7ab57ef6a8348403293321d07b41e5d4afed34f..eefd3eb33fb0c014e35487eb1252222373d8c291 100644 (file)
--- 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];
 // begin Fluka
 //
   Float_t rf1[10], rf2[10];
-  char* materialsA[7] 
+  const char* materialsA[7] 
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "AIR"};
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "AIR"};
-  char* fieldsA[7] 
+  const char* fieldsA[7] 
       = {"MF", "MF", "MF", "MF", "MF", "MF"};
       = {"MF", "MF", "MF", "MF", "MF", "MF"};
-  char* cutsA[7] 
+  const char* cutsA[7] 
       = {"$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH"};
   
   if (fWriteGeometry) {
       = {"$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
 
 //
 // begin Fluka
-  char* materialsB[5] 
+  const char* materialsB[5] 
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR"};
   
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR"};
   
-  char* fieldsB[5] 
+  const char* fieldsB[5] 
       = {"MF", "MF", "MF", "MF", "MF"};
  
       = {"MF", "MF", "MF", "MF", "MF"};
  
-  char* cutsB[5] 
+  const char* cutsB[5] 
       = {"$SHH","$SHH","$SHH","$SHH","$SHH"};
      
   if (fWriteGeometry) {
       = {"$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) {
   Float_t r3V = 0.;
   
   if (fWriteGeometry) {
-   char* materials1[8] 
+   const char* materials1[8] 
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "NIW", "NIW", "STEEL"};
       = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "NIW", "NIW", "STEEL"};
-  char* fields1[8] 
+   const char* fields1[8] 
       = {"MF", "MF", "MF", "MF", "MF", "MF", "MF", "MF"};
       = {"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)");
       = {"$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH","$SHH"};
 
   flukaGeom->Comment("2nd part: Beam shield lateral struture (0)");