diff --git a/dap/algos/__init__.py b/dap/algos/__init__.py
index 45f00c7..f77c042 100644
--- a/dap/algos/__init__.py
+++ b/dap/algos/__init__.py
@@ -1,4 +1,5 @@
 
 from .radprof import calc_radial_integration
+from .addmask import calc_apply_additional_mask
 
 
diff --git a/dap/worker.py b/dap/worker.py
index d98a1c3..4f2b6fc 100644
--- a/dap/worker.py
+++ b/dap/worker.py
@@ -10,7 +10,7 @@ import numpy as np
 import zmq
 from peakfinder8_extension import peakfinder_8
 
-from algos import calc_radial_integration
+from algos import calc_radial_integration, calc_apply_additional_mask
 
 
 FLAGS = 0
@@ -187,61 +187,8 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
 
 # add additional mask at the edge of modules for JF06T08
         apply_additional_mask = results.get("apply_additional_mask", False)
-        if detector == "JF06T08V04" and apply_additional_mask:
-            # edge pixels
-            pixel_mask_pf[67:1097,1063] = 0
-            pixel_mask_pf[0:1030, 1100] = 0
-
-            pixel_mask_pf[1106:2136, 1131] = 0
-            pixel_mask_pf[1039:2069, 1168] = 0
-
-            pixel_mask_pf[1039:2069, 1718] = 0
-            pixel_mask_pf[1039:2069, 1681] = 0
-
-            pixel_mask_pf[1106:2136, 618] = 0
-
-            pixel_mask_pf[1106:2136, 581] = 0
-
-            pixel_mask_pf[67:1097,513] = 0
-
-            pixel_mask_pf[67:1097, 550] = 0
-
-            pixel_mask_pf[0:1030, 1650] = 0
-
-            pixel_mask_pf[0:1030, 1613] = 0
-
-            pixel_mask_pf[1106, 68:582] = 0
-
-            pixel_mask_pf[1096, 550:1064] = 0
-            pixel_mask_pf[1106, 618:1132] = 0
-
-            pixel_mask_pf[1029, 1100:1614] = 0
-            pixel_mask_pf[1039, 1168:1682] = 0
-
-            pixel_mask_pf[1039, 1718:2230] = 0
-
-            pixel_mask_pf[1096, 0:513] = 0
-
-            pixel_mask_pf[1029, 1650:2163] = 0
-
-            pixel_mask_pf[2068, 1168:2232] = 0
-
-            pixel_mask_pf[67,0:1063] = 0
-
-            #bad region in left bottom inner module
-            pixel_mask_pf[842:1097, 669:671] = 0
-
-            #second bad region in left bottom inner module
-            pixel_mask_pf[1094, 620:807] = 0
-
-            # vertical line in upper left bottom module
-            pixel_mask_pf[842:1072, 87:90] = 0
-
-            pixel_mask_pf[1794, 1503:1550] = 0
-
-        if detector == "JF17T16V01" and apply_additional_mask:
-            # mask module 11
-            pixel_mask_pf[2619:3333,1577:2607] = 0
+        if apply_additional_mask:
+            calc_apply_additional_mask(detector, pixel_mask_pf)
 
         if pixel_mask_corrected is not None:
             data_s = copy(image)