Changes between Version 37 and Version 38 of WorkBook/LibraryInterface

Timestamp:

Feb 26, 2013, 9:01:20 AM (12 years ago)

Author:

Pavel Demin

Comment:

--

WorkBook/LibraryInterface

@@ -77 +77 @@
 
   int appargc = 1;
-  char *appName = "DelphesExample";
+  char appName[] = "DelphesExample";
   char *appargv[] = {appName};
   TApplication app(appName, &appargc, appargv);
@@ -129 +129 @@
   Double_t x, y, z, t;  
 
-  pdg = TDatabasePDG::Instance()
+  pdg = TDatabasePDG::Instance();
   
   while(ReadParticle())
   {
-    if(status == 1 || status == 2)
+    candidate = factory->NewCandidate();
+
+    candidate->PID = pid;
+
+    candidate->Status = status;
+
+    pdgParticle = pdg->GetParticle(pid);
+    candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
+    candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
+
+    candidate->Momentum.SetPxPyPzE(px, py, pz, e);
+
+    candidate->Position.SetXYZT(x, y, z, t);
+
+    allParticleOutputArray->Add(candidate);
+
+    if(!pdgParticle) return;
+
+    if(status == 1)
     {
-      candidate = factory->NewCandidate();
-
-      candidate->PID = pid;
-
-      candidate->Status = status;
-
-      
-      pdgParticle = pdg->GetParticle(fPID);
-      candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
-      candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
-  
-      candidate->Momentum.SetPxPyPzE(px, py, pz, e);
-
-      candidate->Position.SetXYZT(x, y, z, t);
-
-      allParticleOutputArray->Add(candidate);
-
-      if(!pdgParticle) return;
-
-      if(status == 1)
-      {
-        stableParticleOutputArray->Add(candidate);
-      }
-      else if(status == 2)
-      {
-        partonOutputArray->Add(candidate);
-      }
+      stableParticleOutputArray->Add(candidate);
+    }
+    else if(status == 2)
+    {
+      partonOutputArray->Add(candidate);
     }
   }
@@ -175 +171 @@
   while((candidate = static_cast<Candidate*>(iteratorJets.Next())))
   {
-    const TLorentzVector &momentum = candidate->GetMomentum();
+    const TLorentzVector &momentum = candidate->Momentum;
   }
 }