? .CandStripListHandle.cxx.swp
? .CandStripListHandle.h.swp
? recent.diffs050120
Index: CandCluster.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandCluster.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -r1.11 -r1.12
2c2
< // $Id: CandCluster.cxx,v 1.11 2004/07/24 01:32:40 musser Exp $
---
> // $Id: CandCluster.cxx,v 1.12 2005/01/20 18:46:30 musser Exp $
27c27
< CVSID("$Id: CandCluster.cxx,v 1.11 2004/07/24 01:32:40 musser Exp $");
---
> CVSID("$Id: CandCluster.cxx,v 1.12 2005/01/20 18:46:30 musser Exp $");
136a137
>   cb->SetCandRecord(fCandRecord);
Index: CandClusterList.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandClusterList.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -r1.5 -r1.6
2c2
< // $Id: CandClusterList.cxx,v 1.5 2003/10/12 21:17:03 gmieg Exp $
---
> // $Id: CandClusterList.cxx,v 1.6 2005/01/20 18:46:30 musser Exp $
23c23
< CVSID("$Id: CandClusterList.cxx,v 1.5 2003/10/12 21:17:03 gmieg Exp $");
---
> CVSID("$Id: CandClusterList.cxx,v 1.6 2005/01/20 18:46:30 musser Exp $");
113a114
>   cb->SetCandRecord(fCandRecord);
Index: CandRecoHandle.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandRecoHandle.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -r1.47 -r1.48
2c2
< // $Id: CandRecoHandle.cxx,v 1.47 2004/08/19 16:15:01 musser Exp $
---
> // $Id: CandRecoHandle.cxx,v 1.48 2005/01/20 00:32:45 musser Exp $
32c32
< CVSID("$Id: CandRecoHandle.cxx,v 1.47 2004/08/19 16:15:01 musser Exp $");
---
> CVSID("$Id: CandRecoHandle.cxx,v 1.48 2005/01/20 00:32:45 musser Exp $");
143a144,148
>  if(planeview_t == PlaneView::kUnknown){
>    Int_t iplane =  dynamic_cast<const CandReco *>
>                                     (GetCandBase())->fVertex.GetPlane();
>    if(iplane>=0) return iplane;
>   }
Index: CandShower.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandShower.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -r1.10 -r1.11
2c2
< // $Id: CandShower.cxx,v 1.10 2004/04/26 03:54:44 rhatcher Exp $
---
> // $Id: CandShower.cxx,v 1.11 2005/01/20 18:46:30 musser Exp $
27c27
< CVSID("$Id: CandShower.cxx,v 1.10 2004/04/26 03:54:44 rhatcher Exp $");
---
> CVSID("$Id: CandShower.cxx,v 1.11 2005/01/20 18:46:30 musser Exp $");
136a137
>   cb->SetCandRecord(fCandRecord);
Index: CandShowerHandle.h
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandShowerHandle.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -r1.10 -r1.11
2c2
< // $Id: CandShowerHandle.h,v 1.10 2004/10/30 13:57:25 musser Exp $
---
> // $Id: CandShowerHandle.h,v 1.11 2005/01/20 18:46:30 musser Exp $
47c47
<   
---
>   Bool_t IsTPosValid(Int_t) const; // returns true if U and V positions have been set for this plane  
51a52,53
>   Int_t GetNStrips(Int_t);
> 
Index: CandShowerList.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandShowerList.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -r1.5 -r1.6
2c2
< // $Id: CandShowerList.cxx,v 1.5 2003/10/12 21:17:03 gmieg Exp $
---
> // $Id: CandShowerList.cxx,v 1.6 2005/01/20 18:46:30 musser Exp $
23c23
< CVSID("$Id: CandShowerList.cxx,v 1.5 2003/10/12 21:17:03 gmieg Exp $");
---
> CVSID("$Id: CandShowerList.cxx,v 1.6 2005/01/20 18:46:30 musser Exp $");
113a114
>   cb->SetCandRecord(fCandRecord);
Index: CandStrip.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandStrip.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -r1.14 -r1.15
2c2
< // $Id: CandStrip.cxx,v 1.14 2004/07/30 21:57:36 musser Exp $
---
> // $Id: CandStrip.cxx,v 1.15 2005/01/20 18:46:30 musser Exp $
24c24
< CVSID("$Id: CandStrip.cxx,v 1.14 2004/07/30 21:57:36 musser Exp $");
---
> CVSID("$Id: CandStrip.cxx,v 1.15 2005/01/20 18:46:30 musser Exp $");
93a94
>   cb->SetCandRecord(fCandRecord);
Index: CandStripList.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandStripList.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -r1.6 -r1.7
2c2
< // $Id: CandStripList.cxx,v 1.6 2003/10/12 21:17:03 gmieg Exp $
---
> // $Id: CandStripList.cxx,v 1.7 2005/01/20 18:46:30 musser Exp $
23c23
< CVSID("$Id: CandStripList.cxx,v 1.6 2003/10/12 21:17:03 gmieg Exp $");
---
> CVSID("$Id: CandStripList.cxx,v 1.7 2005/01/20 18:46:30 musser Exp $");
113a114
>   cb->SetCandRecord(fCandRecord);
Index: CandTrack.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandTrack.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -r1.15 -r1.16
2c2
< // $Id: CandTrack.cxx,v 1.15 2004/11/15 22:14:02 musser Exp $
---
> // $Id: CandTrack.cxx,v 1.16 2005/01/20 18:46:30 musser Exp $
26c26
< CVSID("$Id: CandTrack.cxx,v 1.15 2004/11/15 22:14:02 musser Exp $");
---
> CVSID("$Id: CandTrack.cxx,v 1.16 2005/01/20 18:46:30 musser Exp $");
158a159
>   cb->SetCandRecord(fCandRecord);
Index: CandTrackHandle.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandTrackHandle.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -r1.32 -r1.33
2c2
< // $Id: CandTrackHandle.cxx,v 1.32 2004/11/16 01:35:09 musser Exp $
---
> // $Id: CandTrackHandle.cxx,v 1.33 2005/01/20 18:46:30 musser Exp $
38c38
< CVSID("$Id: CandTrackHandle.cxx,v 1.32 2004/11/16 01:35:09 musser Exp $");
---
> CVSID("$Id: CandTrackHandle.cxx,v 1.33 2005/01/20 18:46:30 musser Exp $");
400,401c400
<   Int_t fwdTrkPlane=min(this->GetVtxPlane(),this->GetEndPlane());
<   Int_t bckTrkPlane=max(this->GetVtxPlane(),this->GetEndPlane());
---
> 
405,408c404,410
<   if(this->IsTPosValid(shw->GetVtxPlane())){
<     dt = shw->GetVtxT()-this->GetT(shw->GetVtxPlane());
<   }
<   if( bckShwPlane>=fwdTrkPlane && fwdShwPlane<=bckTrkPlane && fabs(dt)<tolTime){   // trk overlaps in Z and Time
---
> 
>   Float_t fwdZ=min(shw->GetVtxZ(),shw->GetEndZ());
>   Float_t bckZ=max(shw->GetVtxZ(),shw->GetEndZ());
>   if( bckZ>min(this->GetVtxZ(),this->GetEndZ())-tolZPos  &&
>       fwdZ<max(this->GetVtxZ(),this->GetEndZ())+tolZPos  &&
>       fabs(dt)<tolTime) { // track overlaps shower in Z and time within tolerance
> 
415c417
<       if(iloop >0 && (matchu || matchv))tolTPos=tolTPos*2;
---
>       if(iloop==1)tolTPos=tolTPos*2;
436c438,440
< 	  if(trkU>=shw->GetMinU(iplane)-tolTPos && trkU<=shw->GetMaxU(iplane)+tolTPos){
---
> 	  Float_t shwminU=shw->GetMinU(iplane);
> 	  Float_t shwmaxU=shw->GetMaxU(iplane);
> 	  if(trkU>=shwminU-tolTPos && trkU<=shwmaxU+tolTPos && shw->GetNStrips(iplane)!=0){
455,456c459,461
< 	  
< 	  if(trkV>=shw->GetMinV(iplane)-tolTPos && trkV<=shw->GetMaxV(iplane)+tolTPos){
---
> 	  Float_t shwminV=shw->GetMinV(iplane);
> 	  Float_t shwmaxV=shw->GetMaxV(iplane);
> 	  if(trkV>=shwminV-tolTPos && trkV<=shwmaxV+tolTPos && shw->GetNStrips(iplane)!=0){
477,554d481
<   if( shw->GetVtxZ()>min(this->GetVtxZ(),this->GetEndZ())-tolZPos  &&
<       shw->GetVtxZ()<max(this->GetVtxZ(),this->GetEndZ())+tolZPos) {
<     Double_t du= this->GetVtxU()-shw->GetVtxU();
<     Double_t dv= this->GetVtxV()-shw->GetVtxV();	
<     dt= this->GetVtxT()-shw->GetVtxT();
<     if(this->IsTPosValid(shw->GetVtxPlane())){
<       du = shw->GetVtxU()-this->GetU(shw->GetVtxPlane());
<       dv = shw->GetVtxV()-this->GetV(shw->GetVtxPlane());
<       dt = shw->GetVtxT()-this->GetT(shw->GetVtxPlane());
<     }
<     MSG("RecoBase",Msg::kDebug)
<       << "    at plane " << shw->GetVtxPlane() << " dt2  " << du*du+dv*dv << "/" << tolTPos2 << " dt " << dt*1.e9 << "/" << tolTime*1e9 <<  "\n";
<     
<     if(dt<tolTime && 
<        du*du+dv*dv<tolTPos2) return true;   // check whether vertex within minimum distance from trk 
<   }
< 
<     // finally, check distance between vertices 
<   Double_t trkZ=this->GetVtxZ();
<   Double_t trkU=this->GetVtxU();
<   Double_t trkV=this->GetVtxV();
<   Double_t trkT=this->GetVtxT();
<   Int_t trkPlane=this->GetVtxPlane();
<   Double_t trkDirU=this->GetVtxDirCosU();
<   Double_t trkDirV=this->GetVtxDirCosV();
<   Double_t trkDirZ=this->GetVtxDirCosZ();
< 
<   if(fabs(shw->GetVtxZ()-this->GetEndZ())<fabs(shw->GetVtxZ()-this->GetVtxZ())){
<     trkZ=this->GetEndZ();
<     trkU=this->GetEndU();
<     trkV=this->GetEndV();
<     trkT=this->GetEndT();
<     trkDirU=this->GetEndDirCosU();
<     trkDirV=this->GetEndDirCosV();
<     trkDirZ=this->GetEndDirCosZ();
<     trkPlane=this->GetEndPlane();
<   }
< 
<   Double_t dz=trkZ-shw->GetVtxZ();
<   dt= trkT-shw->GetVtxT(); 
<   //compensate dz for SM gap if necessary
<   if (vldcptr->GetDetector()==DetectorType::kFar &&
<       trkPlane<=pSMPlaneLast &&
<       shw->GetVtxPlane()>=pSMPlaneFirst) dz+=zGapSM;
<   else if (vldcptr->GetDetector()==DetectorType::kFar &&
< 	   trkPlane>=pSMPlaneLast &&
< 	   shw->GetVtxPlane()<=pSMPlaneFirst) dz-=zGapSM;
<   
<   Double_t du = (trkU - dz*trkDirU/trkDirZ) - shw->GetVtxU();
<   Double_t dv = (trkV - dz*trkDirV/trkDirZ) - shw->GetVtxV();
<   MSG("RecoBase",Msg::kDebug)
<     << "    dvertex shower/track " << du
<     << " " << dv << " " << dz <<" "  << dt*1.e9 << "\n";
<   if (du*du+dv*dv<tolTPos2 &&
<       fabs(dz)<tolZPos && 
<       fabs(dt)<tolTime) return true;
< 
<   // now try shower End
<   dz=trkZ-shw->GetEndZ();
<   dt= trkT-shw->GetVtxT(); 
<   //compensate dz for SM gap if necessary
<   if (vldcptr->GetDetector()==DetectorType::kFar &&
<       trkPlane<=pSMPlaneLast &&
<       shw->GetVtxPlane()>=pSMPlaneFirst) dz+=zGapSM;
<   else if (vldcptr->GetDetector()==DetectorType::kFar &&
< 	   trkPlane>=pSMPlaneLast &&
< 	   shw->GetEndPlane()<=pSMPlaneFirst) dz-=zGapSM;
<   
<   du = (trkU - dz*trkDirU/trkDirZ) - shw->GetEndU();
<   dv = (trkV - dz*trkDirV/trkDirZ) - shw->GetEndV();
< 
<   MSG("RecoBase",Msg::kDebug)
<     << "    dvertex shower/track " << du
<     << " " << dv << " " << dz <<" "  << dt*1.e9 << "\n";
<   if (du*du+dv*dv<tolTPos2 &&
<       fabs(dz)<tolZPos && 
<       fabs(dt)<tolTime) return true;
< 
Index: CandTrackList.cxx
===================================================================
RCS file: /cvs/minoscvs/rep1/minossoft/RecoBase/CandTrackList.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -r1.5 -r1.6
2c2
< // $Id: CandTrackList.cxx,v 1.5 2003/10/12 21:17:03 gmieg Exp $
---
> // $Id: CandTrackList.cxx,v 1.6 2005/01/20 18:46:30 musser Exp $
23c23
< CVSID("$Id: CandTrackList.cxx,v 1.5 2003/10/12 21:17:03 gmieg Exp $");
---
> CVSID("$Id: CandTrackList.cxx,v 1.6 2005/01/20 18:46:30 musser Exp $");
114a115
>   cb->SetCandRecord(fCandRecord);