Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6132)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6133)
@@ -22,7 +22,10 @@
  2005/01/30 Markus Gaug 
  
+   * mjobs/MJCalibration.cc
    * mjobs/MJPedestal.cc
+   * mjobs/calibrationref_Nov04.rc
    * mhcalib/MHCalibrationRelTimeCam.[h,cc]
      - updated correct display of reference lines
+
 
 
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6132)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6133)
@@ -228,4 +228,8 @@
   fRefArrivalTimeRmsInner    = 0.5;            
   fRefArrivalTimeRmsOuter    = 0.5;
+  fRefTimeOffsetInner        = -0.23;    
+  fRefTimeOffsetOuter        = 0.39;    
+  fRefTimeResolutionInner    = 0.153;
+  fRefTimeResolutionOuter    = 0.128;
 
 }
@@ -986,5 +990,5 @@
           // set reference lines
           //
-          //  DisplayReferenceLines(obj10,2);
+          DisplayReferenceLines(obj10,5);
       
           c5.cd(3);
@@ -1018,5 +1022,5 @@
           // set reference lines
           //
-          //          DisplayReferenceLines(obj11,0);
+          DisplayReferenceLines(obj11,6);
           
           c5.cd(4);
@@ -1235,15 +1239,31 @@
   TLine *l1 = NULL;
 
-  if (what == 0)
-    l1 = line.DrawLine(0, fRefQEInner, x, fRefQEInner);      
-  else if (what == 1)
-    l1 = line.DrawLine(0, fRefConvFADC2PhotInner, x, fRefConvFADC2PhotInner);      
-  else if (what == 2)
-    l1 = line.DrawLine(0, fRefConvFADC2PheInner, x, fRefConvFADC2PheInner );
-  else if (what == 3)
-    l1 = line.DrawLine(0, fRefArrivalTimeInner, x, fRefArrivalTimeInner );
-  else if (what == 4)
-    l1 = line.DrawLine(0, fRefArrivalTimeRmsInner, x, fRefArrivalTimeRmsInner );
-  
+  switch (what)
+    {
+    case 0:
+      l1 = line.DrawLine(0, fRefQEInner, x, fRefQEInner);      
+      break;
+    case  1:
+      l1 = line.DrawLine(0, fRefConvFADC2PhotInner, x, fRefConvFADC2PhotInner);      
+      break;
+    case  2:
+      l1 = line.DrawLine(0, fRefConvFADC2PheInner, x, fRefConvFADC2PheInner );
+      break;
+    case  3:
+      l1 = line.DrawLine(0, fRefArrivalTimeInner, x, fRefArrivalTimeInner );
+      break;
+    case  4:
+      l1 = line.DrawLine(0, fRefArrivalTimeRmsInner, x, fRefArrivalTimeRmsInner );
+      break;
+    case 5:
+      l1 = line.DrawLine(0, fRefTimeOffsetInner, x, fRefTimeOffsetInner );
+      break;
+    case 6:
+      l1 = line.DrawLine(0, fRefTimeResolutionInner, x, fRefTimeResolutionInner );
+      break;
+    default:
+      break;
+    }
+
   if (geom->InheritsFrom("MGeomCamMagic"))
     {
@@ -1267,8 +1287,16 @@
           line.DrawLine(x2, fRefArrivalTimeRmsOuter, 398, fRefArrivalTimeRmsOuter);
           break;
+        case 5:
+          line.DrawLine(x2, fRefTimeOffsetOuter, 398, fRefTimeOffsetOuter);
+          break;
+        case 6:
+          line.DrawLine(x2, fRefTimeResolutionOuter, 398, fRefTimeResolutionOuter);
+          break;
+	default:
+	  break;
         }
     }
   
-  TLegend *leg = new TLegend(what ? 0.2 : 0.6,0.75,what ? 0.5 : 0.9 ,0.85);
+  TLegend *leg = new TLegend(0.6,0.75,0.9 ,0.85);
   leg->SetBit(kCanDelete);
   leg->AddEntry(l1, "Reference","l");
@@ -1419,4 +1447,8 @@
     fRefArrivalTimeRmsInner    = refenv.GetValue("RefArrivalTimeRmsInner",fRefArrivalTimeRmsInner);
     fRefArrivalTimeRmsOuter    = refenv.GetValue("RefArrivalTimeRmsOuter",fRefArrivalTimeRmsOuter);
+    fRefTimeOffsetInner        = refenv.GetValue("RefTimeOffsetInner",fRefTimeOffsetInner);
+    fRefTimeOffsetOuter        = refenv.GetValue("RefTimeOffsetOuter",fRefTimeOffsetOuter);
+    fRefTimeResolutionInner    = refenv.GetValue("RefTimeResolutionInner",fRefTimeResolutionInner);
+    fRefTimeResolutionOuter    = refenv.GetValue("RefTimeResolutionOuter",fRefTimeResolutionOuter);
 				 
     return kTRUE;		 
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.h
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.h	(revision 6132)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.h	(revision 6133)
@@ -86,5 +86,5 @@
   Float_t  fRefArrivalTimeRmsOuter;        //! Reference value for the arrival time - outer
   Float_t  fRefTimeOffsetInner;            //! Reference value for the time offset - inner
-  Float_t  fRefTimeOffsetOuter;    	   //! Reference value for the time offset - outer
+  Float_t  fRefTimeOffsetOuter;            //! Reference value for the time offset - outer
   Float_t  fRefTimeResolutionInner;  	   //! Reference value for the time resolution - inner
   Float_t  fRefTimeResolutionOuter;	   //! Reference value for the time resolution - outer