Skip to content

Updates for numpy2 #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samaloney merged 1 commit into from
Nov 7, 2025
Merged

Updates for numpy2 #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stixcore/processing/tests/test_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def out_dir(tmp_path):

@pytest.fixture
def packet():
data = "0da4c0090066100319000000000000000212000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b788014000000000ffffffff000000000000000000000000000000000000000000000000000000001f114cffffff" # noqa:
data = "0da4c0090066100319000000000000000212000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b788014000000000ffffffff000000000000000000000000000000000000000000000000000000001f114cffffff" # noqa
packet = GenericTMPacket("0x" + data)
return packet

Expand Down
4 changes: 2 additions & 2 deletions stixcore/products/level0/quicklookL0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def from_levelb(cls, levelb, *, parent="", NIX00405_offset=0):
# When the packets are parsed empty packets are dropped but in LB we don't parse so this
# is not known need to compare control and levelb.control and only use matching rows
if len(levelb.control) > len(control):
matching_index = np.argwhere(np.in1d(levelb.control["scet_coarse"], np.array(packets.get("scet_coarse"))))
matching_index = np.argwhere(np.isin(levelb.control["scet_coarse"], np.array(packets.get("scet_coarse"))))
control["raw_file"] = levelb.control["raw_file"][matching_index].reshape(-1)
control["packet"] = levelb.control["packet"][matching_index].reshape(-1)
else:
Expand Down Expand Up @@ -830,7 +830,7 @@ def from_levelb(cls, levelb, parent=""):
# When the packets are parsed empty packets are dropped but in LB we don't parse so this
# is not known need to compare control and levelb.control and only use matching rows
if len(levelb.control) > len(control):
matching_index = np.argwhere(np.in1d(levelb.control["scet_coarse"], np.array(packets.get("scet_coarse"))))
matching_index = np.argwhere(np.isin(levelb.control["scet_coarse"], np.array(packets.get("scet_coarse"))))
control["raw_file"] = levelb.control["raw_file"][matching_index].reshape(-1)
control["packet"] = levelb.control["packet"][matching_index].reshape(-1)
else:
Expand Down
4 changes: 2 additions & 2 deletions stixcore/products/level0/scienceL0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def split_to_files(self):
key_cols.insert(0, "tc_packet_seq_control")

for control in self.control.group_by(key_cols).groups:
data = self.data[np.in1d(self.data["control_index"], control["index"])]
data = self.data[np.isin(self.data["control_index"], control["index"])]

yield type(self)(
service_type=self.service_type,
Expand Down Expand Up @@ -375,7 +375,7 @@ def from_levelb(cls, levelb, parent=""):
start = 0
end = 0
res = []
for npx in data["num_pixel_sets"]:
for npx in data["num_pixel_sets"].astype(int):
end += npx
cur_pm = pixel_indices[start:end].astype(int).tolist()
full_pm = np.full((12), 0, dtype=np.ubyte)
Expand Down
Loading