Update CS_fit.cpp
This commit is contained in:
39
CS_fit.cpp
39
CS_fit.cpp
@ -651,7 +651,10 @@ int main(int argc, char* argv[]) {
|
||||
scan_v6.push_back("603"); //jfcalib-5
|
||||
scan_v6.push_back("603_fullspeed"); //jfcalib-5
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> refs/remotes/origin/master
|
||||
scan_v6.push_back("578"); //jfcalib-0
|
||||
scan_v6.push_back("578_fullspeed"); //jfcalib-0
|
||||
scan_v6.push_back("588"); //jfcalib-2
|
||||
@ -674,7 +677,10 @@ int main(int argc, char* argv[]) {
|
||||
scan_v6.push_back("589"); //jfcalib-5
|
||||
scan_v6.push_back("589_fullspeed"); //jfcalib-5
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> refs/remotes/origin/master
|
||||
scan_v6.push_back("586"); //jfcalib-0
|
||||
scan_v6.push_back("586_fullspeed"); //jfcalib-0
|
||||
scan_v6.push_back("607"); //jfcalib-1
|
||||
@ -683,9 +689,42 @@ int main(int argc, char* argv[]) {
|
||||
scan_v6.push_back("609_fullspeed"); //jfcalib-2
|
||||
scan_v6.push_back("625"); //jfcalib-3
|
||||
scan_v6.push_back("625_fullspeed"); //jfcalib-3
|
||||
<<<<<<< HEAD
|
||||
scan_v6.push_back("626"); //jfcalib-4
|
||||
scan_v6.push_back("626_fullspeed"); //jfcalib-4
|
||||
|
||||
scan_v6.push_back("607"); //jfcalib-1
|
||||
scan_v6.push_back("607_fullspeed"); //jfcalib-1
|
||||
scan_v6.push_back("609"); //jfcalib-2
|
||||
scan_v6.push_back("609_fullspeed"); //jfcalib-2
|
||||
scan_v6.push_back("367"); //jfcalib-4
|
||||
scan_v6.push_back("367_fullspeed"); //jfcalib-4
|
||||
scan_v6.push_back("604"); //jfcalib-5
|
||||
scan_v6.push_back("604_fullspeed"); //jfcalib-5
|
||||
|
||||
|
||||
scan_v6.push_back("367_Kirsty"); //jfcalib-4
|
||||
scan_v6.push_back("367_Kirsty_fullspeed"); //jfcalib-4
|
||||
scan_v6.push_back("604_Kirsty"); //jfcalib-5
|
||||
scan_v6.push_back("604_Kirsty_fullspeed"); //jfcalib-5
|
||||
|
||||
|
||||
scan_v6.push_back("628"); //jfcalib-0
|
||||
scan_v6.push_back("628_fullspeed"); //jfcalib-0
|
||||
scan_v6.push_back("627"); //jfcalib-1
|
||||
scan_v6.push_back("627_fullspeed"); //jfcalib-1
|
||||
scan_v6.push_back("629"); //jfcalib-5
|
||||
scan_v6.push_back("629_fullspeed"); //jfcalib-5
|
||||
scan_v6.push_back("642"); //jfcalib-3
|
||||
scan_v6.push_back("642_fullspeed"); //jfcalib-3
|
||||
scan_v6.push_back("604"); //jfcalib-4
|
||||
scan_v6.push_back("604_fullspeed"); //jfcalib-4
|
||||
scan_v6.push_back("701_Vadym");
|
||||
=======
|
||||
scan_v6.push_back("526"); //jfcalib-4
|
||||
scan_v6.push_back("526_fullspeed"); //jfcalib-4
|
||||
|
||||
>>>>>>> refs/remotes/origin/master
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user