Index: trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc
===================================================================
--- trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc	(revision 267)
+++ trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc	(revision 268)
@@ -1,21 +1,32 @@
-/** \class BlockClasses
- *
- *  Initialization of static fgCompare functions. At the moment a number of 
- *  functions TCompare*** are implemented (see BlockCompare.h). 
- *  Function TCompareXX sorts objects 
- *  by the variable "XX" that MUST be present in the data members of the 
- *  Block TRoot class.
- *  By default most objects are sorted by PT or ET.
- *  Only calorimeter cells and basic cluster are sorted by E
- *  TRootGenParticle particle is not sorted by default
- *  to preserve mother-dautherlinks between particles.
- *
- *  $Date: 2009-02-13 19:38:03 $
- *  $Revision: 1.9 $
- *
- *  
- *  \author S. Ovyn - UCL, Louvain-la-Neuve
- *
- */
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
 
 #include "BlockClasses.h"
@@ -30,5 +41,5 @@
 TCompare *TRootTauJet::fgCompare = TComparePT<TRootTauJet>::Instance();
 TCompare *TRootJet::fgCompare = TComparePT<TRootJet>::Instance();
-TCompare *TRootTracks::fgCompare = TComparePT<TRootTracks>::Instance();
+TCompare *TRootTracks::fgCompare = 0;
 TCompare *TRootETmis::fgCompare = 0;
 TCompare *TRootCalo::fgCompare = 0;
@@ -39,6 +50,4 @@
 TCompare *TRootRomanPotHits::fgCompare =0;
 TCompare *TRootTrigger::fgCompare =0;
-//TCompare *D_CaloTower::fgCompare=0;
-TCompare *D_Track::fgCompare=0;
 
 void TRootParticle::Set(const TLorentzVector& momentum) {
@@ -107,9 +116,9 @@
     float PT, E, Px, Py, Pz; 
 
-D_Track::D_Track() :
+TRootTracks::TRootTracks() :
 	Eta(UNDEFINED), Phi(UNDEFINED), EtaOuter(UNDEFINED), PhiOuter(UNDEFINED), 
         PT(UNDEFINED), E(UNDEFINED), Px(UNDEFINED), Py(UNDEFINED), Pz(UNDEFINED) {}
 
-D_Track::D_Track(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) :
+TRootTracks::TRootTracks(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) :
 	Eta(inEta), Phi(inPhi), EtaOuter(outEta), PhiOuter(outPhi), 
         PT(pt) {
@@ -117,11 +126,10 @@
         Px = p.Px(); Py = p.Py(); Pz = p.Pz();  E=p.E();
 }
-
-D_Track::D_Track(const D_Track& track) :
+TRootTracks::TRootTracks(const TRootTracks& track) :
 	Eta(track.Eta), Phi(track.Phi), 
         EtaOuter(track.EtaOuter), PhiOuter(track.PhiOuter), 
 	PT(track.PT), E(track.E), Px(track.Px), Py(track.Py), Pz(track.Pz) {}
 
-D_Track& D_Track::operator=(const D_Track& track) {
+TRootTracks& TRootTracks::operator=(const TRootTracks& track) {
   if(this == &track) return *this;
 	Eta = track.Eta;             Phi = track.Phi; 
@@ -131,5 +139,5 @@
 }
 
-void D_Track::Set(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) {
+void TRootTracks::Set(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) {
 	Eta= inEta; Phi=inPhi;  EtaOuter=outEta; PhiOuter=outPhi; PT=pt; 
 	TLorentzVector p; p.SetPtEtaPhiE(PT,Eta,Phi,PT*cosh(Eta));
@@ -137,5 +145,5 @@
 }
 
-const TLorentzVector D_Track::GetFourVector() const {
+const TLorentzVector TRootTracks::GetFourVector() const {
 	TLorentzVector v;
 	v.SetPtEtaPhiE(PT,Eta,Phi,PT*cosh(Eta));
@@ -162,12 +170,3 @@
         E_em=cal.getEem(); E_had=cal.getEhad();
         E   =cal.getE();   ET   =cal.getET();
-	//EtaCalo = cal.getEta();
-	//PhiCalo = cal.getPhi();
 }
-
-
-TRootTracks::TRootTracks(const D_Track& track) :
-   E(track.getE()), Px(track.getPx()), Py(track.getPy()), Pz(track.getPz()),
-   Eta(track.getEta()), Phi(track.getPhi()),
-   /*Etaout(track.getEtaOuter()),*/ EtaCalo(track.getEtaOuter()), /*Phiout(track.getPhiOuter()),*/ PhiCalo(track.getPhiOuter()) {}
-
Index: trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h
===================================================================
--- trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h	(revision 267)
+++ trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h	(revision 268)
@@ -1,14 +1,32 @@
-
-/** \class BlockClassesLinkDef
- *
- *  Lists classes to be included in cint dicitonary
- *
- *  $Date: 2009-02-13 19:38:03 $
- *  $Revision: 1.4 $
- *
- *  
- *  \author S. Ovyn - UCL, Louvain-la-Neuve
- *
- */
+/***********************************************************************
+**                                                                    **
+**          /----------------------------------------------\          **
+**         |  Delphes, a framework for the fast simulation  |         **
+**         |       of a  generic collider experiment        |         **
+**          \----------------------------------------------/          **
+**                                                                    **
+**                                                                    **
+**   This package uses:                                               **
+**   ------------------                                               **
+**   FastJet algorithm: Phys. Lett. B641 (2006) [hep-ph/0512210]      ** 
+**   Hector: JINST 2:P09005 (2007) [physics.acc-ph:0707.1198v2]       ** 
+**   FROG: [hep-ex/0901.2718v1]                                       **
+**                                                                    **
+** ------------------------------------------------------------------ **
+**                                                                    **
+**   Main authors:                                                    **
+**   -------------                                                    **
+**                                                                    **
+**                Severine Ovyn                Xavier Rouby           ** 
+**          severine.ovyn@uclouvain.be      xavier.rouby@cern         ** 
+**                                                                    ** 
+**         Center for Particle Physics and Phenomenology (CP3)        ** 
+**                Universite catholique de Louvain (UCL)              **       
+**                     Louvain-la-Neuve, Belgium                      **            
+**                                                                    **
+**                      Copyright (C) 2008-2009,                      **
+**                        All rights reserved.                        **  
+**                                                                    **
+***********************************************************************/
 
 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
@@ -40,7 +58,4 @@
 #pragma link C++ class TRootLHEFEvent+;
 #pragma link C++ class TRootLHEFParticle+;
-#pragma link C++ class D_Track+;
-//#pragma link C++ class D_CaloTower+;
-
 
 #endif
