From fc9174a082f5f9a3898c0f6bdf85d87046f42405 Mon Sep 17 00:00:00 2001 From: "Ryan@WorkStation" Date: Fri, 20 Oct 2023 11:45:53 -0400 Subject: [PATCH] fixed Process_Run remove padding zero, not remove all zero --- armory/Process_Run | 3 +-- working/Mapping.h | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/armory/Process_Run b/armory/Process_Run index 59a5398..da636cc 100755 --- a/armory/Process_Run +++ b/armory/Process_Run @@ -24,7 +24,6 @@ if [ $# -eq 0 ] || [ $1 == "-help" ]; then exit 1 fi; - RUN=$1 runNum=$1 EventBld=2 @@ -41,7 +40,7 @@ if [ "$RUN" == "lastRun" ]; then RUN=$runID fi -RUN=${RUN%0} #remove zero +RUN=${RUN##*(0)} #remove zero RUN=$(printf '%03d' $RUN) ##add back the zero ################################### Setting display diff --git a/working/Mapping.h b/working/Mapping.h index 8e5b9fd..6500020 100644 --- a/working/Mapping.h +++ b/working/Mapping.h @@ -15,7 +15,7 @@ //^ EZERO : 500 - 599 //^ Apollo : 600 - 699 //^ -//^ line comment is '//^' +//^ line comment is line constains '//^' or '// //' or '////' //^ //^=============================================================================== @@ -41,24 +41,24 @@ const std::vector> map = { 10, 110, 210, 11, 111, 211, 12, 112, 212, 13, 113, 213, 14, 114, 214, -1, /// 32 - 47 15, 115, 215, 16, 116, 216, 17, 117, 217, 18, 118, 218, 19, 119, 219, -1 /// 48 - 63 //C------------- end of a digitizer // this line is an indicator DON'T Remove "//C-" is an indcator -}, -{ +} +,{ //C 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 // this line is an indicator DON'T Remove "//C " is an indcator 20, 120, 220, 21, 121, 221, 22, 122, 222, 23, 123, 223, 24, 124, 224, -1, /// 0 - 15 25, 125, 225, 26, 126, 226, 27, 127, 227, 28, 128, 228, 29, 129, 229, -1, /// 16 - 31 30, 130, 230, 31, 131, 231, 32, 132, 232, 33, 133, 233, 34, 134, 234, -1, /// 32 - 47 35, 135, 235, 36, 136, 236, 37, 137, 237, 38, 138, 238, 39, 139, 239, -1 /// 48 - 63 //C------------- end of a digitizer // this line is an indicator DON'T Remove "//C-" is an indcator -}, -{ +} +,{ //C 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 // this line is an indicator DON'T Remove "//C " is an indcator 40, 140, 240, 41, 141, 241, 42, 142, 242, 43, 143, 243, 44, 144, 244, -1, /// 0 - 15 45, 145, 245, 46, 146, 246, 47, 147, 247, 48, 148, 248, 49, 149, 249, -1, /// 16 - 31 50, 150, 250, 51, 151, 251, 52, 152, 252, 53, 153, 253, 54, 154, 254, -1, /// 32 - 47 55, 155, 255, 56, 156, 256, 57, 157, 257, 58, 158, 258, 59, 159, 259, -1 /// 48 - 63 //C------------- end of a digitizer // this line is an indicator DON'T Remove "//C-" is an indcator -}, -{ +} +,{ //C 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 // this line is an indicator DON'T Remove "//C " is an indcator 300, 301, 302, 303, 304, 305, 306, 307, -1, -1, -1, -1, -1, -1, -1, -1, /// 0 - 15 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /// 16 - 31