In AliMUONAlignment:

Fixing Covery defects and coding conventions
(Javier)

diff --git a/MUON/AliMUONAlignment.cxx b/MUON/AliMUONAlignment.cxx
index 85edda95ff7ca3b566d391175de6abe863b929a6..595d470149ef7f10de3dfed3045551e1e474682d 100644 (file)
--- a/MUON/AliMUONAlignment.cxx
+++ b/MUON/AliMUONAlignment.cxx
@@ -83,7 +83,7 @@ AliMUONAlignment::AliMUONAlignment()
     fTrackRecord(),
     fTransform(0)
 {
-
+  /// Default constructor      
   fSigma[0] = 1.5e-1;
   fSigma[1] = 1.0e-2;
 
@@ -141,6 +141,7 @@ fTransform(0)
     fTrackPos0[i] = 0;  
     fTrackPos[i] = 0;   
     fTrackPosLoc[i] = 0;
+       fDetElemPos[i] = 0;
   }
   fTrackSlope0[0]=0;   fTrackSlope0[1]=0;
   fTrackSlope[0]=0;    fTrackSlope[1]=0;
@@ -150,7 +151,7 @@ fTransform(0)
     fLocalDerivatives[iLPar]=0;        
   }
   for (Int_t iGPar=0; iGPar<624; iGPar++) {
-    fLocalDerivatives[iGPar]=0;        
+    fGlobalDerivatives[iGPar]=0;       
   }
 }
 
