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);
}
//________________________________________________________________________
-TGeoVolume *AliITSv11GeomCableFlat::CreateSegment( Double_t *coord1,
- Double_t *coord2,
- Double_t *localVect1,
- Double_t *localVect2 )
+TGeoVolume *AliITSv11GeomCableFlat::CreateSegment( const Double_t *coord1,
+ const Double_t *coord2,
+ const Double_t *localVect1,
+ const Double_t *localVect2 )
{
// Create a segment with arbitrary vertices (general case)
//=================================================
}
//________________________________________________________________________
-TGeoVolume *AliITSv11GeomCableFlat::CreateCylSegment(Double_t &phi,
- Double_t &r)
+TGeoVolume *AliITSv11GeomCableFlat::CreateCylSegment(const Double_t &phi,
+ const Double_t &r)
{
// Create a segment in shape of a cylinder, allows to represent
// a folded flat cable
}
//________________________________________________________________________
-TGeoVolume *AliITSv11GeomCableFlat::CreateBoxSegment( Double_t *coord1,
- Double_t *coord2)
+TGeoVolume *AliITSv11GeomCableFlat::CreateBoxSegment( const Double_t *coord1,
+ const Double_t *coord2)
{
// Create a segment for the case it is a simple box
//=================================================