Changeset 254 in svn for trunk/src/SmearUtil.cc

Timestamp:

Feb 8, 2009, 2:33:33 PM (15 years ago)

Author:

severine ovyn

Message:

add shifts X,Y,angl

File:

• trunk/src/SmearUtil.cc (modified) (5 diffs)

trunk/src/SmearUtil.cc

@@ -161 +161 @@
   RP_offsetEl_s     = 120;
   RP_offsetEl_x     = 0.097;
+  RP_cross_x        = -500;
+  RP_cross_y        = 0.0;
+  RP_cross_ang      = 142.5;
+
 
   
@@ -248 +252 @@
   RP_offsetEl_s     = DET.RP_offsetEl_s;
   RP_offsetEl_x     = DET.RP_offsetEl_x;
+  RP_cross_x        = DET.RP_cross_x;
+  RP_cross_y        = DET.RP_cross_y;
+  RP_cross_ang      = DET.RP_cross_ang;
+
 
   // In case FROG event display allowed
@@ -357 +365 @@
   RP_beam1Card      = DET.RP_beam1Card;
   RP_beam2Card      = DET.RP_beam2Card;
+  RP_cross_x        = DET.RP_cross_x;
+  RP_cross_y        = DET.RP_cross_y;
+  RP_cross_ang      = DET.RP_cross_ang;
+
 
 
@@ -421 +433 @@
     else if(strstr(temp_string.c_str(),"RP_420_s"))         {curstring >> varname >> value; RP_420_s          = value;}
     else if(strstr(temp_string.c_str(),"RP_420_x"))         {curstring >> varname >> value; RP_420_x          = value;}
-    //else if(strstr(temp_string.c_str(),"Beam1Card"))        {curstring >> varname >> svalue;Beam1Card         = svalue;}
-    //else if(strstr(temp_string.c_str(),"Beam2Card"))        {curstring >> varname >> svalue;Beam2Card         = svalue;}
+    else if(strstr(temp_string.c_str(),"Beam1Card"))        {curstring >> varname >> svalue;RP_beam1Card         = svalue;}
+    else if(strstr(temp_string.c_str(),"Beam2Card"))        {curstring >> varname >> svalue;RP_beam2Card         = svalue;}
     
     else if(strstr(temp_string.c_str(),"ELG_Scen"))         {curstring >> varname >> value; ELG_Scen          = value;}
@@ -567 +579 @@
     f_out << left << setw(35) <<"* Datacard for beam 2: "<<""
           << left << setw(25) <<RP_beam2Card            <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(40) <<"* Beam separation, in meters:     "<<""
-          << left << setw(10) << RP_offsetEl_x          <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
+    f_out << left << setw(44) <<"* Beam separation, in meters:     "<<""
+          << left << setw(6) << RP_offsetEl_x          <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
     f_out << left << setw(44) <<"* Distance from IP for Beam separation (m):"<<""
           << left << setw(6) <<RP_offsetEl_s           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
-
-
+    f_out << left << setw(44) <<"* X offset of beam crossing in micrometers:"<<""
+          << left << setw(6) <<RP_cross_x           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
+    f_out << left << setw(44) <<"* Y offset of beam crossing in micrometers:"<<""
+          << left << setw(6) <<RP_cross_y           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
+    f_out << left << setw(44) <<"* Angle of  beam crossing:"<<""
+          << left << setw(6) <<RP_cross_ang           <<""<< right << setw(20)<<"! not in datacard  *"<<"\n";
 
     f_out<<"*                                                                    *"<<"\n";