Skip to content

Commit

Permalink
[format] Run clang-format on the full repository
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener committed Aug 21, 2024
1 parent 1b05625 commit cf4344b
Show file tree
Hide file tree
Showing 53 changed files with 20,197 additions and 22,806 deletions.
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ INCLUDE_DIRECTORIES( SYSTEM ${MarlinUtil_INCLUDE_DIRS} )
LINK_LIBRARIES( ${MarlinUtil_LIBRARIES} )
ADD_DEFINITIONS( ${MarlinUtil_DEFINITIONS} )

FIND_PACKAGE( MarlinTrk REQUIRED )
FIND_PACKAGE( MarlinTrk REQUIRED )
INCLUDE_DIRECTORIES( SYSTEM ${MarlinTrk_INCLUDE_DIRS} )
LINK_LIBRARIES( ${MarlinTrk_LIBRARIES} )
ADD_DEFINITIONS( ${MarlinTrk_DEFINITIONS} )

FIND_PACKAGE( KiTrack REQUIRED )
FIND_PACKAGE( KiTrack REQUIRED )
INCLUDE_DIRECTORIES( SYSTEM ${KiTrack_INCLUDE_DIRS} )
LINK_LIBRARIES( ${KiTrack_LIBRARIES} )
ADD_DEFINITIONS( ${KiTrack_DEFINITIONS} )

FIND_PACKAGE( KiTrackMarlin REQUIRED )
FIND_PACKAGE( KiTrackMarlin REQUIRED )
INCLUDE_DIRECTORIES( SYSTEM ${KiTrackMarlin_INCLUDE_DIRS} )
LINK_LIBRARIES( ${KiTrackMarlin_LIBRARIES} )
ADD_DEFINITIONS( ${KiTrackMarlin_DEFINITIONS} )
Expand All @@ -78,25 +78,25 @@ include(DD4hep_XML_setup)
INCLUDE_DIRECTORIES( BEFORE SYSTEM ${DD4hep_INCLUDE_DIRS} )
LINK_LIBRARIES( ${DD4hep_LIBRARIES} ${DD4hep_COMPONENT_LIBRARIES} )

#FIND_PACKAGE( ROOT REQUIRED )
#FIND_PACKAGE( ROOT REQUIRED )

INCLUDE_DIRECTORIES( SYSTEM ${ROOT_INCLUDE_DIRS} )
LINK_LIBRARIES( ${ROOT_LIBRARIES} )
ADD_DEFINITIONS( ${ROOT_DEFINITIONS} )

FIND_PACKAGE( GSL REQUIRED )
FIND_PACKAGE( GSL REQUIRED )
INCLUDE_DIRECTORIES( SYSTEM ${GSL_INCLUDE_DIRS} )
LINK_LIBRARIES( ${GSL_LIBRARIES} )
ADD_DEFINITIONS( ${GSL_DEFINITIONS} )

FIND_PACKAGE( RAIDA REQUIRED )
FIND_PACKAGE( RAIDA REQUIRED )
INCLUDE_DIRECTORIES( SYSTEM ${RAIDA_INCLUDE_DIRS} )
LINK_LIBRARIES( ${RAIDA_LIBRARIES} )
ADD_DEFINITIONS( ${RAIDA_DEFINITIONS} )



### FIXME: depedence from DDKalTest is here only for getting the cellIDEndcoding
### FIXME: depedence from DDKalTest is here only for getting the cellIDEndcoding
### if we move the implementation to LCIO it can go away
FIND_PACKAGE( DDKalTest REQUIRED )
INCLUDE_DIRECTORIES( SYSTEM ${DDKalTest_INCLUDE_DIRS} )
Expand Down Expand Up @@ -134,7 +134,7 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
ADD_SHARED_LIBRARY( ${PROJECT_NAME} ${library_sources} ${library_headers})
ELSE()
ADD_SHARED_LIBRARY( ${PROJECT_NAME} ${library_sources} )
ENDIF()
ENDIF()

INSTALL_SHARED_LIBRARY( ${PROJECT_NAME} DESTINATION lib )

Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IF( DOXYGEN_FOUND )
# build documentation out-of-source
SET( DOC_SRC_DIR "${PROJECT_SOURCE_DIR}/doc" )
SET( DOC_BIN_DIR "${PROJECT_BINARY_DIR}/docbuild" )

