X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSmodule.cxx;h=15bf9c54d7180a089175b5d0c052f7d7cecc54a5;hb=7941072e174b2fef4fbd956015ac3955dad02ae7;hp=41d8cf2e55c137f44cdd8304ccd4c5ddd3cf5e2f;hpb=b9d0a01d7a0723a09071b0b56200d72f59a9c2b6;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSmodule.cxx b/ITS/AliITSmodule.cxx index 41d8cf2e55c..15bf9c54d71 100644 --- a/ITS/AliITSmodule.cxx +++ b/ITS/AliITSmodule.cxx @@ -1,6 +1,6 @@ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * * + * * * Author: The ALICE Off-line Project. * * Contributors are mentioned in the code where appropriate. * * * @@ -13,65 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.10.4.2 2002/07/24 09:27:50 alibrary -Updating on VirtualMC - -Revision 1.13 2002/06/12 18:59:47 nilsen -Added Starting track location to hit class and related changes to modules. -This is at present still fully backwards compatible since starting hits -are still written to the file. When aliroot v4.0 will be released, this -backwards compatiblity will be broken by removing the enterence hit, and making -the nessesary changes to module at that time. - -Revision 1.12 2002/06/10 17:31:03 nilsen -Replaced TArrayI expansion with Root version. - -Revision 1.11 2002/06/04 18:43:15 nilsen -Fix to avoid divide by zero problem in MedianHitG and MedianHitL for track -that enter and exit the same side of a detector sensitive volume. Needed -for Fast simulation. Thanks to Nicola Carrer. - -Revision 1.10 2002/03/15 17:21:54 nilsen -Removed zero-ing of fModules variable in constructors. - -Revision 1.9 2000/10/04 19:46:39 barbera -Corrected by F. Carminati for v3.04 - -Revision 1.8 2000/10/02 16:32:57 barbera -Forward declarations added and formatting - -Revision 1.3.4.8 2000/10/02 15:55:26 barbera -Forward declarations added and formatting - -Revision 1.7 2000/09/22 12:36:38 nilsen -Minor changes to improve compilation and create less NOISE. - -Revision 1.6 2000/07/10 16:07:18 fca -Release version of ITS code - -Revision 1.3.4.2 2000/03/02 21:42:29 nilsen -Linked AliDetector::fDigit to AliITSmodule::fDigitsM and AliITS::fITSRecPoints -to AliITSmodule::fRecPointsM. Renamed AliITSmodule::fPointsM to fRecPointsM. -Removed the deletion of fDigitsM from the distructor since it is only a copy -of what is in AliDetector. Fixed a bug in the functions LineSegmentL and -LineSegmentG. Added two new versions of LineSegmentL and LineSegmentG to -additionaly return track number from the hit. Removed FastPoint function, -haven't found anywere it was used, also it had very many problems, should -just call FastPointSPD... . - -Revision 1.3.4.1 2000/01/12 19:03:32 nilsen -This is the version of the files after the merging done in December 1999. -See the ReadMe110100.txt file for details - -Revision 1.3 1999/10/04 15:20:12 fca -Correct syntax accepted by g++ but not standard for static members, remove minor warnings - -Revision 1.2 1999/09/29 09:24:20 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ #include @@ -123,10 +65,9 @@ AliITSmodule::~AliITSmodule() { // we must first destroy all of it's members. if(fHitsM){ - for(Int_t i=0;iGetEntriesFast();i++) - delete ((AliITShit *)(fHitsM->At(i))); - // must delete each object in the TObjArray. - delete fHitsM; + fHitsM->Delete(); + delete fHitsM; + fHitsM = 0; } // end if delete fTrackIndex; delete fHitIndex; @@ -137,20 +78,18 @@ AliITSmodule::AliITSmodule(const AliITSmodule &source){ //////////////////////////////////////////////////////////////////////// // Copy Constructor //////////////////////////////////////////////////////////////////////// - printf("AliITSmodule error: AliITSmodule class has not to be copied! Exit.\n"); + Error("AliITSmodule","AliITSmodule class has not to be copied! Exit."); exit(1); } - //_____________________________________________________________________________ AliITSmodule& AliITSmodule::operator=(const AliITSmodule &source){ //////////////////////////////////////////////////////////////////////// // Assignment operator //////////////////////////////////////////////////////////////////////// - printf("AliITSmodule error: AliITSmodule class has not to be copied! Exit.\n"); + Error("AliITSmodule","AliITSmodule class has not to be copied! Exit."); exit(1); return *this; // fake return neded on Sun -} - +} //_________________________________________________________________________ // // Hits management @@ -224,26 +163,23 @@ Bool_t AliITSmodule::LineSegmentL(Int_t hitindex,Double_t &a,Double_t &b, Double_t &c,Double_t &d, Double_t &e,Double_t &f,Double_t &de){ // line segment - static Int_t hitindex0; - AliITShit *h0,*h1; + AliITShit *h1; + Double_t t; if(hitindex>= fHitsM->GetEntriesFast()) return kFALSE; h1 = (AliITShit *) (fHitsM->At(hitindex)); if(h1->StatusEntering()){ // if track entering volume, get index for next // step - hitindex0 = hitindex; return kFALSE; } // end if StatusEntering() // else stepping - h0 = (AliITShit *) (fHitsM->At(hitindex0)); de = h1->GetIonization(); - h0->GetPositionL(a,c,e); + h1->GetPositionL0(a,c,e,t); h1->GetPositionL(b,d,f); b = b - a; d = d - c; f = f - e; - hitindex0 = hitindex; return kTRUE; } //___________________________________________________________________________ @@ -251,26 +187,23 @@ Bool_t AliITSmodule::LineSegmentG(Int_t hitindex,Double_t &a,Double_t &b, Double_t &c,Double_t &d, Double_t &e,Double_t &f,Double_t &de){ // line segment - static Int_t hitindex0; - AliITShit *h0,*h1; + AliITShit *h1; + Double_t t; if(hitindex>= fHitsM->GetEntriesFast()) return kFALSE; h1 = (AliITShit *) (fHitsM->At(hitindex)); if(h1->StatusEntering()){ // if track entering volume, get index for next // step - hitindex0 = hitindex; return kFALSE; } // end if StatusEntering() // else stepping - h0 = (AliITShit *) (fHitsM->At(hitindex0)); de = h1->GetIonization(); - h0->GetPositionG(a,c,e); + h1->GetPositionG0(a,c,e,t); h1->GetPositionG(b,d,f); b = b - a; d = d - c; f = f - e; - hitindex0 = hitindex; return kTRUE; } //___________________________________________________________________________ @@ -279,27 +212,24 @@ Bool_t AliITSmodule::LineSegmentL(Int_t hitindex,Double_t &a,Double_t &b, Double_t &e,Double_t &f, Double_t &de,Int_t &track){ // line segmente - static Int_t hitindex0; - AliITShit *h0,*h1; + AliITShit *h1; + Double_t t; if(hitindex>= fHitsM->GetEntriesFast()) return kFALSE; h1 = (AliITShit *) (fHitsM->At(hitindex)); if(h1->StatusEntering()){ // if track entering volume, get index for next // step - hitindex0 = hitindex; track = h1->GetTrack(); return kFALSE; } // end if StatusEntering() // else stepping - h0 = (AliITShit *) (fHitsM->At(hitindex0)); de = h1->GetIonization(); - h0->GetPositionL(a,c,e); + h1->GetPositionL0(a,c,e,t); h1->GetPositionL(b,d,f); b = b - a; d = d - c; f = f - e; - hitindex0 = hitindex; track = h1->GetTrack(); return kTRUE; } @@ -309,27 +239,24 @@ Bool_t AliITSmodule::LineSegmentG(Int_t hitindex,Double_t &a,Double_t &b, Double_t &e,Double_t &f, Double_t &de,Int_t &track){ // line segment - static Int_t hitindex0; - AliITShit *h0,*h1; + AliITShit *h1; + Double_t t; if(hitindex>= fHitsM->GetEntriesFast()) return kFALSE; h1 = (AliITShit *) (fHitsM->At(hitindex)); if(h1->StatusEntering()){ // if track entering volume, get index for next // step - hitindex0 = hitindex; track = h1->GetTrack(); return kFALSE; } // end if StatusEntering() // else stepping - h0 = (AliITShit *) (fHitsM->At(hitindex0)); de = h1->GetIonization(); - h0->GetPositionG(a,c,e); + h1->GetPositionG0(a,c,e,t); h1->GetPositionG(b,d,f); b = b - a; d = d - c; f = f - e; - hitindex0 = hitindex; track = h1->GetTrack(); return kTRUE; } @@ -349,10 +276,7 @@ Bool_t AliITSmodule::MedianHitG(AliITShit *h1,AliITShit *h2, h1->GetPositionG(x1l,y1l,z1l); h2->GetPositionG(x2l,y2l,z2l); - // Modified by N.Carrer. In very rare occasions the track may be just - // tangent to the module. Therefore the entrance and exit points have the - // same y. - if( (y2l-y1l) != 0.0 ) { + if((y2l*y1l)<0.) { xMl = (-y1l / (y2l-y1l))*(x2l-x1l) + x1l; zMl = (-y1l / (y2l-y1l))*(z2l-z1l) + z1l; } else { @@ -397,10 +321,7 @@ void AliITSmodule::MedianHitG(Int_t index, y2l = l[1]; z2l = l[2]; - // Modified by N.Carrer. In very rare occasions the track may be just - // tangent to the module. Therefore the entrance and exit points have the - // same y. - if( (y2l-y1l) != 0.0 ) { + if((y2l*y1l)<0.) { xMl = (-y1l / (y2l-y1l))*(x2l-x1l) + x1l; zMl = (-y1l / (y2l-y1l))*(z2l-z1l) + z1l; } else { @@ -428,10 +349,7 @@ Bool_t AliITSmodule::MedianHitL( AliITShit *itsHit1, itsHit2->GetPositionL(x2l,y2l,z2l); yMl = 0.0; - // Modified by N.Carrer. In very rare occasions the track may be just - // tangent to the module. Therefore the entrance and exit points have the - // same y. - if( (y2l-y1l) != 0.0 ) { + if((y2l*y1l)<0.) { xMl = (-y1l / (y2l-y1l))*(x2l-x1l) + x1l; zMl = (-y1l / (y2l-y1l))*(z2l-z1l) + z1l; } else {