Fork me on GitHub

Changeset 254 in svn


Ignore:
Timestamp:
Feb 8, 2009, 2:33:33 PM (16 years ago)
Author:
severine ovyn
Message:

add shifts X,Y,angl

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/interface/SmearUtil.h

    r252 r254  
    8080  float  RP_offsetEl_s;
    8181  float  RP_offsetEl_x;
     82  float  RP_cross_x;
     83  float  RP_cross_y;
     84  float  RP_cross_ang;
    8285
    8386
  • trunk/src/SmearUtil.cc

    r252 r254  
    161161  RP_offsetEl_s     = 120;
    162162  RP_offsetEl_x     = 0.097;
     163  RP_cross_x        = -500;
     164  RP_cross_y        = 0.0;
     165  RP_cross_ang      = 142.5;
     166
    163167
    164168 
     
    248252  RP_offsetEl_s     = DET.RP_offsetEl_s;
    249253  RP_offsetEl_x     = DET.RP_offsetEl_x;
     254  RP_cross_x        = DET.RP_cross_x;
     255  RP_cross_y        = DET.RP_cross_y;
     256  RP_cross_ang      = DET.RP_cross_ang;
     257
    250258
    251259  // In case FROG event display allowed
     
    357365  RP_beam1Card      = DET.RP_beam1Card;
    358366  RP_beam2Card      = DET.RP_beam2Card;
     367  RP_cross_x        = DET.RP_cross_x;
     368  RP_cross_y        = DET.RP_cross_y;
     369  RP_cross_ang      = DET.RP_cross_ang;
     370
    359371
    360372
     
    421433    else if(strstr(temp_string.c_str(),"RP_420_s"))         {curstring >> varname >> value; RP_420_s          = value;}
    422434    else if(strstr(temp_string.c_str(),"RP_420_x"))         {curstring >> varname >> value; RP_420_x          = value;}
    423     //else if(strstr(temp_string.c_str(),"Beam1Card"))        {curstring >> varname >> svalue;Beam1Card         = svalue;}
    424     //else if(strstr(temp_string.c_str(),"Beam2Card"))        {curstring >> varname >> svalue;Beam2Card         = svalue;}
     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;}
    425437   
    426438    else if(strstr(temp_string.c_str(),"ELG_Scen"))         {curstring >> varname >> value; ELG_Scen          = value;}
     
    567579    f_out << left << setw(35) <<"* Datacard for beam 2: "<<""
    568580          << left << setw(25) <<RP_beam2Card            <<""<< right << setw(10)<<"*"<<"\n";
    569     f_out << left << setw(40) <<"* Beam separation, in meters:     "<<""
    570           << left << setw(10) << RP_offsetEl_x          <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
     581    f_out << left << setw(44) <<"* Beam separation, in meters:     "<<""
     582          << left << setw(6) << RP_offsetEl_x          <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
    571583    f_out << left << setw(44) <<"* Distance from IP for Beam separation (m):"<<""
    572584          << left << setw(6) <<RP_offsetEl_s           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
    573 
    574 
     585    f_out << left << setw(44) <<"* X offset of beam crossing in micrometers:"<<""
     586          << left << setw(6) <<RP_cross_x           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
     587    f_out << left << setw(44) <<"* Y offset of beam crossing in micrometers:"<<""
     588          << left << setw(6) <<RP_cross_y           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
     589    f_out << left << setw(44) <<"* Angle of  beam crossing:"<<""
     590          << left << setw(6) <<RP_cross_ang           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
    575591
    576592    f_out<<"*                                                                    *"<<"\n";
  • trunk/src/VeryForward.cc

    r252 r254  
    7777  beamline1->fill(DET->RP_beam1Card,1,"IP5");                               
    7878  beamline1->offsetElements(DET->RP_offsetEl_s,-DET->RP_offsetEl_x);
    79   H_RomanPot * rp220_1 = new H_RomanPot("rp220_1",DET->RP_220_s,DET->RP_220_x*1E6); // RP 220m, 2mm, beam 1 
    80   H_RomanPot * rp420_1 = new H_RomanPot("rp420_1",DET->RP_420_s,DET->RP_420_x*1E6); // RP 420m, 4mm, beam 1 
     79  H_RomanPot * rp220_1 = new H_RomanPot("rp220_1",DET->RP_220_s,DET->RP_220_x*(1E6)); // RP 220m, 2mm, beam 1 
     80  H_RomanPot * rp420_1 = new H_RomanPot("rp420_1",DET->RP_420_s,DET->RP_420_x*(1E6)); // RP 420m, 4mm, beam 1 
    8181  beamline1->add(rp220_1);
    8282  beamline1->add(rp420_1);
     
    8484  beamline2->fill(DET->RP_beam2Card,-1,"IP5");                             
    8585  beamline2->offsetElements(DET->RP_offsetEl_s,+DET->RP_offsetEl_x);
    86   H_RomanPot * rp220_2 = new H_RomanPot("rp220_2",DET->RP_220_s,DET->RP_220_x*1E6);// RP 220m, 2mm, beam 2     
    87   H_RomanPot * rp420_2 = new H_RomanPot("rp420_2",DET->RP_420_s,DET->RP_420_x*1E6);// RP 420m, 4mm, beam 2     
     86  H_RomanPot * rp220_2 = new H_RomanPot("rp220_2",DET->RP_220_s,DET->RP_220_x*(1E6));// RP 220m, 2mm, beam 2     
     87  H_RomanPot * rp420_2 = new H_RomanPot("rp420_2",DET->RP_420_s,DET->RP_420_x*(1E6));// RP 420m, 4mm, beam 2     
    8888  beamline2->add(rp220_2);
    8989  beamline2->add(rp420_2);
     
    141141      p1.smearAng();
    142142      p1.smearPos();
    143       p1.setPosition(p1.getX()-500.,p1.getY(),p1.getTX()-1*kickers_on*CRANG,p1.getTY(),0);
     143      p1.setPosition(p1.getX()+DET->RP_cross_x,p1.getY()+DET->RP_cross_y,p1.getTX()-1*kickers_on*DET->RP_cross_ang,p1.getTY(),0);
    144144      p1.set4Momentum(particle->Px,particle->Py,particle->Pz,particle->E);
    145145     
Note: See TracChangeset for help on using the changeset viewer.