added pdet-ppart over ppart histogram for detector response

[u/mrichter/AliRoot.git] / MUON / AliMUONAlignment.cxx

diff --git a/MUON/AliMUONAlignment.cxx b/MUON/AliMUONAlignment.cxx
index c873e92cb529ac7c1ed886994bc5c47480b14950..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;
 
@@ -125,7 +125,34 @@ fSinPhi(0.),
 fTrackRecord(),
 fTransform(0)
 {
-       /// Root IO constructor
+  /// Root IO constructor
+  ResetConstraints();
+  for (Int_t iCh=0; iCh<10; iCh++) { 
+    fChOnOff[iCh] = kFALSE; 
+  }
+  fSpecLROnOff[0] = kFALSE; fSpecLROnOff[1] = kFALSE;
+  for (Int_t iDoF=0; iDoF<4; iDoF++) {
+    fDoF[iDoF] = kFALSE;
+    fAllowVar[iDoF] = kFALSE;
+  }
+  for (Int_t i=0; i<3; i++) {
+    fClustPos[i] = 0;
+    fClustPosLoc[i] = 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;
+  fMeas[0]=0;  fMeas[1]=0;
+  fSigma[0]=0; fSigma[1]=0;
+  for (Int_t iLPar=0; iLPar<4; iLPar++) {
+    fLocalDerivatives[iLPar]=0;        
+  }
+  for (Int_t iGPar=0; iGPar<624; iGPar++) {
+    fGlobalDerivatives[iGPar]=0;       
+  }
 }
 
 //_____________________________________________________________________
@@ -747,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;
@@ -1120,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;
 
@@ -1201,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