Moved data definition classes to DetaFormats/... directories by shahor02 · Pull Request #808 · AliceO2Group/AliceO2

shahor02 · 2018-01-29T01:54:00Z

To avoid circular dependencies moved some classes from O2/Detectors/Base to O2/DetaFormats/...
Also some math utilities were moved to O2/Common/MathUtils as well as constants moved to O2/Common/Constants
The massive change of multiple files is mostly due to the fixes of headers and namespaces

UPDATE:

adding squashed commit from few fixes needed for the TPC/ITS matching (they were based on this initial PR and were diverging due to this PR being modified to be compatible with evolving dev...)
applied clang-format to all touched files

Below is the summary of moves and files which were modified.

	renamed:    Detectors/Base/include/DetectorsBase/Constants.h -> Common/Constants/include/CommonConstants/MathConstants.h
	renamed:    Detectors/Base/include/DetectorsBase/Utils.h -> Common/MathUtils/include/MathUtils/Utils.h
	new file:   DataFormats/Detectors/CMakeLists.txt
	new file:   DataFormats/Detectors/Common/CMakeLists.txt
	renamed:    Detectors/Base/include/DetectorsBase/AlignParam.h -> DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/AlignParam.h
	renamed:    Detectors/Base/include/DetectorsBase/DetID.h -> DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/DetID.h
	renamed:    Detectors/Base/include/DetectorsBase/DetMatrixCache.h -> DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/DetMatrixCache.h
	renamed:    Detectors/Base/src/AlignParam.cxx -> DataFormats/Detectors/Common/src/AlignParam.cxx
	renamed:    Detectors/Base/src/DetID.cxx -> DataFormats/Detectors/Common/src/DetID.cxx
	renamed:    Detectors/Base/src/DetMatrixCache.cxx -> DataFormats/Detectors/Common/src/DetMatrixCache.cxx
	new file:   DataFormats/Detectors/Common/src/DetectorsCommonDataFormatsLinkDef.h
	renamed:    Detectors/Base/test/testDetID.cxx -> DataFormats/Detectors/Common/test/testDetID.cxx
	new file:   DataFormats/Reconstruction/CMakeLists.txt
	renamed:    Detectors/Base/include/DetectorsBase/BaseCluster.h -> DataFormats/Reconstruction/include/ReconstructionDataFormats/BaseCluster.h
	renamed:    Detectors/Base/include/DetectorsBase/Track.h -> DataFormats/Reconstruction/include/ReconstructionDataFormats/Track.h
	renamed:    Detectors/Base/src/BaseCluster.cxx -> DataFormats/Reconstruction/src/BaseCluster.cxx
	new file:   DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h
	renamed:    Detectors/Base/src/Track.cxx -> DataFormats/Reconstruction/src/Track.cxx
	renamed:    Detectors/Base/include/DetectorsBase/TrackReference.h -> DataFormats/simulation/include/SimulationDataFormat/TrackReference.h
	renamed:    Detectors/Base/src/TrackReference.cxx -> DataFormats/simulation/src/TrackReference.cxx
	renamed:    Detectors/Base/src/BaseLinkDef.h -> Detectors/Base/src/DetectorsBaseLinkDef.h
        renamed:    DataFormats/TPC -> DataFormats/Detectors/TPC


	modified:   Common/Constants/include/CommonConstants/MathConstants.h
	modified:   Common/MathUtils/CMakeLists.txt
	modified:   Common/MathUtils/include/MathUtils/Cartesian3D.h
	modified:   Common/MathUtils/include/MathUtils/Utils.h
	modified:   Common/MathUtils/src/Cartesian3D.cxx
	modified:   Common/MathUtils/src/MathUtilsLinkDef.h
	modified:   Common/MathUtils/test/testCartesian3D.cxx
	modified:   Common/Utils/test/testTreeStream.cxx
	modified:   DataFormats/CMakeLists.txt
	modified:   DataFormats/Detectors/Common/CMakeLists.txt
	modified:   DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/AlignParam.h
	modified:   DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/DetID.h
	modified:   DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/DetMatrixCache.h
	modified:   DataFormats/Detectors/Common/src/AlignParam.cxx
	modified:   DataFormats/Detectors/Common/src/DetID.cxx
	modified:   DataFormats/Detectors/Common/src/DetMatrixCache.cxx
	modified:   DataFormats/Detectors/Common/test/testDetID.cxx
	modified:   DataFormats/Parameters/include/DataFormatsParameters/GRPObject.h
	modified:   DataFormats/Parameters/src/GRPObject.cxx
	modified:   DataFormats/Reconstruction/include/ReconstructionDataFormats/BaseCluster.h
	modified:   DataFormats/Reconstruction/include/ReconstructionDataFormats/Track.h
	modified:   DataFormats/Reconstruction/src/BaseCluster.cxx
	modified:   DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h
	modified:   DataFormats/Reconstruction/src/Track.cxx
	modified:   DataFormats/simulation/CMakeLists.txt
	modified:   DataFormats/simulation/include/SimulationDataFormat/MCTrack.h
	modified:   DataFormats/simulation/include/SimulationDataFormat/Stack.h
	modified:   DataFormats/simulation/include/SimulationDataFormat/TrackReference.h
	modified:   DataFormats/simulation/src/SimulationDataLinkDef.h
	modified:   DataFormats/simulation/src/Stack.cxx
	modified:   DataFormats/simulation/src/TrackReference.cxx
	modified:   DataFormats/simulation/test/MCTrack.cxx
	modified:   Detectors/Base/CMakeLists.txt
	modified:   Detectors/Base/include/DetectorsBase/GeometryManager.h
	modified:   Detectors/Base/include/DetectorsBase/Propagator.h
	modified:   Detectors/Base/src/Detector.cxx
	modified:   Detectors/Base/src/DetectorsBaseLinkDef.h
	modified:   Detectors/Base/src/GeometryManager.cxx
	modified:   Detectors/Base/src/Propagator.cxx
	modified:   Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h
	modified:   Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx
	modified:   Detectors/ITSMFT/ITS/macros/test/CheckClusters.C
	modified:   Detectors/ITSMFT/ITS/macros/test/CheckDigits.C
	modified:   Detectors/ITSMFT/ITS/macros/test/DisplayTrack.C
	modified:   Detectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/CATracker.h
	modified:   Detectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/CAaux.h
	modified:   Detectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/CookedTrack.h
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/CATracker.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/CATrackingStation.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/CAaux.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/ClustererTask.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/CookedTrack.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/CookedTracker.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/CookedTrackerTask.cxx
	modified:   Detectors/ITSMFT/ITS/reconstruction/src/TrivialClustererTask.cxx
	modified:   Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Detector.h
	modified:   Detectors/ITSMFT/ITS/simulation/src/DigitizerTask.cxx
	modified:   Detectors/ITSMFT/MFT/base/include/MFTBase/GeometryTGeo.h
	modified:   Detectors/ITSMFT/MFT/base/src/GeometryTGeo.cxx
	modified:   Detectors/ITSMFT/MFT/macros/CheckClusters.C
	modified:   Detectors/ITSMFT/MFT/macros/CheckDigits.C
	modified:   Detectors/ITSMFT/MFT/reconstruction/src/ClustererTask.cxx
	modified:   Detectors/ITSMFT/MFT/simulation/include/MFTSimulation/Detector.h
	modified:   Detectors/ITSMFT/MFT/simulation/src/DigitizerTask.cxx
	modified:   Detectors/ITSMFT/common/base/include/ITSMFTBase/GeometryTGeo.h
	modified:   Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/Cluster.h
	modified:   Detectors/ITSMFT/common/simulation/include/ITSMFTSimulation/Chip.h
	modified:   Detectors/ITSMFT/common/simulation/include/ITSMFTSimulation/SimulationAlpide.h
	modified:   Detectors/ITSMFT/common/simulation/src/Chip.cxx
	modified:   Detectors/ITSMFT/common/simulation/src/Digitizer.cxx
	modified:   Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysis.cxx
	modified:   Detectors/TOF/simulation/src/Detector.cxx
	modified:   Detectors/TOF/simulation/src/DigitizerTask.cxx
	modified:   Detectors/TPC/reconstruction/include/TPCReconstruction/TrackTPC.h
	modified:   Detectors/TPC/reconstruction/macro/convertTracks.C
	modified:   Detectors/TPC/reconstruction/macro/runCATracking.C
	modified:   Detectors/TPC/reconstruction/macro/runCATrackingClusterNative.C
	modified:   Detectors/TPC/reconstruction/macro/testTracks.C
	modified:   Detectors/TPC/reconstruction/src/TPCCATracking.cxx
	modified:   Detectors/TPC/simulation/macro/testHitsDigitsClusters.C
	modified:   Framework/DebugGUI/src/imgui_draw.cpp
	modified:   cmake/O2Dependencies.cmake
	modified:   macro/CheckClusters_mft.C
	modified:   macro/CheckDigits_mft.C
	modified:   macro/o2sim.C

