Skip to content
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.

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

Cdb rebased onto shipsoft fairship master #3

Open
wants to merge 181 commits into
base: master
Choose a base branch
from

Conversation

nathandpenha
Copy link
Owner

No description provided.

antonioiuliano2 and others added 30 commits May 25, 2019 14:19
* passing from local to global coordinates

* added option for ntuples writing, disabling display by default
* Added SciFiUnpack file and modified SciFiHit class.

* SciFiUnpack: included conversion of raw to root

* Fix SciFi HitData struct

* Modification on SciFiUnpacker: added detectorID.

* Fix SciFi unpacker

* Clang format

* Slight refactoring

* Fixed: conversion channel to detectorId. Added function  GetSciFiXYZ

* Moving z to global reference system

* Update SciFiUnpacker and SciFiHit

* Fix conflicts merge

* adding SciFi hits

* Activate the SciFi on the script

* Fix units on charmdet/SciFiHit.cxx

* Channel mapping: Fixed.

* Fix: charmdet/SciFiHit.cxx

* Deleted some comments on SciFiUnpacker.cxx
* updating Pixel station positions

* removing not loaded variables

* First addition of RPCTrack class

* Adding other methods to RPCTrack class

* a bit of cleaning

* still not w working :(

* Local reconstructed variables

* fixing bugs in some attributes

* Replacing c++ types with RTypes

* first trial for track drawing

* drawing track objects

* adding new MCPoints

* Add partitionID to detectorID

* FIX: use fPartitionID for hit unpacking

* WIP: first try for pixel hit digitization

* ENH: put partitionID in detectorID during unpacking

* ENH: add x,y,z mapping for pixeldetector

* ENH: use pointer to map in EndPoints method

* ENH: move positionsmap to PixelModules class, fix syntax errors

* FIX: correct moduleID calculation, add comments for pixelID values

* ENH: catch case of pixel(0,0), change computation of moduleID

* ENH: better variable name for frontend number, change moduleID calc

* FIX: max_detID

* ENH: account for different pos of larger pixels on even and odd modules.

* ENH: add alignment values, transfrom to global coordinate system

* MAINT: cleanup

* MAINT: variable names

* FIX: typo in variable name

* ENH: correct alignment values, column edge case for uneven frontendID

* FIX: missing declaration

* ENH: create shared_ptr PixelPositionMap

* ENH: move PixelMap back to ShipPixelHit

* use static member variable to hold map
* use static member function MakePositionMap() to initialize

* ENH: compute map only on first use

* MAINT: add comment for ROOT

* ENH: Make PixelMap private

* ENH: remove MapInitialized and helper variable in MakePositionMap

* FIX: check for not exsisting map

* try to add a script for RPC postion transformation, but for now it crashes

* first draft of charmmonitoring script

* Test of loading hits from local tracking

* basic fitting with numpy

* adding Eve clusters and track display

* back to official RPCTrack class

* Changing function comments to Python help() compatible documentation

* Adding Pixel to charmdetAnalysis

* Inserting geometry volumes in pixel hit map

* adding some checks

* ENH: compute position map with reference from geometry file

* FIX: typo

* end temporary check for RPCs

* by default loading first RPC track event

* removing useless lines

* fixing indent

* removing obsolete changes

* no blank line

* Adding a new script for plotting the positions of data hits from July 2018 in a Eve display.
Currently rpc and pixel hits can be loaded, other subdetectors to be added

Best regards,
Antonio

* removed not used imports

* removing code used for tests

* adding other pixel hits

* need to fix positions

* rpc points

* temporary option for event drawing

* FIX: hit displacement, wrong calculation of pixel center

* ENH: switch ShipPixelHit to cm based alignment
* updating Pixel station positions

* removing not loaded variables

* First addition of RPCTrack class

* Adding other methods to RPCTrack class

* a bit of cleaning

* still not w working :(

* Local reconstructed variables

* fixing bugs in some attributes

* Replacing c++ types with RTypes

* first trial for track drawing

* drawing track objects

* adding new MCPoints

* Add partitionID to detectorID

* FIX: use fPartitionID for hit unpacking

* WIP: first try for pixel hit digitization

* ENH: put partitionID in detectorID during unpacking

* ENH: add x,y,z mapping for pixeldetector

* ENH: use pointer to map in EndPoints method

* ENH: move positionsmap to PixelModules class, fix syntax errors

* FIX: correct moduleID calculation, add comments for pixelID values

* ENH: catch case of pixel(0,0), change computation of moduleID

* ENH: better variable name for frontend number, change moduleID calc

* FIX: max_detID

* ENH: account for different pos of larger pixels on even and odd modules.

* ENH: add alignment values, transfrom to global coordinate system

* MAINT: cleanup

* MAINT: variable names

* FIX: typo in variable name

* ENH: correct alignment values, column edge case for uneven frontendID

* FIX: missing declaration

* ENH: create shared_ptr PixelPositionMap

* ENH: move PixelMap back to ShipPixelHit

* use static member variable to hold map
* use static member function MakePositionMap() to initialize

* ENH: compute map only on first use

* MAINT: add comment for ROOT

* ENH: Make PixelMap private

* ENH: remove MapInitialized and helper variable in MakePositionMap

* FIX: check for not exsisting map

* try to add a script for RPC postion transformation, but for now it crashes

* first draft of charmmonitoring script

* Test of loading hits from local tracking

* basic fitting with numpy

* adding Eve clusters and track display

* back to official RPCTrack class

* Changing function comments to Python help() compatible documentation

* Adding Pixel to charmdetAnalysis

* Inserting geometry volumes in pixel hit map

* adding some checks

* ENH: compute position map with reference from geometry file

* FIX: typo

* end temporary check for RPCs

* by default loading first RPC track event

* removing useless lines

* fixing indent

* removing obsolete changes

* no blank line

* Adding a new script for plotting the positions of data hits from July 2018 in a Eve display.
Currently rpc and pixel hits can be loaded, other subdetectors to be added

Best regards,
Antonio

* removed not used imports

* removing code used for tests

* adding other pixel hits

* need to fix positions

* rpc points

* temporary option for event drawing

* FIX: hit displacement, wrong calculation of pixel center

* ENH: switch ShipPixelHit to cm based alignment

* fix positions of pixel volumes, use shipunit.py
* Added SciFiUnpack file and modified SciFiHit class.

* SciFiUnpack: included conversion of raw to root

* Fix SciFi HitData struct

* Modification on SciFiUnpacker: added detectorID.

* Fix SciFi unpacker

* Clang format

* Slight refactoring

* Fixed: conversion channel to detectorId. Added function  GetSciFiXYZ

* Moving z to global reference system

* Update SciFiUnpacker and SciFiHit

* Fix conflicts merge

* adding SciFi hits

* Activate the SciFi on the script

* Fix units on charmdet/SciFiHit.cxx

* Channel mapping: Fixed.

* Fix: charmdet/SciFiHit.cxx

* Deleted some comments on SciFiUnpacker.cxx

* Fix positions in SciFiHit.cxx
* add CI in gitlab

* add aliBuild to the CI

* upgrade aliBuild in CI

* upgrade aliBuild in user directory

* upgrade aliBuild completely

* first source, and then install aliBuild
* options for reading drift tubes data from charm measurement

* removing old comments

* increasing MufluxSpectrometerHit class version
* update magnet dimensions and muon filter sampling

* disabling other volumes to help check geometry

* adding support structures

* fixing typos

* first draft of muon filter hole

* saving current status, still iron sampling to be changed

* new muon filter layout for June 2019 Meeting

* removing HPTs near the coil

* saving draft version

* working version with fixed coil curvature

* first fix of extrusions, need to solve muon filter pillars

* ensuring backwards compatibility

* fixing remaining extrusions

* removing changes which are being done also by Alexander

* fixing pillars

* removing temporary volumes acceptancy checks

* fixing positioning of muon filter

* fixing pillar overlap

* reactivating all FairShip volumes

* preparing for pull request

* removing changes to HPT to avoid conflicts with contemporary pull request

* adding lateral supports
* replacing vacuum mother volumes with TGeoVolumeAssembly within the SND magnetized target

* replacing vacuum volume containers with TGeoVolumeAssembly objects in NuTauMudet class

* replacing virtual volumes with TGeoVolumeAssembly objects within charmdet folder (my code only)

* replacing a remaining virtual volume with TGeoVolumeAssembly
* upgrading print function to python3

* fixing a typo in RPCPositions()

* updating print functions

* applying futurize
* Added SciFiUnpack file and modified SciFiHit class.

* SciFiUnpack: included conversion of raw to root

* Fix SciFi HitData struct

* Modification on SciFiUnpacker: added detectorID.

* Fix SciFi unpacker

* Clang format

* Slight refactoring

* Fixed: conversion channel to detectorId. Added function  GetSciFiXYZ

* Moving z to global reference system

* Update SciFiUnpacker and SciFiHit

* Fix conflicts merge

* adding SciFi hits

* Activate the SciFi on the script

* Fix units on charmdet/SciFiHit.cxx

* Channel mapping: Fixed.

* Fix: charmdet/SciFiHit.cxx

* Deleted some comments on SciFiUnpacker.cxx

* Fix positions in SciFiHit.cxx

* Fix: x,y positions and casting issues on SciFiHit class.

* Update SciFiHit.cxx

Merge together the declaration and the initialisation of ch and boardId
* Change the way unpackers are selected

* use partID from raw data header for pixel unpacking
* different thickness for tungsten run

* editing the comment
* add documetation to build FairShip from CVMFS

* update installation instructions

* add instruction for HTCondor
* Added SciFiUnpack file and modified SciFiHit class.

* SciFiUnpack: included conversion of raw to root

* Fix SciFi HitData struct

* Modification on SciFiUnpacker: added detectorID.

* Fix SciFi unpacker

* Clang format

* Slight refactoring

* Fixed: conversion channel to detectorId. Added function  GetSciFiXYZ

* Moving z to global reference system

* Update SciFiUnpacker and SciFiHit

* Fix conflicts merge

* adding SciFi hits

* Activate the SciFi on the script

* Fix units on charmdet/SciFiHit.cxx

* Channel mapping: Fixed.

* Fix: charmdet/SciFiHit.cxx

* Deleted some comments on SciFiUnpacker.cxx

* Fix positions in SciFiHit.cxx

* Fix: x,y positions and casting issues on SciFiHit class.

* Update SciFiHit.cxx

Merge together the declaration and the initialisation of ch and boardId

* Fix: comment translation on z coordinate. Global z coordinate already in place.
* Implementing new veto geometry design.

* veto.cxx cleaning

* Improve makeID function.

* Add inner walls at magnet region

* Add vertical ribs to the magnet region.

* Remove warnings

* Cleaning

* Change back to simple numbering scheme of veto segments.

* Update in magnet region.

* veto Cleaning

* veto Cleaning more

* Fix hit position for new geomenry
* Make formatting of Pythia strings stable between Python 2 and 3 for HNLs.

* Make formatting of Pythia strings stable between Python 2 and 3 for RPV SUSY.

* Add missing `self.` in front of method call.

* Replace debug statements by MethodLogger in dark photon model.

* Minor comments cleanup.

* Replace raw tab by spaces.

* Make formatting of Pythia strings stable between Python 2 and 3 for the dark photon.
Tom Vrancken and others added 29 commits May 2, 2020 14:16
* Improved code layout
* Improved / corrected code comments
* Removed unused code
* Added example Dockerfile for image with mongoDB.
…streaming of th CDB package.

* Moved the cdb-integrated drifttubemonitoring script to the demo folder as example.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.