From d88b693a11c3acd97feb60d45a0e7dc794b2f2a0 Mon Sep 17 00:00:00 2001 From: Erik von Reis <evonreis@caltech.edu> Date: Mon, 8 Nov 2021 12:43:13 -0800 Subject: [PATCH] rcg: change LOCATION_NAME medm macro to give lowercase site name as used in /opt/rtcds/<site>/<ifo>/ --- src/epics/util/feCodeGen.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/epics/util/feCodeGen.pl b/src/epics/util/feCodeGen.pl index f601b49a0..cc52b0680 100755 --- a/src/epics/util/feCodeGen.pl +++ b/src/epics/util/feCodeGen.pl @@ -1938,7 +1938,7 @@ mkpath $epicsScreensDir, 0, 0755; my $sysname = "FEC"; my $medmDir = $target . "/medm/" . $skeleton . "/"; $sed_arg = "s/SITE_NAME/$ifo/g;s/CONTROL_SYSTEM_SYSTEM_NAME/" . uc($skeleton) . "/g;s/SYSTEM_NAME/" . uc($sysname) . "/g;s/GDS_NODE_ID/" . $gdsNodeId . "/g;"; -$sed_arg .= "s/LOCATION_NAME/$site/g;"; +$sed_arg .= "s/LOCATION_NAME/$lsite/g;"; $sed_arg .= "s/DCU_NODE_ID/$dcuId/g;"; $sysname = uc($skeleton); $sed_arg .= "s/FBID/$sysname/g;"; @@ -2070,7 +2070,7 @@ foreach $cur_part_num (0 .. $partCnt-1) { my $nsys = system_name_part($tfn); $sargs = "s/CONTROL_SYSTEM_SYSTEM_NAME/" . uc($skeleton) . "/g;"; $sargs .= "s/SITE_NAME/$ifo/g;s/SYSTEM_NAME/" . $nsys . "/g;"; - $sargs .= "s/LOCATION_NAME/$site/g;"; + $sargs .= "s/LOCATION_NAME/$lsite/g;"; $sargs .= "s/FILTERNAME/$tfn/g;"; $sargs .= "s/RCGDIR/$ffmedm/g;"; $sargs .= "s/DCU_NODE_ID/$dcuId/g"; @@ -2134,7 +2134,7 @@ foreach $cur_part_num (0 .. $partCnt-1) { my $nsys = system_name_part($tfn); $sargs = "s/CONTROL_SYSTEM_SYSTEM_NAME/" . uc($skeleton) . "/g;"; $sargs .= "s/SITE_NAME/$ifo/g;s/SYSTEM_NAME/" . $nsys . "/g;"; - $sargs .= "s/LOCATION_NAME/$site/g;"; + $sargs .= "s/LOCATION_NAME/$lsite/g;"; $sargs .= "s/FILTERNAME/$tfn/g;"; $sargs .= "s/RCGDIR/$ffmedm/g;"; $sargs .= "s/DCU_NODE_ID/$dcuId/g"; -- GitLab