X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STRUCT%2FAliALIFE.cxx;h=6f319cdf6062ac0228364e1fddbc8e889902a7ef;hp=56363b6d40929771a140ce7fdcc56e46facefa9f;hb=eeacf08b243d5ef04d04ed32ad046c1926283d48;hpb=55fe9d13634c0b206853f13b5ff858edcb17911a

diff --git a/STRUCT/AliALIFE.cxx b/STRUCT/AliALIFE.cxx
index 56363b6d409..6f319cdf606 100644
--- a/STRUCT/AliALIFE.cxx
+++ b/STRUCT/AliALIFE.cxx
@@ -13,22 +13,13 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$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.
-
-*/
+/* $Id$ */
 
+//----------------------------------------------------------------------
+// Helper class to write geometry in ALIFE format
+// in parallel with Geant geometry definition.
+// Author: A.Morsch
+//----------------------------------------------------------------------
 #include <AliALIFE.h>
 
 ClassImp(AliALIFE)
@@ -200,6 +191,7 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2,
     
 //  outer radius
     d=zmax-zmin;
+    sprintf(nameCou, "C%4.4d", fNBodies++);
     if (rmax1 >= 0. && rmax2 >= 0.) {
 	if (rmax1!=rmax2) {
 	    if (rmax1 > rmax2) {
@@ -212,12 +204,10 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2,
 		r1=rmax2;
 		r2=rmax1;
 	    }
-	    sprintf(nameCou, "C%4.4d", fNBodies++);
 	    fprintf(fFile1,"%5s TRC%10.3f%10.3f%10.3f%10.3f%10.3f%10.3f\n",
 		    nameCou, pos[0], pos[1], pos[2], 0., 0., d); 
 	    fprintf(fFile1,"         %10.3f%10.3f\n",r1,r2);
 	} else {
-	    sprintf(nameCou, "C%4.4d", fNBodies++);
 	    fprintf(fFile1,"%5s ZCC%10.3f%10.3f%10.3f\n",
 		    nameCou, pos[0], pos[1], rmax1); 
 	} 
@@ -228,6 +218,7 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2,
     
     
 // inner radius
+    sprintf(nameCin, "C%4.4d", fNBodies++);
     if (rmin1 >= 0. && rmin2 >= 0.) {
 	if (rmin1!=rmin2) {
 	    if (rmin1 != 0 && rmin2 !=0) {
@@ -242,13 +233,11 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2,
 		    r2=rmin1;
 		    d=-d;
 		}
-		sprintf(nameCin, "C%4.4d", fNBodies++);
 		fprintf(fFile1,"%5s TRC%10.3f%10.3f%10.3f%10.3f%10.3f%10.3f\n",
 			nameCin, pos[0], pos[1], pos[2], 0., 0., d); 
 		fprintf(fFile1,"         %10.3f%10.3f\n",r1,r2);
 	    } 
 	} else {
-	    sprintf(nameCin, "C%4.4d", fNBodies++);
 	    fprintf(fFile1,"%5s ZCC%10.3f%10.3f%10.3f\n",
 		    nameCin, pos[0], pos[1], rmin1); 
 	}