research/psboard-qaqc-postprocess
1
0
Fork 0
mirror of https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess.git synced 2024-11-24 16:11:11 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

update: master log (position fixed)

Browse source 
- A -> B
- 0-origin -> 1-origin
This commit is contained in:
Wataru Otsubo 2024-07-23 17:07:35 +09:00
parent 84d321ec30
commit e20c029684
5 changed files with 59 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main.rs
View file

@ -364,6 +364,30 @@ mod test {
patch: 2
}
);
assert_eq!(
Position::from_str("B-1-4").unwrap(),
Position {
major: PositionLayer::B,
minor: 1,
patch: 4
}
);
assert_eq!(
Position::from_str("B-0-9").unwrap(),
Position {
major: PositionLayer::B,
minor: 0,
patch: 9
}
);
assert_ne!(
Position::from_str("B-1-4").unwrap(),
Position {
major: PositionLayer::B,
minor: 0,
patch: 2
}
);
}
#[test]
@ -372,7 +396,6 @@ mod test {
assert!(DateTime::parse_from_str("Date: 2024-06-20T08:42:01+0000", "Date: %+").is_ok());
}
// #[test]
// fn parse_file() {
// let logfile = r"""""";

4
src/masterlog.rs
View file

@ -198,9 +198,9 @@ impl MasterLogResult {
// Origin is different (-1)
let pos = Position {
major: PositionLayer::A,
major: PositionLayer::B,
minor: station_minor,
patch: station_id - 1,
patch: station_id,
};
debug!("pos from table {}", pos);

2
tests/cli.rs
View file

@ -34,7 +34,7 @@ mod integrated_test {
line
.unwrap()
.contains(
"8866,,A-0-0,0,1,1,0,1,8,1,,7,2024-07-20T17:15:46Z,7.log,0.1.0,alice,,,,"
"8866,,B-0-1,0,1,1,0,1,8,1,,7,2024-07-20T17:15:46Z,7.log,0.1.0,alice,,,,"
)
}));
}

36
tests/example_logs/valid/7.log
View file

@ -5,24 +5,24 @@ QAQC runid: 7
Shifters: alice
----------------------
PBS Assignment:
Position / assigned-ID : A-0-0 / PS008866
Position / assigned-ID : A-1-0 / PS008867
Position / assigned-ID : A-0-1 / PS008868
Position / assigned-ID : A-1-1 / PS008869
Position / assigned-ID : A-0-2 / PS008870
Position / assigned-ID : A-1-2 / PS008871
Position / assigned-ID : A-0-3 / PS008872
Position / assigned-ID : A-1-3 / PS008873
Position / assigned-ID : A-0-4 / PS008874
Position / assigned-ID : A-1-4 / PS008875
Position / assigned-ID : A-0-5 / PS008876
Position / assigned-ID : A-1-5 / PS008877
Position / assigned-ID : A-0-6 / PS008878
Position / assigned-ID : A-1-6 / PS008879
Position / assigned-ID : A-0-7 / PS008880
Position / assigned-ID : A-1-7 / PS008881
Position / assigned-ID : A-0-8 / PS008882
Position / assigned-ID : A-1-8 / PS008883
Position / assigned-ID : B-0-1 / PS008866
Position / assigned-ID : B-1-1 / PS008867
Position / assigned-ID : B-0-2 / PS008868
Position / assigned-ID : B-1-2 / PS008869
Position / assigned-ID : B-0-3 / PS008870
Position / assigned-ID : B-1-3 / PS008871
Position / assigned-ID : B-0-4 / PS008872
Position / assigned-ID : B-1-4 / PS008873
Position / assigned-ID : B-0-5 / PS008874
Position / assigned-ID : B-1-5 / PS008875
Position / assigned-ID : B-0-6 / PS008876
Position / assigned-ID : B-1-6 / PS008877
Position / assigned-ID : B-0-7 / PS008878
Position / assigned-ID : B-1-7 / PS008879
Position / assigned-ID : B-0-8 / PS008880
Position / assigned-ID : B-1-8 / PS008881
Position / assigned-ID : B-0-9 / PS008882
Position / assigned-ID : B-1-9 / PS008883
======================
QAQC status| QSPIp | Recov | Power | Clock | ASDTP | Reset | Result |
----------------------------------------------------------------------

28
tests/example_logs/valid/84.log
View file

@ -5,20 +5,20 @@ QAQC runid: 84
Shifters: alice
----------------------
PBS Assignment:
Position / assigned-ID : A-0-0 / PS008867
Position / assigned-ID : A-1-0 / PS008868
Position / assigned-ID : A-0-2 / PS008869
Position / assigned-ID : A-1-2 / PS008810
Position / assigned-ID : A-0-3 / PS008811
Position / assigned-ID : A-1-3 / PS008812
Position / assigned-ID : A-0-4 / PS008813
Position / assigned-ID : A-1-4 / PS008814
Position / assigned-ID : A-1-5 / PS008815
Position / assigned-ID : A-0-6 / PS008816
Position / assigned-ID : A-1-6 / PS008817
Position / assigned-ID : A-0-7 / PS008818
Position / assigned-ID : A-0-8 / PS008819
Position / assigned-ID : A-1-8 / PS008820
Position / assigned-ID : B-0-1 / PS008867
Position / assigned-ID : B-1-1 / PS008868
Position / assigned-ID : B-0-3 / PS008869
Position / assigned-ID : B-1-3 / PS008810
Position / assigned-ID : B-0-4 / PS008811
Position / assigned-ID : B-1-4 / PS008812
Position / assigned-ID : B-0-5 / PS008813
Position / assigned-ID : B-1-5 / PS008814
Position / assigned-ID : B-1-6 / PS008815
Position / assigned-ID : B-0-7 / PS008816
Position / assigned-ID : B-1-7 / PS008817
Position / assigned-ID : B-0-8 / PS008818
Position / assigned-ID : B-0-9 / PS008819
Position / assigned-ID : B-1-9 / PS008820
======================
QAQC status| QSPIp | Recov | Power | Clock | ASDTP | Reset | Result |
----------------------------------------------------------------------