Fork me on GitHub

Changeset 257 in svn for trunk


Ignore:
Timestamp:
Feb 8, 2009, 11:28:45 PM (15 years ago)
Author:
severine ovyn
Message:

small changes

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/DataCardDet.dat

    r252 r257  
    1111ELG_Scen          0.05              // S term for central ECAL
    1212ELG_Ncen          0.25              // N term for central ECAL
    13 ELG_Ccen          0.005              // C term for central ECAL
    14 ELG_Cfwd          0.107             // S term for forward ECAL
    15 ELG_Sfwd          2.084             // C term for forward ECAL
    16 ELG_Nfwd          0.0               // N term for central ECAL
     13ELG_Ccen          0.005             // C term for central ECAL
     14ELG_Sfwd          2.084             // S term for FCAL
     15ELG_Nfwd          0.0               // N term for FCAL
     16ELG_Cfwd          0.107             // C term for FCAL
    1717
    1818# Energy resolution for hadrons in ecal/hcal/hf
    1919# \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
    20 HAD_Shcal         1.5               // S term for central HCAL // hadronic calorimeter
     20HAD_Shcal         1.5               // S term for central HCAL
    2121HAD_Nhcal         0.                // N term for central HCAL
    2222HAD_Chcal         0.05              // C term for central HCAL
    23 HAD_Shf           2.7               // S term for HF // forward calorimeter
    24 HAD_Nhf           0.                // N term for HF
    25 HAD_Chf           0.13              // C term for HF
     23HAD_Shf           2.7               // S term for FCAL
     24HAD_Nhf           0.                // N term for FCAL
     25HAD_Chf           0.13              // C term for FCAL
    2626
    2727# Muon smearing
    … …  
    3939### the list ends with the higher edged of the most forward tower
    4040### there should be NTOWER+1 values
    41 #TOWER_dphi 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20
     41TOWER_dphi 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20
    4242### list of the tower size in phi (in degrees), assuming that all towers are similar in phi for a given eta value
    4343### the list starts with the phi-size of the most central tower (eta=0)
    … …  
    8888RP_420_s          420                   // distance of the RP to the IP, in meters
    8989RP_420_x          0.004                 // distance of the RP to the beam, in meters
    90 Beam1Card         data/LHCB1IR5_v6.500.tfs
    91 Beam2Card         data/LHCB2IR5_v6.500.tfs
     90RP_beam1Card      "data/LHCB1IR5_v6.500.tfs"
     91RP_beam2Card      "data/LHCB2IR5_v6.500.tfs"
     92RP_IP_name        "IP5"
     93
    9294
    9395# In case FROG event display allowed

  • trunk/data/DataCardDet_ATLAS.dat

    r256 r257  
    6161
    6262# Tagging definition
    63 BTAG_b           40             // b-tag efficiency (%)
     63BTAG_b           50             // b-tag efficiency (%)
    6464BTAG_mistag_c    10             // mistagging (%)
    6565BTAG_mistag_l    1              // mistagging (%)
    … …  
    8989RP_420_s          420                   // distance of the RP to the IP, in meters
    9090RP_420_x          0.004                 // distance of the RP to the beam, in meters
    91 RP_beam1Card         data/LHCB1IR1.tfs
    92 RP_beam2Card         data/LHCB2IR1.tfs
     91RP_beam1Card      "data/LHCB1IR1.tfs"
     92RP_beam2Card      "data/LHCB2IR1.tfs"
     93RP_IP_name        "IP1"
    9394
    9495# In case FROG event display allowed

  • trunk/data/DataCardDet_CMS.dat

    r255 r257  
    8888RP_420_s          420                   // distance of the RP to the IP, in meters
    8989RP_420_x          0.004                 // distance of the RP to the beam, in meters
    90 Beam1Card         data/LHCB1IR5_v6.500.tfs
    91 Beam2Card         data/LHCB2IR5_v6.500.tfs
     90RP_beam1Card      "data/LHCB1IR5_v6.500.tfs"
     91RP_beam2Card      "data/LHCB2IR5_v6.500.tfs"
     92RP_IP_name        "IP5"
     93
    9294
    9395# In case FROG event display allowed

  • trunk/interface/SmearUtil.h

    r254 r257  
    7878  string RP_beam1Card; //
    7979  string RP_beam2Card; //
     80  string RP_IP_name; //
    8081  float  RP_offsetEl_s;
    8182  float  RP_offsetEl_x;

  • trunk/src/SmearUtil.cc

    r254 r257  
    5151  ELG_Ncen          = 0.25;              // N term for central ECAL
    5252  ELG_Ccen          = 0.005;             // C term for central ECAL
    53   ELG_Cfwd          = 0.107;             // S term for forward ECAL
    54   ELG_Sfwd          = 2.084;             // C term for forward ECAL
    55   ELG_Nfwd          = 0.0;               // N term for central ECAL
     53  ELG_Sfwd          = 2.084;             // S term for FCAL
     54  ELG_Nfwd          = 0.0;               // N term for FCAL
     55  ELG_Cfwd          = 0.107;             // C term for FCAL
    5656
    5757  // Energy resolution for hadrons in ecal/hcal/hf
    5858  // \sigma/E = C + N/E + S/\sqrt{E}
    59   HAD_Shcal         = 1.5;               // S term for central HCAL // hadronic calorimeter
     59  HAD_Shcal         = 1.5;               // S term for central HCAL
    6060  HAD_Nhcal         = 0.;                // N term for central HCAL
    6161  HAD_Chcal         = 0.05;              // C term for central HCAL
    62   HAD_Shf           = 2.7;               // S term for HF // forward calorimeter
    63   HAD_Nhf           = 0.;                // N term for HF
    64   HAD_Chf           = 0.13;              // C term for HF
     62  HAD_Shf           = 2.7;               // S term for FCAL
     63  HAD_Nhf           = 0.;                // N term for FCAL
     64  HAD_Chf           = 0.13;              // C term for FCAL
    6565
    6666  // Muon smearing
    … …  
    127127  RP_420_s          = 420;                   // distance of the RP to the IP, in meters
    128128  RP_420_x          = 0.004;                 // distance of the RP to the beam, in meters
     129  RP_IP_name        = "IP5";
    129130  RP_beam1Card      = "data/LHCB1IR5_v6.500.tfs";
    130131  RP_beam2Card      = "data/LHCB1IR5_v6.500.tfs";
    … …  
    255256  RP_cross_y        = DET.RP_cross_y;
    256257  RP_cross_ang      = DET.RP_cross_ang;
     258  RP_IP_name        = DET.RP_IP_name;
    257259
    258260
    … …  
    368370  RP_cross_y        = DET.RP_cross_y;
    369371  RP_cross_ang      = DET.RP_cross_ang;
    370 
     372  RP_IP_name        = DET.RP_IP_name;
    371373
    372374
    … …  
    433435    else if(strstr(temp_string.c_str(),"RP_420_s"))         {curstring >> varname >> value; RP_420_s          = value;}
    434436    else if(strstr(temp_string.c_str(),"RP_420_x"))         {curstring >> varname >> value; RP_420_x          = value;}
    435     else if(strstr(temp_string.c_str(),"Beam1Card"))        {curstring >> varname >> svalue;RP_beam1Card         = svalue;}
    436     else if(strstr(temp_string.c_str(),"Beam2Card"))        {curstring >> varname >> svalue;RP_beam2Card         = svalue;}
     437    else if(strstr(temp_string.c_str(),"RP_beam1Card"))     {curstring >> varname >> svalue;RP_beam1Card      = svalue;}
     438    else if(strstr(temp_string.c_str(),"RP_beam2Card"))     {curstring >> varname >> svalue;RP_beam2Card      = svalue;}
     439    else if(strstr(temp_string.c_str(),"RP_IP_name"))       {curstring >> varname >> svalue;RP_IP_name        = svalue;}
    437440   
    438441    else if(strstr(temp_string.c_str(),"ELG_Scen"))         {curstring >> varname >> value; ELG_Scen          = value;}
    … …  
    575578    f_out << left << setw(55) <<"* Distance of the RP to the beam, in meters: "<<""
    576579          << left << setw(5) <<RP_420_x             <<""<< right << setw(10)<<"*"<<"\n";
     580    f_out << left << setw(55) <<"* Interaction point at the LHC named: "<<""
     581          << left << setw(5) <<RP_IP_name             <<""<< right << setw(10)<<"*"<<"\n";
    577582    f_out << left << setw(35) <<"* Datacard for beam 1: "<<""
    578583          << left << setw(25) <<RP_beam1Card            <<""<< right << setw(10)<<"*"<<"\n";
    … …  
    609614  f_out << left << setw(30) <<"* C term for central ECAL: "<<""
    610615        << left << setw(30) <<ELG_Ccen       <<""<< right << setw(10)<<"*"<<"\n";
    611   f_out << left << setw(30) <<"* S term for forward ECAL: "<<""
     616  f_out << left << setw(30) <<"* S term for FCAL: "<<""
    612617        << left << setw(30) <<ELG_Sfwd       <<""<< right << setw(10)<<"*"<<"\n";
    613   f_out << left << setw(30) <<"* N term for forward ECAL: "<<""
     618  f_out << left << setw(30) <<"* N term for FCAL: "<<""
    614619        << left << setw(30) <<ELG_Nfwd       <<""<< right << setw(10)<<"*"<<"\n";
    615   f_out << left << setw(30) <<"* C term for forward ECAL: "<<""
     620  f_out << left << setw(30) <<"* C term for FCAL: "<<""
    616621        << left << setw(30) <<ELG_Cfwd       <<""<< right << setw(10)<<"*"<<"\n";
    617622  f_out<<"*                                                                    *"<<"\n";
    … …  
    626631  f_out << left << setw(30) <<"* C term for central HCAL: "<<""
    627632        << left << setw(30) <<HAD_Chcal       <<""<< right << setw(10)<<"*"<<"\n";
    628   f_out << left << setw(30) <<"* S term for forward HCAL: "<<""
     633  f_out << left << setw(30) <<"* S term for FCAL: "<<""
    629634        << left << setw(30) <<HAD_Shf         <<""<< right << setw(10)<<"*"<<"\n";
    630   f_out << left << setw(30) <<"* N term for forward HCAL: "<<""
     635  f_out << left << setw(30) <<"* N term for FCAL: "<<""
    631636        << left << setw(30) <<HAD_Nhf         <<""<< right << setw(10)<<"*"<<"\n";
    632   f_out << left << setw(30) <<"* C term for forward HCAL: "<<""
     637  f_out << left << setw(30) <<"* C term for FCAL: "<<""
    633638        << left << setw(30) <<HAD_Chf         <<""<< right << setw(10)<<"*"<<"\n";
    634639  f_out<<"*                                                                    *"<<"\n";

  • trunk/src/VeryForward.cc

    r254 r257  
    7575  // user should provide : (1) optics file for each beamline, and IPname,
    7676  // and offset data (s,x) for optical elements
    77   beamline1->fill(DET->RP_beam1Card,1,"IP5");                               
     77  beamline1->fill(DET->RP_beam1Card,1,DET->RP_IP_name);                               
    7878  beamline1->offsetElements(DET->RP_offsetEl_s,-DET->RP_offsetEl_x);
    7979  H_RomanPot * rp220_1 = new H_RomanPot("rp220_1",DET->RP_220_s,DET->RP_220_x*(1E6)); // RP 220m, 2mm, beam 1 
    … …  
    8282  beamline1->add(rp420_1);
    8383 
    84   beamline2->fill(DET->RP_beam2Card,-1,"IP5");                             
     84  beamline2->fill(DET->RP_beam2Card,-1,DET->RP_IP_name);                             
    8585  beamline2->offsetElements(DET->RP_offsetEl_s,+DET->RP_offsetEl_x);
    8686  H_RomanPot * rp220_2 = new H_RomanPot("rp220_2",DET->RP_220_s,DET->RP_220_x*(1E6));// RP 220m, 2mm, beam 2     
Note: See TracChangeset for help on using the changeset viewer.