Changeset 6133 for trunk/MagicSoft


Ignore:
Timestamp:
01/30/05 17:40:56 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r6131 r6133  
    2222 2005/01/30 Markus Gaug
    2323 
     24   * mjobs/MJCalibration.cc
    2425   * mjobs/MJPedestal.cc
     26   * mjobs/calibrationref_Nov04.rc
    2527   * mhcalib/MHCalibrationRelTimeCam.[h,cc]
    2628     - updated correct display of reference lines
     29
    2730
    2831

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r6078 r6133  
    228228  fRefArrivalTimeRmsInner    = 0.5;           
    229229  fRefArrivalTimeRmsOuter    = 0.5;
     230  fRefTimeOffsetInner        = -0.23;   
     231  fRefTimeOffsetOuter        = 0.39;   
     232  fRefTimeResolutionInner    = 0.153;
     233  fRefTimeResolutionOuter    = 0.128;
    230234
    231235}
    … …  
    986990          // set reference lines
    987991          //
    988           //  DisplayReferenceLines(obj10,2);
     992          DisplayReferenceLines(obj10,5);
    989993     
    990994          c5.cd(3);
    … …  
    10181022          // set reference lines
    10191023          //
    1020           //          DisplayReferenceLines(obj11,0);
     1024          DisplayReferenceLines(obj11,6);
    10211025         
    10221026          c5.cd(4);
    … …  
    12351239  TLine *l1 = NULL;
    12361240
    1237   if (what == 0)
    1238     l1 = line.DrawLine(0, fRefQEInner, x, fRefQEInner);     
    1239   else if (what == 1)
    1240     l1 = line.DrawLine(0, fRefConvFADC2PhotInner, x, fRefConvFADC2PhotInner);     
    1241   else if (what == 2)
    1242     l1 = line.DrawLine(0, fRefConvFADC2PheInner, x, fRefConvFADC2PheInner );
    1243   else if (what == 3)
    1244     l1 = line.DrawLine(0, fRefArrivalTimeInner, x, fRefArrivalTimeInner );
    1245   else if (what == 4)
    1246     l1 = line.DrawLine(0, fRefArrivalTimeRmsInner, x, fRefArrivalTimeRmsInner );
    1247  
     1241  switch (what)
     1242    {
     1243    case 0:
     1244      l1 = line.DrawLine(0, fRefQEInner, x, fRefQEInner);     
     1245      break;
     1246    case  1:
     1247      l1 = line.DrawLine(0, fRefConvFADC2PhotInner, x, fRefConvFADC2PhotInner);     
     1248      break;
     1249    case  2:
     1250      l1 = line.DrawLine(0, fRefConvFADC2PheInner, x, fRefConvFADC2PheInner );
     1251      break;
     1252    case  3:
     1253      l1 = line.DrawLine(0, fRefArrivalTimeInner, x, fRefArrivalTimeInner );
     1254      break;
     1255    case  4:
     1256      l1 = line.DrawLine(0, fRefArrivalTimeRmsInner, x, fRefArrivalTimeRmsInner );
     1257      break;
     1258    case 5:
     1259      l1 = line.DrawLine(0, fRefTimeOffsetInner, x, fRefTimeOffsetInner );
     1260      break;
     1261    case 6:
     1262      l1 = line.DrawLine(0, fRefTimeResolutionInner, x, fRefTimeResolutionInner );
     1263      break;
     1264    default:
     1265      break;
     1266    }
     1267
    12481268  if (geom->InheritsFrom("MGeomCamMagic"))
    12491269    {
    … …  
    12671287          line.DrawLine(x2, fRefArrivalTimeRmsOuter, 398, fRefArrivalTimeRmsOuter);
    12681288          break;
     1289        case 5:
     1290          line.DrawLine(x2, fRefTimeOffsetOuter, 398, fRefTimeOffsetOuter);
     1291          break;
     1292        case 6:
     1293          line.DrawLine(x2, fRefTimeResolutionOuter, 398, fRefTimeResolutionOuter);
     1294          break;
     1295        default:
     1296          break;
    12691297        }
    12701298    }
    12711299 
    1272   TLegend *leg = new TLegend(what ? 0.2 : 0.6,0.75,what ? 0.5 : 0.9 ,0.85);
     1300  TLegend *leg = new TLegend(0.6,0.75,0.9 ,0.85);
    12731301  leg->SetBit(kCanDelete);
    12741302  leg->AddEntry(l1, "Reference","l");
    … …  
    14191447    fRefArrivalTimeRmsInner    = refenv.GetValue("RefArrivalTimeRmsInner",fRefArrivalTimeRmsInner);
    14201448    fRefArrivalTimeRmsOuter    = refenv.GetValue("RefArrivalTimeRmsOuter",fRefArrivalTimeRmsOuter);
     1449    fRefTimeOffsetInner        = refenv.GetValue("RefTimeOffsetInner",fRefTimeOffsetInner);
     1450    fRefTimeOffsetOuter        = refenv.GetValue("RefTimeOffsetOuter",fRefTimeOffsetOuter);
     1451    fRefTimeResolutionInner    = refenv.GetValue("RefTimeResolutionInner",fRefTimeResolutionInner);
     1452    fRefTimeResolutionOuter    = refenv.GetValue("RefTimeResolutionOuter",fRefTimeResolutionOuter);
    14211453                                 
    14221454    return kTRUE;               

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.h

    r6132 r6133  
    8686  Float_t  fRefArrivalTimeRmsOuter;        //! Reference value for the arrival time - outer
    8787  Float_t  fRefTimeOffsetInner;            //! Reference value for the time offset - inner
    88   Float_t  fRefTimeOffsetOuter;            //! Reference value for the time offset - outer
     88  Float_t  fRefTimeOffsetOuter;            //! Reference value for the time offset - outer
    8989  Float_t  fRefTimeResolutionInner;        //! Reference value for the time resolution - inner
    9090  Float_t  fRefTimeResolutionOuter;        //! Reference value for the time resolution - outer
Note: See TracChangeset for help on using the changeset viewer.