Changeset dd514ae in git for modules/TauTagging.cc

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 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

File:

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

modules/TauTagging.cc

@@ -73 +73 @@
 
   if(tau->D1 < 0) return -1;
+
+  if(tau->D2 < tau->D1) return -1;
 
   if(tau->D1 >= fParticleInputArray->GetEntriesFast() ||
@@ -201 +203 @@
   tauArray = fFilter->GetSubArray(fClassifier, 0);
 
-  if(tauArray == 0) return;
-
-  TIter itTauArray(tauArray);
-
   // loop over all input jets
   fItJetInputArray->Reset();
@@ -217 +215 @@
 
     // loop over all input taus
-    itTauArray.Reset();
-    while((tau = static_cast<Candidate *>(itTauArray.Next())))
-    {
-      if(tau->D1 < 0) continue;
-
-      if(tau->D1 >= fParticleInputArray->GetEntriesFast() ||
-         tau->D2 >= fParticleInputArray->GetEntriesFast())
+    if(tauArray){
+      TIter itTauArray(tauArray);
+      while((tau = static_cast<Candidate *>(itTauArray.Next())))
       {
-        throw runtime_error("tau's daughter index is greater than the ParticleInputArray size");
-      }
-
-      tauMomentum.SetPxPyPzE(0.0, 0.0, 0.0, 0.0);
-
-      for(i = tau->D1; i <= tau->D2; ++i)
-      {
-        daughter = static_cast<Candidate *>(fParticleInputArray->At(i));
-        if(TMath::Abs(daughter->PID) == 16) continue;
-        tauMomentum += daughter->Momentum;
-      }
-
-      if(jetMomentum.DeltaR(tauMomentum) <= fDeltaR)
-      {
-        pdgCode = 15;
-        charge = tau->Charge;
+        if(tau->D1 < 0) continue;
+
+        if(tau->D1 >= fParticleInputArray->GetEntriesFast() ||
+           tau->D2 >= fParticleInputArray->GetEntriesFast())
+        {
+          throw runtime_error("tau's daughter index is greater than the ParticleInputArray size");
+        }
+
+        tauMomentum.SetPxPyPzE(0.0, 0.0, 0.0, 0.0);
+
+        for(i = tau->D1; i <= tau->D2; ++i)
+        {
+          daughter = static_cast<Candidate *>(fParticleInputArray->At(i));
+          if(TMath::Abs(daughter->PID) == 16) continue;
+          tauMomentum += daughter->Momentum;
+        }
+
+        if(jetMomentum.DeltaR(tauMomentum) <= fDeltaR)
+        {
+          pdgCode = 15;
+          charge = tau->Charge;
+        }
       }
     }