RecPoints recalculation in TSM removed

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 795e9fa..744fe1b 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.101  2007/03/06 06:51:27  kharlov
+ * Calculation of cluster properties dep. on vertex posponed to TrackSegmentMaker
+ *
  * Revision 1.100  2007/01/10 11:07:26  kharlov
  * Raw digits writing to file (B.Polichtchouk)
  *
@@ -637,9 +640,10 @@ void AliPHOSClusterizerv1::WriteRecPoints()
       delete rp ;
     }
 
-// No vertex is available now, calculate only vertex-independent quantities and 
-// postpone cluster properties calculation to TrackSegmentMaker
+// No vertex is available now, calculate cirrections in PID
       rp->EvalAll(fW0,digits) ;
+      TVector3 fakeVtx(0.,0.,0.) ;
+      rp->EvalAll(fW0,fakeVtx,digits) ;
   }
   emcRecPoints->Compress() ;
 //  emcRecPoints->Sort() ; //Can not sort until position is calculated!

diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h
index 6d8c37c..105253f 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.h
+++ b/PHOS/AliPHOSClusterizerv1.h
@@ -8,6 +8,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.49  2007/03/06 06:51:27  kharlov
+ * Calculation of cluster properties dep. on vertex posponed to TrackSegmentMaker
+ *
  * Revision 1.48  2006/08/30 16:12:52  kharlov
  * Reconstruction of raw data from beam test 2006 (B.Polichtchouk)
  *
@@ -133,7 +136,6 @@ private:
 private:
 
   Bool_t  fDefaultInit;              //! Says if the task was created by defaut ctor (only parameters are initialized)
-
   Int_t   fEmcCrystals ;             // number of EMC cristals in PHOS
 
   Bool_t  fToUnfold ;                // To perform unfolding 

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index fc7eef2..c1a231b 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -17,6 +17,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.84  2007/03/07 07:01:21  hristov
+ * Fixing copy/paste erro. Additional protections
+ *
  * Revision 1.83  2007/03/06 21:07:37  kharlov
  * DP: xz CPV-EMC distance filled to TS
  *
@@ -489,9 +492,6 @@ void  AliPHOSTrackSegmentMakerv1::Exec(Option_t *option)
     
     gime->TrackSegments()->Clear();
 
-    GetVertex() ;
-    EvalRecPoints() ;
-
     //    if(!ReadRecPoints(ievent))   continue; //reads RecPoints for event ievent
     
     for(fModule = 1; fModule <= geom->GetNModules() ; fModule++ ) {
@@ -519,68 +519,6 @@ void  AliPHOSTrackSegmentMakerv1::Exec(Option_t *option)
     Unload();
 }
 //____________________________________________________________________________
-void AliPHOSTrackSegmentMakerv1::GetVertex(void)
-{ //extract vertex either using ESD or generator
-  
-  //Try to extract vertex from data
-  if(fESD){
-    const AliESDVertex *esdVtx = fESD->GetVertex() ;
-    if(esdVtx){
-      fVtx.SetXYZ(esdVtx->GetXv(),esdVtx->GetYv(),esdVtx->GetZv()) ;
-      return ;
-    }
-  }
-  
-  AliWarning("Can not read vertex from data, use fixed \n") ;
-  fVtx.SetXYZ(0.,0.,0.) ;
- 
-}
-//____________________________________________________________________________
-void AliPHOSTrackSegmentMakerv1::EvalRecPoints(void)
-{ //calculate parameters of RecPoints using vertex and writing them
-
-  AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
-  TClonesArray * digits = gime->Digits() ;
-  AliPHOSClusterizer * cl = gime->Clusterizer() ;
-  TObjArray * emcRecPoints = gime->EmcRecPoints() ; 
-  if (!emcRecPoints) {
-    AliError("No CPV rec. points!");
-  }
-  else {
-    Double_t w0=cl->GetEmcLogWeight() ;
-    for(Int_t i=0; i<emcRecPoints->GetEntriesFast() ; i++){
-      AliPHOSEmcRecPoint * point = static_cast<AliPHOSEmcRecPoint*>(emcRecPoints->At(i));
-      if (point) point->EvalAll(w0,fVtx,digits) ;
-      else {
-       AliError(Form("No AliPHOSEmcRecPoint is found at %d",i));
-      }
-    }
-    emcRecPoints->Sort() ;
-  }
-
-  TObjArray * cpvRecPoints = gime->CpvRecPoints() ;
-  if (!cpvRecPoints) {
-    AliError("No CPV rec. points!");
-  }
-  else {
-    Double_t w0CPV=cl->GetCpvLogWeight() ;
-    for(Int_t i=0; i<cpvRecPoints->GetEntriesFast() ; i++){
-      AliPHOSCpvRecPoint * point = static_cast<AliPHOSCpvRecPoint*>(cpvRecPoints->At(i));
-      if (point) point->EvalAll(w0CPV,fVtx,digits) ;
-      else {
-       AliError(Form("No AliPHOSCpvRecPoint is found at %d",i));
-      }
-    }
-    cpvRecPoints->Sort() ;
-  }
-
-  //write recaculated RecPoints
-  gime->WriteRecPoints("OVERWRITE");
-  gime->WriteClusterizer("OVERWRITE");
- 
-
-}
-//____________________________________________________________________________
 void AliPHOSTrackSegmentMakerv1::Unload() 
 {
   // Unloads the task from the folder

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h
index 2eb9253..3a45759 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.h
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.h
@@ -7,6 +7,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.50  2007/03/06 06:54:48  kharlov
+ * DP:Calculation of cluster properties dep. on vertex added
+ *
  * Revision 1.49  2007/02/01 13:59:11  hristov
  * Forward declaration
  *
@@ -86,8 +89,6 @@ private:
   void    InitParameters() ;
   void    PrintTrackSegments(Option_t *option) ;
   virtual void   WriteTrackSegments() ;
-  void    GetVertex(void) ;
-  void    EvalRecPoints(void) ;
 
 private: