Changeset 5df97ac in git

Timestamp:

Nov 10, 2016, 3:15:56 PM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9e24b7b

Parents:

a7c9002

Message:

fix formatting in DelphesCMSFWLite.cpp

File:

• readers/DelphesCMSFWLite.cpp (modified) (9 diffs)

readers/DelphesCMSFWLite.cpp

@@ -64 +64 @@
 
 void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
-    ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
-    DelphesFactory *factory, TObjArray *allParticleOutputArray,
-    TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
+  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
+  DelphesFactory *factory, TObjArray *allParticleOutputArray,
+  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
 {
 
@@ -82 +82 @@
   handleGenEventInfo.getByLabel(event, "generator");
 
-  if (!((handleLHEEvent.getBranchNameFor(event, "source")).empty()))
-  { 
+  if(!((handleLHEEvent.getBranchNameFor(event, "source")).empty()))
+  {
     handleLHEEvent.getByLabel(event, "source");
   }
-  else if (!((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty()))
+  else if(!((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty()))
   {
     handleLHEEvent.getByLabel(event, "externalLHEProducer");
   }
-  else if (firstEvent)
-  {
-    std::cout<<"Wrong LHEEvent Label! Please, check the input file."<<std::endl;
-  }
-
-  if (!((handleParticle.getBranchNameFor(event, "genParticles")).empty()))
+  else if(firstEvent)
+  {
+    cout << "Wrong LHEEvent Label! Please, check the input file." << endl;
+  }
+
+  if(!((handleParticle.getBranchNameFor(event, "genParticles")).empty()))
   {
     handleParticle.getByLabel(event, "genParticles");
   }
-  else if (!((handlePackedParticle.getBranchNameFor(event, "packedGenParticles")).empty()) && !((handleParticle.getBranchNameFor(event,"prunedGenParticles")).empty()))
+  else if(!((handlePackedParticle.getBranchNameFor(event, "packedGenParticles")).empty()) && !((handleParticle.getBranchNameFor(event,"prunedGenParticles")).empty()))
   {
     handleParticle.getByLabel(event, "prunedGenParticles");
@@ -146 +146 @@
   element->ProcTime = 0.0;
 
-
   if(foundLHE)
   {
@@ -156 +155 @@
       weight = static_cast<Weight *>(branchRwgt->NewEntry());
       weight->Weight = itWeightsInfo->wgt;
-    }  
+    }
   }
 
@@ -164 +163 @@
   {
     const reco::GenParticle &particle = *itParticle;
-    if( !isMiniAOD || particle.status() != 1 ) vectorCandidate.push_back(&*itParticle);
+    if(!isMiniAOD || particle.status() != 1) vectorCandidate.push_back(&*itParticle);
   }
 
@@ -173 +172 @@
     pid = particle.pdgId();
     status = particle.status();
-    if( isMiniAOD && particle.status() == 1 ) continue;
+    if(isMiniAOD && particle.status() == 1) continue;
     px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.energy(); mass = particle.mass();
     x = particle.vx(); y = particle.vy(); z = particle.vz();
@@ -208 +207 @@
     if(!pdgParticle) continue;
 
-    if( status == 1)
+    if(status == 1)
     {
       // Prevent duplicated particle.
-      if ( !isMiniAOD ) stableParticleOutputArray->Add(candidate);
+      if(!isMiniAOD) stableParticleOutputArray->Add(candidate);
     }
     else if(pdgCode <= 5 || pdgCode == 21 || pdgCode == 15)
@@ -218 +217 @@
     }
   }
-  if ( !isMiniAOD) return ;
+
+  if(!isMiniAOD) return;
   // For MiniAOD sample,
   // Only status==1 particles are saved to packedGenParticles.
@@ -378 +378 @@
       {
         ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
-            allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
         modularDelphes->ProcessTask();