Changeset dd514ae in git for cards

Timestamp:

Jun 10, 2015, 4:04:47 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

Location:

cards

Files:

• delphes_card_FCC_basic.tcl (modified) (3 diffs)
• delphes_card_LHCb.tcl (modified) (2 diffs)

cards/delphes_card_FCC_basic.tcl

@@ -226 +226 @@
   set EFlowTowerOutputArray eflowPhotons
 
+  set IsEcal true 
+ 
   set EnergyMin 0.5
   set EnergySignificanceMin 1.0
@@ -290 +292 @@
   set EFlowTowerOutputArray eflowNeutralHadrons
 
+  set IsEcal false 
+ 
   set EnergyMin 1.0
   set EnergySignificanceMin 1.0
@@ -431 +435 @@
 
 module FastJetFinder FastJetFinder {
-#  set InputArray Calorimeter/towers
+#  set InputArray TowerMerger/towers
   set InputArray EFlowMerger/eflow
 

cards/delphes_card_LHCb.tcl

@@ -223 +223 @@
   set TowerOutputArray ecalTowers
   set EFlowTowerOutputArray eflowPhotons
+
+  set IsEcal true
 
   set EnergyMin 0.0
@@ -303 +305 @@
   set TowerOutputArray hcalTowers
   set EFlowTowerOutputArray eflowNeutralHadrons
+
+  set IsEcal false 
 
   set EnergyMin 0.0