Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Scan-Operator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
YARR
Utilities
Scan-Operator
Commits
fca59f57
Commit
fca59f57
authored
5 years ago
by
Shohei Yamagaya
Browse files
Options
Downloads
Patches
Plain Diff
update : for fei4b scans
parent
62669e98
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
SeaquentialOperator.sh
+1
-1
1 addition, 1 deletion
SeaquentialOperator.sh
SingleOperator.sh
+2
-2
2 additions, 2 deletions
SingleOperator.sh
libYarr/call_scanConsole.sh
+2
-2
2 additions, 2 deletions
libYarr/call_scanConsole.sh
script/setup.sh
+1
-1
1 addition, 1 deletion
script/setup.sh
with
6 additions
and
6 deletions
SeaquentialOperator.sh
+
1
−
1
View file @
fca59f57
...
@@ -55,7 +55,7 @@ if [ -z $module_id ];then
...
@@ -55,7 +55,7 @@ if [ -z $module_id ];then
fi
fi
cd
$TMP_DIR
cd
$TMP_DIR
./libYarr/createDefaultConfig.sh
-a
rd53a
-m
$module_id
-c
1
-R
./libYarr/createDefaultConfig.sh
-a
fei4b
-m
$module_id
-c
1
-R
if
$DCS_Control
;
then
if
$DCS_Control
;
then
echo
"DCS system is turned on!"
echo
"DCS system is turned on!"
...
...
This diff is collapsed.
Click to expand it.
SingleOperator.sh
+
2
−
2
View file @
fca59f57
...
@@ -40,7 +40,7 @@ DataBase=false
...
@@ -40,7 +40,7 @@ DataBase=false
chip_num
=
1
chip_num
=
1
SCAN_SET
=
false
SCAN_SET
=
false
asic_type
=
rd53a
asic_type
=
fei4b
#############################################
#############################################
option_target
=
""
option_target
=
""
...
@@ -132,5 +132,5 @@ fi
...
@@ -132,5 +132,5 @@ fi
cd
$TMP_DIR
cd
$TMP_DIR
if
${
data_taking
}
;
then
if
${
data_taking
}
;
then
./libYarr/call_dbAccessor.sh
-c
$TMP_DIR
/configs/module_configs/
rd53a
/
$module_id
/connectivity.json
-s
$YARR_DIR
/data/last_scan/scanLog.json
-C
./configs/influxDB/connectivity.json
./libYarr/call_dbAccessor.sh
-c
$TMP_DIR
/configs/module_configs/
fei4b
/
$module_id
/connectivity.json
-s
$YARR_DIR
/data/last_scan/scanLog.json
-C
./configs/influxDB/connectivity.json
fi
fi
This diff is collapsed.
Click to expand it.
libYarr/call_scanConsole.sh
+
2
−
2
View file @
fca59f57
...
@@ -19,7 +19,7 @@ cd $YARR_DIR
...
@@ -19,7 +19,7 @@ cd $YARR_DIR
################################
################################
# default parameters
# default parameters
asic_type
=
rd53a
asic_type
=
fei4b
target_tot
=
7
target_tot
=
7
target_preamp
=
10000
target_preamp
=
10000
target_charge
=
1500
target_charge
=
1500
...
@@ -89,7 +89,7 @@ if [ -z ${scan_type} ]; then
...
@@ -89,7 +89,7 @@ if [ -z ${scan_type} ]; then
fi
fi
#if [ ! `echo ${scan_type} | grep "rd53a"` ]; then
#if [ ! `echo ${scan_type} | grep "rd53a"` ]; then
if
[
!
-e
"
${
scan_type
}
"
]
;
then
if
[
!
-e
"
${
scan_type
}
"
]
;
then
scan_type
=
configs/scans/
rd53a
/
${
scan_type
}
.json
scan_type
=
configs/scans/
fei4
/
${
scan_type
}
.json
fi
fi
if
[
!
-f
${
scan_type
}
]
;
then
if
[
!
-f
${
scan_type
}
]
;
then
echo
"Not exist scan
\"
${
scan_type
}
\"
."
echo
"Not exist scan
\"
${
scan_type
}
\"
."
...
...
This diff is collapsed.
Click to expand it.
script/setup.sh
+
1
−
1
View file @
fca59f57
...
@@ -29,7 +29,7 @@ if $need_login ; then
...
@@ -29,7 +29,7 @@ if $need_login ; then
export
system
export
system
export
RunCounter_path
=
$HOME
/.yarr/runCounter
export
RunCounter_path
=
$HOME
/.yarr/runCounter
export
SCAN_DIR
=
$YARR_DIR
/configs/scans/
rd53a
/
export
SCAN_DIR
=
$YARR_DIR
/configs/scans/
fei4
/
# export DCS_setup_file=$TMP_DIR/configs/DCS_setup/DCS_setup.json
# export DCS_setup_file=$TMP_DIR/configs/DCS_setup/DCS_setup.json
export
DCS_setup_file
=
`
get_json
$system_configuration_file
.DCS_setup
`
export
DCS_setup_file
=
`
get_json
$system_configuration_file
.DCS_setup
`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment