Bug fixes in setting parameters

Javier Castillo Castellanos · shahor02 · commit 8a460144c736 · 2020-09-17T09:59:37.000+02:00
diff --git a/DataFormats/Detectors/Common/src/AlignParam.cxx b/DataFormats/Detectors/Common/src/AlignParam.cxx
@@ -103,8 +103,8 @@ bool AlignParam::setRotation(const TGeoMatrix& m)
     double psi, theta, phi;
     if (!matrixToAngles(rot, psi, theta, phi)) {
       return false;
-      setRotation(psi, theta, phi);
     }
+    setRotation(psi, theta, phi);
   } else {
     mPsi = mTheta = mPhi = 0.;
   }
@@ -190,7 +190,8 @@ bool AlignParam::setLocalParams(const TGeoMatrix& m)
   m1.Multiply(&gprimeinv);
   m1.MultiplyLeft(&gprime);
 
-  return setLocalParams(m1);
+  setParams(m1);
+  return true;
 }
 
 //_____________________________________________________________________________

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ bool AlignParam::setRotation(const TGeoMatrix& m)`
`103`	`103`	`double psi, theta, phi;`
`104`	`104`	`if (!matrixToAngles(rot, psi, theta, phi)) {`
`105`	`105`	`return false;`
`106`		`- setRotation(psi, theta, phi);`
`107`	`106`	`}`
	`107`	`+ setRotation(psi, theta, phi);`
`108`	`108`	`} else {`
`109`	`109`	`mPsi = mTheta = mPhi = 0.;`
`110`	`110`	`}`
`@@ -190,7 +190,8 @@ bool AlignParam::setLocalParams(const TGeoMatrix& m)`
`190`	`190`	`m1.Multiply(&gprimeinv);`
`191`	`191`	`m1.MultiplyLeft(&gprime);`
`192`	`192`
`193`		`- return setLocalParams(m1);`
	`193`	`+ setParams(m1);`
	`194`	`+ return true;`
`194`	`195`	`}`
`195`	`196`
`196`	`197`	`//_____________________________________________________________________________`