# directories to search for documentation
SET( DOX_INPUT ../source )

Expand Down
1,026 changes: 513 additions & 513 deletions doc/Doxyfile

Large diffs are not rendered by default.

113 changes: 50 additions & 63 deletions source/Digitisers/include/DDPlanarDigiProcessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,31 @@

#include "lcio.h"

#include <map>
#include <string>
#include <vector>
#include <map>

#include <gsl/gsl_rng.h>
#include "DDRec/Surface.h"
#include "DDRec/SurfaceManager.h"
#include <gsl/gsl_rng.h>

#include <TH1F.h>

using namespace lcio ;
using namespace marlin ;
using namespace lcio;
using namespace marlin;

namespace EVENT {
class SimTrackerHit;
class SimTrackerHit;
}


/** ======= DDPlanarDigiProcessor ========== <br>
* Creates TrackerHits from SimTrackerHits, smearing them according to the input parameters.
* Creates TrackerHits from SimTrackerHits, smearing them according to the input parameters.
* The positions of "digitized" TrackerHits are obtained by gaussian smearing positions
* of SimTrackerHits perpendicular and along the ladder according to the specified point resolutions.
* of SimTrackerHits perpendicular and along the ladder according to the specified point resolutions.
* The geometry of the surface is retreived from DDRec::Surface associated to the hit via cellID.
*
*
* <h4>Input collections and prerequisites</h4>
*
*
* <h4>Input collections and prerequisites</h4>
* Processor requires a collection of SimTrackerHits <br>
* <h4>Output</h4>
* Processor produces collection of smeared TrackerHits<br>
Expand All @@ -49,78 +48,66 @@ namespace EVENT {
* @param Sub_Detector_ID ID of Sub-Detector using UTIL/ILDConf.h from lcio <br>
* (default value lcio::ILDDetID::VXD) <br>
* <br>
*
*
* @author F.Gaede CERN/DESY, S. Aplin DESY
* @date Dec 2014
*/
class DDPlanarDigiProcessor : public Processor {

public:

virtual Processor* newProcessor() { return new DDPlanarDigiProcessor ; }


DDPlanarDigiProcessor() ;

virtual Processor* newProcessor() { return new DDPlanarDigiProcessor; }

DDPlanarDigiProcessor();

/** Called at the begin of the job before anything is read.
* Use to initialize the processor, e.g. book histograms.
*/
virtual void init() ;
virtual void init();

/** Called for every run.
*/
virtual void processRunHeader( LCRunHeader* run ) ;
virtual void processRunHeader(LCRunHeader* run);

/** Called for every event - the working horse.
*/
virtual void processEvent( LCEvent * evt ) ;


virtual void check( LCEvent * evt ) ;


virtual void processEvent(LCEvent* evt);

virtual void check(LCEvent* evt);

/** Called after data processing for clean up.
*/
virtual void end() ;


virtual void end();


protected:

std::string _inColName ;

std::string _outColName ;
std::string _outRelColName ;

std::string _subDetName ;

int _nRun ;
int _nEvt ;

FloatVec _resU ;
FloatVec _resV ;
FloatVec _resT ;

bool _isStrip;

gsl_rng* _rng ;

const dd4hep::rec::SurfaceMap* _map ;
std::string _inColName;

bool _forceHitsOntoSurface ;
double _minEnergy ;
std::string _outColName;
std::string _outRelColName;

bool _useTimeWindow ;
bool _correctTimesForPropagation ;
FloatVec _timeWindow_min ;
FloatVec _timeWindow_max ;
std::string _subDetName;

std::vector<TH1F*> _h ;

} ;
int _nRun;
int _nEvt;

#endif
FloatVec _resU;
FloatVec _resV;
FloatVec _resT;

bool _isStrip;

gsl_rng* _rng;

const dd4hep::rec::SurfaceMap* _map;

bool _forceHitsOntoSurface;
double _minEnergy;

bool _useTimeWindow;
bool _correctTimesForPropagation;
FloatVec _timeWindow_min;
FloatVec _timeWindow_max;

std::vector<TH1F*> _h;
};

#endif
Loading

0 comments on commit cf4344b

Please sign in to comment.