@@ -773,7 +774,14 @@ void AliMUONAlignment::ConstrainR(Int_t lDetElem, Int_t lCh, Double_t *lConstrai
 void AliMUONAlignment::ResetConstraints(){
   /// Reset all constraint equations
   for (Int_t i = 0; i < fgNDetElem; i++){
-    fConstraintX[i*fgNParCh+0]=0.0;
+       fConstraintX3[i*fgNParCh+0]=0.0; 
+       fConstraintY3[i*fgNParCh+0]=0.0; 
+       fConstraintX4[i*fgNParCh+0]=0.0; 
+       fConstraintY4[i*fgNParCh+0]=0.0; 
+       fConstraintP4[i*fgNParCh+0]=0.0; 
+       fConstraintX5[i*fgNParCh+0]=0.0; 
+       fConstraintY5[i*fgNParCh+0]=0.0; 
+       fConstraintX[i*fgNParCh+0]=0.0;
     fConstraintX[i*fgNParCh+1]=0.0;
     fConstraintX[i*fgNParCh+2]=0.0;
     fConstraintY[i*fgNParCh+0]=0.0;
@@ -1146,7 +1154,7 @@ void AliMUONAlignment::FillDetElemData()
 //_____________________________________________________
 AliMUONAlignmentTrackRecord* AliMUONAlignment::ProcessTrack( AliMUONTrack* track, Bool_t doAlignment )
 {
-
+  /// Process track and set Local Equations
   // store current track in running member.
   fTrack = track;
 
@@ -1227,7 +1235,7 @@ AliMUONAlignmentTrackRecord* AliMUONAlignment::ProcessTrack( AliMUONTrack* track
 //______________________________________________________________________________
 void AliMUONAlignment::ProcessTrack( AliMUONAlignmentTrackRecord* track, Bool_t doAlignment )
 {
-
+  /// Process track (from record) and set Local Equations
   if( !( track && doAlignment ) ) return;
 
   // loop over clusters

diff --git a/MUON/AliMUONAlignment.h b/MUON/AliMUONAlignment.h
index 6fe0c823a08a4cb8e5b75285a0d9d816615030a7..f398cca3f5e2b6a6b65a51addb6822a683e17e96 100644 (file)
--- a/MUON/AliMUONAlignment.h
+++ b/MUON/AliMUONAlignment.h
@@ -46,7 +46,7 @@ class AliMUONAlignment:public TObject
   AliMUONAlignmentTrackRecord* ProcessTrack(AliMUONTrack *track, Bool_t doAlignment );
 
   /// process track record
-  void ProcessTrack( AliMUONAlignmentTrackRecord*, Bool_t doAlignment = kTRUE );
+  void ProcessTrack( AliMUONAlignmentTrackRecord* track, Bool_t doAlignment = kTRUE );
 
   /// returns current track record
   AliMUONAlignmentTrackRecord* GetTrackRecord( void )
@@ -82,7 +82,7 @@ class AliMUONAlignment:public TObject
 
   void FixHalfSpectrometer(const Bool_t* bChOnOff, const Bool_t* bSpecLROnOff);
 
-  void AllowVariations( const Bool_t* );
+  void AllowVariations(const Bool_t* bChOnOff);
 
   void SetNonLinear(const Bool_t *bChOnOff, const Bool_t *bVarXYT);
 
@@ -155,46 +155,34 @@ class AliMUONAlignment:public TObject
   void LocalEquationY( Bool_t doAlignment = kTRUE );
 
   /// local equation using cluster alignment record
-  void LocalEquation( const AliMUONAlignmentClusterRecord& );
+  void LocalEquation( const AliMUONAlignmentClusterRecord& clusterRecord);
 
   TGeoCombiTrans ReAlign(const TGeoCombiTrans& transform, const double *detElemMisAlignment) const;
 
-  /// Flag for Magnetic filed On/Off
-  Bool_t fBFieldOn;
+  Bool_t fBFieldOn; ///< Flag for Magnetic filed On/Off
 
-  /// Flags for chamber On/Off
-  Bool_t fChOnOff[10];
+  Bool_t fChOnOff[10];  ///< Flags for chamber On/Off
 
-  /// Flags for left right On/Off
-  Bool_t fSpecLROnOff[2];
+  Bool_t fSpecLROnOff[2];  ///< Flags for left right On/Off
 
-  /// Flags degrees of freedom to align (x,y,phi)
-  Bool_t fDoF[4];
+  Bool_t fDoF[4];  ///< Flags degrees of freedom to align (x,y,phi)
 
-  /// "Encouraged" variation for degrees of freedom
-  Double_t fAllowVar[4];
+  Double_t fAllowVar[4];  ///< "Encouraged" variation for degrees of freedom
 
-  /// Initial value for chi2 cut
   /** if > 1 Iterations in AliMillepede are turned on */
-  Double_t fStartFac;
+  Double_t fStartFac;   ///< Initial value for chi2 cut
 
-  /// Cut on residual for first iteration
-  Double_t fResCutInitial;
+  Double_t fResCutInitial;  ///< Cut on residual for first iteration
 
-  /// Cut on residual for other iterations
-  Double_t fResCut;
+  Double_t fResCut;  ///< Cut on residual for other iterations
 
-  /// Detector independent alignment class
-  AliMillepede *fMillepede;
+  AliMillepede *fMillepede;   ///< Detector independent alignment class
 
-  /// AliMUONTrack
-  AliMUONTrack *fTrack;
+  AliMUONTrack *fTrack;   //!< AliMUONTrack
 
-  /// AliMUONVCluster
-  AliMUONVCluster *fCluster;
+  AliMUONVCluster *fCluster;  //!< AliMUONVCluster
 
-  ///< Track parameters
-  AliMUONTrackParam *fTrackParam;
+  AliMUONTrackParam *fTrackParam;  //!< Track parameters
 
   Int_t fNGlobal;  ///< Number of global parameters
   Int_t fNLocal;   ///< Number of local parameters
@@ -266,11 +254,9 @@ class AliMUONAlignment:public TObject
   Double_t fSinPhi;        ///< Sine of fPhi
   Double_t fDetElemPos[3]; ///< Position of detection element
 
-  /// running Track record
-  AliMUONAlignmentTrackRecord fTrackRecord;
+  AliMUONAlignmentTrackRecord fTrackRecord;  //!< running Track record
 
-  /// Geometry transformation
-  AliMUONGeometryTransformer *fTransform;
+  AliMUONGeometryTransformer *fTransform;  ///< Geometry transformation
 
   static Int_t fgNSt;            ///< Number tracking stations
   static Int_t fgNCh;            ///< Number tracking chambers