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

Refactor TRD Digitizerworkflow by bazinski · Pull Request #2923 · AliceO2Group/AliceO2 · GitHub

/ AliceO2 Public

Refactor TRD Digitizerworkflow #2923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 4 commits into from
Feb 10, 2020
Conversation 1 Commits 4 Checks 0 Files changed
Merged

Refactor TRD Digitizerworkflow #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36524fe
moved trd digitizer to workflow in Detector/TRD/workflow
bazinski Feb 7, 2020
270f0df
remove inline from TRDDigitWriterSpec.h, this is all compiling fine o…
bazinski Feb 7, 2020
763e5d1
redid TRDWorkflowLinkDef.h
bazinski Feb 9, 2020
7354800
now compiling on centos7, header file in make file for o2_target_root…
bazinski Feb 10, 2020
File filter

Filter by extension

Filter by extension .cxx  (2) .h  (3) .txt  (3) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 2 additions & 1 deletion Detectors/TRD/CMakeLists.txt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@

add_subdirectory(base)
add_subdirectory(simulation)
add_subdirectory(macros)
add_subdirectory(macros)
add_subdirectory(workflow)
18 changes: 18 additions & 0 deletions Detectors/TRD/workflow/CMakeLists.txt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright CERN and copyright holders of ALICE O2. This software is distributed
# under the terms of the GNU General Public License v3 (GPL Version 3), copied
# verbatim in the file "COPYING".
#
# See http://alice-o2.web.cern.ch/license for full licensing information.
#
# In applying this license CERN does not waive the privileges and immunities
# granted to it by virtue of its status as an Intergovernmental Organization or
# submit itself to any jurisdiction.


o2_add_library(TRDWorkflow
TARGETVARNAME targetName
SOURCES src/TRDDigitizerSpec.cxx #src/TRDDigitWriterSpec.h
PUBLIC_LINK_LIBRARIES O2::Framework O2::DPLUtils O2::Steer O2::Algorithm O2::DataFormatsTRD O2::TRDSimulation O2::DetectorsBase O2::SimulationDataFormat O2::TRDBase)

o2_target_root_dictionary(TRDWorkflow
HEADERS include/TRDWorkflow/TRDDigitizerSpec.h)
8 changes: 4 additions & 4 deletions ...igitizerWorkflow/src/TRDDigitWriterSpec.h → .../include/TRDWorkflow/TRDDigitWriterSpec.h
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#ifndef STEER_DIGITIZERWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
#define STEER_DIGITIZERWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
#ifndef TRDWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_
#define TRDWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_

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

o2::framework::DataProcessorSpec getTRDDigitWriterSpec()
inline o2::framework::DataProcessorSpec getTRDDigitWriterSpec()
{
using InputSpec = framework::InputSpec;
using MakeRootTreeWriterSpec = framework::MakeRootTreeWriterSpec;
Expand All @@ -43,4 +43,4 @@ o2::framework::DataProcessorSpec getTRDDigitWriterSpec()
} // end namespace trd
} // end namespace o2

#endif /* STEER_DIGITIZERWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_ */
#endif /* TRDWORKFLOW_SRC_TRDDIGITWRITERSPEC_H_ */
0 .../DigitizerWorkflow/src/TRDDigitizerSpec.h → ...ow/include/TRDWorkflow/TRDDigitizerSpec.h
Show comments
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...igitizerWorkflow/src/TRDDigitizerSpec.cxx → ...ors/TRD/workflow/src/TRDDigitizerSpec.cxx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include "TRDDigitizerSpec.h"
#include "TRDWorkflow/TRDDigitizerSpec.h"
#include "Framework/ConfigParamRegistry.h"
#include "Framework/ControlService.h"
#include "Framework/DataProcessorSpec.h"
Expand Down
21 changes: 21 additions & 0 deletions Detectors/TRD/workflow/src/TRDWorkflowLinkDef.h
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright CERN and copyright holders of ALICE O2. This software is
// distributed under the terms of the GNU General Public License v3 (GPL
// Version 3), copied verbatim in the file "COPYING".
//
// See http://alice-o2.web.cern.ch/license for full licensing information.
//
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#ifdef __CLING__

#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;

//#pragma link C++ class o2::trd::TRDDPLDigitizerTask + ;


#endif

4 changes: 2 additions & 2 deletions Steer/DigitizerWorkflow/CMakeLists.txt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ o2_add_executable(digitizer-workflow
src/TOFDigitizerSpec.cxx
src/TPCDigitRootWriterSpec.cxx
src/TPCDigitizerSpec.cxx
src/TRDDigitizerSpec.cxx
src/ZDCDigitizerSpec.cxx
PUBLIC_LINK_LIBRARIES O2::Framework
O2::Steer
Expand All @@ -50,10 +49,11 @@ o2_add_executable(digitizer-workflow
O2::PHOSSimulation
O2::CPVSimulation
O2::TOFSimulation
O2::TOFCalibration
O2::TOFCalibration
O2::TOFReconstruction
O2::TPCSimulation
O2::TPCWorkflow
O2::TRDSimulation
O2::TRDWorkflow
O2::DataFormatsTRD
O2::ZDCSimulation)
4 changes: 2 additions & 2 deletions Steer/DigitizerWorkflow/src/SimpleDigitizerWorkflow.cxx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
#include "HMPIDDigitWriterSpec.h"

// for TRD
#include "TRDDigitizerSpec.h"
#include "TRDDigitWriterSpec.h"
#include "TRDWorkflow/TRDDigitizerSpec.h"
#include "TRDWorkflow/TRDDigitWriterSpec.h"

//for MUON MCH
#include "MCHDigitizerSpec.h"
Expand Down
Back | FazBrowse Home | New Git URL