- Reordering includes and/or

- Moving ClassImp() after static data definition (needed for Doxygen)
(Laurent)

diff --git a/MUON/AliMUONClusterInput.cxx b/MUON/AliMUONClusterInput.cxx
index 7ce5ac175da391972333f0a9158f52a17b99039a..e3e990de1e3463d824d3a57292d46f37b7df61f1 100644 (file)
--- a/MUON/AliMUONClusterInput.cxx
+++ b/MUON/AliMUONClusterInput.cxx
@@ -15,25 +15,27 @@
 
 /* $Id$ */
 
-#include <TClonesArray.h>
-#include <TMinuit.h>
+#include "AliMUONClusterInput.h"
 
-#include "AliRun.h"
 #include "AliMUON.h"
 #include "AliMUONSegmentation.h"
 #include "AliMUONConstants.h"
-#include "AliMUONClusterInput.h"
 #include "AliMUONMathieson.h"
 #include "AliMUONRawCluster.h"
 #include "AliMUONDigit.h"
+
+#include "AliRun.h"
 #include "AliLog.h"
 
-ClassImp(AliMUONClusterInput)
+#include <TClonesArray.h>
+#include <TMinuit.h>
 
 AliMUONClusterInput* AliMUONClusterInput::fgClusterInput = 0; 
 TMinuit* AliMUONClusterInput::fgMinuit = 0; 
 AliMUONMathieson* AliMUONClusterInput::fgMathieson = 0; 
 
+ClassImp(AliMUONClusterInput)
+
 AliMUONClusterInput::AliMUONClusterInput()
   : TObject(),
     fCluster(0),

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 4232364471398c5f3bf6216ecacba62fc29f59f2..d08f7a412b459949ddb39c7e615496b69f2b11a1 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -15,10 +15,9 @@
 
 /* $Id$ */
 
-#include <TMath.h>
 #include "AliMUONConstants.h"
 
-ClassImp(AliMUONConstants)
+#include <TMath.h>
 
 Int_t   AliMUONConstants::fgNCh = 14;
 Int_t   AliMUONConstants::fgNTrackingCh = 10;
