Updated for coding convenstions compilation errors and warnings and the like.

diff --git a/ITS/AliITSv1.cxx b/ITS/AliITSv1.cxx
index 500dd1ab51b012730bd1c78a872c99bd50b5d017..2095572ee7518fef7bf169eecb2a1064cbb89fb2 100644 (file)
--- a/ITS/AliITSv1.cxx
+++ b/ITS/AliITSv1.cxx
@@ -15,6 +15,17 @@
 
 /*
 $Log$
+Revision 1.14.2.6  2000/06/12 19:14:32  barbera
+Remove partical transision to new Config.C calling convension. Bug Found.
+
+Revision 1.14.2.5  2000/06/12 18:15:13  barbera
+fixed posible compilation errors on HP unix. Modifided default constructor
+for use with new calling requirements. Removed creation of hits from this
+cource geometry.
+
+Revision 1.14.2.4  2000/06/11 20:37:26  barbera
+coding convenstion update.
+
 Revision 1.14.2.2  2000/05/19 10:09:21  nilsen
 fix for bug with HP and Sun unix + fix for event display in ITS-working branch
 
@@ -85,7 +96,7 @@ Introduction of the Copyright and cvs Log
 ClassImp(AliITSv1)
  
 //_____________________________________________________________________________
-AliITSv1::AliITSv1() {
+  AliITSv1::AliITSv1()/*:AliITS("ITS","TDR cource version")*/ {
 ////////////////////////////////////////////////////////////////////////
 //    Standard default constructor for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
@@ -97,6 +108,7 @@ AliITSv1::AliITSv1() {
     fId1Name[3] = "ITS4";
     fId1Name[4] = "ITS5";
     fId1Name[5] = "ITS6";
+    printf("Created ITS TDR Cource version\n");
 }
 //_____________________________________________________________________________
 AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
@@ -111,6 +123,7 @@ AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
     fId1Name[3] = "ITS4";
     fId1Name[4] = "ITS5";
     fId1Name[5] = "ITS6";
+    printf("Created ITS TDR Cource version\n");
 }
 //____________________________________________________________________________
 AliITSv1::AliITSv1(const AliITSv1 &source){
@@ -120,19 +133,21 @@ AliITSv1::AliITSv1(const AliITSv1 &source){
     if(&source == this) return;
     this->fId1N = source.fId1N;
     this->fId1Name = new char*[fId1N];
-        for(Int_t i=0;i<6;i++) strcpy(this->fId1Name[i],source.fId1Name[i]);
-       return;
+    Int_t i;
+    for(i=0;i<6;i++) strcpy(this->fId1Name[i],source.fId1Name[i]);
+    return;
 }
 //_____________________________________________________________________________
 AliITSv1& AliITSv1::operator=(const AliITSv1 &source){
 ////////////////////////////////////////////////////////////////////////
 //    Assignment operator for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
-       if(&source == this) return *this;
-    this->fId1N = source.fId1N;
-    this->fId1Name = new char*[fId1N];
-        for(Int_t i=0;i<6;i++) strcpy(this->fId1Name[i],source.fId1Name[i]);
-       return *this;
+  if(&source == this) return *this;
+  this->fId1N = source.fId1N;
+  this->fId1Name = new char*[fId1N];
+  Int_t i;
+  for(i=0;i<6;i++) strcpy(this->fId1Name[i],source.fId1Name[i]);
+  return *this;
 }
 //_____________________________________________________________________________
 AliITSv1::~AliITSv1() {
@@ -146,7 +161,7 @@ void AliITSv1::BuildGeometry(){
 //    Geometry builder for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
     TNode *node, *top;
-    const int kColorITS=kYellow;
+    const Int_t kColorITS=kYellow;
     //
     top = gAlice->GetGeometry()->GetNode("alice");
 
@@ -217,7 +232,7 @@ void AliITSv1::CreateGeometry(){
   Int_t *idtmed = fIdtmed->GetArray()-199;
   
   //     CONVERT INTO CM (RL(SI)=9.36 CM) 
-  for (i = 0; i < 6; ++i) {
+  for(i = 0; i < 6; ++i) {
     drl[i] = drl[i] / 100. * 9.36;
   }
   
@@ -251,7 +266,7 @@ void AliITSv1::CreateGeometry(){
   
   //     PARAMETERS FOR SMALL (1/2) ITS 
 
-  for (i = 0; i < 6; ++i) {
+  for(i = 0; i < 6; ++i) {
     dzl[i] /= 2.;
     dzb[i] /= 2.;
   }
@@ -268,7 +283,7 @@ void AliITSv1::CreateGeometry(){
   
   //     EQUAL DISTRIBUTION INTO THE 6 LAYERS 
   rstep = drcatpc / 6.;
-  for (i = 0; i < 6; ++i) {
+  for(i = 0; i < 6; ++i) {
     drcac[i] = (i+1) * rstep;
   }
 
@@ -279,7 +294,7 @@ void AliITSv1::CreateGeometry(){
   //     PACK IN PHI AS MUCH AS POSSIBLE 
   //     NOW PACK USING THICKNESS 
   
-  for (i = 0; i < 6; ++i) {
+  for(i = 0; i < 6; ++i) {
     
 //     PACKING FACTOR 
     fp = rl[5] / rl[i];
@@ -348,7 +363,7 @@ void AliITSv1::CreateGeometry(){
   //     PCB (layer #3 and #4) 
   
   gMC->Gsvolu("IPCB", "TUBE", idtmed[233], dits, 0);
-  for (i = 2; i < 4; ++i) {
+  for(i = 2; i < 4; ++i) {
     dits[0] = rl[i];
     dits[1] = dits[0] + drpcb[i];
     dits[2] = dzb[i] / 2.;
@@ -360,7 +375,7 @@ void AliITSv1::CreateGeometry(){
   //     COPPER (layer #3 and #4) 
   
   gMC->Gsvolu("ICO2", "TUBE", idtmed[234], dits, 0);
-  for (i = 2; i < 4; ++i) {
+  for(i = 2; i < 4; ++i) {
     dits[0] = rl[i] + drpcb[i];
     dits[1] = dits[0] + drcu[i];
     dits[2] = dzb[i] / 2.;
@@ -372,7 +387,7 @@ void AliITSv1::CreateGeometry(){
   //     CERAMICS (layer #3 and #4) 
   
   gMC->Gsvolu("ICER", "TUBE", idtmed[235], dits, 0);
-  for (i = 2; i < 4; ++i) {
+  for(i = 2; i < 4; ++i) {
     dits[0] = rl[i] + drpcb[i] + drcu[i];
     dits[1] = dits[0] + drcer[i];
     dits[2] = dzb[i] / 2.;
@@ -384,7 +399,7 @@ void AliITSv1::CreateGeometry(){
   //     SILICON (layer #3 and #4) 
   
   gMC->Gsvolu("ISI2", "TUBE", idtmed[226], dits, 0);
-  for (i = 2; i < 4; ++i) {
+  for(i = 2; i < 4; ++i) {
     dits[0] = rl[i] + drpcb[i] + drcu[i] + drcer[i];
     dits[1] = dits[0] + drsi[i];
     dits[2] = dzb[i] / 2.;
@@ -396,7 +411,7 @@ void AliITSv1::CreateGeometry(){
   //     PLASTIC (G10FR4) (layer #5 and #6) 
   
   gMC->Gsvolu("IPLA", "TUBE", idtmed[262], dits, 0);
-  for (i = 4; i < 6; ++i) {
+  for(i = 4; i < 6; ++i) {
     dits[0] = rl[i];
     dits[1] = dits[0] + drpla[i];
     dits[2] = dzb[i] / 2.;
@@ -408,7 +423,7 @@ void AliITSv1::CreateGeometry(){
   //     COPPER (layer #5 and #6) 
   
   gMC->Gsvolu("ICO3", "TUBE", idtmed[259], dits, 0);
-  for (i = 4; i < 6; ++i) {
+  for(i = 4; i < 6; ++i) {
     dits[0] = rl[i] + drpla[i];
     dits[1] = dits[0] + drcu[i];
     dits[2] = dzb[i] / 2.;
@@ -420,7 +435,7 @@ void AliITSv1::CreateGeometry(){
   //     EPOXY (layer #5 and #6) 
   
   gMC->Gsvolu("IEPX", "TUBE", idtmed[262], dits, 0);
-  for (i = 4; i < 6; ++i) {
+  for(i = 4; i < 6; ++i) {
     dits[0] = rl[i] + drpla[i] + drcu[i];
     dits[1] = dits[0] + drepx[i];
     dits[2] = dzb[i] / 2.;
@@ -432,7 +447,7 @@ void AliITSv1::CreateGeometry(){
   //     SILICON (layer #5 and #6) 
   
   gMC->Gsvolu("ISI3", "TUBE", idtmed[251], dits, 0);
-  for (i = 4; i < 6; ++i) {
+  for(i = 4; i < 6; ++i) {
     dits[0] = rl[i] + drpla[i] + drcu[i] + drepx[i];
     dits[1] = dits[0] + drsi[i];
     dits[2] = dzb[i] / 2.;
@@ -444,7 +459,7 @@ void AliITSv1::CreateGeometry(){
   //    SUPPORT 
   
   gMC->Gsvolu("ISUP", "TUBE", idtmed[274], dits, 0);
-  for (i = 0; i < 6; ++i) {
+  for(i = 0; i < 6; ++i) {
     dits[0] = rl[i];
     if (i < 5) dits[1] = rl[i+1];
     else       dits[1] = rlim;
@@ -457,7 +472,7 @@ void AliITSv1::CreateGeometry(){
   // CABLES (HORIZONTAL) 
   
   gMC->Gsvolu("ICHO", "TUBE", idtmed[278], dits, 0);
-  for (i = 0; i < 6; ++i) {
+  for(i = 0; i < 6; ++i) {
     dits[0] = rl[i];
     dits[1] = dits[0] + drca;
     dits[2] = (rzcone + TMath::Tan(acone) * (rl[i] - rl[0]) - (dzl[i]+ dzb[i] + drsu)) / 2.;
@@ -490,7 +505,7 @@ void AliITSv1::CreateGeometry(){
   
   pcits[2] = 2.;
   gMC->Gsvolu("ICCO", "PCON", idtmed[278], pcits, 0);
-  for (i = 1; i < 6; ++i) {
+  for(i = 1; i < 6; ++i) {
     pcits[0] = -dphi[i] / 2.;
     pcits[1] = dphi[i];
     if (i < 5) {
@@ -545,7 +560,7 @@ void AliITSv1::CreateGeometry(){
   r0 = rend;
   z0 = zend;
   dz = (xltpc - zend) / 9.;
-  for (i = 0; i < 9; ++i) {
+  for(i = 0; i < 9; ++i) {
     zi = z0 + i*dz + dz / 2.;
     ri = r0 + (zi - z0) * TMath::Tan(acable * kDegrad);
     dphii = dphi[5] * r0 / ri;
@@ -827,6 +842,8 @@ void AliITSv1::StepManager(){
 //    Called for every step in the ITS, then calles the AliITShit class
 // creator with the information to be recoreded about that hit.
 ////////////////////////////////////////////////////////////////////////
+  /*
+  We no longer generate hits from the cource version.
   Int_t         copy, id;
   Float_t       hits[8];
   Int_t         vol[4];
@@ -891,6 +908,9 @@ void AliITSv1::StepManager(){
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
     new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+    we no longer generate hit from the cource version.
+  */
+  return;
 }
 //____________________________________________________________________________
 void AliITSv1::Streamer(TBuffer &R__b){

diff --git a/ITS/AliITSv3.cxx b/ITS/AliITSv3.cxx
index 370af89b390f7f069dabd3ad80aa88e3313a981f..c0f9171da77925e91e493cec1f5ae6580132a975 100644 (file)
--- a/ITS/AliITSv3.cxx
+++ b/ITS/AliITSv3.cxx
@@ -15,6 +15,16 @@
 
 /*
 $Log$
+Revision 1.11.4.8  2000/06/12 19:14:40  barbera
+Remove partical transision to new Config.C calling convension. Bug Found.
+
+Revision 1.11.4.7  2000/06/12 18:15:38  barbera
+fixed posible compilation errors on HP unix. Modifided default constructor
+for use with new calling requirements.
+
+Revision 1.11.4.6  2000/06/11 20:37:41  barbera
+coding convenstion update.
+
 Revision 1.11.4.4  2000/05/19 10:09:51  nilsen
 fix for bug with HP and Sun unix + fix for event display in ITS-working branch
 
@@ -89,7 +99,7 @@ Introduction of the Copyright and cvs Log
 ClassImp(AliITSv3)
  
 //_____________________________________________________________________________
-AliITSv3::AliITSv3() {
+  AliITSv3::AliITSv3()/* : AliITS("ITS","TP version")*/{
 ////////////////////////////////////////////////////////////////////////
 //    Standard default constructor for the ITS version 3.
 ////////////////////////////////////////////////////////////////////////
@@ -102,6 +112,7 @@ AliITSv3::AliITSv3() {
     fId3Name[4] = "ITS5";
     fId3Name[5] = "ITS6";
     fMinorVersionV3=1;
+    printf("Created ITS TP Detailed version\n");
 }
 //____________________________________________________________________________
 AliITSv3::AliITSv3(const AliITSv3 &source){
@@ -111,19 +122,21 @@ AliITSv3::AliITSv3(const AliITSv3 &source){
     if(&source == this) return;
     this->fId3N = source.fId3N;
     this->fId3Name = new char*[fId3N];
-        for(Int_t i=0;i<6;i++) strcpy(this->fId3Name[i],source.fId3Name[i]);
-       return;
+    Int_t i;
+    for(i=0;i<6;i++) strcpy(this->fId3Name[i],source.fId3Name[i]);
+    return;
 }
 //_____________________________________________________________________________
 AliITSv3& AliITSv3::operator=(const AliITSv3 &source){
 ////////////////////////////////////////////////////////////////////////
 //    Assignment operator for the ITS version 3.
 ////////////////////////////////////////////////////////////////////////
-       if(&source == this) return *this;
-    this->fId3N = source.fId3N;
-    this->fId3Name = new char*[fId3N];
-        for(Int_t i=0;i<6;i++) strcpy(this->fId3Name[i],source.fId3Name[i]);
-       return *this;
+  if(&source == this) return *this;
+  this->fId3N = source.fId3N;
+  this->fId3Name = new char*[fId3N];
+  Int_t i;
+  for(i=0;i<6;i++) strcpy(this->fId3Name[i],source.fId3Name[i]);
+  return *this;
 }
 //_____________________________________________________________________________
 AliITSv3::~AliITSv3() {
@@ -146,13 +159,14 @@ AliITSv3::AliITSv3(const char *name, const char *title) : AliITS(name, title){
     fId3Name[4] = "ITS5";
     fId3Name[5] = "ITS6";
     fMinorVersionV3=1;
+    printf("Created ITS TP Detailed version\n");
 }//__________________________________________________________________________
 void AliITSv3::BuildGeometry(){
 ////////////////////////////////////////////////////////////////////////
 //    Geometry builder for the ITS version 3.
 ////////////////////////////////////////////////////////////////////////
     TNode *node, *top;
-    const int kColorITS=kYellow;
+    const Int_t kColorITS=kYellow;
     //
     top = gAlice->GetGeometry()->GetNode("alice");
 
@@ -478,7 +492,7 @@ void AliITSv3::CreateGeometry(){
   jbox2 = 0;
   
   // counter over the number of elements of layer #2 ( 
-  for (i = 1; i <= 10; ++i) {
+  for(i = 1; i <= 10; ++i) {
     
     // --- Place part # 1-2 (see sketch) 
     
@@ -1484,7 +1498,7 @@ void AliITSv3::CreateGeometry(){
   //     (IDV1) 
   
   ypos = 0.;
-  for (j = 1; j <= 5; ++j) {
+  for(j = 1; j <= 5; ++j) {
     // odd elements are up and even elements are down 
     if (j == 1) {
       xpos = dbox1[0] - dpcb[0] * 2. - dcop[0] * 2. - dcer[0] * 2. - dsil[0] * 2. - dits[0];
@@ -1720,7 +1734,7 @@ void AliITSv3::CreateGeometry(){
   //     (IDV2) 
   
   ypos = 0.;
-  for (j = 1; j <= 5; ++j) {
+  for(j = 1; j <= 5; ++j) {
     // odd element are up and even elements are down 
     if (j == 1) {
       xpos = dbox2[0] - dpcb[0] * 2. - dcop[0] * 2. - dcer[0] * 2. - dsil[0] * 2. - dits[0];
@@ -1878,7 +1892,7 @@ void AliITSv3::CreateGeometry(){
   //     mother volume (IT34) 
   //     Odd elements have large ribs and even elements have small ribs 
   
-  for (i = 1; i <= 12; ++i) {
+  for(i = 1; i <= 12; ++i) {
     atheta = (i-1) * 30.;
     AliMatrix(idrotm[i+1299], 90., atheta, 90., atheta + 90., 0.,0.);
     if (i % 2 == 0) {
@@ -2023,7 +2037,7 @@ void AliITSv3::CreateGeometry(){
   //     (IDV3) 
   
   ypos = 0.;
-  for (j = 1; j <= 7; ++j) {
+  for(j = 1; j <= 7; ++j) {
     // odd elements are down and even elements are up 
     if (j == 1) {
       xpos = dbox1[0] - dpcb[0] * 2. - dcop[0] * 2. - dcer[0] * 2. - dsil[0] * 2. - dits[0];
@@ -2269,7 +2283,7 @@ void AliITSv3::CreateGeometry(){
   //     (IDV4) 
   
   ypos = 0.;
-  for (j = 1; j <= 7; ++j) {
+  for(j = 1; j <= 7; ++j) {
     // odd elements are down and even elements are up 
     if (j == 1) {
       xpos = dbox2[0] - dpcb[0] * 2. - dcop[0] * 2. - dcer[0] * 2. - dsil[0] * 2. - dits[0];
@@ -2438,7 +2452,7 @@ void AliITSv3::CreateGeometry(){
   //     mother volume (IT34) 
   //     Odd elements have large ribs and even elements have small ribs 
   
-  for (i = 1; i <= 24; ++i) {
+  for(i = 1; i <= 24; ++i) {
     atheta = (i-1) * 15.;
     AliMatrix(idrotm[i+1399], 90., atheta, 90., atheta + 90., 0.,0.);
     if (i % 2 == 0) {
@@ -2647,7 +2661,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the sensitive part of the strips into its mother (ISV1) 
     
     ypos = 0.;
-    for (j = 1; j <= 23; ++j) {
+    for(j = 1; j <= 23; ++j) {
       if (j % 2 == 0) xpos = dbox1[0] - dits[0];
       else            xpos = -dbox1[0] + dits[0];
       zpos = ((j - 1) - 11.) * 3.91;
@@ -2657,7 +2671,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the electronics of the strips into its mother (SSV1) 
     
     ypos = 0.;
-    for (j = 1; j <= 23; ++j) {
+    for(j = 1; j <= 23; ++j) {
       if (j % 2 == 0) xpos = -dsrv[0] + .28;
       else            xpos = -dsrv[0] + .28 - dits[0] * 2. - .03;
       zpos = ((j - 1) - 11.) * 3.91 + .85;
@@ -2685,7 +2699,7 @@ void AliITSv3::CreateGeometry(){
     
     xpos = -dsrv[0] + .47 + TMath::Sqrt(3.) / 6. * 4.2;
     ypos = 0.;
-    for (j = 1; j <= 23; ++j) { // Loop was to 24. Changed to 23 to fit inside
+    for(j = 1; j <= 23; ++j) { // Loop was to 24. Changed to 23 to fit inside
                                 // volume SSV1. This is the same number of
                                 // elements as SCH5 above. Done Bjorn S. Nilsen
                                 // April 4 2000. Error found by Ivana 
@@ -2726,7 +2740,7 @@ void AliITSv3::CreateGeometry(){
     rzero   = dbox1[0] + 40.;
     runo    = dbox1[0] * 2. + 40. + dsrv[0];
     rtwo    = dbox1[0] * 2. + 40. + dela[0];
-    for (i = 1; i <= 35; ++i) {
+    for(i = 1; i <= 35; ++i) {
       atheta = (i-1) * ktwopi * kraddeg / 35. + offset2;
       AliMatrix(idrotm[i+1499], 90., atheta, 90., atheta + 90., 0., 0.);
       
@@ -2908,7 +2922,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the sensitive part of the strips into its mother (ISV2) 
     
     ypos = 0.;
-    for (j = 1; j <= 26; ++j) {
+    for(j = 1; j <= 26; ++j) {
       if (j % 2 == 0) xpos = dbox2[0] - dits[0];
       else            xpos = -dbox2[0] + dits[0];
       zpos = ((j - 1) - 12.) * 3.91 - 1.96;
@@ -2918,7 +2932,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the electronics of the strips into its mother (SSV2) 
     
     ypos = 0.;
-    for (j = 1; j <= 26; ++j) {
+    for(j = 1; j <= 26; ++j) {
       if (j % 2 == 0) xpos = -dsrv[0] + .28;
       else            xpos = -dsrv[0] + .28 - dits[0] * 2. - .03;
       zpos = ((j - 1) - 12.) * 3.91 - 1.96 + .85;
@@ -2946,7 +2960,7 @@ void AliITSv3::CreateGeometry(){
     
     xpos = -dsrv[0] + .47 + TMath::Sqrt(3.) / 6. * 4.2;
     ypos = 0.;
-    for (j = 1; j <= 27; ++j) {
+    for(j = 1; j <= 27; ++j) {
       zpos = ((j - 1) - 12.) * 3.91 - 1.96 - 4.2/2.;
       gMC->Gspos("SFR6", j, "SSV2", xpos, ypos, zpos, 0, "ONLY");
     }
@@ -2983,7 +2997,7 @@ void AliITSv3::CreateGeometry(){
     rzero   = dbox2[0] + 45.;
     runo    = dbox2[0] * 2. + 45. + dsrv[0];
     rtwo    = dbox2[0] * 2. + 45. + dela[0];
-    for (i = 1; i <= 39; ++i) {
+    for(i = 1; i <= 39; ++i) {
       atheta = (i-1) * ktwopi * kraddeg / 39. + offset2;
       AliMatrix(idrotm[i+1599], 90., atheta, 90., atheta + 90., 0., 0.);
       
@@ -3197,7 +3211,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the sensitive part of the strips into its mother (ISV1) 
     
     ypos = 0.;
-    for (j = 1; j <= 22; ++j) {
+    for(j = 1; j <= 22; ++j) {
       if (j % 2 == 0) xpos = dbox1[0] - dits[0];
       else            xpos = -dbox1[0] + dits[0];
       zpos = ((j - 1) - 10.) * 3.91 - 1.96;
@@ -3207,7 +3221,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the electronics of the strips into its mother (SSV1) 
     
     ypos = 0.;
-    for (j = 1; j <= 22; ++j) {
+    for(j = 1; j <= 22; ++j) {
       if (j % 2 == 0) xpos = -dsrv[0] + .28;
       else            xpos = -dsrv[0] + .28 - dits[0] * 2. - .03;
       zpos = ((j - 1) - 10.) * 3.91 - 1.96 + .85;
@@ -3235,7 +3249,7 @@ void AliITSv3::CreateGeometry(){
     
     xpos = -dsrv[0] + .47 + TMath::Sqrt(3.) / 6. * 4.2;
     ypos = 0.;
-    for (j = 1; j <= 23; ++j) {
+    for(j = 1; j <= 23; ++j) {
       zpos = ((j - 1) - 10.) * 3.91 - 1.96 - 4.2/2.;
       gMC->Gspos("SFR5", j, "SSV1", xpos, ypos, zpos, 0, "ONLY");
     }
@@ -3272,7 +3286,7 @@ void AliITSv3::CreateGeometry(){
     rzero   = dbox1[0] + 36.6;
     runo    = dbox1[0] * 2. + 36.6 + dsrv[0];
     rtwo    = dbox1[0] * 2. + 36.6 + dela[0];
-    for (i = 1; i <= 32; ++i) {
+    for(i = 1; i <= 32; ++i) {
       atheta = (i-1) * ktwopi * kraddeg / 32. + offset2;
       AliMatrix(idrotm[i+1499], 90., atheta, 90., atheta + 90., 0., 0.);
       
@@ -3454,7 +3468,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the sensitive part of the strips into its mother (ISV2) 
     
     ypos = 0.;
-    for (j = 1; j <= 24; ++j) {
+    for(j = 1; j <= 24; ++j) {
       if (j % 2 == 0) xpos = -dbox2[0] + dits[0];
       else            xpos = dbox2[0] - dits[0];
       zpos = ((j - 1) - 11.) * 3.91 - 1.96;
@@ -3464,7 +3478,7 @@ void AliITSv3::CreateGeometry(){
     // --- Place the electronics of the strips into its mother (SSV2) 
     
     ypos = 0.;
-    for (j = 1; j <= 24; ++j) {
+    for(j = 1; j <= 24; ++j) {
       if (j % 2 == 0) xpos = -dsrv[0] + .28 - dits[0] * 2. - .03;
       else            xpos = -dsrv[0] + .28;
       zpos = ((j - 1) - 11.) * 3.91 - 1.96 + .85;
@@ -3492,7 +3506,7 @@ void AliITSv3::CreateGeometry(){
     
     xpos = -dsrv[0] + .47 + TMath::Sqrt(3.) / 6. * 4.2;
     ypos = 0.;
-    for (j = 1; j <= 25; ++j) {
+    for(j = 1; j <= 25; ++j) {
       zpos = ((j - 1) - 11.) * 3.91 - 1.96 - 4.2/2.;
       gMC->Gspos("SFR6", j, "SSV2", xpos, ypos, zpos, 0, "ONLY");
     }
@@ -3529,7 +3543,7 @@ void AliITSv3::CreateGeometry(){
     rzero   = dbox2[0] + 41.2;
     runo    = dbox2[0] * 2. + 41.2 + dsrv[0];
     rtwo    = dbox2[0] * 2. + 41.2 + dela[0];
-    for (i = 1; i <= 36; ++i) {
+    for(i = 1; i <= 36; ++i) {
       atheta = (i-1) * ktwopi * kraddeg / 36. + offset2;
       AliMatrix(idrotm[i+1599], 90., atheta, 90., atheta + 90., 0., 0.);
       
@@ -3609,7 +3623,7 @@ void AliITSv3::CreateGeometry(){
     dtra1[2] = TMath::Sqrt(dtra[2] * dtra[2] + (55.4*55.4-50.5*50.5))/2.;
     angle    = 45.;
     offset   = angle / 2.;
-    for (i = 0; i < 8; ++i) {
+    for(i = 0; i < 8; ++i) {
       xtra[i] = rzero * TMath::Cos(i * angle * kdegrad);
       ytra[i] = rzero * TMath::Sin(i * angle * kdegrad);
       ztra[i] = 0.;
@@ -3774,7 +3788,7 @@ void AliITSv3::CreateGeometry(){
     dtra1[2] = TMath::Sqrt(dtra[2] * dtra[2] + (55.4*55.4-50.5*50.5))/2.;
     angle    = 45.;
     offset   = angle / 2.;
-    for (i = 0; i < 8; ++i) {
+    for(i = 0; i < 8; ++i) {
       xtra[i] = rzero * TMath::Cos(i * angle * kdegrad);
       ytra[i] = rzero * TMath::Sin(i * angle * kdegrad);
       ztra[i] = 0.;
@@ -3948,7 +3962,7 @@ void AliITSv3::CreateGeometry(){
     dtra4[2] = TMath::Sqrt(dtra2[2] * dtra2[2] + (59.9*59.9-50.*50.)) / 2.;
     angle = 60.;
     offset = angle / 2.;
-    for (i = 0; i < 6; ++i) {
+    for(i = 0; i < 6; ++i) {
       xtra1[i] = rzero * TMath::Cos((i * angle + offset) *kdegrad);
       ytra1[i] = rzero * TMath::Sin((i * angle + offset) *kdegrad);
       ztra1[i] = 0.;
@@ -4181,7 +4195,7 @@ void AliITSv3::CreateGeometry(){
     dtra4[2] = TMath::Sqrt(dtra2[2] * dtra2[2] + (59.9*59.9-50.*50.)) / 2.;
     angle  = 60.;
     offset = angle / 2.;
-    for (i = 0; i < 6; ++i) {
+    for(i = 0; i < 6; ++i) {
       xtra1[i] = rzero * TMath::Cos((i * angle + offset) *kdegrad);
       ytra1[i] = rzero * TMath::Sin((i * angle + offset) *kdegrad);
       ztra1[i] = 0.;

diff --git a/ITS/AliITSv5.cxx b/ITS/AliITSv5.cxx
index 2329b0af67268edbfd2e85b8400540b0510a4e47..6f08ae3eba3bb09159387d470fc3399e15835c15 100644 (file)
--- a/ITS/AliITSv5.cxx
+++ b/ITS/AliITSv5.cxx
@@ -15,6 +15,16 @@
 
 /*
 $Log$
+Revision 1.14.4.9  2000/06/12 19:14:51  barbera
+Remove partical transision to new Config.C calling convension. Bug Found.
+
+Revision 1.14.4.8  2000/06/12 18:15:52  barbera
+fixed posible compilation errors on HP unix. Modifided default constructor
+for use with new calling requirements.
+
+Revision 1.14.4.7  2000/06/11 20:37:59  barbera
+coding convenstion update.
+
 Revision 1.14.4.4  2000/05/19 10:10:21  nilsen
 fix for bug with HP and Sun unix + fix for event display in ITS-working branch
 
@@ -81,7 +91,7 @@ Introduction of the Copyright and cvs Log
 ClassImp(AliITSv5)
  
 //_____________________________________________________________________________
-AliITSv5::AliITSv5() {
+  AliITSv5::AliITSv5()/*:AliITS("ITS","TDR version")*/{
 ////////////////////////////////////////////////////////////////////////
 //    Standard default constructor for the ITS version 5.
 ////////////////////////////////////////////////////////////////////////
@@ -93,6 +103,10 @@ AliITSv5::AliITSv5() {
     fId5Name[3] = "ITS4";
     fId5Name[4] = "ITS5";
     fId5Name[5] = "ITS6";
+
+    fEuclidMaterial = "$ALICE_ROOT/Euclid/ITSgeometry_5.tme";
+    fEuclidGeometry = "$ALICE_ROOT/Euclid/ITSgeometry_5.euc";
+    printf("Created ITS TDR Detailed version reading geometry from file\n");
 }
 //____________________________________________________________________________
 AliITSv5::AliITSv5(const AliITSv5 &source){
@@ -102,19 +116,21 @@ AliITSv5::AliITSv5(const AliITSv5 &source){
     if(&source == this) return;
     this->fId5N = source.fId5N;
     this->fId5Name = new char*[fId5N];
-        for(Int_t i=0;i<6;i++) strcpy(this->fId5Name[i],source.fId5Name[i]);
-       return;
+    Int_t i;
+    for(i=0;i<6;i++) strcpy(this->fId5Name[i],source.fId5Name[i]);
+    return;
 }
 //_____________________________________________________________________________
 AliITSv5& AliITSv5::operator=(const AliITSv5 &source){
 ////////////////////////////////////////////////////////////////////////
 //    Assignment operator for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
-       if(&source == this) return *this;
-    this->fId5N = source.fId5N;
-    this->fId5Name = new char*[fId5N];
-        for(Int_t i=0;i<6;i++) strcpy(this->fId5Name[i],source.fId5Name[i]);
-       return *this;
+  if(&source == this) return *this;
+  this->fId5N = source.fId5N;
+  this->fId5Name = new char*[fId5N];
+  Int_t i;
+  for(i=0;i<6;i++) strcpy(this->fId5Name[i],source.fId5Name[i]);
+  return *this;
 }
 //_____________________________________________________________________________
 AliITSv5::~AliITSv5() {
@@ -139,6 +155,7 @@ AliITSv5::AliITSv5(const char *name, const char *title) : AliITS(name, title){
 
     fEuclidMaterial = "$ALICE_ROOT/Euclid/ITSgeometry_5.tme";
     fEuclidGeometry = "$ALICE_ROOT/Euclid/ITSgeometry_5.euc";
+    printf("Created ITS TDR Detailed version reading geometry from file\n");
 }
 //_____________________________________________________________________________
 void AliITSv5::BuildGeometry(){
@@ -152,9 +169,9 @@ void AliITSv5::BuildGeometry(){
 
   TNode *top;
   TNode *nd;
-  //const int kColorITSSPD=kRed;
-  //const int kColorITSSDD=kGreen;
-  const int kColorITSSSD=kBlue;
+  //const Int_t kColorITSSPD=kRed;
+  //const Int_t kColorITSSDD=kGreen;
+  const Int_t kColorITSSSD=kBlue;
   //
   top=gAlice->GetGeometry()->GetNode("alice");
   AliITSgeom  *gm = this->GetITSgeom();
@@ -752,7 +769,7 @@ void AliITSv5::Streamer(TBuffer &R__b){
 // dosen't contain any "real" data to be saved, it doesn't.
 ////////////////////////////////////////////////////////////////////////
 
-    printf("AliITSv5Streamer Starting\n");
+  //    printf("AliITSv5Streamer Starting\n");
    if (R__b.IsReading()) {
       Version_t R__v = R__b.ReadVersion(); 
       if (R__v==1) {
@@ -771,6 +788,6 @@ void AliITSv5::Streamer(TBuffer &R__b){
       //R__b << fId5N;
       //R__b.WriteArray(fId5Name, __COUNTER__);
    } // end if R__b.IsReading()
-    printf("AliITSv5Streamer Finishing\n");
+   //    printf("AliITSv5Streamer Finishing\n");
 }