Changeset 384 in svn for trunk/src

Timestamp:

May 15, 2009, 7:28:55 PM (16 years ago)

Author:

Xavier Rouby

Message:

energy flow

Location:

trunk/src

Files:

• JetsUtil.cc (modified) (1 diff)
• SmearUtil.cc (modified) (2 diffs)

trunk/src/JetsUtil.cc

@@ -134 +134 @@
       // sort jets into increasing pt
       sorted_jets = sorted_by_pt(inclusive_jets);
-
       //Bin tracks to make the link 
       float  iEtaTrack[TrackCentral.size()];
       float  iPhiTrack[TrackCentral.size()];
       for(unsigned int t = 0; t < TrackCentral.size(); t++)
-         {
-           DET->BinEtaPhi(TrackCentral[t].PhiOuter,TrackCentral[t].EtaOuter,iPhiTrack[t],iEtaTrack[t]); 
-         }
+        {
+          if(!DET->JET_Eflow) 
+            DET->BinEtaPhi(TrackCentral[t].PhiOuter,TrackCentral[t].EtaOuter,iPhiTrack[t],iEtaTrack[t]); 
+          else {
+            iPhiTrack[t] = TrackCentral[t].PhiOuter;    iEtaTrack[t] = TrackCentral[t].EtaOuter; 
+          }
+        }
       int numTrackJet;
       for (unsigned int i = 0; i < sorted_jets.size(); i++) 

trunk/src/SmearUtil.cc

@@ -577 +577 @@
     else if(strstr(temp_string.c_str(),"JET_jetalgo"))      {curstring >> varname >> ivalue;JET_jetalgo       = ivalue;}
     else if(strstr(temp_string.c_str(),"JET_seed"))         {curstring >> varname >> value; JET_seed          = value;}
-    else if(strstr(temp_string.c_str(),"JET_Eflow"))        {curstring >> varname >> value; JET_Eflow         = value;}
+    else if(strstr(temp_string.c_str(),"JET_Eflow"))        {curstring >> varname >> ivalue; JET_Eflow        = ivalue;}
  
     else if(strstr(temp_string.c_str(),"BTAG_b"))           {curstring >> varname >> ivalue;BTAG_b            = ivalue;}
@@ -638 +638 @@
   f_out <<"**                 of a  generic collider experiment                **"<< endl;
   f_out <<"**                                                                  **"<< endl;
-  f_out <<"**                --- Version 1.4beta of Delphes ---                **"<< endl;
-  f_out <<"**               Last date of change: 9 February 2009               **"<< endl;
+  f_out <<"**                --- Version 1.6 of Delphes ---                    **"<< endl;
+  f_out <<"**               Last date of change: 7 May 2009                    **"<< endl;
   f_out <<"**                                                                  **"<< endl;
   f_out <<"**                                                                  **"<< endl;