davidrohr · 2018-01-29T09:07:20Z

Hu @shahor02 , perhaps we should move DataFormats/TPC to DataFormats/Detectors/TPC as well then?

shahor02 · 2018-01-29T09:43:12Z

@davidrohr: yes, and also TrackTPC

alibuild · 2018-01-29T10:59:31Z

Error while checking build/O2/o2 for 89956e815cf8e4945fa52cce1d65ffd2a5633d8b:

sw/BUILD/O2-latest/log
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:24:25: error: allocation of incomplete type 'FairRunSim'
  FairRunSim* run = new FairRunSim();
                        ^~~~~~~~~~
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
class FairRunSim;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:25:6: error: member access into incomplete type 'FairRunSim'
  run->SetOutputFile("foo.root"); // Output file
     ^
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
class FairRunSim;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:26:6: error: member access into incomplete type 'FairRunSim'
  run->SetName("TGeant3");      // Transport engine
     ^
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
class FairRunSim;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:28:6: error: member access into incomplete type 'FairRunSim'
  run->SetMaterials("media.geo"); // Materials
     ^
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
--
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:31:16: error: no type named 'Cave' in namespace 'o2::Passive'
  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
  ~~~~~~~~~~~~~^
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:31:46: error: no type named 'Cave' in namespace 'o2::Passive'
  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
                                ~~~~~~~~~~~~~^
