removing some ValidActorTraits to save on clutter

Author: knopers8

Framework/include/QualityControl/Actor.h

@@ -42,7 +42,6 @@ namespace o2::bkp {
 enum class DplProcessType;
 }
 
-
 namespace o2::quality_control::repository {
 class DatabaseInterface;
 }

Framework/include/QualityControl/ActorHelpers.h

@@ -66,8 +66,7 @@ namespace actor_helpers
   ServicesConfig extractConfig(const CommonSpec& commonSpec);
 
   template<typename ConcreteActor>
-  requires (ValidActorTraits<ActorTraits<ConcreteActor>> &&
-            runsUserCode<ActorTraits<ConcreteActor>>() &&
+  requires (runsUserCode<ActorTraits<ConcreteActor>>() &&
             ActorTraits<ConcreteActor>::sDetectorSpecific)
   std::string dataProcessorName(std::string_view userCodeName, std::string_view detectorName)
   {
@@ -78,16 +77,14 @@ namespace actor_helpers
   }
 
   template<typename ConcreteActor>
-  requires (ValidActorTraits<ActorTraits<ConcreteActor>>)
   std::string dataProcessorName()
   {
     using traits = ActorTraits<ConcreteActor>;
     return std::string{traits::sActorTypeKebabCase};
   }
 
   template <typename ConcreteActor, typename ConfigT>
-  requires (ValidActorTraits<ActorTraits<ConcreteActor>> &&
-           (impl::UserCodeConfigSingle<ConfigT> || impl::UserCodeConfigRange<ConfigT>))
+  requires (impl::UserCodeConfigSingle<ConfigT> || impl::UserCodeConfigRange<ConfigT>)
   framework::Inputs collectUserInputs(ConfigT&& config)
   {
     using traits = ActorTraits<ConcreteActor>;
@@ -128,8 +125,7 @@ namespace actor_helpers
   }
 
   template <typename ConcreteActor, DataSourceType dataSourceType, typename ConfigT>
-  requires (ValidActorTraits<ActorTraits<ConcreteActor>> &&
-           (impl::UserCodeConfigSingle<ConfigT> || impl::UserCodeConfigRange<ConfigT>))
+  requires (impl::UserCodeConfigSingle<ConfigT> || impl::UserCodeConfigRange<ConfigT>)
   framework::Outputs collectUserOutputs(ConfigT&& config)
   {
     using traits = ActorTraits<ConcreteActor>;
@@ -148,7 +144,6 @@ namespace actor_helpers
   }
 
   template<typename ConcreteActor>
-  requires ValidActorTraits<ActorTraits<ConcreteActor>>
   framework::DataProcessorLabel dataProcessorLabel()
   {
     using traits = ActorTraits<ConcreteActor>;

Framework/include/QualityControl/ActorTraits.h

@@ -125,7 +125,6 @@ struct ActorTraits {
 };
 
 template<typename ConcreteActor>
-requires ValidActorTraits<ActorTraits<ConcreteActor>>
 consteval bool publishesDataSource(DataSourceType dataSourceType)
 {
   for (auto t : ActorTraits<ConcreteActor>::sPublishedDataSources) {
@@ -138,7 +137,6 @@ consteval bool publishesDataSource(DataSourceType dataSourceType)
 
 template<typename ConcreteActor, DataSourceType dataSourceType>
 concept ValidDataSourceForActor =
-  ValidActorTraits<ActorTraits<ConcreteActor>> &&
   publishesDataSource<ConcreteActor>(dataSourceType);
 
 }

Framework/include/QualityControl/DataProcessorAdapter.h

@@ -28,7 +28,6 @@ namespace o2::quality_control::core {
 struct DataProcessorAdapter
 {
   template<typename ConcreteActor>
-  requires ValidActorTraits<ActorTraits<ConcreteActor>>
   static o2::framework::DataProcessorSpec
   adapt(ConcreteActor&& actor, std::string&& dataProcessorName, framework::Inputs&& inputs, framework::Outputs&& outputs, framework::Options&& options)
   {

Framework/include/QualityControl/InputUtils.h

@@ -27,7 +27,7 @@
 namespace o2::quality_control::core {
 // the returned value can be used either as OutputSpec or InputSpec, depending who needs it
 template<typename ConcreteActor, DataSourceType dataSourceType>
-  requires ValidActorTraits<ActorTraits<ConcreteActor> > && ValidDataSourceForActor<ConcreteActor, dataSourceType>
+  requires ValidDataSourceForActor<ConcreteActor, dataSourceType>
 static framework::ConcreteDataMatcher createUserDataMatcher(const std::string& detectorName,
                                                             const std::string& userCodeName)
 {
@@ -40,7 +40,7 @@ static framework::ConcreteDataMatcher createUserDataMatcher(const std::string& d
 }
 
 template<typename ConcreteActor, DataSourceType dataSourceType>
-  requires ValidActorTraits<ActorTraits<ConcreteActor> > && ValidDataSourceForActor<ConcreteActor, dataSourceType>
+  requires ValidDataSourceForActor<ConcreteActor, dataSourceType>
 static framework::OutputSpec createUserOutputSpec(const std::string& detectorName, const std::string& userCodeName)
 {
   // currently all of our outputs are Lifetime::Sporadic, so we don't allow for customization, but it could be factored out
@@ -53,7 +53,7 @@ static framework::OutputSpec createUserOutputSpec(const std::string& detectorNam
 }
 
 template<typename ConcreteActor, DataSourceType dataSourceType>
-  requires ValidActorTraits<ActorTraits<ConcreteActor> > && ValidDataSourceForActor<ConcreteActor, dataSourceType>
+  requires ValidDataSourceForActor<ConcreteActor, dataSourceType>
 static framework::InputSpec createUserInputSpec(const std::string& detectorName, const std::string& userCodeName)
 {
   // currently all of our outputs are Lifetime::Sporadic, so we don't allow for customization, but it could be factored out