Changeset 3f8df25 in git for modules

Timestamp:

Jun 4, 2016, 8:07:59 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3c46e17

Parents:

50edcdbf

Message:

clean module

Location:

modules

Files:

• VertexFinder4D.cc (modified) (39 diffs)
• VertexFinder4D.h (modified) (5 diffs)

modules/VertexFinder4D.cc

@@ -3 +3 @@
  *  Cluster vertices from tracks using deterministic annealing and timing information
  *
- *  \authors M. Selvaggi, L. Grey
+ *  \authors M. Selvaggi, L. Gray
  *
  */
@@ -36 +36 @@
 
 namespace {
-  constexpr double dtCutOff = 4.0;
-
   bool recTrackLessZ1(const VertexFinder4D::track_t & tk1,
                       const VertexFinder4D::track_t & tk2)
@@ -49 +47 @@
 
 VertexFinder4D::VertexFinder4D() :
-  fSigma(0), fMinPT(0), fMaxEta(0), fSeedMinPT(0), fMinNDF(0), fGrowSeeds(0)
+  fVerbose(0), fMinPT(0), fVertexSpaceSize(0), fVertexTimeSize(0),
+  fUseTc(0), fBetaMax(0), fBetaStop(0), fCoolingFactor(0),
+  fMaxIterations(0), fDzCutOff(0), fD0CutOff(0), fDtCutOff(0)
 {
 }
@@ -65 +65 @@
   
   fVerbose = GetBool("Verbose", 1);
-  fSigma = GetDouble("Sigma", 3.0);
   fMinPT = GetDouble("MinPT", 0.1);
-  fMaxEta = GetDouble("MaxEta", 10.0);
-  fSeedMinPT = GetDouble("SeedMinPT", 5.0);
-  fMinNDF = GetInt("MinNDF", 4);
-  fGrowSeeds = GetInt("GrowSeeds", 1);
-
-  // setting everything in cm to be able to compare easily with Lindsey code
-  useTc_=true;
-  betamax_=0.1;
-  betastop_  =1.0;
-  coolingFactor_=0.8;
-  maxIterations_=100;
-  vertexSize_=0.05;  // 0.5 mm
-  dzCutOff_=4.0;   // Adaptive Fitter uses 3.0 but that appears to be a bit tight here sometimes
-  d0CutOff_=3.0; 
- 
+  fVertexSpaceSize = GetDouble("VertexSpaceSize", 0.5); //in mm
+  fVertexTimeSize = GetDouble("VertexTimeSize", 10E-12); //in s
+  fUseTc         = GetBool("UseTc", 1);
+  fBetaMax       = GetDouble("BetaMax ", 0.1);
+  fBetaStop      = GetDouble("BetaStop", 1.0);
+  fCoolingFactor = GetDouble("CoolingFactor", 0.8);
+  fMaxIterations = GetInt("MaxIterations", 100);
+  fDzCutOff      = GetDouble("DzCutOff", 40);  // Adaptive Fitter uses 30 mm but that appears to be a bit tight here sometimes
+  fD0CutOff      = GetDouble("D0CutOff", 30);
+  fDtCutOff      = GetDouble("DtCutOff", 100E-12);  // dummy
+  
+  // convert stuff in cm, ns
+  fVertexSpaceSize /= 10.0;  
+  fVertexTimeSize *= 1E9;  
+  fDzCutOff       /= 10.0;   // Adaptive Fitter uses 3.0 but that appears to be a bit tight here sometimes
+  fD0CutOff       /= 10.0; 
+  
   fInputArray = ImportArray(GetString("InputArray", "TrackSmearing/tracks"));
   fItInputArray = fInputArray->MakeIterator();
@@ -105 +106 @@
   TIterator *ItClusterArray;
   Int_t ivtx = 0;
-
+  
+  fInputArray->Sort();
+  
+  TLorentzVector pos, mom;
+  if (fVerbose)
+  {
+     cout<<" start processing vertices ..."<<endl;
+     cout<<" Found "<<fInputArray->GetEntriesFast()<<" input tracks"<<endl;
+     //loop over input tracks
+     fItInputArray->Reset();
+     while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
+     {  
+        pos = candidate->InitialPosition;
+        mom = candidate->Momentum;
+       
+        cout<<"pt: "<<mom.Pt()<<", eta: "<<mom.Eta()<<", phi: "<<mom.Phi()<<", z: "<<candidate->DZ/10<<endl;
+     }
+  }   
+     
   // clusterize tracks in Z
   clusterize(*fInputArray, *ClusterArray);
  
   if (fVerbose){std::cout <<  " clustering returned  "<< ClusterArray->GetEntriesFast() << " clusters  from " << fInputArray->GetEntriesFast() << " selected tracks" <<std::endl;}
-
-  
+ 
   //loop over vertex candidates
   ItClusterArray = ClusterArray->MakeIterator();
@@ -117 +135 @@
   while((candidate = static_cast<Candidate*>(ItClusterArray->Next())))
   {
+  
      double meantime = 0.;
      double expv_x2 = 0.;
@@ -131 +150 @@
      int itr = 0;
      
+     if(fVerbose)cout<<"this vertex has: "<<candidate->GetCandidates()->GetEntriesFast()<<" tracks"<<endl;
+     
      // loop over tracks belonging to this vertex
      TIter it1(candidate->GetCandidates());
      it1.Reset();
+     
      while((track = static_cast<Candidate*>(it1.Next())))
      {
@@ -139 +161 @@
         itr++;
         // TBC: the time is in ns for now TBC 
-        double t = track->Position.T()/c_light;
-        double l = track->L/c_light;
+        double t = track->InitialPosition.T()/c_light;
         double dt = track->ErrorT/c_light;
-        
-        const double time = t-l;
+        const double time = t;
         const double inverr = 1.0/dt;
         meantime += time*inverr;
@@ -151 +171 @@
         // compute error position TBC
         const double pt = track->Momentum.Pt();
-        const double z = track->DZ;
+        const double z = track->DZ/10.0;
         const double err_pt = track->ErrorPT;
         const double err_z = track->ErrorDZ;
@@ -163 +183 @@
       
         // while we are here store cluster index in tracks
-        track->ClusterIndex = ivtx; 
-      
+        track->ClusterIndex = ivtx;  
      }
-     
      
      meantime = meantime/normw;
@@ -182 +200 @@
      candidate->ClusterIndex = ivtx;
 
+     fVertexOutputArray->Add(candidate);
+     
      ivtx++;
  
@@ -189 +209 @@
        std::cout << "=" << candidate->Position.X()/10.0 <<" " << candidate->Position.Y()/10.0 << " " <<  candidate->Position.Z()/10.0;
        std::cout << " " << candidate->Position.T()/c_light;
+       
        std::cout << std::endl;
+       std::cout << "sumpt2 " << candidate->SumPT2<<endl;
      }
    }// end of cluster loop