In file included from G__BaseDict dictionary payload:1884:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairTimeStamp.h:11:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairMultiLinkedData_Interface.h:13:
/mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairLink.h:104:26: error: redefinition of 'operator<<'
    friend std::ostream& operator<< (std::ostream& out, const FairLink& link) {
                         ^
/mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairLink.h:104:26: note: previous definition is here
--
In file included from G__BaseDict dictionary payload:1884:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairTimeStamp.h:11:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairMultiLinkedData_Interface.h:14:

Full log here.

alibuild · 2018-01-29T13:12:59Z

Error while checking build/o2/macos for eb3a5abc501f20f5133cf25e33c1352af6e961c7:

Full log here.

alibuild · 2018-01-29T13:23:08Z

Error while checking build/O2/o2 for eb3a5abc501f20f5133cf25e33c1352af6e961c7:

sw/BUILD/O2-latest/log
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:24:25: error: allocation of incomplete type 'FairRunSim'
  FairRunSim* run = new FairRunSim();
                        ^~~~~~~~~~
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
class FairRunSim;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:25:6: error: member access into incomplete type 'FairRunSim'
  run->SetOutputFile("foo.root"); // Output file
     ^
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
class FairRunSim;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:26:6: error: member access into incomplete type 'FairRunSim'
  run->SetName("TGeant3");      // Transport engine
     ^
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
class FairRunSim;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:28:6: error: member access into incomplete type 'FairRunSim'
  run->SetMaterials("media.geo"); // Materials
     ^
G__BaseDict dictionary forward declarations' payload:22:7: note: forward declaration of 'FairRunSim'
--
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:31:16: error: no type named 'Cave' in namespace 'o2::Passive'
  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
  ~~~~~~~~~~~~~^
/mnt/mesos/sandbox/sandbox/O2/Detectors/EMCAL/testsimulation/PutEmcalInTop.C:31:46: error: no type named 'Cave' in namespace 'o2::Passive'
  o2::Passive::Cave* cave = new o2::Passive::Cave("CAVE");
                                ~~~~~~~~~~~~~^
In file included from G__BaseDict dictionary payload:1884:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairTimeStamp.h:11:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairMultiLinkedData_Interface.h:13:
/mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairLink.h:104:26: error: redefinition of 'operator<<'
    friend std::ostream& operator<< (std::ostream& out, const FairLink& link) {
                         ^
/mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairLink.h:104:26: note: previous definition is here
--
In file included from G__BaseDict dictionary payload:1884:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairTimeStamp.h:11:
In file included from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/FairRoot/alice-dev-20180110-2/include/FairMultiLinkedData_Interface.h:14:

Full log here.

alibuild · 2018-01-29T13:23:49Z

Error while checking build/o2/macos for 2e543165758e404fae769050078de84c63fa7896:

Full log here.

alibuild · 2018-01-29T13:37:37Z

Error while checking build/O2/o2 for 2e543165758e404fae769050078de84c63fa7896:

sw/BUILD/O2-latest/log
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:44:27: error: allocation of incomplete type 'FairRunAna'
  FairRunAna * fRun = new FairRunAna();
                          ^~~~~~~~~~
G__BaseDict dictionary forward declarations' payload:16:7: note: forward declaration of 'FairRunAna'
--
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:45:37: error: allocation of incomplete type 'FairFileSource'
  FairFileSource *fFileSource = new FairFileSource(inFile);
                                    ^~~~~~~~~~~~~~
G__BaseDict dictionary forward declarations' payload:17:69: note: forward declaration of 'FairFileSource'
class __attribute__((annotate("$clingAutoload$FairFileSource.h")))  FairFileSource;
                                                                    ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:46:7: error: member access into incomplete type 'FairRunAna'
  fRun->SetSource(fFileSource);
      ^
G__BaseDict dictionary forward declarations' payload:16:7: note: forward declaration of 'FairRunAna'
class FairRunAna;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:47:7: error: member access into incomplete type 'FairRunAna'
  fRun->SetOutputFile(outFile);
      ^
G__BaseDict dictionary forward declarations' payload:16:7: note: forward declaration of 'FairRunAna'
class FairRunAna;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:50:29: error: member access into incomplete type 'FairRunAna'
  FairRuntimeDb* rtdb = fRun->GetRuntimeDb();
                            ^
G__BaseDict dictionary forward declarations' payload:16:7: note: forward declaration of 'FairRunAna'
--
#undef  _BACKWARD_BACKWARD_WARNING_H

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:51:38: error: allocation of incomplete type 'FairParRootFileIo'
  FairParRootFileIo* parInput1 = new FairParRootFileIo();
                                     ^~~~~~~~~~~~~~~~~
G__ParBaseDict dictionary forward declarations' payload:17:85: note: forward declaration of 'FairParRootFileIo'
class __attribute__((annotate(R"ATTRDUMP(Parameter I/O from ROOT files)ATTRDUMP"))) FairParRootFileIo;
                                                                                    ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/Detectors/ITSMFT/MFT/macros/run_clus.C:52:12: error: member access into incomplete type 'FairParRootFileIo'
  parInput1->open(parFile);

Full log here.

alibuild · 2018-01-29T22:11:51Z

Error while checking build/o2checkcode/o2 for c0a9e282b67786322a9f9ce2aea7781dcb838f15:

sw/BUILD/O2-latest/log
[ 87%] Building CXX object Detectors/ITSMFT/MFT/simulation/CMakeFiles/MFTSimulation.dir/src/Detector.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/MFT/simulation/CMakeFiles/MFTSimulation.dir/src/DigitizerTask.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitPad.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/TrivialClusterer.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/MFT/simulation/CMakeFiles/MFTSimulation.dir/G__MFTSimulationDict.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitTime.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CAaux.cxx.o
[ 88%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/ElectronTransport.cxx.o
[ 89%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATracker.cxx.o
[ 89%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/PadResponse.cxx.o
[ 89%] Linking CXX shared library ../../../../lib/libMFTSimulation.so
[ 90%] Built target MFTSimulation
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/Point.cxx.o
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/SAMPAProcessing.cxx.o
[ 90%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATrackingStation.cxx.o
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/G__TPCSimulationDict.cxx.o
[ 90%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CookedTracker.cxx.o
Scanning dependencies of target MFTReconstruction
[ 90%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/ClustererTask.cxx.o
[ 90%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/FindTracks.cxx.o
[ 90%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/G__MFTReconstructionDict.cxx.o
[ 90%] Linking CXX shared library ../../../../lib/libITSReconstruction.so
[ 90%] Built target ITSReconstruction
[ 90%] Linking CXX shared library ../../../../lib/libMFTReconstruction.so
[ 91%] Built target MFTReconstruction
[ 91%] Linking CXX shared library ../../../lib/libTPCSimulation.so
[ 91%] Built target TPCSimulation
[ 92%] Generating G__TPCReconstructionDict.cxx, G__TPCReconstructionDict_rdict.pcm, ../../../lib/libTPCReconstruction.rootmap
Scanning dependencies of target test_TPCSimulation_testTPCCommonMode
Scanning dependencies of target test_TPCSimulation_testTPCSAMPAProcessing
Scanning dependencies of target test_TPCSimulation_testTPCDigitContainer
[ 92%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCCommonMode.dir/test/testTPCCommonMode.cxx.o
[ 92%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCSAMPAProcessing.dir/test/testTPCSAMPAProcessing.cxx.o
[ 92%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCDigitContainer.dir/test/testTPCDigitContainer.cxx.o
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCCommonMode
In file included from input_line_12:2452:
In file included from /mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/0_O2_DAQ/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/Track.h:28:
/mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/0_O2_DAQ/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/BaseCluster.h:20:10: fatal error: 'DetectorsCommonDataFormats/DetMatrixCache.h' file not found
#include "DetectorsCommonDataFormats/DetMatrixCache.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/bin/rootcint: compilation failure (/mnt/mesos/sandbox/sandbox/sw/BUILD/66c551a3ad5f7ded5895cdfb527172ac8f24a4bb/O2/Detectors/TPC/reconstruction/G__TPCReconstructionDict2ae9091292_dictUmbrella.h)
make[2]: *** [Detectors/TPC/reconstruction/G__TPCReconstructionDict.cxx] Error 1
make[1]: *** [Detectors/TPC/reconstruction/CMakeFiles/TPCReconstruction.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 92%] Built target test_TPCSimulation_testTPCCommonMode
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCSAMPAProcessing
[ 92%] Built target test_TPCSimulation_testTPCSAMPAProcessing
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCDigitContainer
[ 92%] Built target test_TPCSimulation_testTPCDigitContainer

Full log here.

alibuild · 2018-01-29T22:32:29Z

Error while checking build/o2/macos for 40c3d6d01f6414c8a5ed524c5dbaa60f9485f45e:

Full log here.

alibuild · 2018-01-29T22:34:05Z

Error while checking build/o2checkcode/o2 for 40c3d6d01f6414c8a5ed524c5dbaa60f9485f45e:

sw/BUILD/O2-latest/log
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitCRU.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/TrivialClusterer.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/Digitizer.cxx.o
[ 88%] Built target MFTSimulation
[ 88%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitizerTask.cxx.o
[ 88%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CAaux.cxx.o
[ 88%] Generating G__MFTReconstructionDict.cxx, G__MFTReconstructionDict_rdict.pcm, ../../../../lib/libMFTReconstruction.rootmap
[ 89%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATracker.cxx.o
[ 89%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATrackingStation.cxx.o
Scanning dependencies of target MFTReconstruction
[ 89%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/ClustererTask.cxx.o
[ 89%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/FindTracks.cxx.o
[ 89%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitPad.cxx.o
[ 89%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CookedTracker.cxx.o
[ 89%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/G__MFTReconstructionDict.cxx.o
[ 89%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitTime.cxx.o
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/ElectronTransport.cxx.o
[ 90%] Linking CXX shared library ../../../../lib/libMFTReconstruction.so
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/PadResponse.cxx.o
[ 90%] Linking CXX shared library ../../../../lib/libITSReconstruction.so
[ 91%] Built target MFTReconstruction
[ 91%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/Point.cxx.o
[ 91%] Built target ITSReconstruction
[ 91%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/SAMPAProcessing.cxx.o
[ 91%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/G__TPCSimulationDict.cxx.o
[ 91%] Linking CXX shared library ../../../lib/libTPCSimulation.so
[ 91%] Built target TPCSimulation
[ 92%] Generating G__TPCReconstructionDict.cxx, G__TPCReconstructionDict_rdict.pcm, ../../../lib/libTPCReconstruction.rootmap
Scanning dependencies of target test_TPCSimulation_testTPCCommonMode
Scanning dependencies of target test_TPCSimulation_testTPCSAMPAProcessing
Scanning dependencies of target test_TPCSimulation_testTPCDigitContainer
[ 92%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCCommonMode.dir/test/testTPCCommonMode.cxx.o
[ 92%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCSAMPAProcessing.dir/test/testTPCSAMPAProcessing.cxx.o
[ 92%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCDigitContainer.dir/test/testTPCDigitContainer.cxx.o
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCCommonMode
In file included from input_line_12:2452:
In file included from /mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/0_O2_DAQ/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/Track.h:28:
/mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/0_O2_DAQ/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/BaseCluster.h:20:10: fatal error: 'DetectorsCommonDataFormats/DetMatrixCache.h' file not found
#include "DetectorsCommonDataFormats/DetMatrixCache.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/bin/rootcint: compilation failure (/mnt/mesos/sandbox/sandbox/sw/BUILD/66c551a3ad5f7ded5895cdfb527172ac8f24a4bb/O2/Detectors/TPC/reconstruction/G__TPCReconstructionDict2740de9101_dictUmbrella.h)
make[2]: *** [Detectors/TPC/reconstruction/G__TPCReconstructionDict.cxx] Error 1
make[1]: *** [Detectors/TPC/reconstruction/CMakeFiles/TPCReconstruction.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 92%] Built target test_TPCSimulation_testTPCCommonMode
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCSAMPAProcessing
[ 92%] Built target test_TPCSimulation_testTPCSAMPAProcessing
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCDigitContainer
[ 92%] Built target test_TPCSimulation_testTPCDigitContainer

Full log here.

alibuild · 2018-01-29T22:35:09Z

Error while checking build/O2/o2 for 40c3d6d01f6414c8a5ed524c5dbaa60f9485f45e:

sw/BUILD/O2-latest/log
[ 86%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATracker.cxx.o
Scanning dependencies of target MFTReconstruction
[ 86%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/ClustererTask.cxx.o
[ 86%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitPad.cxx.o
[ 86%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATrackingStation.cxx.o
[ 86%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitRow.cxx.o
[ 86%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/Track.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/DigitTime.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CookedTracker.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/src/FindTracks.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/ElectronTransport.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/GEMAmplification.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/MFT/reconstruction/CMakeFiles/MFTReconstruction.dir/G__MFTReconstructionDict.cxx.o
[ 87%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/PadResponse.cxx.o
[ 88%] Linking CXX shared library ../../../../lib/libMFTReconstruction.so
[ 88%] Built target MFTReconstruction
[ 88%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/Point.cxx.o
[ 88%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/src/SAMPAProcessing.cxx.o
[ 89%] Linking CXX shared library ../../../../lib/libITSReconstruction.so
[ 89%] Building CXX object Detectors/TPC/simulation/CMakeFiles/TPCSimulation.dir/G__TPCSimulationDict.cxx.o
[ 89%] Built target ITSReconstruction
[ 90%] Linking CXX shared library ../../../lib/libTPCSimulation.so
[ 90%] Built target TPCSimulation
[ 90%] Generating G__TPCReconstructionDict.cxx, G__TPCReconstructionDict_rdict.pcm, ../../../lib/libTPCReconstruction.rootmap
Scanning dependencies of target test_TPCSimulation_testTPCCommonMode
Scanning dependencies of target test_TPCSimulation_testTPCSAMPAProcessing
Scanning dependencies of target test_TPCSimulation_testTPCDigitContainer
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCCommonMode.dir/test/testTPCCommonMode.cxx.o
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCSAMPAProcessing.dir/test/testTPCSAMPAProcessing.cxx.o
[ 90%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCDigitContainer.dir/test/testTPCDigitContainer.cxx.o
[ 90%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCCommonMode
In file included from input_line_12:2452:
In file included from /mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/dev/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/Track.h:28:
/mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/dev/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/BaseCluster.h:20:10: fatal error: 'DetectorsCommonDataFormats/DetMatrixCache.h' file not found
#include "DetectorsCommonDataFormats/DetMatrixCache.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 90%] Built target test_TPCSimulation_testTPCCommonMode
Error: /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-1/bin/rootcint: compilation failure (/mnt/mesos/sandbox/sandbox/sw/BUILD/1e8a3ffe92fa2c8a5e508980eb3e92c47851fc30/O2/Detectors/TPC/reconstruction/G__TPCReconstructionDict462fece90f_dictUmbrella.h)
make[2]: *** [Detectors/TPC/reconstruction/G__TPCReconstructionDict.cxx] Error 1
make[1]: *** [Detectors/TPC/reconstruction/CMakeFiles/TPCReconstruction.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
Scanning dependencies of target test_TPCSimulation_testTPCSimulation
[ 91%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCSimulation.dir/test/testTPCSimulation.cxx.o
[ 91%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCSAMPAProcessing
[ 91%] Built target test_TPCSimulation_testTPCSAMPAProcessing
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCDigitContainer
[ 92%] Built target test_TPCSimulation_testTPCDigitContainer
[ 92%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCSimulation
[ 92%] Built target test_TPCSimulation_testTPCSimulation

Full log here.

alibuild · 2018-01-29T22:36:01Z

Error while checking build/O2/o2-dev-fairroot for c0a9e282b67786322a9f9ce2aea7781dcb838f15:

sw/BUILD/O2-latest/log
[ 84%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/LadderSegmentation.cxx.o
[ 84%] Generating G__ITSReconstructionDict.cxx, G__ITSReconstructionDict_rdict.pcm, ../../../../lib/libITSReconstruction.rootmap
[ 84%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/ChipSegmentation.cxx.o
[ 84%] Generating G__HitAnalysisDict.cxx, G__HitAnalysisDict_rdict.pcm, ../../../../lib/libHitAnalysis.rootmap
[ 84%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/HalfDetector.cxx.o
Warning: Unused class rule: o2::ITS::Cluster
[ 85%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/HalfDisk.cxx.o
Scanning dependencies of target HitAnalysis
[ 85%] Building CXX object Detectors/ITSMFT/test/HitAnalysis/CMakeFiles/HitAnalysis.dir/src/HitAnalysis.cxx.o
Scanning dependencies of target ITSReconstruction
[ 85%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/TrivialClustererTask.cxx.o
[ 85%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/Ladder.cxx.o
[ 86%] Linking CXX shared library ../../../lib/libTPCSimulation.so
[ 86%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/Flex.cxx.o
[ 86%] Built target TPCSimulation
[ 86%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/Support.cxx.o
[ 86%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/ClustererTask.cxx.o
[ 86%] Building CXX object Detectors/ITSMFT/test/HitAnalysis/CMakeFiles/HitAnalysis.dir/G__HitAnalysisDict.cxx.o
[ 86%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/HeatExchanger.cxx.o
[ 86%] Linking CXX shared library ../../../../lib/libHitAnalysis.so
[ 86%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CookedTrack.cxx.o
[ 86%] Built target HitAnalysis
[ 87%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CookedTrackerTask.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/G__ITSReconstructionDict.cxx.o
[ 87%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/src/HalfCone.cxx.o
[ 87%] Generating G__TPCReconstructionDict.cxx, G__TPCReconstructionDict_rdict.pcm, ../../../lib/libTPCReconstruction.rootmap
[ 88%] Building CXX object Detectors/ITSMFT/MFT/base/CMakeFiles/MFTBase.dir/G__MFTBaseDict.cxx.o
[ 88%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/TrivialClusterer.cxx.o
Scanning dependencies of target test_TPCSimulation_testTPCDigitContainer
[ 88%] Building CXX object Detectors/TPC/simulation/CMakeFiles/test_TPCSimulation_testTPCDigitContainer.dir/test/testTPCDigitContainer.cxx.o
[ 88%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CAaux.cxx.o
In file included from input_line_12:2452:
In file included from /mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/0_O2_DEV_FAIRROOT/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/Track.h:28:
/mnt/mesos/sandbox/sandbox/sw/SOURCES/O2/0_O2_DEV_FAIRROOT/0/DataFormats/Reconstruction/include/ReconstructionDataFormats/BaseCluster.h:20:10: fatal error: 'DetectorsCommonDataFormats/DetMatrixCache.h' file not found
#include "DetectorsCommonDataFormats/DetMatrixCache.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/bin/rootcint: compilation failure (/mnt/mesos/sandbox/sandbox/sw/BUILD/a05640451be7d11c72ddf140b00a5da755318c21/O2/Detectors/TPC/reconstruction/G__TPCReconstructionDictd7a1debc74_dictUmbrella.h)
make[2]: *** [Detectors/TPC/reconstruction/G__TPCReconstructionDict.cxx] Error 1
make[1]: *** [Detectors/TPC/reconstruction/CMakeFiles/TPCReconstruction.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 88%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATracker.cxx.o
[ 88%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CATrackingStation.cxx.o
[ 88%] Linking CXX shared library ../../../../lib/libMFTBase.so
[ 88%] Built target MFTBase
[ 88%] Building CXX object Detectors/ITSMFT/ITS/reconstruction/CMakeFiles/ITSReconstruction.dir/src/CookedTracker.cxx.o
[ 89%] Linking CXX executable ../../../bin/test_TPCSimulation_testTPCDigitContainer
[ 89%] Built target test_TPCSimulation_testTPCDigitContainer
[ 90%] Linking CXX shared library ../../../../lib/libITSReconstruction.so
[ 90%] Built target ITSReconstruction

Full log here.

alibuild · 2018-01-29T22:40:40Z

Error while checking build/o2/macos for 51f91d056ff8c11970a2b701dde1881d8fd8798f:

Full log here.

alibuild · 2018-01-29T23:09:05Z

Error while checking build/o2/macos for 09e613ea49a1e625ab6beb5e255596a49d75d8b1:

Full log here.

shahor02 · 2018-01-29T23:47:07Z

Hi, after every dev change this PR gets a lot of conflicts, would it be possible to review it? Sorry for jumping out of the queue...

sawenzel · 2018-01-30T15:46:59Z

This is probably ok.
a) Find names like DetecorCommonDataFormats slightly longuish.
b) still unclear how to map to namespace names?
c) We now have a clang-format checker which screams on changed codes lines; Could you try to take a look at the travis build log (under clang-format) and see if you can incorporate the suggested formatting changes. (Can be done locally using git clang-format tool as well).

shahor02 · 2018-01-30T16:52:09Z

Hi @sawenzel ,
For the DetectorsCommonDataFormats, I actually adopted the scheme of SimulationDataFormats, also would prefer shorter one. Any suggestion for naming scheme of includes dirs in nested directories? If the abbreviations are not strictly forbidden, I would actually use DetCommonDF, SimDF, RecDF, standardizing some obvious abbreviations.

For the namespaces: here I was not planning to address this, just simplified it little bit and trying to avoid using namespace, to make it simple to change in future, when we adopt a reasonable scheme.

OK, will re-run clang-format on all classes affected by the PR, though most of the complains are from old code.

sawenzel · 2018-01-30T17:07:52Z

@shahor02 : Ok. I understand that the formatting issues come from old code. The idea is that we fix the formatting when touching something to adiabatically go to a good state.

To avoid circular dependencies moved some classes from O2/Detectors/Base to O2/DetaFormats/... Also some math utilities were moved to O2/Common/MathUtils as well as constants moved to O2/Common/Constants The massive change of multiple files is mostly due to the fixes of headers and namespaces

Static method to init Bfield from propagator, MagFieldFact ownership fix: Bug fix: MagFieldFact factory class cannot own the field it created: since the FairRunAna and TGeoGlobalMagField delete the field created by the factor, we have to use naked new in the factory, which cannot own the field Apply material correction in backpropagation fit (CookedTracker) Bug fix: CookedTrack::getChi2 should return float (CookedTrack) Use double for all error matrix calc. + fix in array init + extra getters (Track) Add comparison methods to MCCompLabel Fix: add ClassDefNV for TrackTPC + make getter const Added method to load geometry from file (GeometryManager) Separate methods for field and geom inits (initSimGeomAndField.C)

alibuild · 2018-01-30T23:57:22Z

Error while checking build/O2/o2 for 39a04fd0b05e8638c0496b7b8b1608307b185715:

sw/BUILD/O2-latest/log
 81/152 Test  #59: /macro/initSimGeomAndField.C ............................................***Failed    2.57 sec

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:29:7: error: use of undeclared identifier 'INFO'
  LOG(INFO) << "Loading geometry from " << geomFileName << FairLogger::endl;
      ^
Error in <TInterpreter::AutoParse>: Error parsing payload code for class FairLogger with content:
--

#undef  _BACKWARD_BACKWARD_WARNING_H

/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:29:60: error: incomplete type 'FairLogger' named in nested name specifier
  LOG(INFO) << "Loading geometry from " << geomFileName << FairLogger::endl;
                                                           ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:32:9: error: use of undeclared identifier 'ERROR'
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
        ^
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:32:56: error: incomplete type 'FairLogger' named in nested name specifier
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
                                                       ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:36:9: error: use of undeclared identifier 'ERROR'
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
        ^
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:36:65: error: incomplete type 'FairLogger' named in nested name specifier
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
                                                                ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:46:7: error: use of undeclared identifier 'INFO'
  LOG(INFO) << "Loading field from GRP of " << grpFileName << FairLogger::endl;
      ^
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:46:63: error: incomplete type 'FairLogger' named in nested name specifier
  LOG(INFO) << "Loading field from GRP of " << grpFileName << FairLogger::endl;
                                                              ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:49:9: error: use of undeclared identifier 'ERROR'

Full log here.

alibuild · 2018-01-31T00:02:31Z

Error while checking build/O2/o2-dev-fairroot for 39a04fd0b05e8638c0496b7b8b1608307b185715:

sw/BUILD/O2-latest/log
 76/152 Test  #59: /macro/initSimGeomAndField.C ............................................***Failed    2.70 sec

In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:29:7: error: use of undeclared identifier 'INFO'
  LOG(INFO) << "Loading geometry from " << geomFileName << FairLogger::endl;
      ^
Error in <TInterpreter::AutoParse>: Error parsing payload code for class FairLogger with content:
--

#undef  _BACKWARD_BACKWARD_WARNING_H

/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:29:60: error: incomplete type 'FairLogger' named in nested name specifier
  LOG(INFO) << "Loading geometry from " << geomFileName << FairLogger::endl;
                                                           ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:32:9: error: use of undeclared identifier 'ERROR'
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
        ^
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:32:56: error: incomplete type 'FairLogger' named in nested name specifier
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
                                                       ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:36:9: error: use of undeclared identifier 'ERROR'
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
        ^
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:36:65: error: incomplete type 'FairLogger' named in nested name specifier
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
                                                                ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:46:7: error: use of undeclared identifier 'INFO'
  LOG(INFO) << "Loading field from GRP of " << grpFileName << FairLogger::endl;
      ^
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:46:63: error: incomplete type 'FairLogger' named in nested name specifier
  LOG(INFO) << "Loading field from GRP of " << grpFileName << FairLogger::endl;
                                                              ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
class FairLogger;
      ^
In file included from input_line_10:1:
/mnt/mesos/sandbox/sandbox/O2/macro/initSimGeomAndField.C:49:9: error: use of undeclared identifier 'ERROR'

Full log here.

alibuild · 2018-01-31T00:08:53Z

Error while checking build/o2/macos for 39a04fd0b05e8638c0496b7b8b1608307b185715:

sw/BUILD/O2-latest/log
}

In file included from input_line_10:1:
/build/ci_checks/o2_checker_macos_o2_ci_0/O2/macro/initSimGeomAndField.C:29:7: error: use of undeclared identifier 'INFO'
  LOG(INFO) << "Loading geometry from " << geomFileName << FairLogger::endl;
      ^
Error in <TInterpreter::AutoParse>: Error parsing payload code for class FairLogger with content:
--
--

#undef  _BACKWARD_BACKWARD_WARNING_H

/build/ci_checks/o2_checker_macos_o2_ci_0/O2/macro/initSimGeomAndField.C:29:60: error: incomplete type 'FairLogger' named in nested name specifier
  LOG(INFO) << "Loading geometry from " << geomFileName << FairLogger::endl;
                                                           ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
--
--
class FairLogger;
      ^
In file included from input_line_10:1:
/build/ci_checks/o2_checker_macos_o2_ci_0/O2/macro/initSimGeomAndField.C:32:9: error: use of undeclared identifier 'ERROR'
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
        ^
--
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
        ^
/build/ci_checks/o2_checker_macos_o2_ci_0/O2/macro/initSimGeomAndField.C:32:56: error: incomplete type 'FairLogger' named in nested name specifier
    LOG(ERROR) << "Failed to open " << geomFileName << FairLogger::endl;
                                                       ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
--
--
class FairLogger;
      ^
In file included from input_line_10:1:
/build/ci_checks/o2_checker_macos_o2_ci_0/O2/macro/initSimGeomAndField.C:36:9: error: use of undeclared identifier 'ERROR'
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
        ^
--
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
        ^
/build/ci_checks/o2_checker_macos_o2_ci_0/O2/macro/initSimGeomAndField.C:36:65: error: incomplete type 'FairLogger' named in nested name specifier
    LOG(ERROR) << "Did not find geometry named " << geomName << FairLogger::endl;
                                                                ^~~~~~~~~~~~
G__FairToolsDict dictionary forward declarations' payload:5:7: note: forward declaration of 'FairLogger'
--
--
class FairLogger;

Full log here.

shahor02 · 2018-01-31T00:24:19Z

Hi @sawenzel
OK, I've applied clang-format to all affected files. Funnily, the Travis check complains about 2 files passed via clang-format...
Since I had some patches in the branch derived from this one, they would completely diverge after reformatting, so I've squashed and added them here (before formatting).
Cheers,
Ruben

alibuild · 2018-01-31T08:16:18Z

Error while checking build/O2/o2-dev-fairroot for 61e7662:

sw/BUILD/O2-latest/log
#14 0x00007f76ffc9e84c in TGeant3TGeo::TGeant3TGeo (this=0xa3fe580, title=<optimized out>, nwgeant=<optimized out>) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/TGeant3/TGeant3TGeo.cxx:560
#15 0x00007f771cf90cca in ?? ()
#16 0x000000000a3b6680 in ?? ()
#17 0x00007ffcf89a1950 in ?? ()
#18 0x00007f77080d1640 in ?? () from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/lib/libCling.so
#19 0x00007f77080d1680 in ?? () from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/lib/libCling.so
#20 0x000000000a388c40 in ?? ()
#21 0x000000000a40f740 in ?? ()
#22 0x0000000000000000 in ?? ()
===========================================================


The lines below might hint at the cause of the crash.
You may get help by asking at the ROOT forum http://root.cern.ch/forum.
Only if you are really convinced it is a bug in ROOT then please submit a
report at http://root.cern.ch/bugs. Please post the ENTIRE stack trace
from above as an attachment in addition to anything else
that might help us fixing this issue.
===========================================================
#6  0x00007f76ffc494fe in dzsnap (chtext=<error reading variable: value requires 2560801 bytes, which is more than max-value-size>, ixdiv=0, chopt=<error reading variable: value requires 2560877 bytes, which is more than max-value-size>, _chtext=_chtext
entry=6, _chopt=_chopt
entry=5) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/minicern/dzsnap.F:97
#7  0x00007f76ffc605ef in zpostm (chdump=<error reading variable: value requires 2718561 bytes, which is more than max-value-size>, _chdump=_chdump
entry=5) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/minicern/zpostm.F:56
#8  0x00007f76ffc5f254 in zabend () at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/minicern/zabend.F:23
#9  0x00007f76ffc5fa92 in zfatal () at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/minicern/zfatal.F:133
#10 0x00007f76ffc57b65 in mzstor (ixstor=..., chname=<error reading variable: value requires 293531360 bytes, which is more than max-value-size>, chopt=<error reading variable: value requires 293531456 bytes, which is more than max-value-size>, ifence=..., lv=..., llr=..., lld=..., limit=..., last=..., _chname=8, _chopt=1) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/minicern/zebra/qtofatal.inc:27
#11 0x00007f76ffabe661 in g3zebra (nzeb=5000000) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/gbase/gzebra.F:39
#12 0x00007f76ffab7a52 in g3cinit () at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/gcinit.F:7
#13 0x00007f76ffc9b415 in TGeant3::TGeant3 (this=0xa3fe580, title=<optimized out>, nwgeant=<optimized out>) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/TGeant3/TGeant3.cxx:1165
#14 0x00007f76ffc9e84c in TGeant3TGeo::TGeant3TGeo (this=0xa3fe580, title=<optimized out>, nwgeant=<optimized out>) at /mnt/mesos/sandbox/sandbox/sw/SOURCES/GEANT3/v2-5/v2-5/TGeant3/TGeant3TGeo.cxx:560
#15 0x00007f771cf90cca in ?? ()
#16 0x000000000a3b6680 in ?? ()
#17 0x00007ffcf89a1950 in ?? ()
#18 0x00007f77080d1640 in ?? () from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/lib/libCling.so
#19 0x00007f77080d1680 in ?? () from /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/ROOT/v6-12-04-2/lib/libCling.so
#20 0x000000000a388c40 in ?? ()
#21 0x000000000a40f740 in ?? ()
#22 0x0000000000000000 in ?? ()
===========================================================



        Start  79: /macro/run_trac_its.C
 46/152 Test  #58: /macro/eventDisplay.C ...................................................   Passed    2.71 sec
        Start  68: /macro/run_digi_its.C
 47/152 Test  #50: /Detectors/gconfig/g3Config.C ...........................................   Passed    2.92 sec
 48/152 Test  #73: /macro/run_sim_emcal.C ..................................................   Passed    2.88 sec
        Start  70: /macro/run_digi_tof.C

Full log here.

davidrohr · 2018-01-31T15:42:43Z

For me this is fine. I would merge it soon, since it produces a lot of conflicts with every update, and I am waiting with my next PR until this is in.

shahor02 force-pushed the dev_mv2datafmt branch 2 times, most recently from 1511dd6 to 67a20f8 Compare January 29, 2018 08:36

shahor02 force-pushed the dev_mv2datafmt branch from 67a20f8 to 89956e8 Compare January 29, 2018 10:21

shahor02 force-pushed the dev_mv2datafmt branch from 89956e8 to eb3a5ab Compare January 29, 2018 13:08

shahor02 mentioned this pull request Jan 29, 2018

Offer o2::dataformats::TimeStamp class globally #787

Merged

shahor02 force-pushed the dev_mv2datafmt branch 2 times, most recently from 3e0c8bb to c0a9e28 Compare January 29, 2018 22:07

shahor02 force-pushed the dev_mv2datafmt branch from c0a9e28 to 40c3d6d Compare January 29, 2018 22:29

shahor02 force-pushed the dev_mv2datafmt branch from 40c3d6d to 51f91d0 Compare January 29, 2018 22:37

shahor02 force-pushed the dev_mv2datafmt branch from 51f91d0 to 09e613e Compare January 29, 2018 23:04

AliceO2Group deleted a comment from alibuild Jan 30, 2018

shahor02 added 2 commits January 31, 2018 00:18

shahor02 force-pushed the dev_mv2datafmt branch from 09e613e to 39a04fd Compare January 30, 2018 23:47

shahor02 force-pushed the dev_mv2datafmt branch from 39a04fd to 8f49f5e Compare January 31, 2018 00:18

apply clang-format to modified files

61e7662

shahor02 force-pushed the dev_mv2datafmt branch from 8f49f5e to 61e7662 Compare January 31, 2018 01:03

sawenzel merged commit 1e1f2df into AliceO2Group:dev Jan 31, 2018

shahor02 deleted the dev_mv2datafmt branch January 31, 2018 15:48

arvindkhuntia pushed a commit to arvindkhuntia/AliceO2 that referenced this pull request Jun 6, 2022

Skip duplicated histograms (AliceO2Group#808)

cee602b

Conversation

shahor02 commented Jan 29, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidrohr commented Jan 29, 2018

Uh oh!

shahor02 commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

alibuild commented Jan 29, 2018

Uh oh!

shahor02 commented Jan 29, 2018

Uh oh!

sawenzel commented Jan 30, 2018

Uh oh!

shahor02 commented Jan 30, 2018

Uh oh!

sawenzel commented Jan 30, 2018

Uh oh!

alibuild commented Jan 30, 2018

Uh oh!

alibuild commented Jan 31, 2018

Uh oh!

alibuild commented Jan 31, 2018

Uh oh!

shahor02 commented Jan 31, 2018

Uh oh!

alibuild commented Jan 31, 2018

Uh oh!

davidrohr commented Jan 31, 2018

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

shahor02 commented Jan 29, 2018 •

edited

Loading

alibuild commented Jan 29, 2018 •

edited

Loading