* provided "as is" without express or implied warranty. *
**************************************************************************/
+// $Id$
//*************************************************************************
// Class for flat cables
fLayColor[i] = 0;
fLayMedia[i] = 0;
};
+ for(Int_t i=0;i<3;i++)fPreviousX[i]=0.;
}
//________________________________________________________________________
fLayColor[i] = 0;
fLayMedia[i] = 0;
};
+ for(Int_t i=0;i<3;i++)fPreviousX[i]=0.;
}
-
+/*
//________________________________________________________________________
AliITSv11GeomCableFlat::AliITSv11GeomCableFlat(const AliITSv11GeomCableFlat &s) :
AliITSv11GeomCable(s),fWidth(s.fWidth),fThick(s.fThick),fNlayer(s.fNlayer)
fLayMedia[i] = s.fLayMedia[i];
fLayColor[i] = s.fLayColor[i];
}
+ for(Int_t i=0;i<3;i++)fPreviousX[i]=s.fPreviousX[i];
+
}
//________________________________________________________________________
};
return *this;
}
-
+*/
//________________________________________________________________________
Int_t AliITSv11GeomCableFlat::GetPoint( Int_t iCheckPt, Double_t *coord)
const {
Double_t torusPhi1 = TMath::ACos(cosPhi);
Double_t torusR = (length/2)/TMath::Sin(torusPhi1);
torusPhi1 = torusPhi1*TMath::RadToDeg();
- Double_t perpLength = TMath::Sqrt(torusR*torusR-length*length/4);
+ Double_t perpLength = TMath::Sqrt((torusR-0.5*length)*(torusR+0.5*length));
Double_t localTransT[3] = {-perpLength,0,0};
Double_t globalTransT[3];
rotTorus.LocalToMasterVect(localTransT, globalTransT);
cableSeg->SetVertex( 7, fWidth/2, -length/2 + dL1 - dl1);
TGeoVolume *vCableSeg = new TGeoVolume(GetName(), cableSeg, fLayMedia[fNlayer-1]);
+ vCableSeg->SetLineColor(fLayColor[fNlayer-1]);
// add all cable layers but the last
for (Int_t iLay=0; iLay<fNlayer-1; iLay++) {
TGeoTubeSeg *cableSeg = new TGeoTubeSeg(rMin, rMax, fWidth/2,
phi1, phi2);
TGeoVolume *vCableSeg = new TGeoVolume(GetName(), cableSeg, fLayMedia[fNlayer-1]);
+ vCableSeg->SetLineColor(fLayColor[fNlayer-1]);
// add all cable layers but the last
for (Int_t iLay=0; iLay<fNlayer-1; iLay++) {
TGeoBBox *cableSeg = new TGeoBBox(fWidth/2, length/2, fThick/2);
TGeoVolume *vCableSeg = new TGeoVolume(GetName(), cableSeg, fLayMedia[fNlayer-1]);
+ vCableSeg->SetLineColor(fLayColor[fNlayer-1]);
// This volume is the cable container. It codes also the material for the
// last layer