Update for diffdrr v0.4.3 (#8)

* Sync with DiffDRR dev branch

* Ensure det=1 for poses

* Update README.md

README.md

@@ -90,6 +90,7 @@ drr = DRR(
     deepfluoro.delx * subsample,
     x0=deepfluoro.x0,
     y0=deepfluoro.y0,
+    reverse_x_axis=False,
 )
 transform = Transforms(deepfluoro.height // subsample)
 
@@ -140,8 +141,9 @@ drr = DRR(
     delx * subsample,
     width // subsample,
     dely * subsample,
-    x0=x0,
+    x0=-x0,
     y0=y0,
+    reverse_x_axis=False,
 )
 transform = Transforms(height // subsample, width // subsample)
 

diffdrrdata/deepfluoro.py

@@ -62,7 +62,7 @@ def __init__(
         self.flip_z = RigidTransform(
             torch.tensor(
                 [
-                    [0, -1, 0, 0],
+                    [0, 1, 0, 0],
                     [1, 0, 0, 0],
                     [0, 0, -1, 0],
                     [0, 0, 0, 1],
@@ -141,15 +141,6 @@ def parse_volume(subject, bone_attenuation_multiplier):
     volume = ScalarImage(tensor=volume, affine=affine)
     labelmap = LabelMap(tensor=mask, affine=affine)
 
-    # Package the subject
-    subject = read(
-        volume=volume,
-        labelmap=labelmap,
-        bone_attenuation_multiplier=bone_attenuation_multiplier,
-        label_def=defns,
-        fiducials=fiducials,
-    )
-
     # Move the fiducials's isocenter to the origin in world coordinates
     isocenter = volume.get_center()
     anatomical2world = RigidTransform(
@@ -164,6 +155,15 @@ def parse_volume(subject, bone_attenuation_multiplier):
         )
     )
 
+    # Package the subject
+    subject = read(
+        volume=volume,
+        labelmap=labelmap,
+        bone_attenuation_multiplier=bone_attenuation_multiplier,
+        label_def=defns,
+        fiducials=fiducials,
+    )
+
     return subject, anatomical2world
 
 

diffdrrdata/ljubljana.py

@@ -35,7 +35,7 @@ def __init__(
         self.flip_z = RigidTransform(
             torch.tensor(
                 [
-                    [0, -1, 0, 0],
+                    [0, 1, 0, 0],
                     [1, 0, 0, 0],
                     [0, 0, -1, 0],
                     [0, 0, 0, 1],
@@ -89,13 +89,7 @@ def parse_volume(f, subject_id):
 
     volume = ScalarImage(tensor=volume, affine=affine)
     fiducials = torch.from_numpy(subject["points"][:]).unsqueeze(0)
-    subject = read(
-        volume=volume,
-        labelmap=None,
-        bone_attenuation_multiplier=1.0,
-        fiducials=fiducials,
-        orientation="AP",
-    )
+
     # Move the Subject's isocenter to the origin in world coordinates
     isocenter = volume.get_center()
     anatomical2world = RigidTransform(
@@ -110,6 +104,15 @@ def parse_volume(f, subject_id):
         )
     )
 
+    # Package the subject
+    subject = read(
+        volume=volume,
+        labelmap=None,
+        bone_attenuation_multiplier=1.0,
+        fiducials=fiducials,
+        orientation="AP",
+    )
+
     return subject, anatomical2world
 
 # %% ../notebooks/01_ljubljana.ipynb 7