Changeset 91acc76 in git for cards

Timestamp:

Aug 23, 2016, 3:28:48 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

19389b8, 7993cad

Parents:

e55f5b0 (diff), 98ce52a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolved conflict in ModulesLinkDef

Location:

cards/CMS_PhaseII

Files:

• CMS_PhaseII_Substructure_0PU.tcl (added)
• CMS_PhaseII_Substructure_200PU.tcl (added)
• CMS_PhaseII_Substructure_PIX4022_0PU.tcl (added)
• CMS_PhaseII_Substructure_PIX4022_200PU.tcl (added)
• trackMomentumResolution_PIX4022.tcl (added)
• trackMomentumResolution_vs_p_PIX4022.tcl (added)