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

Preliminary HGCAL trigger clustering #18419

Merged
merged 87 commits into from
Apr 27, 2017

Commits on Feb 16, 2017

  1. fix conflict

    mastrolorenzo committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    0e0145f View commit details
    Browse the repository at this point in the history
  2. add ntuple.root

    mastrolorenzo committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    5a68efe View commit details
    Browse the repository at this point in the history
  3. removal of the cluster3D dataformat in favour of a multicluster one +…

    … upgrade on the clustering algorithm + rename of some file
    mastrolorenzo committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    bbb107b View commit details
    Browse the repository at this point in the history
  4. create this new branch from c2d_devel branch after rebase with PFCal-…

    …dev/hgc-tpg-devel-CMSSW_9_0_0_pre4 (include SimClustering)
    mastrolorenzo committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    b84e09b View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. add of HGCalClusteringImpl and HGCalMulticlusteringImpl to implement …

    …the clustering algorithms + modification to the dataformat to include a collection of clusters in the multicluster + some minor modification to the parameters python and HGCClusterAlgo.cc class
    mastrolorenzo committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    6fb3a78 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. cleaning

    jbsauvan committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    646ce23 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f982b50 View commit details
    Browse the repository at this point in the history
  3. Fix clustering parameters

    jbsauvan committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    15ecb3f View commit details
    Browse the repository at this point in the history
  4. cleaning

    jbsauvan committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    00eb89a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #86 from jbsauvan/lucas-clustering-infrastructure

    Clustering infrastructure
    jbsauvan authored Mar 1, 2017
    Configuration menu
    Copy the full SHA
    0abf384 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. this is the version of the code using pointers in the context of the …

    …clustering and multiclutering next commit will use references
    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    f44450d View commit details
    Browse the repository at this point in the history
  2. modifications to the cluster implementation functions in order to tak…

    …e collection references instead of unique_ptr to collections + add of parameter for geometrical cluster 2D in hgcalTriggerPrimitiveDigiProducer_cfi.py
    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    d8a8f91 View commit details
    Browse the repository at this point in the history
  3. c2d clustering algorithm core is compiling: defined addTC() and dist(…

    …) member functions as const in HGCalCluster class
    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    6c45248 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    822a000 View commit details
    Browse the repository at this point in the history
  5. small modification to the 2D-clustering algorithm + 3D-clustering as …

    …in IC code just to debug the C2d (need the sum of the energy)
    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    bab7b5c View commit details
    Browse the repository at this point in the history
  6. 2D cluster algorithm implemented (simple 2D-dR(x,y) approach)

    + modifications to the cluster classes and their implementation:
    parsing of the eventSetup and Event in the clusterise functions
    (needed to retrieve GlobalPointers to the cartesian position of the 2D) + creation of a *temporary-C3d* used to test the C2d + global cleaning
    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    db7da66 View commit details
    Browse the repository at this point in the history
  7. prepare for rebase

    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    ef5d9c2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7a72d47 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ac18a54 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c3cca38 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b622b27 View commit details
    Browse the repository at this point in the history
  12. adjust of the calibration class to host a new member function that re…

    …turns the calibrated pT in mip units
    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    bb4ef45 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d3f05bf View commit details
    Browse the repository at this point in the history
  14. cleaning

    mastrolorenzo committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    ae568a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. cluster and multicluster class modified: methods that return an std::…

    …vector<HGCalTriggerCell*> and std::vector<Cluster*> have been implemented + removal of Event and EventSetup from the clustering functions parameters, using the GlobalPointer from TC
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    b04e07f View commit details
    Browse the repository at this point in the history
  2. this is the version of the code using pointers in the context of the …

    …clustering and multiclutering next commit will use references
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    2a2e408 View commit details
    Browse the repository at this point in the history
  3. modifications to the cluster implementation functions in order to tak…

    …e collection references instead of unique_ptr to collections + add of parameter for geometrical cluster 2D in hgcalTriggerPrimitiveDigiProducer_cfi.py
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    251e0c1 View commit details
    Browse the repository at this point in the history
  4. c2d clustering algorithm core is compiling: defined addTC() and dist(…

    …) member functions as const in HGCalCluster class
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    3940f9a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6f6d3e4 View commit details
    Browse the repository at this point in the history
  6. small modification to the 2D-clustering algorithm + 3D-clustering as …

    …in IC code just to debug the C2d (need the sum of the energy)
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    47a863c View commit details
    Browse the repository at this point in the history
  7. 2D cluster algorithm implemented (simple 2D-dR(x,y) approach)

    + modifications to the cluster classes and their implementation:
    parsing of the eventSetup and Event in the clusterise functions
    (needed to retrieve GlobalPointers to the cartesian position of the 2D) + creation of a *temporary-C3d* used to test the C2d + global cleaning
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    3522bd6 View commit details
    Browse the repository at this point in the history
  8. update the rebased_on_pre5 branch with what has been done on 03/03/17…

    … in hgc_l1clustering_rebased
    mastrolorenzo committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    0c942a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2017

  1. All minor comments from Jean-Baptiste implemented. Major comments rel…

    …ated to the usage of PtrVector (used to get the collection of pertinent trgCell and Cluster) will be included in the next commit
    mastrolorenzo committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    c81a6d5 View commit details
    Browse the repository at this point in the history
  2. "isPertinent" function has been moved from cluster and multicluster c…

    …lasses to the respective Impl.
    mastrolorenzo committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    c2767b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. 1) Addition of Persistent PtrVector to pertinent tc/clusters collections

    2) Modification of the classes_def.xml and classes.h
    3) Restored the the type of centre and centreProj (previously centreNorm) as GlobalPoint
    4) other minor changes + few variable renames + overall cleaning
    mastrolorenzo committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    dd198b3 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. Update Jean-Baptiste comments of the 10/03/17, in particluar, the han…

    …dles in input to the clusterization functions have been replaced by PtrVectors
    mastrolorenzo committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    7713b07 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. fix indentation

    mastrolorenzo committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    55eda78 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4962904 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    00844b1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #87 from mastrolorenzo/hgc_l1clustering_rebased_pr…

    …e5_tmp
    
    HGC L1 Clustering
    jbsauvan authored Mar 14, 2017
    Configuration menu
    Copy the full SHA
    12bb239 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. Configuration menu
    Copy the full SHA
    3878f85 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Merge branch 'hgc-tpg-integration-90X-170228' of github.com:PFCal-dev…

    …/cmssw into hgc-tpg-devel-CMSSW_9_0_0_pre6
    
    Conflicts:
    	DataFormats/L1THGCal/interface/HGCalCluster.h
    jbsauvan committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    002fb1b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #90 from jbsauvan/backprop-integration-comments

    Back-propagation of integration comments
    jbsauvan authored Mar 20, 2017
    Configuration menu
    Copy the full SHA
    db72c7a View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Configuration menu
    Copy the full SHA
    f889357 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f92b64b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0dba8c0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3505779 View commit details
    Browse the repository at this point in the history
  5. Fix wafer type numbering

    jbsauvan committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    52999e3 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    41a14c5 View commit details
    Browse the repository at this point in the history
  7. Remove couts

    jbsauvan committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    bf375c3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5dcefd0 View commit details
    Browse the repository at this point in the history
  9. Fix indent

    jbsauvan committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    34e4d9a View commit details
    Browse the repository at this point in the history
  10. Geometry naming changes

    jbsauvan committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    c6eeb17 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #91 from jbsauvan/triggercell-neighbours

    Implementation of trigger cell neighbors
    jbsauvan authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    1a1e85c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Configuration menu
    Copy the full SHA
    7f465e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. fixed the variable used to cut on seeding and clustering thresholds (…

    …from hwPt to mipT) + cleaning of testNtuplizer_cfg.py and L1Clustering_cfg.py
    mastrolorenzo committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    e891ecd View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2017

  1. Merge pull request #95 from mastrolorenzo/GeometricC2d_fixed

    fixed the variable used to cut on seeding and clustering thresholds
    jbsauvan authored Mar 25, 2017
    Configuration menu
    Copy the full SHA
    1d86e66 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2017

  1. Configuration menu
    Copy the full SHA
    2d3e020 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2017

  1. Configuration menu
    Copy the full SHA
    02a0b01 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2017

  1. Based on 900pre6: creation of clusterizeNN function with a basic NN-a…

    …lgorithm (to be updated soon with the IC NN-algorithm) + ordering of trigger-cells in phi
    mastrolorenzo committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    c777bf4 View commit details
    Browse the repository at this point in the history
  2. cleaning

    mastrolorenzo committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    fda8811 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4f2229d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0992533 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    71646e0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6f6d206 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2017

  1. upgrade of the NNC2d using where possible unorderd_map/set to reduce …

    …computing time + the clustering type is now a configurable parameter of the config file
    mastrolorenzo committed Apr 8, 2017
    Configuration menu
    Copy the full SHA
    0bd4767 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2017

  1. Update 2D clustering

    jbsauvan committed Apr 9, 2017
    Configuration menu
    Copy the full SHA
    8315885 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1 from jbsauvan/clustering2D_NN_910pre1

    Fix and update 2D clustering
    mastrolorenzo authored Apr 9, 2017
    Configuration menu
    Copy the full SHA
    ca11260 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2017

  1. NNC2d update + cleaning

    mastrolorenzo committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    1980482 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    047ea1d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #100 from mastrolorenzo/clustering2D_NN_910pre1

    Nearest neighbor 2D clustering
    jbsauvan authored Apr 10, 2017
    Configuration menu
    Copy the full SHA
    76785bc View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. Configuration menu
    Copy the full SHA
    56c6cd6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dbfbd2d View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Cleaning

    jbsauvan committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    6349664 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7c1e86f View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. Configuration menu
    Copy the full SHA
    a455745 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    97ce1d9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    489b3a6 View commit details
    Browse the repository at this point in the history
  4. Fix naming

    jbsauvan committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    23a41ab View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f4ca8f3 View commit details
    Browse the repository at this point in the history
  6. new branch based on 910_pre2 + merged with PFCal-dev/hgc-tpg-integrat…

    …ion-170420 + update of clusters classes + upgrade to range-based loop in the implementation + other smaller fizes into HGCClusterAlgo.cc
    mastrolorenzo committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    40b18e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2017

  1. enum cases implemented in HGCClusterAlgo.cc to faster select the algo…

    …rithm type + resize() & set() funztions replaced the push_back() in the implementation classes + added parameter to tune max-dR of C3d in testNtuplizer_cfg.py
    mastrolorenzo committed Apr 23, 2017
    Configuration menu
    Copy the full SHA
    084a01c View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2017

  1. Merge branch 'clustering2D_NN_910pre2' of https://github.com/mastrolo…

    …renzo/cmssw into hgc-tpg-integration-170420
    jbsauvan committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    2488c04 View commit details
    Browse the repository at this point in the history
  2. Fixes in clusterings

    jbsauvan committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    4fe89e2 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. Configuration menu
    Copy the full SHA
    5e8a0ac View commit details
    Browse the repository at this point in the history
  2. Minor fixes

    jbsauvan committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    50c4ae4 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. Change cout to edm log

    jbsauvan committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    38f91ba View commit details
    Browse the repository at this point in the history