Changeset 1385 in svn for trunk

Timestamp:

Apr 17, 2014, 1:41:34 PM (11 years ago)

Author:

Pavel Demin

Message:

fix cards and Example3

Location:

trunk/examples

Files:

• Example3.C (modified) (3 diffs)
• delphes_card_ATLAS.tcl (modified) (1 diff)
• delphes_card_CMS.tcl (modified) (1 diff)

trunk/examples/Example3.C

@@ -95 +95 @@
   TClonesArray *branchPhoton = treeReader->UseBranch("Photon");
   TClonesArray *branchMuon = treeReader->UseBranch("Muon");
+
+  TClonesArray *branchTrack = treeReader->UseBranch("Track");
+  TClonesArray *branchTower = treeReader->UseBranch("Tower");
 
   TClonesArray *branchEFlowTrack = treeReader->UseBranch("EFlowTrack");
@@ -167 +170 @@
 
     // Loop over all tracks in event
-    for(i = 0; i < branchEFlowTrack->GetEntriesFast(); ++i)
-    {
-      track = (Track*) branchEFlowTrack->At(i);
+    for(i = 0; i < branchTrack->GetEntriesFast(); ++i)
+    {
+      track = (Track*) branchTrack->At(i);
       particle = (GenParticle*) track->Particle.GetObject();
 
@@ -197 +200 @@
         if(object->IsA() == GenParticle::Class())
         {
-          cout<<"    GenPart pt: "<<((GenParticle*) object)->PT<<", eta: "<<((GenParticle*) object)->Eta<<", phi: "<<((GenParticle*) object)->Phi<<endl;
-          momentum += ((GenParticle*) object)->P4();
+          particle = (GenParticle*) object;
+          cout << "    GenPart pt: " << particle->PT << ", eta: " << particle->Eta << ", phi: " << particle->Phi << endl;
+          momentum += particle->P4();
         }
         else if(object->IsA() == Track::Class())
         {
-          cout<<"    Track pt: "<<((Track*) object)->PT<<", eta: "<<((Track*) object)->Eta<<", phi: "<<((Track*) object)->Phi<<endl;
-          momentum += ((Track*) object)->P4();
+          track = (Track*) object;
+          cout << "    Track pt: " << track->PT << ", eta: " << track->Eta << ", phi: " << track->Phi << endl;
+          momentum += track->P4();
         }
         else if(object->IsA() == Tower::Class())
         {
-          cout<<"    Tower pt: "<<((Tower*) object)->ET<<", eta: "<<((Tower*) object)->Eta<<", phi: "<<((Tower*) object)->Phi<<endl;
-          momentum += ((Tower*) object)->P4();
+          tower = (Tower*) object;
+          cout << "    Tower pt: " << tower->ET << ", eta: " << tower->Eta << ", phi: " << tower->Phi << endl;
+          momentum += tower->P4();
         }
         else if(object->IsA() == Muon::Class())
         {
-          cout<<"    Muon pt: "<<((Muon*) object)->PT<<", eta: "<<((Muon*) object)->Eta<<", phi: "<<((Muon*) object)->Phi<<endl;
-          momentum += ((Muon*) object)->P4();
+          muon = (Muon*) object;
+          cout << "    Muon pt: " << muon->PT << ", eta: " << muon->Eta << ", phi: " << muon->Phi << endl;
+          momentum += muon->P4();
         }
       }

trunk/examples/delphes_card_ATLAS.tcl

@@ -530 +530 @@
   add Branch Delphes/allParticles Particle GenParticle
 
-#  add Branch TrackMerger/tracks Track Track
-#  add Branch Calorimeter/towers Tower Tower
-
-#  add Branch Calorimeter/eflowTracks EFlowTrack Track
-#  add Branch Calorimeter/eflowPhotons EFlowPhoton Tower
-#  add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
+  add Branch TrackMerger/tracks Track Track
+  add Branch Calorimeter/towers Tower Tower
+
+  add Branch Calorimeter/eflowTracks EFlowTrack Track
+  add Branch Calorimeter/eflowPhotons EFlowPhoton Tower
+  add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
 
   add Branch GenJetFinder/jets GenJet Jet

trunk/examples/delphes_card_CMS.tcl

@@ -542 +542 @@
   add Branch Delphes/allParticles Particle GenParticle
 
-#  add Branch TrackMerger/tracks Track Track
-#  add Branch Calorimeter/towers Tower Tower
-
-#  add Branch Calorimeter/eflowTracks EFlowTrack Track
-#  add Branch Calorimeter/eflowPhotons EFlowPhoton Tower
-#  add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
+  add Branch TrackMerger/tracks Track Track
+  add Branch Calorimeter/towers Tower Tower
+
+  add Branch Calorimeter/eflowTracks EFlowTrack Track
+  add Branch Calorimeter/eflowPhotons EFlowPhoton Tower
+  add Branch Calorimeter/eflowNeutralHadrons EFlowNeutralHadron Tower
 
   add Branch GenJetFinder/jets GenJet Jet