From 446e1e1f5d4e773e5bf3c00ccc342024ef466cc9 Mon Sep 17 00:00:00 2001
From: Rolf Bork <rolf.bork@ligo.org>
Date: Tue, 30 Jul 2013 18:30:32 +0000
Subject: [PATCH] Bug fix - bug number 477. Auto-generated DAC Monitor screens
not properly generated when both 16bit and 18bit DAC cards in a model. Cause
was that supporting MEDM generation perl modules were not used correct DAC
number index to write screen files, causing generation of 16bit and 18bit
screens by the same name.
git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@3428 6dcd42c9-f523-4c6d-aada-af552506706e
---
src/epics/util/lib/Dac.pm | 5 +++--
src/epics/util/lib/Dac18.pm | 2 +-
src/epics/util/lib/medmGenGdsTp.pm | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/epics/util/lib/Dac.pm b/src/epics/util/lib/Dac.pm
index 839391ffc..1b1a92cc2 100644
--- a/src/epics/util/lib/Dac.pm
+++ b/src/epics/util/lib/Dac.pm
@@ -182,9 +182,10 @@ sub createDac16Medm
my $ii=0;
- my $fname = "$mdlName\_DAC_MONITOR_$::dacCardNum[$dacNum].adl";
+ #my $fname = "$mdlName\_DAC_MONITOR_$::dacCardNum[$dacNum].adl";
+ my $fname = "$mdlName\_DAC_MONITOR_$dacNum.adl";
# Create MEDM File
- print "creating file $medmDir\/$fname \n";
+ print "creating file $medmDir\/$fname DAC 16bit\n";
open(OUTMEDM, ">$medmDir/$fname") || die "cannot open $medmDir/$fname for writing ";
my $xpos = 0; my $ypos = 0; my $width = 171; my $height = 430;
diff --git a/src/epics/util/lib/Dac18.pm b/src/epics/util/lib/Dac18.pm
index 54d517c4f..74ca273b1 100644
--- a/src/epics/util/lib/Dac18.pm
+++ b/src/epics/util/lib/Dac18.pm
@@ -180,7 +180,7 @@ sub createDac18Medm
my $ii=0;
- my $fname = "$mdlName\_DAC_MONITOR_$::dacCardNum[$dacNum].adl";
+ my $fname = "$mdlName\_DAC_MONITOR_$dacNum.adl";
# Create MEDM File
print "creating file $medmDir\/$fname \n";
open(OUTMEDM, ">$medmDir/$fname") || die "cannot open $medmDir/$fname for writing ";
diff --git a/src/epics/util/lib/medmGenGdsTp.pm b/src/epics/util/lib/medmGenGdsTp.pm
index 9d692093e..17f36d737 100644
--- a/src/epics/util/lib/medmGenGdsTp.pm
+++ b/src/epics/util/lib/medmGenGdsTp.pm
@@ -326,7 +326,7 @@ sub createGdsMedm
$b1width = 14;
for($ii=0;$ii<$dacCnt;$ii++)
{
- $relDisp = "$medmTarget\/$mdlNamelc\/$mdlName\_DAC_MONITOR_$::dacCardNum[$ii].adl";
+ $relDisp = "$medmTarget\/$mdlNamelc\/$mdlName\_DAC_MONITOR_$ii.adl";
if($dactype[$ii] eq "GSC_18AO8" ) {
$medmdata .= ("CDS::medmGen::medmGenRelDisp") -> ($xpos,$ypos,$width,$height,$relDisp,$ecolors{white},$ecolors{dacblue},"D$::dacCardNum[$ii]");
if($adcMaster == 1)
--
GitLab