Merge pull request #157 from DiamondLightSource/error_msg_CS_scaleZero

LeandroMartinsdS · web-flow · commit 02c4f7247c76 · 2025-10-13T10:47:59.000+01:00
Add error message to pmacCSAxis::move to notify scale_==0
diff --git a/pmacApp/src/pmacCSAxis.cpp b/pmacApp/src/pmacCSAxis.cpp
@@ -213,8 +213,12 @@ asynStatus pmacCSAxis::move(double position, int /*relative*/, double min_veloci
       }
     }
 
-    deviceUnits = position / (double) scale_;
-
+    if (scale_ == 0) {
+      debug(DEBUG_ERROR, functionName, "Error getting CSAxis scale");
+      debug(DEBUG_ERROR, functionName, "  scale_", scale_);
+    } else {
+      deviceUnits = position / static_cast<double>(scale_);
+    }
 
     if (pC_->movesDeferred_ == 0) {
       sprintf(command, "&%d%s%sQ7%d=%.12f", pC_->getCSNumber(), vel_buff,

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,12 @@ asynStatus pmacCSAxis::move(double position, int /relative/, double min_veloci`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`		`- deviceUnits = position / (double) scale_;`
`217`		`-`
	`216`	`+ if (scale_ == 0) {`
	`217`	`+ debug(DEBUG_ERROR, functionName, "Error getting CSAxis scale");`
	`218`	`+ debug(DEBUG_ERROR, functionName, " scale_", scale_);`
	`219`	`+ } else {`
	`220`	`+ deviceUnits = position / static_cast<double>(scale_);`
	`221`	`+ }`
`218`	`222`
`219`	`223`	`if (pC_->movesDeferred_ == 0) {`
`220`	`224`	`sprintf(command, "&%d%s%sQ7%d=%.12f", pC_->getCSNumber(), vel_buff,`