X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSAlignMille2ConstrArray.cxx;h=82534140e3cc4ac333ecbc3e403990a2d64684ed;hb=535d15f506e88160f5c6e27623583932dd8a44ef;hp=b4ca683da1cffe385c400d73b954c8c6181337ac;hpb=6526a72c570f2e38335cd4670cda3795da01e774;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSAlignMille2ConstrArray.cxx b/ITS/AliITSAlignMille2ConstrArray.cxx
index b4ca683da1c..82534140e3c 100644
--- a/ITS/AliITSAlignMille2ConstrArray.cxx
+++ b/ITS/AliITSAlignMille2ConstrArray.cxx
@@ -21,6 +21,7 @@ AliITSAlignMille2ConstrArray::AliITSAlignMille2ConstrArray(const Char_t* name,Do
   fCoeffs(npar),
   fError(err)
 {
+  // create module
   for (int i=0;i<npar;i++) {fCoeffs[i] = parcf[i]; if (parcf[i]!=0) SetBit(0x1<<i);}
 }
 
@@ -34,28 +35,31 @@ AliITSAlignMille2ConstrArray::AliITSAlignMille2ConstrArray(const AliITSAlignMill
 {/* DUMMY */} 
 
 //________________________________________________________________________________________________________
-void AliITSAlignMille2ConstrArray::AddModule(AliITSAlignMille2Module* mod)
+void AliITSAlignMille2ConstrArray::AddModule(AliITSAlignMille2Module* mod, Bool_t needGeom)
 {
+  // add module to constraint
   int nmd = GetNModules();
   // check if its already not there
   for (int im=nmd;im--;) {if (mod->GetUniqueID() == (UInt_t)fModuleIDs[im]) return; }
   fModuleIDs.Set(nmd+1);
   fModulePatt.Set(nmd+1);
   fModuleIDs[nmd] = mod->GetUniqueID();
-  double jacobian[AliITSAlignMille2Module::kMaxParGeom][AliITSAlignMille2Module::kMaxParGeom];
-  if (mod->GeomParamsGlobal()) mod->CalcDerivLocGlo(&jacobian[0][0]);
-  //
-  Short_t patt =  GetPattern();
-  if (mod->GeomParamsGlobal()) {
-    // the constraint is defined in the module's local frame. If the alignment of geom params is
-    // done in the global frame, we need to set the real parameter involved
-    patt &= 0xffff<< AliITSAlignMille2Module::kMaxParGeom;     // reset the geometry parameters
-    for (int i=0;i<AliITSAlignMille2Module::kMaxParGeom;i++) {
-      if (!IncludesParam(i)) continue;
-      for (int j=0;j<AliITSAlignMille2Module::kMaxParGeom;j++) if (jacobian[i][j]!=0) patt |= (0x1<<j);
+  if (needGeom) { // this is geometrical constraint
+    double jacobian[AliITSAlignMille2Module::kMaxParGeom][AliITSAlignMille2Module::kMaxParGeom];
+    if (mod->GeomParamsGlobal()) mod->CalcDerivLocGlo(&jacobian[0][0]);
+    //
+    Short_t patt =  GetPattern();
+    if (mod->GeomParamsGlobal()) {
+      // the constraint is defined in the module's local frame. If the alignment of geom params is
+      // done in the global frame, we need to set the real parameter involved
+      for (int i=AliITSAlignMille2Module::kMaxParGeom;i--;) patt &= ~BIT(i);  // reset the geometry parameters
+      for (int i=0;i<AliITSAlignMille2Module::kMaxParGeom;i++) {
+	if (!IncludesParam(i)) continue;
+	for (int j=0;j<AliITSAlignMille2Module::kMaxParGeom;j++) if (jacobian[i][j]!=0) patt |= BIT(j);
+      }
     }
+    fModulePatt[nmd] = patt;
   }
-  fModulePatt[nmd] = patt;
 }
 
 //________________________________________________________________________________________________________
@@ -80,7 +84,7 @@ Bool_t AliITSAlignMille2ConstrArray::IncludesModPar(Int_t id,Int_t par) const
 }
 
 //________________________________________________________________________________________________________
-Bool_t AliITSAlignMille2ConstrArray::IncludesModPar(AliITSAlignMille2Module* mod, Int_t par) const
+Bool_t AliITSAlignMille2ConstrArray::IncludesModPar(const AliITSAlignMille2Module* mod, Int_t par) const
 {
   // is this module/parameter mentioned in the list?
   return IncludesModPar(mod->GetUniqueID(), par);
@@ -90,6 +94,7 @@ Bool_t AliITSAlignMille2ConstrArray::IncludesModPar(AliITSAlignMille2Module* mod
 //________________________________________________________________________________________________________
 void AliITSAlignMille2ConstrArray::Print(Option_t* ) const
 {
+  // print data
   printf("#%3d Constraint %s of type %d | Value=%+e Error=%+e\n",GetConstraintID(),GetName(),GetType(),GetValue(),GetError());
   printf("Weights on params: "); for (int i=0;i<GetNCoeffs();i++) printf("%+.3e ",GetCoeff(i)); 
   printf("\nModules involved: \n");