AliceO2Group · MohammadAlTurany · Nov 5, 2015 · Jul 30, 2015 · Aug 5, 2015 · Aug 6, 2015
@@ -2,9 +2,8 @@
 /// \brief Implementation of the Detector class
 
 #include "Detector.h"
-
-#include <Riostream.h>
-#include <TVirtualMC.h>
+#include <TVirtualMC.h>  // for TVirtualMC, gMC
+#include "TString.h"     // for TString
 
 using std::endl;
 using std::cout;

@@ -4,7 +4,8 @@
 #ifndef ALICEO2_BASE_DETECTOR_H_
 #define ALICEO2_BASE_DETECTOR_H_
 
-#include "FairDetector.h"
+#include "FairDetector.h"  // for FairDetector
+#include "Rtypes.h"        // for Float_t, Int_t, Double_t, Detector::Class, etc
 
 namespace AliceO2 {
 namespace Base {

@@ -2,16 +2,16 @@
 /// \brief Implementation of the TrackReference class
 /// \author Sylwester Radomski (S.Radomski@gsi.de) GSI, Jan 31, 2003
 
-#include "TVirtualMC.h"
-#include "TParticle.h"
-
 #include "TrackReference.h"
+#include "TVirtualMC.h"  // for TVirtualMC, gMC
 #include <Riostream.h>
 
 using std::endl;
 using std::cout;
+
 using namespace AliceO2::Base;
 
+
 ClassImp(AliceO2::Base::TrackReference)
 
 TrackReference::TrackReference()

@@ -5,8 +5,10 @@
 #ifndef ALICEO2_BASE_TRACKREFERENCE_H_
 #define ALICEO2_BASE_TRACKREFERENCE_H_
 
-#include "TObject.h"
-#include "TMath.h"
+#include "Rtypes.h"   // for Float_t, Int_t, TrackReference::Class, Bool_t, etc
+#include "TMath.h"    // for Pi, Sqrt, ATan2, Cos, Sin, ACos
+#include "TObject.h"  // for TObject
+
 
 namespace AliceO2 {
 namespace Base {

@@ -46,9 +46,9 @@ if(NOT ALICEO2_MODULAR_BUILD)
 
   # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
   # is checked
-  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
   set(CMAKE_MODULE_PATH "${FAIRROOTPATH}/share/fairbase/cmake/modules"  ${CMAKE_MODULE_PATH})
   set(CMAKE_MODULE_PATH "${FAIRROOTPATH}/share/fairbase/cmake/modules_old"  ${CMAKE_MODULE_PATH})
+  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
   Set(CheckSrcDir "${FAIRROOTPATH}/share/fairbase/cmake/checks")
 else(NOT ALICEO2_MODULAR_BUILD)
@@ -116,15 +116,16 @@ if(ALICEO2_MODULAR_BUILD)
   find_package(Geant4 REQUIRED)
 else(ALICEO2_MODULAR_BUILD)
   # For old versions of VMC packages (to be removed)
-  find_package(GEANT3 REQUIRED)
+  find_package(GEANT3)
   find_package(GEANT4)
   find_package(GEANT4DATA)
   find_package(GEANT4VMC)
   find_package(CLHEP)
 endif(ALICEO2_MODULAR_BUILD)
 find_package(CERNLIB)
 find_package(HEPMC)
-
+find_package(IWYU)
+find_package(DDS)
 
 if(NOT BOOST_ROOT)
   Set(Boost_NO_SYSTEM_PATHS TRUE)
@@ -208,7 +209,9 @@ endif(NOT ALICEO2_MODULAR_BUILD)
 
 add_subdirectory (Base)
 add_subdirectory (Data)
+if (PYTHIA8_FOUND AND Pythia6_FOUND)
 add_subdirectory (Generators)
+Endif ()
 add_subdirectory (itsmft)
 add_subdirectory (tpc)
 add_subdirectory (passive)
@@ -227,6 +230,11 @@ if(BUILD_DOXYGEN)
 endif(BUILD_DOXYGEN)
 
 
+If(IWYU_FOUND)
+  ADD_CUSTOM_TARGET(checkHEADERS 
+                    DEPENDS $ENV{ALL_HEADER_RULES}
+  )
+EndIf()
 
 
 WRITE_CONFIG_FILE(config.sh)

@@ -118,6 +118,7 @@ Int_t MCTrack::getNumberOfPoints(DetectorId detId) const
   //   return 0;
   // }
   //
+  return 0;
 }
 
 void MCTrack::setNumberOfPoints(Int_t iDet, Int_t nPoints)

@@ -3,23 +3,17 @@
 /// \author M. Al-Turany - June 2014
 
 #include "Stack.h"
-
-#include "FairDetector.h"
-#include "FairLink.h"
-#include "FairMCPoint.h"
-#include "MCTrack.h"
-#include "FairRootManager.h"
-#include "FairLogger.h"
-
-#include "Riosfwd.h"
-#include "TClonesArray.h"
-#include "TIterator.h"
-#include "TLorentzVector.h"
-#include "TParticle.h"
-#include "TRefArray.h"
-
-#include <stddef.h>
-#include <iostream>
+#include <stddef.h>           // for NULL
+#include "FairDetector.h"     // for FairDetector
+#include "FairLogger.h"       // for MESSAGE_ORIGIN, FairLogger
+#include "FairMCPoint.h"      // for FairMCPoint
+#include "FairRootManager.h"  // for FairRootManager
+#include "MCTrack.h"          // for MCTrack
+#include "TClonesArray.h"     // for TClonesArray
+#include "TIterator.h"        // for TIterator
+#include "TLorentzVector.h"   // for TLorentzVector
+#include "TParticle.h"        // for TParticle
+#include "TRefArray.h"        // for TRefArray
 
 using std::cout;
 using std::endl;

@@ -2,6 +2,7 @@
 # the array .
 # The extension is already found.  Any number of sources could be listed here.
 
+if(PYTHIA8_INCLUDE_DIR)
 set(INCLUDE_DIRECTORIES
 ${CMAKE_SOURCE_DIR}/Generators
 )
@@ -21,6 +22,8 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${Pythia6_LIBRARY_DIR}
+${PYTHIA8_LIBRARY_DIR}
 ${AlFa_DIR}/lib
 ${SIMPATH}/lib
 )
@@ -38,3 +41,6 @@ set(LIBRARY_NAME O2Gen)
 set(DEPENDENCIES Base O2Data pythia8 Pythia6)
 
 GENERATE_LIBRARY()
+else(PYTHIA8_INCLUDE_DIR)
+  message(STATUS "module 'Generators' requires Pythia8 ... deactivated")
+endif(PYTHIA8_INCLUDE_DIR)
@@ -62,11 +62,10 @@
 #define PND_PYTHIAGENERATOR_H
 
 
-#include "FairGenerator.h"
-
-class TDatabasePDG;
-class FairPrimaryGenerator;
-
+#include <stdio.h>          // for FILE
+#include "FairGenerator.h"  // for FairGenerator
+#include "Rtypes.h"         // for Int_t, Pythia6Generator::Class, Bool_t, etc
+class FairPrimaryGenerator;  // lines 68-68
 
 
 class Pythia6Generator : public FairGenerator  

@@ -12,7 +12,7 @@
 
 #include <math.h>
 #include "TROOT.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 #include "FairPrimaryGenerator.h"
 //#include "FairGenerator.h"
 
@@ -40,7 +40,17 @@ Bool_t Pythia8Generator::Init()
   fPythia.setRndmEnginePtr(fRandomEngine);
 
   cout<<"Beam Momentum "<<fMom<<endl;
-  fPythia.init(fId, 2212, 0., 0., fMom, 0., 0., 0.);
+  // Set arguments in Settings database.
+  fPythia.settings.mode("Beams:idA",  fId);
+  fPythia.settings.mode("Beams:idB",  2212);
+  fPythia.settings.mode("Beams:frameType",  3);
+  fPythia.settings.parm("Beams:pxA",    0.);
+  fPythia.settings.parm("Beams:pyA",    0.);
+  fPythia.settings.parm("Beams:pzA",    fMom);
+  fPythia.settings.parm("Beams:pxB",    0.);
+  fPythia.settings.parm("Beams:pyB",    0.);
+  fPythia.settings.parm("Beams:pzB",    0.);
+  fPythia.init();
   return kTRUE;
 }
 // -------------------------------------------------------------------------

@@ -13,11 +13,14 @@
 #ifndef PNDP8GENERATOR_H
 #define PNDP8GENERATOR_H 1
 
-#include "TROOT.h"
-#include "FairGenerator.h"
-#include "Pythia.h"
-#include "TRandom1.h"
-#include "TRandom3.h"
+#include "Basics.h"          // for RndmEngine
+#include "FairGenerator.h"   // for FairGenerator
+#include "Pythia8/Pythia.h"  // for Pythia
+#include "Rtypes.h"          // for Double_t, Bool_t, Int_t, etc
+#include "TRandom.h"         // for TRandom
+#include "TRandom1.h"        // for TRandom1
+#include "TRandom3.h"        // for TRandom3, gRandom
+class FairPrimaryGenerator;  // lines 22-22
 
 class FairPrimaryGenerator;
 using namespace Pythia8;

@@ -2,17 +2,20 @@
 /// \brief Implementation of the Cheb3D class
 /// \author ruben.shahoyan@cern.ch 09/09/2006
 
-#include <TString.h>
-#include <TSystem.h>
-#include <TROOT.h>
-#include <TRandom.h>
-#include <stdio.h>
-#include <TMethodCall.h>
-#include <TMath.h>
-#include <TH1.h>
 #include "Chebyshev3D.h"
-#include "Chebyshev3DCalc.h"
-#include "FairLogger.h"
+#include <TH1.h>              // for TH1D, TH1
+#include <TMath.h>            // for Cos, Pi
+#include <TMethodCall.h>      // for TMethodCall
+#include <TROOT.h>            // for TROOT, gROOT
+#include <TRandom.h>          // for TRandom, gRandom
+#include <TString.h>          // for TString
+#include <TSystem.h>          // for TSystem, gSystem
+#include <stdio.h>            // for printf, fprintf, FILE, fclose, fflush, etc
+#include "Chebyshev3DCalc.h"  // for Chebyshev3DCalc, etc
+#include "FairLogger.h"       // for FairLogger, MESSAGE_ORIGIN
+#include "TMathBase.h"        // for Max, Abs
+#include "TNamed.h"           // for TNamed
+#include "TObjArray.h"        // for TObjArray
 
 using namespace AliceO2::MathUtils;
 

@@ -5,19 +5,15 @@
 #ifndef ALICEO2_MATHUTILS_CHEBYSHEV3D_H_
 #define ALICEO2_MATHUTILS_CHEBYSHEV3D_H_
 
-#include <TNamed.h>
-#include <TObjArray.h>
-#include "Chebyshev3DCalc.h"
-
-class TString;
-class TSystem;
-class TRandom;
-class TH1;
-class TMethodCall;
-class TRandom;
-class TROOT;
-class stdio;
-class FairLogger;
+#include <TNamed.h>           // for TNamed
+#include <TObjArray.h>        // for TObjArray
+#include <stdio.h>            // for FILE, stdout
+#include "Chebyshev3DCalc.h"  // for Chebyshev3DCalc, etc
+#include "Rtypes.h"           // for Float_t, Int_t, Double_t, Bool_t, etc
+#include "TString.h"          // for TString
+class FairLogger;  // lines 20-20
+class TH1;  // lines 15-15
+class TMethodCall;  // lines 16-16
 
 
 namespace AliceO2 {

@@ -2,10 +2,10 @@
 /// \brief Implementation of the Cheb3DCalc class
 /// \author ruben.shahoyan@cern.ch 09/09/2006
 
-#include <cstdlib>
-#include <TSystem.h>
 #include "Chebyshev3DCalc.h"
-
+#include <TSystem.h>  // for TSystem, gSystem
+#include "TNamed.h"   // for TNamed
+#include "TString.h"  // for TString, TString::EStripType::kBoth
 using namespace AliceO2::MathUtils;
 
 ClassImp(Chebyshev3DCalc)

@@ -5,8 +5,11 @@
 #ifndef ALICEO2_MATHUTILS_CHEBYSHEV3DCALC_H_
 #define ALICEO2_MATHUTILS_CHEBYSHEV3DCALC_H_
 
-#include <TNamed.h>
-class TSystem;
+#include <TNamed.h>  // for TNamed
+#include <stdio.h>   // for FILE, stdout
+#include "Rtypes.h"  // for Float_t, UShort_t, Int_t, Double_t, etc
+class TString;
+
 
 // To decrease the compilable code size comment this define. This will exclude the routines
 // used for the calculation and saving of the coefficients.
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,6 +118,7 @@ Int_t MCTrack::getNumberOfPoints(DetectorId detId) const @@
       //   return 0;
       // }
       //
+      return 0;
     }
     void MCTrack::setNumberOfPoints(Int_t iDet, Int_t nPoints)
@@ Expand Down @@