Fork me on GitHub

Changeset 107 in svn


Ignore:
Timestamp:
Dec 22, 2008, 9:48:14 PM (16 years ago)
Author:
Xavier Rouby
Message:

modifications FROG lyon

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Delphes.cpp

    r100 r107  
    194194  Long64_t entry, allEntries = treeReader->GetEntries();
    195195  cout << "** Chain contains " << allEntries << " events" << endl;
    196   for(entry = 0; entry < allEntries; ++entry)
     196  for(entry = 0; entry < 200; ++entry)
    197197    {
    198198      TLorentzVector PTmis(0,0,0,0);
    … …  
    334334      for(unsigned int i=0; i < towers.size(); i++)
    335335        {
    336 Att.SetPxPyPzE(towers[i].fourVector.px, towers[i].fourVector.py, towers[i].fourVector.pz, towers[i].fourVector.E);
    337 if(fabs(Att.Eta())<DET->CEN_max_calo_fwd)
    338 {
    339           PTmis = PTmis + Att;
    340           // create a fastjet::PseudoJet with these components and put it onto
    341           // back of the input_particles vector
    342           input_particles.push_back(fastjet::PseudoJet(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E));
    343 }
     336          Att.SetPxPyPzE(towers[i].fourVector.px, towers[i].fourVector.py, towers[i].fourVector.pz, towers[i].fourVector.E);
     337          if(fabs(Att.Eta()) < DET->CEN_max_calo_fwd)
     338          {
     339            PTmis = PTmis + Att;
     340            // create a fastjet::PseudoJet with these components and put it onto
     341            // back of the input_particles vector
     342            input_particles.push_back(fastjet::PseudoJet(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E));
     343          }
    344344        }
    345345      elementEtmis = (TRootETmis*) branchETmis->NewEntry();

  • trunk/Utilities/FROG/Includes/FROG/FROG_Element_Event_Candidate.h

    r95 r107  
    6565                        glPushMatrix();
    6666                        glRotatef(57.29*Phi_                        ,0,0,1);
    67                         glRotatef(57.29*FROG_COORD::EtaToTheta(Eta_),0,1,0);           
     67                        glRotatef(57.29*FROG_COORD::EtaToTheta(Eta_),1,0,0);           
     68cout<<"eta "<<Eta_<<" et le theta "<<FROG_COORD::EtaToTheta(Eta_)<<" et ce qu'on utilise pour tourner "<<57.29*FROG_COORD::EtaToTheta(Eta_)<<endl;
    6869
    6970                        float dphi = 0.62832;

  • trunk/Utilities/FROG/Includes/FROG/FROG_Element_Event_Jet.h

    r95 r107  
    9393                        glPushMatrix();
    9494                        glRotatef(57.29*Phi_                        ,0,0,1);
    95                         glRotatef(57.29*FROG_COORD::EtaToTheta(Eta_),0,1,0);           
     95                        glRotatef(57.29*FROG_COORD::EtaToTheta(Eta_),1,0,0);           
     96cout<<"eta du jet "<<Eta_<<" theta du jet "<<FROG_COORD::EtaToTheta(Eta_)<<" et en degre "<<57.29*FROG_COORD::EtaToTheta(Eta_)<<endl;
    9697                        float dphi = 0.62832;
    9798                               

  • trunk/Utilities/FROG/config.txt

    r106 r107  
    44
    55GeomToDisplay = {910000000,920000000,930000000,940000000};
     6//GeomToDisplay = {910000000};
    67EventToDisplay = {21000000};
    78
    … …  
    6162//COLORS
    6263ZAxis_Color           = {0.14 , 0.026 , 0.026 , 1.0};    // ZAXIS (Z Opacity to 0, in order to switch it off)
    63 BackGround_Color      = {0.0 , 0.0 , 0.0 , 0.0};
     64BackGround_Color      = {1.0 , 1.0 , 1.0 , 1.0};
    6465
    6566Id_900000000_Color = {1.0 , 1.0 , 0.0 , 1.0};    // Detecteur
    … …  
    6768Id_920000000_Color = {0.0 , 0.3 , 0.3 , 1.0};    // Calo
    6869Id_930000000_Color = {0.0 , 0.0 , 0.3 , 1.0};    // FWCalo
    69 Id_940000000_Color = {0.25, 0.01 , 0.05 , 1.0};    // Muon
     70Id_940000000_Color = {0.25 , 0.01 , 0.05 , 1.0};    // FWCalo
    7071//Id_9000020_Color = {1.0 , 0.0 , 1.0 , 1.0};    // Tracker
    7172//Id_9000010_Color = {0.3 , 1.0 , 0.3 , 1.0};    // PIB
    … …  
    8081Id_21004000_Color       = {1.0 , 1.0 , 0.0 , 1.0};    // Photons
    8182Id_21005000_Color       = {0.0 , 1.0 , 1.0 , 1.0};    // Jets
    82 Id_21006000_Color       = {1.0 , 1.0 , 1.0 , 1.0};    // MET
     83Id_21006000_Color       = {1.0 , 0.0 , 1.0 , 1.0};    // MET
    8384
    8485

  • trunk/data/DataCardDet.dat

    r104 r107  
    4646
    4747# Thresholds for reconstructed objetcs
    48 PTCUT_elec       10.0
    49 PTCUT_muon       10.0
    50 PTCUT_jet        10.0
    51 PTCUT_gamma      10.0
    52 PTCUT_taujet     10.0
     48PTCUT_elec       0.0
     49PTCUT_muon       0.0
     50PTCUT_jet        0.0
     51PTCUT_gamma      0.0
     52PTCUT_taujet     0.0
    5353
    5454# General jet variable
    … …  
    8787
    8888# In case FROG event display allowed
    89 NEvents_Frog      2
     89NEvents_Frog      100
    9090

  • trunk/src/FrogUtil.cc

    r100 r107  
    434434      photon = (TRootPhoton*) branchPhoton->At(p);
    435435      cout<<"Photon nO"<<p<<" PT: "<<photon->PT<<"Eta "<<photon->Eta<<" Phi"<<photon->Phi<<endl;
    436       FROG_Element_Event_Candidate* frog_photon = new FROG_Element_Event_Candidate(15,photon->E,photon->Eta,photon->Phi);
     436      FROG_Element_Event_Candidate* frog_photon = new FROG_Element_Event_Candidate(22,photon->E,photon->Eta,photon->Phi);
    437437      frog_branchPhotons->addDaughter(frog_photon);
    438438    }
    439439   
    440440    //SIM JETS
    441     //Create a new sub-branch in the SIM branch with name Jets: this sub branch will contais all the Jets
     441
     442//Create a new sub-branch in the SIM branch with name Jets: this sub branch will contais all the Jets
    442443    FROG_Element_Base_With_DetId_And_Name* frog_branchJets = new FROG_Element_Base_With_DetId_And_Name(EVTID_SIM+5000,"Jets");
    443444    frog_branchSIM->addDaughter(frog_branchJets);
    … …  
    445446      jet = (TRootJet*) branchJet->At(p);
    446447      cout<<"Jet nO"<<p<<" PT: "<<jet->PT<<"Eta "<<jet->Eta<<" Phi"<<jet->Phi<<endl;
     448cout<<"eta du jet "<<jet->Eta<<" theta du jet "<<FROG_COORD::EtaToTheta(jet->Eta)<<" et en degre "<<57.29*FROG_COORD::EtaToTheta(jet->Eta)<<endl;
    447449      FROG_Element_Event_Jet* frog_jet = new FROG_Element_Event_Jet(jet->E,jet->Eta,jet->Phi);
    448450      frog_branchJets->addDaughter(frog_jet);
    … …  
    493495 
    494496  int plus=1;
    495   int NumPhi=4;
    496  
     497 
     498int NumPhi=20;
     499
     500
     501 
     502
     503 
    497504  //************************************************Tracker*************************************************
    498505  //********************************************************************************************************
Note: See TracChangeset for help on using the changeset viewer.