Skip to content

Fix some incorrectly resolved conflicts

Codecov / codecov/patch failed Sep 19, 2024 in 1s

25.40% of diff hit (target 36.38%)

View this Pull Request on Codecov

25.40% of diff hit (target 36.38%)

Annotations

Check warning on line 133 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L129-L133

Added lines #L129 - L133 were not covered by tests

Check warning on line 137 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L135-L137

Added lines #L135 - L137 were not covered by tests

Check warning on line 140 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L139-L140

Added lines #L139 - L140 were not covered by tests

Check warning on line 143 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L142-L143

Added lines #L142 - L143 were not covered by tests

Check warning on line 162 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L160-L162

Added lines #L160 - L162 were not covered by tests

Check warning on line 167 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L164-L167

Added lines #L164 - L167 were not covered by tests

Check warning on line 169 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L169

Added line #L169 was not covered by tests

Check warning on line 174 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L171-L174

Added lines #L171 - L174 were not covered by tests

Check warning on line 176 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L176

Added line #L176 was not covered by tests

Check warning on line 180 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L178-L180

Added lines #L178 - L180 were not covered by tests

Check warning on line 186 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L184-L186

Added lines #L184 - L186 were not covered by tests

Check warning on line 189 in hexrd/instrument/cylindrical_detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/cylindrical_detector.py#L189

Added line #L189 was not covered by tests

Check warning on line 162 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L162

Added line #L162 was not covered by tests

Check warning on line 599 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L599

Added line #L599 was not covered by tests

Check warning on line 606 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L603-L606

Added lines #L603 - L606 were not covered by tests

Check warning on line 610 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L610

Added line #L610 was not covered by tests

Check warning on line 617 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L614-L617

Added lines #L614 - L617 were not covered by tests

Check warning on line 621 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L621

Added line #L621 was not covered by tests

Check warning on line 628 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L625-L628

Added lines #L625 - L628 were not covered by tests

Check warning on line 1730 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L1728-L1730

Added lines #L1728 - L1730 were not covered by tests

Check warning on line 1733 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L1732-L1733

Added lines #L1732 - L1733 were not covered by tests

Check warning on line 1736 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L1736

Added line #L1736 was not covered by tests

Check warning on line 1738 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L1738

Added line #L1738 was not covered by tests

Check warning on line 1741 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L1740-L1741

Added lines #L1740 - L1741 were not covered by tests

Check warning on line 1744 in hexrd/instrument/detector.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

hexrd/instrument/detector.py#L1743-L1744

Added lines #L1743 - L1744 were not covered by tests