@@ -195 +217 @@
     
     if(fVerbose){
-      std::cout << "PrimaryVertexProducerAlgorithm::vertices  candidates =" << ClusterArray->GetEntriesFast() << std::endl;
+      std::cout << "PrimaryVertexProducerAlgorithm::vertices candidates =" << ClusterArray->GetEntriesFast() << std::endl;
     }
 
@@ -219 +241 @@
     cout << "###################################################" << endl;
   }
-
-  Candidate *candidate;
-  
-  vector< Candidate > pv=vertices(tracks);
-
-  cout<<"test"<<endl;
+ 
+  vector< Candidate* > pv = vertices();
+
   if(fVerbose){ cout << "# VertexFinder4D::clusterize   pv.size="<<pv.size() << endl;  }
   if (pv.size()==0){ return;  }
@@ -231 +250 @@
   //TObjArray *ClusterArray = pv.begin()->GetCandidates();
   //Candidate *aCluster = static_cast<Candidate*>(&(pv.at(0)));
-   Candidate *aCluster = &(pv.at(0));
+   Candidate *aCluster = pv.at(0);
    
   // fill into clusters and merge
@@ -238 +257 @@
   if( fVerbose ) { 
       std::cout << '\t' << 0;
-      std::cout << ' ' << pv.begin()->Position.Z()/10.0 << ' ' << pv.begin()->Position.T()/c_light << std::endl; 
-    }
-
-  for(vector<Candidate>::iterator k=pv.begin()+1; k!=pv.end(); k++){
+      std::cout << ' ' << (*pv.begin())->Position.Z()/10.0 << ' ' << (*pv.begin())->Position.T()/c_light << std::endl; 
+    }
+
+  for(vector<Candidate*>::iterator k=pv.begin()+1; k!=pv.end(); k++){
     if( fVerbose ) { 
       std::cout << '\t' << std::distance(pv.begin(),k);
-      std::cout << ' ' << k->Position.Z() << ' ' << k->Position.T() << std::endl; 
+      std::cout << ' ' << (*k)->Position.Z() << ' ' << (*k)->Position.T() << std::endl; 
     }
     
     
     // TBC - check units here
-    if ( std::abs(k->Position.Z() - (k-1)->Position.Z())/10.0 > (2*vertexSize_) ||
-         std::abs(k->Position.T() - (k-1)->Position.Z())/c_light > 2*0.010 ) {
+    if ( std::abs((*k)->Position.Z() - (*(k-1))->Position.Z())/10.0 > (2*fVertexSpaceSize) ||
+         std::abs((*k)->Position.T() - (*(k-1))->Position.Z())/c_light > 2*0.010 ) {
       // close a cluster
       clusters.Add(aCluster);
@@ -256 +275 @@
     }
     //for(unsigned int i=0; i<k->GetCandidates().GetEntriesFast(); i++){ 
-      aCluster = &*k; 
+      aCluster = *k; 
     //}
     
@@ -269 +288 @@
 //------------------------------------------------------------------------------
 
-vector< Candidate >
-VertexFinder4D::vertices(const TObjArray & tracks, const int verbosity) 
+vector< Candidate* > VertexFinder4D::vertices() 
 {
   Candidate *candidate;
   UInt_t clusterIndex = 0;
-  vector< Candidate > clusters;
- 
-  vector<track_t> tks=fill(tracks);
+  vector< Candidate* > clusters;
+ 
+  vector<track_t> tks = fill();
+   
+  //print out input tracks
+   
+  if(fVerbose)
+  { 
+    std::cout<<" start processing vertices ..."<<std::endl;
+    std::cout<<" Found "<<tks.size()<<" input tracks"<<std::endl;
+    //loop over input tracks
+ 
+   
+   for(std::vector<track_t>::const_iterator it=tks.begin(); it!=tks.end(); it++){
+     double z = it->z;
+     double pt=it->pt;
+     double eta=it->eta;
+     double phi=it->phi;
+     double t = it->t;
+
+     std::cout<<"pt: "<<pt<<", eta: "<<eta<<", phi: "<<phi<<", z: "<<z<<", t: "<<t<<std::endl;
+   } 
+  }
    
   unsigned int nt=tks.size();
@@ -294 +332 @@
  
   // estimate first critical temperature
-  double beta=beta0(betamax_, tks, y);
-  niter=0; while((update(beta, tks,y)>1.e-6)  && (niter++ < maxIterations_)){ }
+  double beta=beta0(fBetaMax, tks, y);
+  niter=0; while((update(beta, tks,y)>1.e-6)  && (niter++ < fMaxIterations)){ }
 
   // annealing loop, stop when T<Tmin  (i.e. beta>1/Tmin)
-  while(beta<betamax_){ 
-
-    if(useTc_){
+  while(beta<fBetaMax){ 
+
+    if(fUseTc){
       update(beta, tks,y);
       while(merge(y,beta)){update(beta, tks,y);}
-      split(beta, tks,y, 1.);
-      beta=beta/coolingFactor_;
+      split(beta, tks,y);
+      beta=beta/fCoolingFactor;
     }else{
-      beta=beta/coolingFactor_;
+      beta=beta/fCoolingFactor;
       splitAll(y);
     }
 
-
    // make sure we are not too far from equilibrium before cooling further
-   niter=0; while((update(beta, tks,y)>1.e-6)  && (niter++ < maxIterations_)){ }
-
-  }
-
-  if(useTc_){
+   niter=0; while((update(beta, tks,y)>1.e-6)  && (niter++ < fMaxIterations)){ }
+
+  }
+
+  if(fUseTc){
     // last round of splitting, make sure no critical clusters are left
     update(beta, tks,y);
     while(merge(y,beta)){update(beta, tks,y);}
     unsigned int ntry=0;
-    while( split(beta, tks,y,1.) && (ntry++<10) ){
+    while( split(beta, tks,y) && (ntry++<10) ){
       niter=0; 
-      while((update(beta, tks,y)>1.e-6)  && (niter++ < maxIterations_)){}
+      while((update(beta, tks,y)>1.e-6)  && (niter++ < fMaxIterations)){}
       merge(y,beta);
       update(beta, tks,y);
@@ -330 +367 @@
     // merge collapsed clusters 
     while(merge(y,beta)){update(beta, tks,y);}  
-    if(fVerbose ){ cout << "dump after 1st merging " << endl;  dump(beta,y,tks,2);}
+    if(fVerbose ){ cout << "dump after 1st merging " << endl;  dump(beta,y,tks);}
   }
  
   // switch on outlier rejection
   rho0=1./nt; for(vector<vertex_t>::iterator k=y.begin(); k!=y.end(); k++){ k->pk =1.; }  // democratic
-  niter=0; while((update(beta, tks,y,rho0) > 1.e-8)  && (niter++ < maxIterations_)){  }
-  if(fVerbose  ){ cout << "rho0=" << rho0 <<   " niter=" << niter <<  endl; dump(beta,y,tks,2);}
+  niter=0; while((update(beta, tks,y,rho0) > 1.e-8)  && (niter++ < fMaxIterations)){  }
+  if(fVerbose  ){ cout << "rho0=" << rho0 <<   " niter=" << niter <<  endl; dump(beta,y,tks);}
 
   
   // merge again  (some cluster split by outliers collapse here)
-  while(merge(y,tks.size())){}  
-  if(fVerbose  ){ cout << "dump after 2nd merging " << endl;  dump(beta,y,tks,2);}
+  while(merge(y)){}  
+  if(fVerbose  ){ cout << "dump after 2nd merging " << endl;  dump(beta,y,tks);}
 
 
   // continue from freeze-out to Tstop (=1) without splitting, eliminate insignificant vertices
-  while(beta<=betastop_){
+  while(beta<=fBetaStop){
     while(purge(y,tks,rho0, beta)){
-      niter=0; while((update(beta, tks, y, rho0) > 1.e-6)  && (niter++ < maxIterations_)){  }
+      niter=0; while((update(beta, tks, y, rho0) > 1.e-6)  && (niter++ < fMaxIterations)){  }
     } 
-    beta/=coolingFactor_;
-    niter=0; while((update(beta, tks, y, rho0) > 1.e-6)  && (niter++ < maxIterations_)){  }
+    beta/=fCoolingFactor;
+    niter=0; while((update(beta, tks, y, rho0) > 1.e-6)  && (niter++ < fMaxIterations)){  }
   }
 
@@ -356 +393 @@
 //   // new, one last round of cleaning at T=Tstop
 //   while(purge(y,tks,rho0, beta)){
-//     niter=0; while((update(beta, tks,y,rho0) > 1.e-6)  && (niter++ < maxIterations_)){  }
+//     niter=0; while((update(beta, tks,y,rho0) > 1.e-6)  && (niter++ < fMaxIterations)){  }
 //   } 
 
@@ -362 +399 @@
   if(fVerbose){
    cout << "Final result, rho0=" << rho0 << endl;
-   dump(beta,y,tks,2);
+   dump(beta,y,tks);
   }
 
@@ -371 +408 @@
   // ensure correct normalization of probabilities, should make double assginment reasonably impossible
   for(unsigned int i=0; i<nt; i++){  
-    tks[i].Z=rho0*exp(-beta*( dzCutOff_*dzCutOff_));
+    tks[i].Z=rho0*exp(-beta*( fDzCutOff*fDzCutOff));
     for(vector<vertex_t>::iterator k=y.begin(); k!=y.end(); k++){ 
       tks[i].Z += k->pk * exp(-beta*Eik(tks[i],*k));
@@ -420 +457 @@
     
     candidate->ClusterIndex = clusterIndex++;;
-    //candidate->ClusterNDF = 5;
-    //candidate->ClusterSigma = fSigma;
-    //candidate->SumPT2 = cluster->second;
-    
-    // TBC units - set everything back in mm 
-    
-    //cout<<z<<","<<time<<endl;
-    
     candidate->Position.SetXYZT(0.0, 0.0, z*10.0 , time*c_light);
     
@@ -433 +462 @@
     candidate->PositionError.SetXYZT(0.0, 0.0, 0.0 , crappy_error_guess*c_light);
 
-    //fVertexOutputArray->Add(candidate);
-
     clusterIndex++;   
-    clusters.push_back(*candidate);
+    clusters.push_back(candidate);
   }
   
@@ -447 +474 @@
 
 vector<VertexFinder4D::track_t> 
-VertexFinder4D::fill( const TObjArray & tracks )const{
+VertexFinder4D::fill()const{
   
   Candidate *candidate;
@@ -453 +480 @@
   Double_t z, dz, t, l, dt, d0, d0error;
   
-  
   // prepare track data for clustering
   vector< track_t > tks;
@@ -459 +485 @@
   // loop over input tracks
   fItInputArray->Reset();
-  cout<<"new fill"<<endl;
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
-     cout<<"new track"<<endl;
      //TBC everything in cm 
      z = candidate->DZ/10;
@@ -470 +494 @@
    // TBC: beamspot size induced error, take 0 for now.        
    //   + (std::pow(beamspot.BeamWidthX()*cos(phi),2.)+std::pow(beamspot.BeamWidthY()*sin(phi),2.))/std::pow(tantheta,2.) // beam-width induced
-      + vertexSize_*vertexSize_;                     // intrinsic vertex size, safer for outliers and short lived decays
-    
-    // TBC: the time is in ns for now TBC 
-     t = candidate->Position.T()/c_light;
+      + fVertexSpaceSize*fVertexSpaceSize;                     // intrinsic vertex size, safer for outliers and short lived decays
+    
+     // TBC: the time is in ns for now TBC 
+     //t = candidate->Position.T()/c_light;
+     t = candidate->InitialPosition.T()/c_light;
      l = candidate->L/c_light;
      
-     tr.t = (t-l); // 
+     double pt = candidate->Momentum.Pt();
+     double eta = candidate->Momentum.Eta();
+     double phi = candidate->Momentum.Phi();
+
+     tr.pt = pt;
+     tr.eta = eta;
+     tr.phi = phi;
+     tr.t = t; // 
      tr.dtz = 0.;
      dt = candidate->ErrorT/c_light;
-     tr.dt2 = dt*dt + 0.010*0.010;   // the ~injected~ timing error, need to add a small minimum vertex size in time
-     //cout<<"t error: "<<dt<<endl;
-    if (d0CutOff_>0){
-    
-      d0 = TMath::Abs(candidate->D0)/10.0;
-      d0error = candidate->ErrorD0/10.0;
+     tr.dt2 = dt*dt + fVertexTimeSize*fVertexTimeSize;   // the ~injected~ timing error plus a small minimum vertex size in time
+     if (fD0CutOff>0){
+    
+     d0 = TMath::Abs(candidate->D0)/10.0;
+     d0error = candidate->ErrorD0/10.0;
       
-      tr.pi=1./(1.+exp((d0*d0)/(d0error*d0error) - d0CutOff_*d0CutOff_));  // reduce weight for high ip tracks  
-     // cout<<"IP: "<<d0<<endl;
-     // cout<<"IP error: "<<d0error<<endl;
-    
-    }else{
+     tr.pi=1./(1.+exp((d0*d0)/(d0error*d0error) - fD0CutOff*fD0CutOff));  // reduce weight for high ip tracks  
+     
+    }
+    else{
       tr.pi=1.;
     }
     tr.tt=&(*candidate);    
     tr.Z=1.;
-    if( tr.pi > 1e-3 ) {
+ 
+    // TBC now putting track selection here (> fPTMin)
+    if( tr.pi > 1e-3 && tr.pt > fMinPT) {
       tks.push_back(tr);
     }
- 
-   cout<<"dz2: "<<tr.dz2<<endl;
-   cout<<"t: "<<tr.t<<endl;
-   cout<<"z: "<<tr.z<<endl;
-   cout<<"dt2: "<<tr.dt2<<endl;
-   cout<<"pi: "<<tr.pi<<endl;
-
- 
  
   }
@@ -523 +547 @@
 //--------------------------------------------------------------------------------  
 
-void VertexFinder4D::dump(const double beta, const vector<vertex_t> & y, const vector<track_t> & tks0, int verbosity)const{
+void VertexFinder4D::dump(const double beta, const vector<vertex_t> & y, const vector<track_t> & tks0)const{
 
   // copy and sort for nicer printout
@@ -531 +555 @@
 
   cout << "-----DAClusterizerInZT::dump ----" << endl;
-  cout << " beta=" << beta << "   betamax= " << betamax_ << endl;
+  cout << " beta=" << beta << "   betamax= " << fBetaMax << endl;
   cout << "                                                               z= ";
   cout.precision(4);
@@ -554 +578 @@
   cout  << endl;
 
-  if(verbosity>0){
+  if(fVerbose){
     double E=0, F=0;
     cout << endl;
@@ -566 +590 @@
            << setw(8) << fixed << setprecision(4) << tt << " +/-" << setw(6) << std::sqrt(tks[i].dt2)  ;
       
-      
-      // TBC - see later if we want to keep these print outs 
-      /*
-      if(tks[i].tt->track().quality(reco::TrackBase::highPurity)){ cout << " *";}else{cout <<"  ";}
-      if(tks[i].tt->track().hitPattern().hasValidHitInFirstPixelBarrel()){cout <<"+";}else{cout << "-";}
-      
-      cout << setw(1) << tks[i].tt->track().hitPattern().pixelBarrelLayersWithMeasurement(); // see DataFormats/TrackReco/interface/HitPattern.h
-      cout << setw(1) << tks[i].tt->track().hitPattern().pixelEndcapLayersWithMeasurement(); 
-      cout << setw(1) << hex << tks[i].tt->track().hitPattern().trackerLayersWithMeasurement()-tks[i].tt->track().hitPattern().pixelLayersWithMeasurement() <<dec; 
-      cout << "=" << setw(1)<<hex <<tks[i].tt->track().trackerExpectedHitsOuter().numberOfHits() << dec;
-
-      Measurement1D IP=tks[i].tt->stateAtBeamLine().transverseImpactParameter();
-      cout << setw (8) << IP.value() << "+/-" << setw (6) << IP.error();
-      cout << " " << setw(6) << setprecision(2)  << tks[i].tt->track().pt()*tks[i].tt->track().charge();
-      cout << " " << setw(5) << setprecision(2) << tks[i].tt->track().phi() 
-           << " "  << setw(5)  << setprecision(2)   << tks[i].tt->track().eta() ;
-      */
       double sump=0.;
       for(vector<vertex_t>::const_iterator k=y.begin(); k!=y.end(); k++){
@@ -704 +711 @@
 
     // update pik and Zi and Ti
-    double Zi = rho0*std::exp(-beta*(dzCutOff_*dzCutOff_));// cut-off (eventually add finite size in time)
-    //double Ti = 0.; // dt0*std::exp(-beta*dtCutOff_);
+    double Zi = rho0*std::exp(-beta*(fDzCutOff*fDzCutOff));// cut-off (eventually add finite size in time)
+    //double Ti = 0.; // dt0*std::exp(-beta*fDtCutOff);
     for(vector<vertex_t>::iterator k=y.begin(); k!=y.end(); k++){
       k->ei = std::exp(-beta*Eik(tks[i],*k));// cache exponential for one track at a time
@@ -725 +732 @@
     }
 
-
   } // end of track loop
-
 
   // now update z
@@ -752 +757 @@
 //------------------------------------------------------------------------------
 
-bool VertexFinder4D::merge(vector<vertex_t> & y, int nt)const{
+bool VertexFinder4D::merge(vector<vertex_t> & y)const{
   // merge clusters that collapsed or never separated, return true if vertices were merged, false otherwise
   
@@ -827 +832 @@
     int nUnique=0;
     double sump=0;
-    double pmax=k->pk/(k->pk+rho0*exp(-beta*dzCutOff_*dzCutOff_));
+    double pmax=k->pk/(k->pk+rho0*exp(-beta*fDzCutOff*fDzCutOff));
     for(unsigned int i=0; i<nt; i++){
       if(tks[i].Z > 0){
@@ -892 +897 @@
   
   if (T0>1./betamax){
-    return betamax/pow(coolingFactor_, int(std::log(T0*betamax)/std::log(coolingFactor_))-1 );
+    return betamax/pow(fCoolingFactor, int(std::log(T0*betamax)/std::log(fCoolingFactor))-1 );
   }else{
     // ensure at least one annealing step
-    return betamax/coolingFactor_;
+    return betamax/fCoolingFactor;
   }
 }
@@ -903 +908 @@
 bool VertexFinder4D::split( double beta,
                                vector<track_t> & tks,
-                               vector<vertex_t> & y,
-                               double threshold ) const {
+                               vector<vertex_t> & y) const {
   // split only critical vertices (Tc >~ T=1/beta   <==>   beta*Tc>~1)
   // an update must have been made just before doing this (same beta, no merging)

modules/VertexFinder4D.h

@@ -6 +6 @@
  *  Cluster vertices from tracks using deterministic annealing and timing information
  *
- *  \authors M. Selvaggi
+ *  \authors M. Selvaggi, L. Gray
  *
  */
@@ -48 +48 @@
   double Z;              // Z[i]   for DA clustering
   double pi;             // track weight
+  double pt;
+  double eta;
+  double phi;
+
 };
 
@@ -70 +74 @@
   void clusterize(const TObjArray & tracks, TObjArray & clusters);
 
-  std::vector< Candidate >
-    vertices(const TObjArray & tracks, const int verbosity=0);
+  std::vector< Candidate* > vertices();
 
-  std::vector<track_t> fill(const TObjArray & tracks)const;
+  std::vector<track_t> fill() const;
 
   bool split( double beta,
              std::vector<track_t> & tks,
-             std::vector<vertex_t> & y,
-             double threshold ) const;
+             std::vector<vertex_t> & y) const;
 
   double update( double beta,
@@ -89 +91 @@
                double & )const;
 
-  void dump(const double beta, const std::vector<vertex_t> & y, const std::vector<track_t> & tks, const int verbosity=0) const;
-  bool merge(std::vector<vertex_t> &,int ) const;
+  void dump(const double beta, const std::vector<vertex_t> & y, const std::vector<track_t> & tks) const;
+  bool merge(std::vector<vertex_t> &) const;
   bool merge(std::vector<vertex_t> &,double & ) const;
   bool purge(std::vector<vertex_t> &, std::vector<track_t> & , double &, const double ) const;
@@ -105 +107 @@
 private:
 
-  Double_t fSigma;
+  Bool_t fVerbose;
   Double_t fMinPT;
-  Double_t fMaxEta;
-  Double_t fSeedMinPT;
-  Int_t fMinNDF;
-  Int_t fGrowSeeds;
-  Bool_t fVerbose;
-
-  bool useTc_;
-  float vertexSize_;
-  int maxIterations_;
-  double coolingFactor_;
-  float betamax_;
-  float betastop_;
-  double dzCutOff_;
-  double d0CutOff_;
-  double dtCutOff_; // for when the beamspot has time
+  
+  Float_t fVertexSpaceSize;
+  Float_t fVertexTimeSize;
+  Bool_t fUseTc;
+  Float_t fBetaMax;
+  Float_t fBetaStop;
+  Double_t fCoolingFactor;
+  Int_t fMaxIterations;
+  Double_t fDzCutOff;
+  Double_t fD0CutOff;
+  Double_t fDtCutOff; // for when the beamspot has time
 
   TObjArray *fInputArray;