Improve interface for bloqs with specialized single-qubit-controlled versions

qualtran/bloqs/chemistry/hubbard_model/qubitization/select_hubbard.py

@@ -191,14 +191,12 @@ def __str__(self):
         return s
 
     def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlledT']:
-        from qualtran.bloqs.mcmt.bloq_with_specialized_single_qubit_control import (
-            get_ctrl_system_for_bloq_with_specialized_single_qubit_control,
-        )
+        from qualtran.bloqs.mcmt.specialized_ctrl import get_ctrl_system_1bit_cv
 
-        return get_ctrl_system_for_bloq_with_specialized_single_qubit_control(
+        return get_ctrl_system_1bit_cv(
+            self,
             ctrl_spec=ctrl_spec,
             current_ctrl_bit=self.control_val,
-            bloq_without_ctrl=attrs.evolve(self, control_val=None),
             get_ctrl_bloq_and_ctrl_reg_name=lambda cv: (
                 attrs.evolve(self, control_val=cv),
                 'control',

qualtran/bloqs/chemistry/sparse/select_bloq.py

@@ -170,14 +170,12 @@ def build_call_graph(self, ssa: 'SympySymbolAllocator') -> 'BloqCountDictT':
         return {SGate(): 1, maj_x: 1, c_maj_x: 1, maj_y: 1, c_maj_y: 1}
 
     def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlledT']:
-        from qualtran.bloqs.mcmt.bloq_with_specialized_single_qubit_control import (
-            get_ctrl_system_for_bloq_with_specialized_single_qubit_control,
-        )
+        from qualtran.bloqs.mcmt.specialized_ctrl import get_ctrl_system_1bit_cv
 
-        return get_ctrl_system_for_bloq_with_specialized_single_qubit_control(
+        return get_ctrl_system_1bit_cv(
+            self,
             ctrl_spec=ctrl_spec,
             current_ctrl_bit=self.control_val,
-            bloq_without_ctrl=attrs.evolve(self, control_val=None),
             get_ctrl_bloq_and_ctrl_reg_name=lambda cv: (
                 attrs.evolve(self, control_val=cv),
                 'control',

qualtran/bloqs/chemistry/thc/select_bloq.py

@@ -315,14 +315,12 @@ def build_composite_bloq(self, bb: 'BloqBuilder', **soqs: 'SoquetT') -> Dict[str
         return out_soqs
 
     def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlledT']:
-        from qualtran.bloqs.mcmt.bloq_with_specialized_single_qubit_control import (
-            get_ctrl_system_for_bloq_with_specialized_single_qubit_control,
-        )
+        from qualtran.bloqs.mcmt.specialized_ctrl import get_ctrl_system_1bit_cv
 
-        return get_ctrl_system_for_bloq_with_specialized_single_qubit_control(
+        return get_ctrl_system_1bit_cv(
+            self,
             ctrl_spec=ctrl_spec,
             current_ctrl_bit=self.control_val,
-            bloq_without_ctrl=evolve(self, control_val=None),
             get_ctrl_bloq_and_ctrl_reg_name=lambda cv: (evolve(self, control_val=cv), 'control'),
         )
 

qualtran/bloqs/for_testing/random_select_and_prepare.py

@@ -150,14 +150,12 @@ def decompose_from_registers(
             yield op
 
     def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlledT']:
-        from qualtran.bloqs.mcmt.bloq_with_specialized_single_qubit_control import (
-            get_ctrl_system_for_bloq_with_specialized_single_qubit_control,
-        )
+        from qualtran.bloqs.mcmt.specialized_ctrl import get_ctrl_system_1bit_cv
 
-        return get_ctrl_system_for_bloq_with_specialized_single_qubit_control(
+        return get_ctrl_system_1bit_cv(
+            self,
             ctrl_spec=ctrl_spec,
             current_ctrl_bit=self.control_val,
-            bloq_without_ctrl=attrs.evolve(self, control_val=None),
             get_ctrl_bloq_and_ctrl_reg_name=lambda cv: (
                 attrs.evolve(self, control_val=cv),
                 'control',