@@ -62,6 +61,8 @@ Float_t  AliMUONConstants::fgDmax[7]  = {  176.6, 229.0, 308.84, 418.2,  522.0,
  
 Int_t    AliMUONConstants::fgMaxZoom = 20;
 
+ClassImp(AliMUONConstants)
+
 //______________________________________________________________________________
 Int_t AliMUONConstants::ChamberNumber(Float_t z) 
 {

diff --git a/MUON/AliMUONEventRecoCombi.cxx b/MUON/AliMUONEventRecoCombi.cxx
index f7dab52b5e401c4007544f6b3890e09dc04eb221..9054e4f9b527bed7fc37f46b7cd109e753475bb1 100644 (file)
--- a/MUON/AliMUONEventRecoCombi.cxx
+++ b/MUON/AliMUONEventRecoCombi.cxx
@@ -15,11 +15,8 @@
 
 /* $Id$ */
 
-#include <Riostream.h>
-#include <TClonesArray.h>
-#include <TArrayS.h>
-#include <TArrayD.h>
 #include "AliMUONEventRecoCombi.h"
+
 #include "AliMUONData.h"
 #include "AliMUONDetElement.h"
 #include "AliMUONDigit.h"
@@ -28,12 +25,18 @@
 #include "AliMUONTrackK.h"
 #include "AliMUONTrackReconstructor.h"
 #include "AliMUONConstants.h"
+
 #include "AliLoader.h"
 
-ClassImp(AliMUONEventRecoCombi)
+#include <Riostream.h>
+#include <TClonesArray.h>
+#include <TArrayS.h>
+#include <TArrayD.h>
 
 AliMUONEventRecoCombi* AliMUONEventRecoCombi::fgRecoCombi = 0; 
 
+ClassImp(AliMUONEventRecoCombi)
+
 //_________________________________________________________________________
 AliMUONEventRecoCombi::AliMUONEventRecoCombi() : TObject()
 {

diff --git a/MUON/AliMUONGeometryBuilder.cxx b/MUON/AliMUONGeometryBuilder.cxx
index f667ad848c09c33b6ee072599aec3e7274dccbbc..a0fa1051de4c6503562ea3f8ef4559ac68ab2d74 100644 (file)
--- a/MUON/AliMUONGeometryBuilder.cxx
+++ b/MUON/AliMUONGeometryBuilder.cxx
@@ -41,9 +41,6 @@
 #include <TVirtualMC.h>
 #include <TGeoManager.h>
 
-
-ClassImp(AliMUONGeometryBuilder)
-
 // static data members
  
 const TString  AliMUONGeometryBuilder::fgkDefaultVolPathsFileName = "volpath.dat";   
@@ -51,6 +48,8 @@ const TString  AliMUONGeometryBuilder::fgkDefaultTransformFileName = "transform.
 const TString  AliMUONGeometryBuilder::fgkDefaultSVMapFileName = "svmap.dat";    
 const TString  AliMUONGeometryBuilder::fgkOutFileNameExtension = ".out";    
 
+ClassImp(AliMUONGeometryBuilder)
+
 // static functions
 
 //______________________________________________________________________________

diff --git a/MUON/AliMUONGeometrySegmentation.cxx b/MUON/AliMUONGeometrySegmentation.cxx
index 8010ac4aadb108d035b5f3b4806b47c21dedd536..df3548305ea009d215b4a07de2a8bcd8aa8fb647 100644 (file)
--- a/MUON/AliMUONGeometrySegmentation.cxx
+++ b/MUON/AliMUONGeometrySegmentation.cxx
@@ -36,10 +36,10 @@
 #include <TObjString.h>
 #include <TClass.h>
 
-ClassImp(AliMUONGeometrySegmentation)
-
 const Float_t  AliMUONGeometrySegmentation::fgkMaxDistance = 1.0e6;
 
+ClassImp(AliMUONGeometrySegmentation)
+
 //______________________________________________________________________________
 AliMUONGeometrySegmentation::AliMUONGeometrySegmentation(
                              const AliMUONGeometryModuleTransformer* transformer) 

diff --git a/MUON/AliMUONGeometryStore.cxx b/MUON/AliMUONGeometryStore.cxx
index 049be3f478152c589c14f47e4ea5683d4975adb7..7f3ef847a05c79fb9ca1f93a3fc8faeab277ea6c 100644 (file)
--- a/MUON/AliMUONGeometryStore.cxx
+++ b/MUON/AliMUONGeometryStore.cxx
@@ -30,11 +30,11 @@
 
 #include "AliMUONGeometryStore.h"
 
-ClassImp(AliMUONGeometryStore)
-
 const Int_t AliMUONGeometryStore::fgkInitSize = 100;
 const Int_t AliMUONGeometryStore::fgkCoefficient = 100;
 
+ClassImp(AliMUONGeometryStore)
+
 //
 // static methods
 //

diff --git a/MUON/AliMUONScalerEventTrigger.cxx b/MUON/AliMUONScalerEventTrigger.cxx
index 696b8fb1f5c74235b4540961bd1564ed0899dcae..184ec4f03e224c5e3b6ec129c28a8cfccaa8edee 100644 (file)
--- a/MUON/AliMUONScalerEventTrigger.cxx
+++ b/MUON/AliMUONScalerEventTrigger.cxx
@@ -15,11 +15,12 @@
 
 #include "AliMUONScalerEventTrigger.h"
 
+const Int_t AliMUONScalerEventTrigger::fgkLocalScalerLength  = 45;
+const Int_t AliMUONScalerEventTrigger::fgkRegScalerLength    = 8;
+const Int_t AliMUONScalerEventTrigger::fgkGlobalScalerLength = 10;
+const Int_t AliMUONScalerEventTrigger::fgkDarcScalerLength   = 6;
+
 ClassImp(AliMUONScalerEventTrigger)
-  const Int_t AliMUONScalerEventTrigger::fgkLocalScalerLength  = 45;
-  const Int_t AliMUONScalerEventTrigger::fgkRegScalerLength    = 8;
-  const Int_t AliMUONScalerEventTrigger::fgkGlobalScalerLength = 10;
-  const Int_t AliMUONScalerEventTrigger::fgkDarcScalerLength   = 6;
 
 //___________________________________________
 AliMUONScalerEventTrigger::AliMUONScalerEventTrigger()

diff --git a/MUON/AliMUONSt1Response.cxx b/MUON/AliMUONSt1Response.cxx
index afd4d8a0ac84f30a2084294cf78cc1be1b7a1c7d..14a0b67315040f50da4ec618c1c5c9039a159263 100644 (file)
--- a/MUON/AliMUONSt1Response.cxx
+++ b/MUON/AliMUONSt1Response.cxx
@@ -51,8 +51,6 @@
 #include "AliRun.h"
 #include "AliLog.h"
 
-ClassImp(AliMUONSt1Response)
-
 const TString AliMUONSt1Response::fgkTopDir = getenv("ALICE_ROOT");
 const TString AliMUONSt1Response::fgkDataDir = "/MUON/data/";
 const TString AliMUONSt1Response::fgkConfigBaseName = "configChamber";
@@ -81,7 +79,7 @@ const TString AliMUONSt1Response::fgkGausName ="gaus";
 const TString AliMUONSt1Response::fgkNotName ="no";
 const TString AliMUONSt1Response::fgkNofSigmaName ="nofSigma";
 
-
+ClassImp(AliMUONSt1Response)
 
 //__________________________________________________________________________
 AliMUONSt1Response::AliMUONSt1Response(Int_t chamberId)

diff --git a/MUON/AliMUONSubEventTrigger.cxx b/MUON/AliMUONSubEventTrigger.cxx
index 0476d199c4abb76c056b443811bbef510db580de..8e253e68709a1e49b7fe9c7b1317a56f93f6311d 100644 (file)
--- a/MUON/AliMUONSubEventTrigger.cxx
+++ b/MUON/AliMUONSubEventTrigger.cxx
@@ -14,11 +14,10 @@
  **************************************************************************/
 
 #include "AliMUONSubEventTrigger.h"
-
+ 
+const Int_t AliMUONSubEventTrigger::fgkRegHeaderLength = 3;
 
 ClassImp(AliMUONSubEventTrigger)
- 
- const Int_t AliMUONSubEventTrigger::fgkRegHeaderLength = 3;
 
 //___________________________________________
 AliMUONSubEventTrigger::AliMUONSubEventTrigger()

diff --git a/MUON/AliMUONTrack.cxx b/MUON/AliMUONTrack.cxx
index 92b32b7354555bd310dbbcf1bb2e4ea5b6750d8b..3090c1ee1a41c1b6df8728f8b76140d5979b1573 100644 (file)
--- a/MUON/AliMUONTrack.cxx
+++ b/MUON/AliMUONTrack.cxx
@@ -25,24 +25,25 @@
 //
 ///////////////////////////////////////////////////
 
-#include <stdlib.h> // for exit()
-
-#include <Riostream.h> // for cout
-#include <TMath.h>
-#include <TMatrixD.h>
-#include <TObjArray.h>
-#include <TVirtualFitter.h>
-
-#include "AliLog.h"
+#include "AliMUONTrack.h"
 
 #include "AliMUONTrackReconstructor.h" 
 #include "AliMUONHitForRec.h" 
 #include "AliMUONSegment.h" 
-#include "AliMUONTrack.h"
 #include "AliMUONTrackHit.h"
 #include "AliMUONTriggerTrack.h"
 #include "AliMUONConstants.h"
 
+#include "AliLog.h"
+
+#include <Riostream.h> // for cout
+#include <TMath.h>
+#include <TMatrixD.h>
+#include <TObjArray.h>
+#include <TVirtualFitter.h>
+
+#include <stdlib.h> // for exit()
+
 // Functions to be minimized with Minuit
 void TrackChi2(Int_t &NParam, Double_t *Gradient, Double_t &Chi2, Double_t *Param, Int_t Flag);
 void TrackChi2MCS(Int_t &NParam, Double_t *Gradient, Double_t &Chi2, Double_t *Param, Int_t Flag);
@@ -51,11 +52,11 @@ void mnvertLocal(Double_t* a, Int_t l, Int_t m, Int_t n, Int_t& ifail);
 
 Double_t MultipleScatteringAngle2(AliMUONTrackHit *TrackHit);
 
-ClassImp(AliMUONTrack) // Class implementation in ROOT context
-
 TVirtualFitter* AliMUONTrack::fgFitter = NULL; 
 
-  //__________________________________________________________________________
+ClassImp(AliMUONTrack) // Class implementation in ROOT context
+
+//__________________________________________________________________________
 AliMUONTrack::AliMUONTrack()
   : TObject() 
 {

diff --git a/MUON/AliMUONTriggerElectronics.cxx b/MUON/AliMUONTriggerElectronics.cxx
index 4f1335b2193a50c7ab1c92794baa1c919c389436..c03bad997c24b2bc2ef784be75c2f6cc442f97fe 100644 (file)
--- a/MUON/AliMUONTriggerElectronics.cxx
+++ b/MUON/AliMUONTriggerElectronics.cxx
@@ -42,10 +42,10 @@
 #include "Riostream.h"
 #include "TSystem.h"
 
-ClassImp(AliMUONTriggerElectronics)
-
 const Int_t AliMUONTriggerElectronics::fgkNCrates = 16;
 
+ClassImp(AliMUONTriggerElectronics)
+
 //___________________________________________
 AliMUONTriggerElectronics::AliMUONTriggerElectronics(AliMUONData *Data) 
 : TTask("AliMUONTriggerElectronics",

diff --git a/MUON/mapping/AliMpDEIterator.cxx b/MUON/mapping/AliMpDEIterator.cxx
index 5eeabd8982a963c15f13bd2bdb59e06a6abb0392..5857dbc80537fed36202954e3ef7985885bce783 100644 (file)
--- a/MUON/mapping/AliMpDEIterator.cxx
+++ b/MUON/mapping/AliMpDEIterator.cxx
@@ -24,12 +24,12 @@
 #include <Riostream.h>
 #include <TSystem.h>
 
-ClassImp(AliMpDEIterator)
-
 const  Int_t  AliMpDEIterator::fgkMaxNofDetElements = 250;
 TArrayI  AliMpDEIterator::fgDetElemIds(fgkMaxNofDetElements);
 Int_t    AliMpDEIterator::fgNofDetElemIds = 0; 
 
+ClassImp(AliMpDEIterator)
+
 //
 // static private methods
 //

diff --git a/MUON/mapping/AliMpFiles.cxx b/MUON/mapping/AliMpFiles.cxx
index 0b0ed71829be3f8c5d925b233e1c80c3ce6bc8af..3d3881e6c15af258d71b8a09e7c6c83a7860f1ef 100755 (executable)
--- a/MUON/mapping/AliMpFiles.cxx
+++ b/MUON/mapping/AliMpFiles.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpFiles.cxx,v 1.6 2006/01/11 10:05:08 ivana Exp $
+// $MpId: AliMpFiles.cxx,v 1.8 2006/03/02 16:37:20 ivana Exp $
 // Category: basic
 //
 // Class AliMpFiles
@@ -35,8 +35,6 @@
 #include "AliLog.h"
 #include "TClass.h"
 
-ClassImp(AliMpFiles)
-
 //
 // static
 
@@ -58,6 +56,8 @@ const TString AliMpFiles::fgkBergToGCFileName = "/bergToGC";
 const TString AliMpFiles::fgkTriggerLocalBoards = "MUONLocalTriggerBoard";
 const TString AliMpFiles::fgkBusPatchFileName = "DetElemIdToBusPatch";
 
+ClassImp(AliMpFiles)
+
 //______________________________________________________________________________
 AliMpFiles::AliMpFiles()
   : TObject()

diff --git a/MUON/mapping/AliMpGraphContext.cxx b/MUON/mapping/AliMpGraphContext.cxx
index 02591932bd82feba361508b73519d42c1e3fd7f3..9bb38b6ccbf7dfdfb73d70e669d73eb689709c6f 100755 (executable)
--- a/MUON/mapping/AliMpGraphContext.cxx
+++ b/MUON/mapping/AliMpGraphContext.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpGraphContext.cxx,v 1.8 2005/09/26 16:06:36 ivana Exp $
+// $MpId: AliMpGraphContext.cxx,v 1.9 2006/03/02 16:37:24 ivana Exp $
 // Category: graphics
 //
 // Class AliMpGraphContext
@@ -24,11 +24,9 @@
 // Included in AliRoot: 2003/05/02
 // Author: David GUEZ, IPN Orsay
 
-#include <TError.h>
-
 #include "AliMpGraphContext.h"
 
-ClassImp(AliMpGraphContext)
+#include <TError.h>
 
 AliMpGraphContext *AliMpGraphContext::fgInstance = 0;
 AliMpGraphContext::GraphContextVector AliMpGraphContext::fgStack;
@@ -36,6 +34,8 @@ AliMpGraphContext::GraphContextVector AliMpGraphContext::fgStack;
 Int_t              AliMpGraphContext::fgStackSize = 0;
 #endif
 
+ClassImp(AliMpGraphContext)
+
 //_____________________________________________________________________________
 AliMpGraphContext::AliMpGraphContext():
   TObject(),

diff --git a/MUON/mapping/AliMpMotifType.cxx b/MUON/mapping/AliMpMotifType.cxx
index 1c8a3e6dc130db0590a2deee16e058813b615e42..5ee95dfb3dffef5db90db6cfc8c9f4d443dfdb7d 100755 (executable)
--- a/MUON/mapping/AliMpMotifType.cxx
+++ b/MUON/mapping/AliMpMotifType.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpMotifType.cxx,v 1.7 2005/09/26 16:11:20 ivana Exp $
+// $MpId: AliMpMotifType.cxx,v 1.8 2006/03/02 16:37:27 ivana Exp $
 // Category: motif
 //
 // Class AliMpMotifType
@@ -23,17 +23,18 @@
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#include <stdlib.h>
-#include <Riostream.h>
-
 #include "AliMpMotifType.h"
 #include "AliMpMotifTypePadIterator.h"
 #include "AliMpConnection.h"
 
-ClassImp(AliMpMotifType)
+#include <Riostream.h>
+
+#include <stdlib.h>
 
 const Int_t AliMpMotifType::fgkPadNumForA = 65;
 
+ClassImp(AliMpMotifType)
+
 //______________________________________________________________________________
 AliMpMotifType::AliMpMotifType(const TString &id) 
   : TObject(),

diff --git a/MUON/mapping/AliMpNeighboursPadIterator.cxx b/MUON/mapping/AliMpNeighboursPadIterator.cxx
index 427a349504a70ad4176add4d77d1e475e72b291d..9547b6456c8ac7a5e7a7c33d17ac83c65e6a5982 100755 (executable)
--- a/MUON/mapping/AliMpNeighboursPadIterator.cxx
+++ b/MUON/mapping/AliMpNeighboursPadIterator.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpNeighboursPadIterator.cxx,v 1.9 2005/09/26 16:12:23 ivana Exp $
+// $MpId: AliMpNeighboursPadIterator.cxx,v 1.11 2006/03/02 16:37:30 ivana Exp $
 // Category: sector
 //
 // Class AliMpNeighboursPadIterator
@@ -23,19 +23,19 @@
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#include <TVector2.h>
-
 #include "AliMpNeighboursPadIterator.h"
 #include "AliMpIntPair.h"
 #include "AliMpSectorSegmentation.h"
 #include "AliMpRow.h"
 #include "AliMpConstants.h"
 
-ClassImp(AliMpNeighboursPadIterator)
+#include <TVector2.h>
 
 const UInt_t AliMpNeighboursPadIterator::fgkInvalidIndex = 9999; 
                                                    //never so much neighbours...
 
+ClassImp(AliMpNeighboursPadIterator)
+
 //______________________________________________________________________________
 AliMpNeighboursPadIterator::AliMpNeighboursPadIterator()
   : AliMpVPadIterator(),

diff --git a/MUON/mapping/AliMpTriggerReader.cxx b/MUON/mapping/AliMpTriggerReader.cxx
index 549a08d6a235477b0a311af1dd36d0ac2245597a..ebe9d22840d745e62a79809a689b52df9c1ebefd 100644 (file)
--- a/MUON/mapping/AliMpTriggerReader.cxx
+++ b/MUON/mapping/AliMpTriggerReader.cxx
@@ -14,12 +14,9 @@
 **************************************************************************/
 
 // $Id$
-// $MpId$
+// $MpId: AliMpTriggerReader.cxx,v 1.2 2006/03/02 16:36:30 ivana Exp $
 
-#include <assert.h>
 #include "AliMpTriggerReader.h"
-
-#include "AliLog.h"
 #include "AliMpMotifReader.h"
 #include "AliMpFiles.h"
 #include "AliMpMotifType.h"
@@ -32,16 +29,16 @@
 #include "AliMpSt345Reader.h"
 #include "AliMpTrigger.h"
 
-#include "Riostream.h"
+#include "AliLog.h"
 
+#include "Riostream.h"
 #include "TClass.h"
 #include "TObjString.h"
 #include "TList.h"
 #include "TString.h"
 
 #include <sstream>
-
-ClassImp(AliMpTriggerReader)
+#include <cassert>
 
 TMap AliMpTriggerReader::fgPCBMap;
 TMap AliMpTriggerReader::fgLocalBoardMap;
@@ -55,6 +52,8 @@ namespace
   const TString KEYWORD_FLIPY("FLIP_Y");
 }
 
+ClassImp(AliMpTriggerReader)
+
 //_____________________________________________________________________________
 AliMpTriggerReader::AliMpTriggerReader() : TObject()
 {

diff --git a/MUON/mapping/AliMpVRowSegmentSpecial.cxx b/MUON/mapping/AliMpVRowSegmentSpecial.cxx
index 4e37efa34b511bf44ca33fd4c3500f852732722b..6fd9ac06aab4a748cfa20625f21d0a385125f552 100644 (file)
--- a/MUON/mapping/AliMpVRowSegmentSpecial.cxx
+++ b/MUON/mapping/AliMpVRowSegmentSpecial.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpVRowSegmentSpecial.cxx,v 1.6 2005/08/26 15:43:36 ivana Exp $
+// $MpId: AliMpVRowSegmentSpecial.cxx,v 1.7 2006/03/02 16:37:30 ivana Exp $
 // Category: sector
 //
 // Class AliMpVRowSegmentSpecial
@@ -24,9 +24,6 @@
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#include <TError.h>
-#include <Riostream.h>
-
 #include "AliMpVRowSegmentSpecial.h"
 #include "AliMpRow.h"
 #include "AliMpPadRow.h"
@@ -37,12 +34,15 @@
 #include "AliMpMotifPosition.h"
 #include "AliMpConstants.h"
 
-ClassImp(AliMpVRowSegmentSpecial)
+#include <TError.h>
+#include <Riostream.h>
 
 #ifdef WITH_ROOT
 const Int_t  AliMpVRowSegmentSpecial::fgkMaxNofMotifPositionIds = 20;
 #endif    
 
+ClassImp(AliMpVRowSegmentSpecial)
+
 //______________________________________________________________________________
 AliMpVRowSegmentSpecial::AliMpVRowSegmentSpecial(AliMpRow* row, Double_t offsetX)
   : AliMpVRowSegment(),