Fork me on GitHub

Changeset 306 in svn for trunk


Ignore:
Timestamp:
Mar 9, 2009, 12:38:39 PM (16 years ago)
Author:
severine ovyn
Message:

OK flags very forward

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Delphes.cpp

    r305 r306  
    296296  ExRootTreeBranch *branchMuon = treeWriter->NewBranch("Muon", TRootMuon::Class());
    297297  ExRootTreeBranch *branchPhoton = treeWriter->NewBranch("Photon", TRootPhoton::Class());
    298   //ExRootTreeBranch *branchTracks = treeWriter->NewBranch("Tracks", TRootTracks::Class());
    299298  ExRootTreeBranch *branchTrack = treeWriter->NewBranch("Tracks", TRootTracks::Class());
    300299  ExRootTreeBranch *branchETmis = treeWriter->NewBranch("ETmis", TRootETmis::Class());
    … …  
    318317  vector<fastjet::PseudoJet> input_particles;//for FastJet algorithm
    319318  vector<fastjet::PseudoJet> sorted_jets;
    320   //vector<TLorentzVector> TrackCentral; 
    321319  vector<TRootTracks> TrackCentral; 
    322320  vector<PhysicsTower> towers;
    323   //vector<ParticleUtil> electron;
    324321  vector<D_Particle> electron;
    325   //vector<ParticleUtil> muon;
    326322  vector<D_Particle> muon;
    327   //vector<ParticleUtil> gamma;
    328323  vector<D_Particle> gamma;
    329324
    … …  
    509504            }
    510505            // 2.1a.2.5 : very forward detectors
    511             else if (DET->FLAG_vfd==1) {
    512                 // for the moment, only protons are transported
    513                 // BUT !!! could be a beam of other particles! (heavy ions?)
    514                 // BUT ALSO !!! if very forward muons, or others!
    515               VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
    516               VFD->ZDC(treeWriter,branchZDC,particle);
    517             }
    518             // 2.1a.2.6: Zero degree calorimeter
    519             //else if(DET->FLAG_zdc==1) {
    520               //VFD->ZDC(treeWriter,branchZDC,particle);
    521             //}
     506            else
     507              {
     508                if (DET->FLAG_RP==1) {
     509                   // for the moment, only protons are transported
     510                   // BUT !!! could be a beam of other particles! (heavy ions?)
     511                   // BUT ALSO !!! if very forward muons, or others!
     512                   VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
     513                }
     514                // 2.1a.2.6: Zero degree calorimeter
     515                if(DET->FLAG_vfd==1) {
     516                   VFD->ZDC(treeWriter,branchZDC,particle);
     517                }
     518              }
    522519
    523520          } // 2.1a.2 : if visible particle
    … …  
    579576        elementElec->PhiCalo = electron[i].PhiCalo();
    580577        elementElec->Charge = sign(electron[i].PID());
    581         //elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,2.0,0.5);//isolation based on tracks
    582578        elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone);//isolation based on tracks
    583579      }                                                                                 /////////////// HARDCODING
    … …  
    589585        elementMu->EtaCalo = muon[i].EtaCalo();
    590586        elementMu->PhiCalo = muon[i].PhiCalo();
    591         //elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,2.0,0.5); /////////////// HARDCODING
    592587        elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone); /////////////// HARDCODING
    593588      }

  • trunk/data/DetectorCard.dat

    r305 r306  
    7171FLAG_bfield      1                       //1 to run the bfield propagation else 0
    7272FLAG_vfd         1                       //1 to run the very forward detectors else 0
     73FLAG_RP          1                       //1 to run the very forward detectors else 0
    7374FLAG_trigger     1                       //1 to run the trigger selection else 0
    7475FLAG_frog        1                       //1 to run the FROG event display

  • trunk/data/DetectorCard_ATLAS.dat

    r305 r306  
    7171FLAG_bfield      1                       // 1 to run the bfield propagation else 0
    7272FLAG_vfd         1                       // 1 to run the very forward detectors else 0
     73FLAG_RP          1                       // 1 to run the very forward detectors else 0
    7374FLAG_trigger     1                       // 1 to run the trigger selection else 0
    7475FLAG_frog        1                       // 1 to run the FROG event display

  • trunk/data/DetectorCard_CMS.dat

    r305 r306  
    7171FLAG_bfield      1                       //1 to run the bfield propagation else 0
    7272FLAG_vfd         1                       //1 to run the very forward detectors else 0
     73FLAG_RP          1                       //1 to run the very forward detectors else 0
    7374FLAG_trigger     1                       //1 to run the trigger selection else 0
    7475FLAG_frog        1                       //1 to run the FROG event display

  • trunk/interface/SmearUtil.h

    r305 r306  
    192192 int FLAG_bfield;               //flag for bfield propagation
    193193 int FLAG_vfd;                  //flag for very forward detector
    194  int FLAG_zdc;                  //flag for very forward detector
     194 int FLAG_RP;                  //flag for very forward detector
    195195 
    196196 int NEvents_Frog;

  • trunk/src/SmearUtil.cc

    r305 r306  
    119119  FLAG_bfield      = 1;                       //1 to run the bfield propagation else 0
    120120  FLAG_vfd         = 1;                       //1 to run the very forward detectors else 0
    121   FLAG_zdc         = 1;                       //1 to run the zero degree calorimeter else 0
     121  FLAG_RP         = 1;                       //1 to run the zero degree calorimeter else 0
    122122  FLAG_trigger     = 1;                       //1 to run the trigger selection else 0
    123123  FLAG_frog        = 1;                       //1 to run the FROG event display
    … …  
    244244  FLAG_bfield      = DET.FLAG_bfield;
    245245  FLAG_vfd         = DET.FLAG_vfd;
    246   FLAG_zdc         = DET.FLAG_zdc;
     246  FLAG_RP          = DET.FLAG_RP;
    247247  FLAG_trigger     = DET.FLAG_trigger;
    248248  FLAG_frog        = DET.FLAG_frog;
    … …  
    362362  FLAG_bfield      = DET.FLAG_bfield;
    363363  FLAG_vfd         = DET.FLAG_vfd;
    364   FLAG_zdc         = DET.FLAG_zdc;
     364  FLAG_RP          = DET.FLAG_RP;
    365365  FLAG_trigger     = DET.FLAG_trigger;
    366366  FLAG_frog        = DET.FLAG_frog;
    … …  
    507507
    508508    else if(strstr(temp_string.c_str(),"FLAG_vfd"))         {curstring >> varname >> ivalue; FLAG_vfd         = ivalue;}
    509     else if(strstr(temp_string.c_str(),"FLAG_zdc"))         {curstring >> varname >> ivalue; FLAG_zdc         = ivalue;}
     509    else if(strstr(temp_string.c_str(),"FLAG_RP"))          {curstring >> varname >> ivalue; FLAG_RP         = ivalue;}
    510510    else if(strstr(temp_string.c_str(),"FLAG_trigger"))     {curstring >> varname >> ivalue; FLAG_trigger     = ivalue;}
    511511    else if(strstr(temp_string.c_str(),"FLAG_frog"))        {curstring >> varname >> ivalue; FLAG_frog        = ivalue;}
    … …  
    606606        << left << setw(10) <<CEN_max_mu        <<""<< right << setw(15)<<"*"<<"\n";
    607607  f_out<<"*                                                                    *"<<"\n";
    608   if(FLAG_vfd==1){
    609     f_out<<"#**********************************                                  *"<<"\n";
    610     f_out<<"# Very forward detector switched on                                  *"<<"\n";
    611     f_out<<"#**********************************                                  *"<<"\n";
     608  if(FLAG_RP==1){
     609    f_out<<"#************************************                                *"<<"\n";
     610    f_out<<"# Very forward Roman Pots switched on                                *"<<"\n";
     611    f_out<<"#************************************                                *"<<"\n";
    612612    f_out<<"*                                                                    *"<<"\n";
    613     f_out << left << setw(55) <<"* Minimum very forward calorimeter:          "<<""
    614           << left << setw(5) <<VFD_min_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
    615     f_out << left << setw(55) <<"* Maximum very forward calorimeter:          "<<""
    616           << left << setw(5) <<VFD_max_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
    617     f_out << left << setw(55) <<"* Minimum coverage zero_degree calorimeter "<<""
    618           << left << setw(5) <<VFD_min_zdc          <<""<< right << setw(10)<<"*"<<"\n";
    619     f_out << left << setw(55) <<"* Distance of the ZDC to the IP, in meters:  "<<""
    620           << left << setw(5) <<VFD_s_zdc            <<""<< right << setw(10)<<"*"<<"\n";
    621     f_out << left << setw(55) <<"* Distance of the RP to the IP, in meters:   "<<""
     613    f_out << left << setw(55) <<"* Distance of the 220 RP to the IP in meters:"<<""
    622614          << left << setw(5) <<RP_220_s             <<""<< right << setw(10)<<"*"<<"\n";
    623     f_out << left << setw(55) <<"* Distance of the RP to the beam, in meters: "<<""
     615    f_out << left << setw(55) <<"* Distance of the 220 RP to the beam in meters:"<<""
    624616          << left << setw(5) <<RP_220_x             <<""<< right << setw(10)<<"*"<<"\n";
    625     f_out << left << setw(55) <<"* Distance of the RP to the IP, in meters:   "<<""
     617    f_out << left << setw(55) <<"* Distance of the 420 RP to the IP in meters:"<<""
    626618          << left << setw(5) <<RP_420_s             <<""<< right << setw(10)<<"*"<<"\n";
    627     f_out << left << setw(55) <<"* Distance of the RP to the beam, in meters: "<<""
     619    f_out << left << setw(55) <<"* Distance of the 420 RP to the beam in meters:"<<""
    628620          << left << setw(5) <<RP_420_x             <<""<< right << setw(10)<<"*"<<"\n";
    629621    f_out << left << setw(55) <<"* Interaction point at the LHC named: "<<""
    … …  
    646638  }
    647639  else {
    648     f_out<<"#***********************************                                 *"<<"\n";
    649     f_out<<"# Very forward detector switched off                                 *"<<"\n";
    650     f_out<<"#***********************************                                 *"<<"\n";
     640    f_out<<"#*************************************                               *"<<"\n";
     641    f_out<<"# Very forward Roman Pots switched off                               *"<<"\n";
     642    f_out<<"#*************************************                               *"<<"\n";
    651643    f_out<<"*                                                                    *"<<"\n";
    652644  }
     645  if(FLAG_vfd==1){
     646    f_out<<"#**************************************                              *"<<"\n";
     647    f_out<<"# Very forward calorimeters switched on                              *"<<"\n";
     648    f_out<<"#**************************************                              *"<<"\n";
     649    f_out<<"*                                                                    *"<<"\n";
     650    f_out << left << setw(55) <<"* Minimum very forward calorimeter:          "<<""
     651          << left << setw(5) <<VFD_min_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
     652    f_out << left << setw(55) <<"* Maximum very forward calorimeter:          "<<""
     653          << left << setw(5) <<VFD_max_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
     654    f_out << left << setw(55) <<"* Minimum coverage zero_degree calorimeter "<<""
     655          << left << setw(5) <<VFD_min_zdc          <<""<< right << setw(10)<<"*"<<"\n";
     656    f_out << left << setw(55) <<"* Distance of the ZDC to the IP, in meters:  "<<""
     657          << left << setw(5) <<VFD_s_zdc            <<""<< right << setw(10)<<"*"<<"\n";
     658    f_out<<"*                                                                    *"<<"\n";
     659  }
     660  else {
     661    f_out<<"#***************************************                             *"<<"\n";
     662    f_out<<"# Very forward calorimeters switched off                             *"<<"\n";
     663    f_out<<"#***************************************                             *"<<"\n";
     664    f_out<<"*                                                                    *"<<"\n";
     665  }
     666
    653667  f_out<<"#************************************                                *"<<"\n";
    654668  f_out<<"# Electromagnetic smearing parameters                                *"<<"\n";
Note: See TracChangeset for help on using the changeset viewer.