removed iostream

[u/mrichter/AliRoot.git] / STRUCT / AliALIFE.cxx

diff --git a/STRUCT/AliALIFE.cxx b/STRUCT/AliALIFE.cxx
index 79822f0e2903495f76f31148c98a3609834bfb1f..56363b6d40929771a140ce7fdcc56e46facefa9f 100644 (file)
--- a/STRUCT/AliALIFE.cxx
+++ b/STRUCT/AliALIFE.cxx
@@ -15,6 +15,15 @@
 
 /*
 $Log$
+Revision 1.3.6.1  2002/08/29 18:08:17  hristov
+Replace strcpy by assignment operator
+
+Revision 1.3  2001/10/31 15:56:54  morsch
+Correction in OnionCone.
+
+Revision 1.2  2000/10/10 06:40:25  hristov
+Bug fixes
+
 Revision 1.1  2000/07/26 15:10:57  morsch
 Helper class to write geometry in ALIFE format in parallel with Geant geometry definition.
 
@@ -213,7 +222,7 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2,
                    nameCou, pos[0], pos[1], rmax1); 
        } 
     }else {
-       strcpy(nameCou,fDefaultVolume1);
+      fDefaultVolume1 = nameCou;
     }
 
     
@@ -244,7 +253,7 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2,
                    nameCin, pos[0], pos[1], rmin1); 
        } 
     }else {
-       strcpy(nameCin,fDefaultVolume2);
+      fDefaultVolume2 = nameCin;
     }
 
 
@@ -315,7 +324,7 @@ void AliALIFE::OnionCone (Float_t* r1, Float_t* r2, Int_t nr,
            }
        }
     } else {
-       strcpy(nameCin,fDefaultVolume1);
+      fDefaultVolume1 = nameCin;
     }
     
     
@@ -349,7 +358,7 @@ void AliALIFE::OnionCone (Float_t* r1, Float_t* r2, Int_t nr,
                        nameCou, pos[0], pos[1], r1[i]); 
            }
        } else {
-           strcpy(nameCou,fDefaultVolume1);
+         fDefaultVolume1 = nameCou;
        }
        
 // Volumes
@@ -363,9 +372,11 @@ void AliALIFE::OnionCone (Float_t* r1, Float_t* r2, Int_t nr,
            fprintf(fFile2,"EMFCUT=%s\n", "$UNSHIELDED");
            fprintf(fFile2,"WW-FACTOR=%s\n", "$UNSHIELDED");
        }
-       if (hasInner) {
-           fprintf(fFile2,"+%5s-%5s+%5s-%5s\n", 
+       if (hasInner || isCylinder) {
+           if (!isCylinder) fprintf(fFile2,"+%5s-%5s+%5s-%5s\n", 
                    nameCou, nameCin, nameZou, nameZin);
+           if (isCylinder)  fprintf(fFile2,"+%5s+%5s-%5s\n",
+                   nameCou, nameZou, nameZin); 
        } else {
            fprintf(fFile2,"+%5s\n", nameCou);
            hasInner=kTRUE;