Changeset 100 in svn for trunk/Delphes.cpp

Timestamp:

Dec 18, 2008, 2:39:26 PM (16 years ago)

Author:

severine ovyn

Message:

Remove datacard bug + CaloTowers OK

File:

• trunk/Delphes.cpp (modified) (5 diffs)

trunk/Delphes.cpp

@@ -105 +105 @@
   
   //Propagation of tracks in the B field
-  TrackPropagation *TRACP = new TrackPropagation(); 
+  TrackPropagation *TRACP = new TrackPropagation(DetDatacard); 
   
   //Jet information
-  JetsUtil *JETRUN = new JetsUtil();
+  JetsUtil *JETRUN = new JetsUtil(DetDatacard);
   
   //VFD information
-  VeryForward * VFD = new VeryForward();
+  VeryForward * VFD = new VeryForward(DetDatacard);
   
   //todo(LogName.c_str());
@@ -189 +189 @@
   
   
-  
+  float iPhi=0,iEta=0;
+
   // Loop over all events
   Long64_t entry, allEntries = treeReader->GetEntries();
@@ -266 +267 @@
               
               // all final particles but muons and neutrinos    
-              // for calorimetric towers and mission PT
+              // for calorimetric towers and missing PT
               int charge=Charge(pid); 
               if(genMomentum.E() !=0 && pid != pMU) {
                 if(charge == 0 || (charge !=0 && genMomentum.Pt() >= DET->TRACK_ptmin)){
-                  PhysicsTower CaloTower = PhysicsTower(LorentzVector(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E()));
-                  towers.push_back(CaloTower);
-                  // create a fastjet::PseudoJet with these components and put it onto
-                  // back of the input_particles vector
-                  input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())); 
-                  
-                  genMomentumCalo.SetPxPyPzE(CaloTower.fourVector.px,CaloTower.fourVector.py,CaloTower.fourVector.pz,CaloTower.fourVector.E);
-                  
-                  elementCalo = (TRootCalo*) branchCalo->NewEntry();
-                  elementCalo->Set(genMomentumCalo);
-                  DET->BinEtaPhi(genMomentumCalo.Phi(), genMomentumCalo.Eta(), elementCalo->Phi, elementCalo->Eta);
+                  DET->BinEtaPhi(genMomentum.Phi(), genMomentum.Eta(), iPhi, iEta);
+                  if(iEta != -100 && iPhi != -100) 
+                    {
+                      genMomentumCalo.SetPtEtaPhiE(genMomentum.Pt(),iEta,iPhi,genMomentum.E());
+                      elementCalo = (TRootCalo*) branchCalo->NewEntry();
+                      elementCalo->Set(genMomentumCalo);
+
+//                    CalTower     myCaloTower(genMomentumCalo.Et,genMomentumCalo.Eta,genMomentumCalo.Phi,iEta,iPhi);
+//                    PhysicsTower Tower(LorentzVector(genMomentumCalo.Px(),genMomentumCalo.Py(),genMomentumCalo.Pz(), genMomentumCalo.E()),myCaloTower);
+                      PhysicsTower Tower(LorentzVector(genMomentumCalo.Px(),genMomentumCalo.Py(),genMomentumCalo.Pz(), genMomentumCalo.E()));
+                      towers.push_back(Tower);
+                    }
                 }
               }
@@ -302 +304 @@
           if(DET->FLAG_vfd==1)
             {  
-              VFD->ZDC(treeWriter,branchZDC,particle);
-              VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
+             VFD->ZDC(treeWriter,branchZDC,particle);
+             VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
             }
           
@@ -332 +334 @@
       for(unsigned int i=0; i < towers.size(); i++)
         {
-          Att.SetPxPyPzE(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E);
+Att.SetPxPyPzE(towers[i].fourVector.px, towers[i].fourVector.py, towers[i].fourVector.pz, towers[i].fourVector.E);
+if(fabs(Att.Eta())<DET->CEN_max_calo_fwd)
+{
           PTmis = PTmis + Att;
+          // create a fastjet::PseudoJet with these components and put it onto
+          // back of the input_particles vector
+          input_particles.push_back(fastjet::PseudoJet(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E));
+}
         }
       elementEtmis = (TRootETmis*) branchETmis->NewEntry();