Changeset 215ee01 in git

Timestamp:

Feb 27, 2015, 10:36:23 PM (10 years ago)

Author:

Sho Iwamoto <sho@…>

Parents:

8ab9694 (diff), 20dc57b (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:

Merge 20dc57b6880472585a8520390f3f894a8ae1dca3 into 8ab969494a0fa92452f3bbe1154a63340c3634a4

File:

• modules/TauTagging.cc (modified) (3 diffs)

modules/TauTagging.cc

@@ -61 +61 @@
 {
   Candidate *tau = static_cast<Candidate *>(object);
-  Candidate *daughter1 = 0;
-  Candidate *daughter2 = 0;
   
   const TLorentzVector &momentum = tau->Momentum;
-  Int_t pdgCode, i, j;
-
-  pdgCode = TMath::Abs(tau->PID);
+
+  Int_t pdgCode = TMath::Abs(tau->PID);
   if(pdgCode != 15) return -1;
 
@@ -82 +79 @@
   }
 
-  for(i = tau->D1; i <= tau->D2; ++i)
-  {
-    daughter1 = static_cast<Candidate *>(fParticleInputArray->At(i));
+  for(Int_t i = tau->D1; i <= tau->D2; ++i)
+  {
+    Candidate *daughter1 = static_cast<Candidate *>(fParticleInputArray->At(i));
     pdgCode = TMath::Abs(daughter1->PID);
     if(pdgCode == 11 || pdgCode == 13 || pdgCode == 15) return -1;
@@ -90 +87 @@
     {
      if(daughter1->D1 < 0) return -1;
-     for(j = daughter1->D1; j <= daughter1->D2; ++j)
+     for(Int_t j = daughter1->D1; j <= daughter1->D2; ++j)
      {
-       daughter2 = static_cast<Candidate*>(fParticleInputArray->At(j));
+       Candidate *daughter2 = static_cast<Candidate*>(fParticleInputArray->At(j));
        pdgCode = TMath::Abs(daughter2->PID);
        if(pdgCode == 11 || pdgCode == 13) return -1;