From f531a546a9974bd7865e20843d21d2a63848b886 Mon Sep 17 00:00:00 2001 From: nick Date: Wed, 6 Jun 2001 13:19:03 +0000 Subject: [PATCH] 27-may-2001 NvE New class AliEvent introduced and RALICELinkDef.h & co. updated accordingly. Also RALICELinkDef.h changed back to old schema evolution (i.e. "+" removed) because of problems with I/O in ROOT 3.00/06 w.r.t. multiple inheritance. 29-may-2001 NvE Position reset added in AliVertex::Reset(). 01-jun-2001 NvE Memberfunctions Add() renamed explicitly to AddTrack(), AddJet() and AddVertex() in AliJet and AliVertex. 03-jun-2001 NvE Treatment of masshypotheses introduced in AliTrack. 04-jun-2001 NvE CVS Log text and keyword replaced by Id in .cxx files and C++ comment indicator /* ... */ replaced by // in the Id record of the .h files to prevent problems. 06-jun-2001 NvE CVS Date keyword introduced in 'Modified' field in .cxx files so that the modification date is updated automatically in the html docs. --- RALICE/Ali3Vector.cxx | 9 +- RALICE/Ali3Vector.h | 2 +- RALICE/Ali3VectorObj.cxx | 5 +- RALICE/Ali3VectorObj.h | 2 +- RALICE/Ali4Vector.cxx | 9 +- RALICE/Ali4Vector.h | 2 +- RALICE/Ali4VectorObj.cxx | 5 +- RALICE/Ali4VectorObj.h | 2 +- RALICE/AliBoost.cxx | 9 +- RALICE/AliBoost.h | 2 +- RALICE/AliCalcluster.cxx | 12 +-- RALICE/AliCalcluster.h | 2 +- RALICE/AliCalmodule.cxx | 12 +-- RALICE/AliCalmodule.h | 2 +- RALICE/AliCalorimeter.cxx | 12 +-- RALICE/AliCalorimeter.h | 2 +- RALICE/AliInvmass.cxx | 8 +- RALICE/AliInvmass.h | 2 +- RALICE/AliJet.cxx | 19 ++-- RALICE/AliJet.h | 6 +- RALICE/AliMath.cxx | 12 +-- RALICE/AliMath.h | 2 +- RALICE/AliPosition.cxx | 8 +- RALICE/AliPosition.h | 2 +- RALICE/AliPositionObj.cxx | 5 +- RALICE/AliPositionObj.h | 2 +- RALICE/AliRandom.cxx | 8 +- RALICE/AliRandom.h | 2 +- RALICE/AliSample.cxx | 8 +- RALICE/AliSample.h | 2 +- RALICE/AliSignal.cxx | 9 +- RALICE/AliSignal.h | 2 +- RALICE/AliTrack.cxx | 200 ++++++++++++++++++++++++++++++++++++-- RALICE/AliTrack.h | 13 ++- RALICE/AliVertex.cxx | 52 +++++----- RALICE/AliVertex.h | 10 +- RALICE/RALICELinkDef.h | 37 +++---- RALICE/history.txt | 14 +++ 38 files changed, 320 insertions(+), 192 deletions(-) diff --git a/RALICE/Ali3Vector.cxx b/RALICE/Ali3Vector.cxx index 1bb0c72a40f..2868ca177a3 100644 --- a/RALICE/Ali3Vector.cxx +++ b/RALICE/Ali3Vector.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class Ali3Vector @@ -78,7 +73,7 @@ Introduction of the Copyright and cvs Log // c=a*5; // //--- Author: Nick van Eijndhoven 30-mar-1999 UU-SAP Utrecht -//- Modified: NvE 25-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "Ali3Vector.h" diff --git a/RALICE/Ali3Vector.h b/RALICE/Ali3Vector.h index 6c8c593bd8e..023c76cb127 100644 --- a/RALICE/Ali3Vector.h +++ b/RALICE/Ali3Vector.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/Ali3VectorObj.cxx b/RALICE/Ali3VectorObj.cxx index e0c371a6095..77e72061445 100644 --- a/RALICE/Ali3VectorObj.cxx +++ b/RALICE/Ali3VectorObj.cxx @@ -13,9 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class Ali3VectorObj @@ -53,6 +51,7 @@ $Log$ // vec2.Info(); // //--- Author: Nick van Eijndhoven 18-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "Ali3VectorObj.h" diff --git a/RALICE/Ali3VectorObj.h b/RALICE/Ali3VectorObj.h index 156fbc4438d..5c040196704 100644 --- a/RALICE/Ali3VectorObj.h +++ b/RALICE/Ali3VectorObj.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include "TObject.h" diff --git a/RALICE/Ali4Vector.cxx b/RALICE/Ali4Vector.cxx index 44d6c82eb65..3891ad9bc10 100644 --- a/RALICE/Ali4Vector.cxx +++ b/RALICE/Ali4Vector.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class Ali4Vector @@ -132,7 +127,7 @@ Introduction of the Copyright and cvs Log // c=a*5; // //--- Author: Nick van Eijndhoven 01-apr-1999 UU-SAP Utrecht -//- Modified: NvE 15-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "Ali4Vector.h" diff --git a/RALICE/Ali4Vector.h b/RALICE/Ali4Vector.h index 9eff7c6f8a3..425c0897c63 100644 --- a/RALICE/Ali4Vector.h +++ b/RALICE/Ali4Vector.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/Ali4VectorObj.cxx b/RALICE/Ali4VectorObj.cxx index b7fec056be1..3a5fd9d678a 100644 --- a/RALICE/Ali4VectorObj.cxx +++ b/RALICE/Ali4VectorObj.cxx @@ -13,9 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class Ali4VectorObj @@ -53,6 +51,7 @@ $Log$ // vec2.Info(); // //--- Author: Nick van Eijndhoven 18-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "Ali4VectorObj.h" diff --git a/RALICE/Ali4VectorObj.h b/RALICE/Ali4VectorObj.h index 6b23953f22a..271dde07be0 100644 --- a/RALICE/Ali4VectorObj.h +++ b/RALICE/Ali4VectorObj.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include "TObject.h" diff --git a/RALICE/AliBoost.cxx b/RALICE/AliBoost.cxx index c03a61b8586..ebe99912216 100644 --- a/RALICE/AliBoost.cxx +++ b/RALICE/AliBoost.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliBoost @@ -61,7 +56,7 @@ Introduction of the Copyright and cvs Log // b2.Info("sph"); // //--- Author: Nick van Eijndhoven 14-may-1996 UU-SAP Utrecht -//- Modified: NvE 24-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliBoost.h" diff --git a/RALICE/AliBoost.h b/RALICE/AliBoost.h index 83b7bda88c3..d7e0484392a 100644 --- a/RALICE/AliBoost.h +++ b/RALICE/AliBoost.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliCalcluster.cxx b/RALICE/AliCalcluster.cxx index 46ee98a9518..297cf1a46e5 100644 --- a/RALICE/AliCalcluster.cxx +++ b/RALICE/AliCalcluster.cxx @@ -13,15 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3 1999/11/03 14:23:17 fca -New version of RALICE introduced - -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliCalcluster @@ -33,7 +25,7 @@ Introduction of the Copyright and cvs Log // to enable EM or hadronic cluster identification. // //--- Author: Nick van Eijndhoven 13-jun-1997 UU-SAP Utrecht -//- Modified: NvE 18-jan-2000 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliCalcluster.h" diff --git a/RALICE/AliCalcluster.h b/RALICE/AliCalcluster.h index 24bd3497de7..2d9e026dfc4 100644 --- a/RALICE/AliCalcluster.h +++ b/RALICE/AliCalcluster.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliCalmodule.cxx b/RALICE/AliCalmodule.cxx index cddb75041c0..b58078a8dbf 100644 --- a/RALICE/AliCalmodule.cxx +++ b/RALICE/AliCalmodule.cxx @@ -13,15 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3 1999/11/03 14:23:17 fca -New version of RALICE introduced - -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliCalmodule @@ -31,7 +23,7 @@ Introduction of the Copyright and cvs Log // Note : row and col start counting at 1. // //--- Author: Nick van Eijndhoven 13-jun-1997 UU-SAP Utrecht -//- Modified: NvE 18-jan-2000 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliCalmodule.h" diff --git a/RALICE/AliCalmodule.h b/RALICE/AliCalmodule.h index 0929165c19c..c4856cba91f 100644 --- a/RALICE/AliCalmodule.h +++ b/RALICE/AliCalmodule.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include diff --git a/RALICE/AliCalorimeter.cxx b/RALICE/AliCalorimeter.cxx index 7354792b08e..42d179be0f7 100644 --- a/RALICE/AliCalorimeter.cxx +++ b/RALICE/AliCalorimeter.cxx @@ -13,15 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3 1999/11/03 14:23:17 fca -New version of RALICE introduced - -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliCalorimeter @@ -56,7 +48,7 @@ Introduction of the Copyright and cvs Log // // Note : Module gain, edge and dead flags remain // //--- Author: Nick van Eijndhoven 13-jun-1997 UU-SAP Utrecht -//- Modified: NvE 03-mar-2000 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliCalorimeter.h" diff --git a/RALICE/AliCalorimeter.h b/RALICE/AliCalorimeter.h index 2769fab3c4a..a494899295f 100644 --- a/RALICE/AliCalorimeter.h +++ b/RALICE/AliCalorimeter.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliInvmass.cxx b/RALICE/AliInvmass.cxx index a54c867e316..a68812965ba 100644 --- a/RALICE/AliInvmass.cxx +++ b/RALICE/AliInvmass.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ //////////////////////////////////////////////////////////////////////////////// // Class AliInvmass @@ -104,6 +99,7 @@ Introduction of the Copyright and cvs Log // // //--- Author: Nick van Eijndhoven 12-apr-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht //////////////////////////////////////////////////////////////////////////////// #include "AliInvmass.h" diff --git a/RALICE/AliInvmass.h b/RALICE/AliInvmass.h index b069219c137..5a32840888e 100644 --- a/RALICE/AliInvmass.h +++ b/RALICE/AliInvmass.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliJet.cxx b/RALICE/AliJet.cxx index 8d0f17080e2..a47e0f0a139 100644 --- a/RALICE/AliJet.cxx +++ b/RALICE/AliJet.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliJet @@ -36,10 +31,10 @@ Introduction of the Copyright and cvs Log // ... // AliJet j1(5); // AliJet j2(12); -// j1.Add(t1); -// j1.Add(t2); -// j2.Add(t3); -// j2.Add(t4); +// j1.AddTrack(t1); +// j1.AddTrack(t2); +// j2.AddTrack(t3); +// j2.AddTrack(t4); // // j1.Info(); // j2.Info("sph"); @@ -54,7 +49,7 @@ Introduction of the Copyright and cvs Log // Note : All quantities are in GeV, GeV/c or GeV/c**2 // //--- Author: Nick van Eijndhoven 10-jul-1997 UU-SAP Utrecht -//- Modified: NvE 06-apr-1999 UU-SAP Utrecht to inherit from Ali4Vector +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliJet.h" @@ -120,7 +115,7 @@ void AliJet::Reset() if (fNtinit > 0) SetNtinit(fNtinit); } /////////////////////////////////////////////////////////////////////////// -void AliJet::Add(AliTrack& t) +void AliJet::AddTrack(AliTrack& t) { // Add a track to the jet // In case the maximum number of tracks has been reached diff --git a/RALICE/AliJet.h b/RALICE/AliJet.h index 7190b3c22ef..622fc872b76 100644 --- a/RALICE/AliJet.h +++ b/RALICE/AliJet.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include @@ -21,8 +21,8 @@ class AliJet : public TObject,public Ali4Vector AliJet(Int_t n); // Create a Jet to hold initially n Tracks ~AliJet(); // Default destructor void Reset(); // Reset all values - virtual void Add(AliTrack& t); // Add a track to the jet - virtual void Add(AliTrack* t) { Add(*t); } + virtual void AddTrack(AliTrack& t);// Add a track to the jet + virtual void AddTrack(AliTrack* t) { AddTrack(*t); } void Info(TString f); // Print jet information in coordinate frame f void List(TString f="car"); // Print jet prim. track information for coord. frame f void ListAll(TString f="car"); // Print jet prim. and decay track information for coord. frame f diff --git a/RALICE/AliMath.cxx b/RALICE/AliMath.cxx index 5c78bd69378..0ccafef38de 100644 --- a/RALICE/AliMath.cxx +++ b/RALICE/AliMath.cxx @@ -13,15 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3 1999/11/03 14:23:17 fca -New version of RALICE introduced - -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliMath @@ -39,7 +31,7 @@ Introduction of the Copyright and cvs Log // // correct model // //--- Author: Nick van Eijndhoven 14-nov-1998 UU-SAP Utrecht -//- Modified: NvE 12-mar-2000 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliMath.h" diff --git a/RALICE/AliMath.h b/RALICE/AliMath.h index 8560b5caa9e..c53ba81bd16 100644 --- a/RALICE/AliMath.h +++ b/RALICE/AliMath.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliPosition.cxx b/RALICE/AliPosition.cxx index 75e9745b425..94541f701fb 100644 --- a/RALICE/AliPosition.cxx +++ b/RALICE/AliPosition.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliPosition @@ -55,6 +50,7 @@ Introduction of the Copyright and cvs Log // q.GetPositionErrors(dloc,"sph"); // //--- Author: Nick van Eijndhoven 06-feb-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliPosition.h" diff --git a/RALICE/AliPosition.h b/RALICE/AliPosition.h index e3efa3aa4c9..cb49c0dba0a 100644 --- a/RALICE/AliPosition.h +++ b/RALICE/AliPosition.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliPositionObj.cxx b/RALICE/AliPositionObj.cxx index 1fcc77194d1..e5e404cc500 100644 --- a/RALICE/AliPositionObj.cxx +++ b/RALICE/AliPositionObj.cxx @@ -13,9 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliPositionObj @@ -53,6 +51,7 @@ $Log$ // ssum.Info(); // //--- Author: Nick van Eijndhoven 18-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliPositionObj.h" diff --git a/RALICE/AliPositionObj.h b/RALICE/AliPositionObj.h index 4c69e9495bd..bc2b27865f0 100644 --- a/RALICE/AliPositionObj.h +++ b/RALICE/AliPositionObj.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include "TObject.h" diff --git a/RALICE/AliRandom.cxx b/RALICE/AliRandom.cxx index 3ccce9bdf60..0840d4f458e 100644 --- a/RALICE/AliRandom.cxx +++ b/RALICE/AliRandom.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliRandom @@ -108,6 +103,7 @@ Introduction of the Copyright and cvs Log // 3) Using the rvec facility saves a lot of CPU time for large n values. // //--- Author: Nick van Eijndhoven 11-oct-1997 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliRandom.h" diff --git a/RALICE/AliRandom.h b/RALICE/AliRandom.h index 0963c2c005b..c239083a59c 100644 --- a/RALICE/AliRandom.h +++ b/RALICE/AliRandom.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliSample.cxx b/RALICE/AliSample.cxx index b4c624cdb46..2670a940aed 100644 --- a/RALICE/AliSample.cxx +++ b/RALICE/AliSample.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliSample @@ -44,6 +39,7 @@ Introduction of the Copyright and cvs Log // All statistics of a sample are obtained via s.Info(). // //--- Author: Nick van Eijndhoven 30-mar-1996 CERN Geneva +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliSample.h" diff --git a/RALICE/AliSample.h b/RALICE/AliSample.h index a99c24ffbf5..66bdd118d9a 100644 --- a/RALICE/AliSample.h +++ b/RALICE/AliSample.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include diff --git a/RALICE/AliSignal.cxx b/RALICE/AliSignal.cxx index 3a7c3a6f1e9..3296f8293bb 100644 --- a/RALICE/AliSignal.cxx +++ b/RALICE/AliSignal.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliSignal @@ -74,7 +69,7 @@ Introduction of the Copyright and cvs Log // q.SetSignalError(error,3); // //--- Author: Nick van Eijndhoven 23-jan-1999 UU-SAP Utrecht -//- Modified: NvE 30-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliSignal.h" diff --git a/RALICE/AliSignal.h b/RALICE/AliSignal.h index f37eec0fe21..635577c5351 100644 --- a/RALICE/AliSignal.h +++ b/RALICE/AliSignal.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include "TObject.h" #include "TArrayF.h" diff --git a/RALICE/AliTrack.cxx b/RALICE/AliTrack.cxx index fe4f949582d..f51f08637e4 100644 --- a/RALICE/AliTrack.cxx +++ b/RALICE/AliTrack.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.2 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliTrack @@ -91,7 +86,7 @@ Introduction of the Copyright and cvs Log // Note : All quantities are in GeV, GeV/c or GeV/c**2 // //--- Author: Nick van Eijndhoven 10-jul-1997 UU-SAP Utrecht -//- Modified: NvE 29-oct-1999 UU-SAP Utrecht +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliTrack.h" @@ -104,6 +99,9 @@ AliTrack::AliTrack() // All variables initialised to 0 fDecays=0; fSignals=0; + fMasses=0; + fDmasses=0; + fPmasses=0; Reset(); } /////////////////////////////////////////////////////////////////////////// @@ -130,6 +128,7 @@ void AliTrack::Reset() fQ=0; fNdec=0; fNsig=0; + fNmasses=0; Double_t a[4]={0,0,0,0}; SetVector(a,"sph"); if (fDecays) @@ -147,6 +146,21 @@ void AliTrack::Reset() Double_t b[3]={0,0,0}; fBegin.SetPosition(b,"sph"); fEnd.SetPosition(b,"sph"); + if (fMasses) + { + delete fMasses; + fMasses=0; + } + if (fDmasses) + { + delete fDmasses; + fDmasses=0; + } + if (fPmasses) + { + delete fPmasses; + fPmasses=0; + } } /////////////////////////////////////////////////////////////////////////// void AliTrack::Set3Momentum(Ali3Vector& p) @@ -187,8 +201,14 @@ void AliTrack::Info(TString f) Double_t dm=GetResultError(); cout << " *AliTrack::Info* Mass : " << m << " error : " << dm << " Charge : " << fQ - << " Momentum : " << GetMomentum() << " Ntracks : " << fNdec - << " Nsignals : " << fNsig << endl; + << " Momentum : " << GetMomentum() << " Nmass hyp. : " << fNmasses + << " Ntracks : " << fNdec << " Nsignals : " << fNsig << endl; + for (Int_t i=0; iAt(i) + << " error : " << fDmasses->At(i) << " prob. : " << fPmasses->At(i) + << endl; + } Ali4Vector::Info(f); } /////////////////////////////////////////////////////////////////////////// @@ -485,3 +505,165 @@ AliPosition AliTrack::GetEndPoint() return fEnd; } /////////////////////////////////////////////////////////////////////////// +void AliTrack::AddMassHypothesis(Double_t prob,Double_t m,Double_t dm) +{ +// Add a mass hypothesis for this current track. +// prob=probalility m=mass value dm=error on the mass value. +// The default value for the mass error dm is 0. + if (!fMasses) fMasses=new TArrayD(); + if (!fDmasses) fDmasses=new TArrayD(); + if (!fPmasses) fPmasses=new TArrayD(); + + fNmasses++; + fMasses->Set(fNmasses); + fDmasses->Set(fNmasses); + fPmasses->Set(fNmasses); + + fMasses->AddAt(m,fNmasses-1); + fDmasses->AddAt(dm,fNmasses-1); + fPmasses->AddAt(prob,fNmasses-1); +} +/////////////////////////////////////////////////////////////////////////// +Int_t AliTrack::GetNMassHypotheses() +{ +// Provide the number of mass hypotheses for this track. + return fNmasses; +} +/////////////////////////////////////////////////////////////////////////// +Double_t AliTrack::GetMassHypothesis(Int_t j) +{ +// Provide the mass of the jth hypothesis for this track. +// Note : the first hypothesis is indicated by j=1. +// Default : j=0 ==> Hypothesis with highest probability. +// The error on the mass can be obtained by invoking GetResultError() +// after invokation of GetMassHypothesis(j). + + Double_t m=0,dm=0,prob=0; + + // Check validity of index j + if (j<0 || j>fNmasses) + { + cout << " *AliTrack::GetMassHypothesis* Invalid index j : " << j + << " Number of mass hypotheses : " << fNmasses << endl; + fDresult=0; + return 0; + } + + // Select mass hypothesis with highest probability + if (j==0) + { + if (fNmasses) + { + m=fMasses->At(0); + dm=fDmasses->At(0); + prob=fPmasses->At(0); + for (Int_t i=1; iAt(i)>prob) + { + m=fMasses->At(i); + dm=fDmasses->At(i); + } + } + } + fDresult=dm; + return m; + } + + // Provide data of requested mass hypothesis + m=fMasses->At(j-1); + fDresult=fDmasses->At(j-1); + return m; +} +/////////////////////////////////////////////////////////////////////////// +Double_t AliTrack::GetMassHypothesisProb(Int_t j) +{ +// Provide the probability of the jth hypothesis for this track. +// Note : the first hypothesis is indicated by j=1. +// Default : j=0 ==> Hypothesis with highest probability. + + Double_t prob=0; + + // Check validity of index j + if (j<0 || j>fNmasses) + { + cout << " *AliTrack::GetMassHypothesisProb* Invalid index j : " << j + << " Number of mass hypotheses : " << fNmasses << endl; + return 0; + } + + // Select mass hypothesis with highest probability + if (j==0) + { + if (fNmasses) + { + prob=fPmasses->At(0); + for (Int_t i=1; iAt(i)>prob) prob=fPmasses->At(i); + } + } + return prob; + } + + // Provide probability of requested mass hypothesis + prob=fPmasses->At(j-1); + return prob; +} +/////////////////////////////////////////////////////////////////////////// +void AliTrack::SetMass() +{ +// Set the mass and error to the value of the hypothesis with highest prob. + + Double_t m=0,dm=0,prob=0; + + // Select mass hypothesis with highest probability + if (fNmasses) + { + m=fMasses->At(0); + dm=fDmasses->At(0); + prob=fPmasses->At(0); + for (Int_t i=1; iAt(i)>prob) + { + m=fMasses->At(i); + dm=fDmasses->At(i); + } + } + SetMass(m,dm); + } + else + { + cout << " *AliTrack::SetMass()* No hypothesis present => No action." << endl; + } +} +/////////////////////////////////////////////////////////////////////////// +void AliTrack::RemoveMassHypothesis(Int_t j) +{ +// Remove the jth mass hypothesis for this track. +// Note : the first hypothesis is indicated by j=1. + + if (j<=0 || j>fNmasses) // Check validity of index j + { + cout << " *AliTrack::RemoveMassHypothesis* Invalid index j : " << j + << " Number of mass hypotheses : " << fNmasses << endl; + } + else + { + if (j != fNmasses) + { + fMasses->AddAt(fMasses->At(fNmasses-1),j-1); + fDmasses->AddAt(fDmasses->At(fNmasses-1),j-1); + fPmasses->AddAt(fPmasses->At(fNmasses-1),j-1); + } + fMasses->AddAt(0,fNmasses-1); + fDmasses->AddAt(0,fNmasses-1); + fPmasses->AddAt(0,fNmasses-1); + fNmasses--; + fMasses->Set(fNmasses); + fDmasses->Set(fNmasses); + fPmasses->Set(fNmasses); + } +} +/////////////////////////////////////////////////////////////////////////// diff --git a/RALICE/AliTrack.h b/RALICE/AliTrack.h index c018a7913c3..6ce524dc471 100644 --- a/RALICE/AliTrack.h +++ b/RALICE/AliTrack.h @@ -4,11 +4,12 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include "TObject.h" #include "TObjArray.h" +#include "TArrayD.h" #include "AliSignal.h" #include "AliBoost.h" @@ -23,6 +24,7 @@ class AliTrack : public TObject,public Ali4Vector void Set4Momentum(Ali4Vector& p); // Set track 4-momentum void Set3Momentum(Ali3Vector& p); // Set track 3-momentum void SetMass(Double_t m,Double_t dm=0); // Set particle mass and error + void SetMass(); // Set mass and error to mass hypothesis with highest prob. void SetCharge(Float_t q); // Set particle charge void Info(TString f="car"); // Print track information for coord. frame f void List(TString f="car"); // Print track and decay level 1 information for coord. frame f @@ -43,6 +45,11 @@ class AliTrack : public TObject,public Ali4Vector AliPosition GetBeginPoint(); // Provide the track begin-point void SetEndPoint(AliPosition p); // Set the track end-point AliPosition GetEndPoint(); // Provide the track end-point + void AddMassHypothesis(Double_t prob,Double_t m,Double_t dm=0); // Add mass hypothesis data + Int_t GetNMassHypotheses(); // Provide number of mass hypotheses + Double_t GetMassHypothesis(Int_t j=0); // Provide mass of jth hypothesis + Double_t GetMassHypothesisProb(Int_t j=0); // Provide prob. of jth mass hypothesis + void RemoveMassHypothesis(Int_t j); // Remove the jth mass hypothesis protected: Float_t fQ; // The charge of the particle @@ -52,6 +59,10 @@ class AliTrack : public TObject,public Ali4Vector TObjArray* fSignals; // The array of related AliSignals AliPosition fBegin; // The begin-point of the track AliPosition fEnd; // The end-point of the track + Int_t fNmasses; // The number of mass hypotheses + TArrayD* fMasses; // The various mass hypotheses + TArrayD* fDmasses; // The errors on the various masses + TArrayD* fPmasses; // The probabilities of the various mass hypotheses private: void Dump(AliTrack* t,Int_t n,TString f); // Recursively print all decay levels diff --git a/RALICE/AliVertex.cxx b/RALICE/AliVertex.cxx index 41b61d4a0c5..7c4c9640ec7 100644 --- a/RALICE/AliVertex.cxx +++ b/RALICE/AliVertex.cxx @@ -13,15 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.4 1999/11/03 14:23:18 fca -New version of RALICE introduced - -Revision 1.3 1999/09/29 09:24:28 fca -Introduction of the Copyright and cvs Log - -*/ +// $Id$ /////////////////////////////////////////////////////////////////////////// // Class AliVertex @@ -48,26 +40,26 @@ Introduction of the Copyright and cvs Log // // AliVertex v1(5); // -// v1.Add(t1); -// v1.Add(t2); -// v1.Add(t3); -// v1.Add(t4); +// v1.AddTrack(t1); +// v1.AddTrack(t2); +// v1.AddTrack(t3); +// v1.AddTrack(t4); // // Float_t r1[3]={2.4,0.1,-8.5}; // v1.SetPosition(r1,"car"); // // AliVertex v2(2); -// v2.Add(t5); -// v2.Add(t6); -// v2.Add(t7); +// v2.AddTrack(t5); +// v2.AddTrack(t6); +// v2.AddTrack(t7); // // Float_t r2[3]={1.6,-3.2,5.7}; // v2.SetPosition(r2,"car"); // // AliVertex v3; // -// v3.Add(j1); -// v3.Add(j2); +// v3.AddJet(j1); +// v3.AddJet(j2); // // Float_t r3[3]={6.2,4.8,1.3}; // v3.SetPosition(r3,"car"); @@ -87,8 +79,8 @@ Introduction of the Copyright and cvs Log // // Specify the vertices v2 and v3 as secondary vertices of v1 // -// v1.Add(v2); -// v1.Add(v3); +// v1.AddVertex(v2); +// v1.AddVertex(v3); // // v1.List(); // @@ -102,16 +94,16 @@ Introduction of the Copyright and cvs Log // // v1.Reset(); // v1.SetNvmax(25); // Increase initial no. of sec. vertices -// v1.Add(t3); -// v1.Add(t7); -// v1.Add(j2); +// v1.AddTrack(t3); +// v1.AddTrack(t7); +// v1.AddJet(j2); // Float_t pos[3]={7,9,4}; // v1.SetPosition(pos,"car"); // // Note : All quantities are in GeV, GeV/c or GeV/c**2 // //--- Author: Nick van Eijndhoven 04-apr-1998 UU-SAP Utrecht -//- Modified: NvE 08-apr-1999 UU-SAP Utrecht to inherit from AliJet +//- Modified: NvE $Date$ UU-SAP Utrecht /////////////////////////////////////////////////////////////////////////// #include "AliVertex.h" @@ -191,6 +183,10 @@ void AliVertex::Reset() AliJet::Reset(); + Double_t a[3]={0,0,0}; + SetPosition(a,"sph"); + SetPositionErrors(a,"car"); + fNvtx=0; if (fNvmax>0) SetNvmax(fNvmax); if (fConnects) @@ -201,18 +197,18 @@ void AliVertex::Reset() } } /////////////////////////////////////////////////////////////////////////// -void AliVertex::Add(AliJet& j) +void AliVertex::AddJet(AliJet& j) { // Add the tracks of a jet to the vertex AliTrack* tj; for (Int_t i=1; i<=j.GetNtracks(); i++) { tj=j.GetTrack(i); - AliJet::Add(tj); + AliJet::AddTrack(tj); } } /////////////////////////////////////////////////////////////////////////// -void AliVertex::Add(AliVertex& v,Int_t connect) +void AliVertex::AddVertex(AliVertex& v,Int_t connect) { // Add a (secondary) vertex to the current vertex. // In case the maximum number of (secondary) vertices has been reached, @@ -255,7 +251,7 @@ void AliVertex::Add(AliVertex& v,Int_t connect) t->Set3Momentum(p); t->SetInvariant(v2,dv2); - AliJet::Add(t); + AliJet::AddTrack(t); if (!fConnects) fConnects=new TObjArray(fNvmax); fConnects->Add(t); diff --git a/RALICE/AliVertex.h b/RALICE/AliVertex.h index 3d5d46366a1..06161925c73 100644 --- a/RALICE/AliVertex.h +++ b/RALICE/AliVertex.h @@ -3,7 +3,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id$ */ +// $Id$ #include #include @@ -21,10 +21,10 @@ class AliVertex : public AliJet,public AliPosition AliVertex(Int_t n); // Create a vertex to hold initially n tracks ~AliVertex(); // Default destructor void Reset(); // Reset all values - void Add(AliJet& j); // Add a jet of tracks to the vertex - void Add(AliVertex& v,Int_t connect=1); // Add (and connect) a (sec.) vertex to the current vertex - void Add(AliJet* j) { Add(*j); } - void Add(AliVertex* v,Int_t connect=1) { Add(*v,connect); } + void AddJet(AliJet& j); // Add a jet of tracks to the vertex + void AddVertex(AliVertex& v,Int_t connect=1);// Add (and connect) a (sec.) vertex to the current vertex + void Add(AliJet* j) { AddJet(*j); } + void Add(AliVertex* v,Int_t connect=1) { AddVertex(*v,connect); } void Info(TString f="car"); // Print the vertex info within coordinate frame f void List(TString f="car"); // Print vertex prim. track information for coord. frame f void ListAll(TString f="car"); // Print prim. + sec. vertex full track info for coord. frame f diff --git a/RALICE/RALICELinkDef.h b/RALICE/RALICELinkDef.h index 096905f1659..dbe623429a1 100644 --- a/RALICE/RALICELinkDef.h +++ b/RALICE/RALICELinkDef.h @@ -14,23 +14,24 @@ #pragma link off all classes; #pragma link off all functions; - #pragma link C++ class AliMath+; - #pragma link C++ class AliSample+; - #pragma link C++ class AliRandom+; - #pragma link C++ class Ali3Vector+; - #pragma link C++ class Ali3VectorObj+; - #pragma link C++ class Ali4Vector+; - #pragma link C++ class Ali4VectorObj+; - #pragma link C++ class AliBoost+; - #pragma link C++ class AliPosition+; - #pragma link C++ class AliPositionObj+; - #pragma link C++ class AliSignal+; - #pragma link C++ class AliCalorimeter+; - #pragma link C++ class AliCalmodule+; - #pragma link C++ class AliCalcluster+; - #pragma link C++ class AliTrack+; - #pragma link C++ class AliJet+; - #pragma link C++ class AliVertex+; - #pragma link C++ class AliInvmass+; + #pragma link C++ class AliMath; + #pragma link C++ class AliSample; + #pragma link C++ class AliRandom; + #pragma link C++ class Ali3Vector; + #pragma link C++ class Ali3VectorObj; + #pragma link C++ class Ali4Vector; + #pragma link C++ class Ali4VectorObj; + #pragma link C++ class AliBoost; + #pragma link C++ class AliPosition; + #pragma link C++ class AliPositionObj; + #pragma link C++ class AliSignal; + #pragma link C++ class AliCalorimeter; + #pragma link C++ class AliCalmodule; + #pragma link C++ class AliCalcluster; + #pragma link C++ class AliTrack; + #pragma link C++ class AliJet; + #pragma link C++ class AliVertex; + #pragma link C++ class AliInvmass; + #pragma link C++ class AliEvent; #endif diff --git a/RALICE/history.txt b/RALICE/history.txt index bf92042426f..075c231d34b 100644 --- a/RALICE/history.txt +++ b/RALICE/history.txt @@ -237,3 +237,17 @@ 06-jun-2000 NvE AliMath::K() etc... renamed to AliMath::BesselK() etc... for clarity. 07-jun-2000 NvE Vertex linking of AliVertex::Add(AliVertex&) made more sophisticated by introduction of automatic generation of connecting track. +26-jan-2001 NvE File RALICELinkDef.h updated to allow the automatic schema evolution + as introduced in ROOT 3.00/05. +27-may-2001 NvE New class AliEvent introduced and RALICELinkDef.h & co. updated accordingly. + Also RALICELinkDef.h changed back to old schema evolution (i.e. "+" removed) + because of problems with I/O in ROOT 3.00/06 w.r.t. multiple inheritance. +29-may-2001 NvE Position reset added in AliVertex::Reset(). +01-jun-2001 NvE Memberfunctions Add() renamed explicitly to AddTrack(), AddJet() and + AddVertex() in AliJet and AliVertex. +03-jun-2001 NvE Treatment of masshypotheses introduced in AliTrack. +04-jun-2001 NvE CVS Log text and keyword replaced by Id in .cxx files and C++ comment + indicator /* ... */ replaced by // in the Id record of the .h files + to prevent problems. +06-jun-2001 NvE CVS Date keyword introduced in 'Modified' field in .cxx files so that + the modification date is updated automatically in the html docs. -- 2.43.0