Dimitri : bug concerning relative distances fixed

diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h
index ec875722ef78fd7086db5d8589068504de6a9ef3..0e76c747929168a98f90868cc031e412252c6d2d 100644 (file)
--- a/PHOS/AliPHOSPID.h
+++ b/PHOS/AliPHOSPID.h
@@ -30,7 +30,7 @@ class AliPHOSPID : public TObject {
 
 public:
 
-  AliPHOSPID() ;          // ctor            
+  AliPHOSPID(){} ;          // ctor            
   virtual ~AliPHOSPID() ; // dtor
 
   virtual void MakeParticles(AliPHOSTrackSegment::TrackSegmentsList * trsl, 

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 8d95e39d3c904dc4e7715aef2d88db476b53a5f6..da5a23ca414b0c85d9a9a893785a0b158a8abcf2 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -37,6 +37,13 @@
 
 ClassImp( AliPHOSPIDv1) 
 
+//____________________________________________________________________________
+AliPHOSPIDv1::AliPHOSPIDv1():AliPHOSPID()
+{ 
+  fCutOnDispersion = 2.0; 
+  fCutOnRelativeDistance = 3.0 ;
+}
+
 //____________________________________________________________________________
 Float_t  AliPHOSPIDv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcclu,AliPHOSPpsdRecPoint * PpsdClu, Bool_t &toofar, Option_t *  Axis)
 {
@@ -71,9 +78,6 @@ Float_t  AliPHOSPIDv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcclu,AliPHO
   return r ;
 }
 
-
-
-
 //____________________________________________________________________________
 void  AliPHOSPIDv1::MakeParticles(AliPHOSTrackSegment::TrackSegmentsList * trsl, 
                                  AliPHOSRecParticle::RecParticlesList * rpl)
@@ -87,8 +91,8 @@ void  AliPHOSPIDv1::MakeParticles(AliPHOSTrackSegment::TrackSegmentsList * trsl,
   Bool_t tDistance;
   Int_t type ; 
   Int_t showerprofile;  // 0 narrow and 1 wide
-  Int_t cpvdetector;  // 1 hit and 0 no hit
-  Int_t pcdetector;  // 1 hit and 0 no hit
+  Int_t cpvdetector ;   // 1 hit and 0 no hit
+  Int_t pcdetector ;    // 1 hit and 0 no hit
 
   while ( (tracksegment = (AliPHOSTrackSegment *)next()) ) {
     new( (*rpl)[index] ) AliPHOSRecParticle(tracksegment) ;
@@ -114,17 +118,26 @@ void  AliPHOSPIDv1::MakeParticles(AliPHOSTrackSegment::TrackSegmentsList * trsl,
     else      
       showerprofile = 1 ;// WIDE PROFILE
   
+
     // Looking at the photon conversion detector
     if( tracksegment->GetPpsdLowRecPoint() == 0 )   
       pcdetector = 0 ;  // No hit
-    else      
-      if (GetDistanceInPHOSPlane(recp, rppc, tDistance, "R")< fCutOnRelativeDistance)  pcdetector = 1 ;  // hit
+    else{      
+      if (GetDistanceInPHOSPlane(recp, rppc, tDistance, "R")  < fCutOnRelativeDistance) 
+       pcdetector = 1 ;  // hit
+      else
+       pcdetector = 0 ;
+    }
   
     // Looking at the photon conversion detector
     if( tracksegment->GetPpsdUpRecPoint() == 0 )
       cpvdetector = 0 ;  // No hit
-    else  
-      if (GetDistanceInPHOSPlane(recp, rpcpv, tDistance, "R")< fCutOnRelativeDistance) cpvdetector = 1 ;  // Hit
+    else{  
+      if (GetDistanceInPHOSPlane(recp, rpcpv, tDistance, "R")< fCutOnRelativeDistance) 
+       cpvdetector = 1 ;  // Hit
+      else
+       cpvdetector = 0 ;
+    }
      
     type = showerprofile + 2 * pcdetector + 4 * cpvdetector ;
     rp->SetType(type) ; 

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index ca646436740902e17b485b44601c0291f520d523..548f445f9dcb31b58c7d23cfd1a75dec681432d4 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -24,13 +24,9 @@ class  AliPHOSPIDv1 : public AliPHOSPID {
 
 public:
 
-  AliPHOSPIDv1() 
-  { 
-    fCutOnDispersion = 1.5; 
-    fCutOnRelativeDistance = 3.0 ;
-  }
+  AliPHOSPIDv1() ;
                      
-  virtual ~ AliPHOSPIDv1(){} ; // dtor
+  virtual ~AliPHOSPIDv1(){} ; // dtor
 
 
   Float_t GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcclu, AliPHOSPpsdRecPoint * PpsdClu, Bool_t &toofar, Option_t * Axis) ; // Relative Distance PPSD-EMC