FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Refactor TRD Digitizerworkflow (#2923) · AliceO2Group/AliceO2@e1f2f27 · GitHub

/ AliceO2 Public

Commit e1f2f27

Browse files
bazinski
authored
Refactor TRD Digitizerworkflow (#2923)
Moved trd digitizer to workflow in Detector/TRD/workflow
1 parent c27d238 commit e1f2f27

8 files changed

Lines changed: 50 additions & 10 deletions

File tree

‎Detectors/TRD/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010

1111
add_subdirectory(base)
1212
add_subdirectory(simulation)
13-
add_subdirectory(macros)
13+
add_subdirectory(macros)
14+
add_subdirectory(workflow)

‎Detectors/TRD/workflow/CMakeLists.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright CERN and copyright holders of ALICE O2. This software is distributed
2+
# under the terms of the GNU General Public License v3 (GPL Version 3), copied
3+
# verbatim in the file "COPYING".
4+
#
5+
# See http://alice-o2.web.cern.ch/license for full licensing information.
6+
#
7+
# In applying this license CERN does not waive the privileges and immunities
8+
# granted to it by virtue of its status as an Intergovernmental Organization or
9+
# submit itself to any jurisdiction.
10+
11+
12+
o2_add_library(TRDWorkflow
13+
TARGETVARNAME targetName
14+
SOURCES src/TRDDigitizerSpec.cxx #src/TRDDigitWriterSpec.h
15+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DPLUtils O2::Steer O2::Algorithm O2::DataFormatsTRD O2::TRDSimulation O2::DetectorsBase O2::SimulationDataFormat O2::TRDBase)
16+
17+
o2_target_root_dictionary(TRDWorkflow
18+
HEADERS include/TRDWorkflow/TRDDigitizerSpec.h)

Steer/DigitizerWorkflow/src/TRDDigitWriterSpec.h renamed to Detectors/TRD/workflow/include/TRDWorkflow/TRDDigitWriterSpec.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// granted to it by virtue of its status as an Intergovernmental Organization
99
// or submit itself to any jurisdiction.
1010

11-
#ifndef STEER_DIGITIZERWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
12-
#define STEER_DIGITIZERWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
11+
#ifndef TRDWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
12+
#define TRDWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
1313

1414
#include "Framework/DataProcessorSpec.h"
1515
#include "DPLUtils/MakeRootTreeWriterSpec.h"
@@ -27,7 +27,7 @@ namespace trd
2727
template <typename T>
2828
using BranchDefinition = framework::MakeRootTreeWriterSpec::BranchDefinition<T>;
2929

30-
o2::framework::DataProcessorSpec getTRDDigitWriterSpec()
30+
inline o2::framework::DataProcessorSpec getTRDDigitWriterSpec()
3131
{
3232
using InputSpec = framework::InputSpec;
3333
using MakeRootTreeWriterSpec = framework::MakeRootTreeWriterSpec;
@@ -43,4 +43,4 @@ o2::framework::DataProcessorSpec getTRDDigitWriterSpec()
4343
} // end namespace trd
4444
} // end namespace o2
4545

46-
#endif /* STEER_DIGITIZERWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_ */
46+
#endif /* TRDWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_ */

Steer/DigitizerWorkflow/src/TRDDigitizerSpec.h renamed to Detectors/TRD/workflow/include/TRDWorkflow/TRDDigitizerSpec.h

File renamed without changes.

Steer/DigitizerWorkflow/src/TRDDigitizerSpec.cxx renamed to Detectors/TRD/workflow/src/TRDDigitizerSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// granted to it by virtue of its status as an Intergovernmental Organization
99
// or submit itself to any jurisdiction.
1010

11-
#include "TRDDigitizerSpec.h"
11+
#include "TRDWorkflow/TRDDigitizerSpec.h"
1212
#include "Framework/ConfigParamRegistry.h"
1313
#include "Framework/ControlService.h"
1414
#include "Framework/DataProcessorSpec.h"

‎Detectors/TRD/workflow/src/TRDWorkflowLinkDef.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright CERN and copyright holders of ALICE O2. This software is
2+
// distributed under the terms of the GNU General Public License v3 (GPL
3+
// Version 3), copied verbatim in the file "COPYING".
4+
//
5+
// See http://alice-o2.web.cern.ch/license for full licensing information.
6+
//
7+
// In applying this license CERN does not waive the privileges and immunities
8+
// granted to it by virtue of its status as an Intergovernmental Organization
9+
// or submit itself to any jurisdiction.
10+
11+
#ifdef __CLING__
12+
13+
#pragma link off all globals;
14+
#pragma link off all classes;
15+
#pragma link off all functions;
16+
17+
//#pragma link C++ class o2::trd::TRDDPLDigitizerTask + ;
18+
19+
20+
#endif
21+

‎Steer/DigitizerWorkflow/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ o2_add_executable(digitizer-workflow
3232
src/TOFDigitizerSpec.cxx
3333
src/TPCDigitRootWriterSpec.cxx
3434
src/TPCDigitizerSpec.cxx
35-
src/TRDDigitizerSpec.cxx
3635
src/ZDCDigitizerSpec.cxx
3736
PUBLIC_LINK_LIBRARIES O2::Framework
3837
O2::Steer
@@ -50,10 +49,11 @@ o2_add_executable(digitizer-workflow
5049
O2::PHOSSimulation
5150
O2::CPVSimulation
5251
O2::TOFSimulation
53-
O2::TOFCalibration
52+
O2::TOFCalibration
5453
O2::TOFReconstruction
5554
O2::TPCSimulation
5655
O2::TPCWorkflow
5756
O2::TRDSimulation
57+
O2::TRDWorkflow
5858
O2::DataFormatsTRD
5959
O2::ZDCSimulation)

‎Steer/DigitizerWorkflow/src/SimpleDigitizerWorkflow.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
#include "HMPIDDigitWriterSpec.h"
5959

6060
// for TRD
61-
#include "TRDDigitizerSpec.h"
62-
#include "TRDDigitWriterSpec.h"
61+
#include "TRDWorkflow/TRDDigitizerSpec.h"
62+
#include "TRDWorkflow/TRDDigitWriterSpec.h"
6363

6464
//for MUON MCH
6565
#include "MCHDigitizerSpec.h"

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL