Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2594)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2595)
@@ -4,4 +4,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/12/02: Abelardo Moralejo
+
+   * mimage/MStereoCalc.[h,cc]
+     - changed names of variables (removed underscores). Use new
+       function MTask::AddSerialNumber  (see below).
+
  2003/12/02: Thomas Bretz
  
@@ -20,5 +26,5 @@
 
    * mbase/MTask.h:
-     - added static member functions AddDerialNumber to simplify 
+     - added static member functions AddSerialNumber to simplify 
        using different Serial numbers.
 
Index: trunk/MagicSoft/Mars/mimage/MStereoCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MStereoCalc.cc	(revision 2594)
+++ trunk/MagicSoft/Mars/mimage/MStereoCalc.cc	(revision 2595)
@@ -75,22 +75,17 @@
 {
     // necessary
-    TString mcname = "MMcEvt;";
-    mcname += fCT1_id;
 
-    fmcevt1 = (MMcEvt*)pList->FindObject(mcname);
+    fmcevt1 = (MMcEvt*)pList->FindObject(AddSerialNumber("MMcEvt",fCT1id));
     if (!fmcevt1)
     {
-        *fLog << err << mcname << " not found... aborting." << endl;
+        *fLog << err << "MMcEvt;" << fCT1id << " not found... aborting." << endl;
         return kFALSE;
     }
 
     // necessary
-    mcname = "MMcEvt;";
-    mcname += fCT2_id;
-
-    fmcevt2 = (MMcEvt*)pList->FindObject(mcname);
+    fmcevt1 = (MMcEvt*)pList->FindObject(AddSerialNumber("MMcEvt",fCT2id));
     if (!fmcevt2)
     {
-        *fLog << err << mcname << " not found... aborting." << endl;
+      *fLog << err << "MMcEvt;" << fCT2id << " not found... aborting." << endl;
         return kFALSE;
     }
@@ -98,5 +93,5 @@
     // necessary
     TString geomname = "MGeomCam;";
-    geomname += fCT1_id;
+    geomname += fCT1id;
     fGeomCam1 = (MGeomCam*)pList->FindObject(geomname);
     if (!fGeomCam1)
@@ -108,5 +103,5 @@
     // necessary
     geomname = "MGeomCam;";
-    geomname += fCT2_id;
+    geomname += fCT2id;
     fGeomCam2 = (MGeomCam*)pList->FindObject(geomname);
     if (!fGeomCam2)
@@ -118,5 +113,5 @@
     // necessary
     TString hillasname = "MHillas;";
-    hillasname += fCT1_id;
+    hillasname += fCT1id;
     fHillas1 = (MHillas*)pList->FindObject(hillasname);
     if (!fHillas1)
@@ -128,5 +123,5 @@
     // necessary
     hillasname = "MHillas;";
-    hillasname += fCT2_id;
+    hillasname += fCT2id;
     fHillas2 = (MHillas*)pList->FindObject(hillasname);
     if (!fHillas2)
@@ -153,5 +148,5 @@
 Int_t MStereoCalc::Process()
 {
-    fStereoPar->Calc(*fHillas1, *fmcevt1, *fGeomCam1, fCT1_x, fCT1_y, *fHillas2, *fmcevt2, *fGeomCam2, fCT2_x, fCT2_y);
+    fStereoPar->Calc(*fHillas1, *fmcevt1, *fGeomCam1, fCT1x, fCT1y, *fHillas2, *fmcevt2, *fGeomCam2, fCT2x, fCT2y);
 
     return kTRUE;
Index: trunk/MagicSoft/Mars/mimage/MStereoCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MStereoCalc.h	(revision 2594)
+++ trunk/MagicSoft/Mars/mimage/MStereoCalc.h	(revision 2595)
@@ -32,11 +32,11 @@
     const MMcEvt      *fmcevt2;      //! input
 
-    Int_t fCT1_id;   //! 
-    Int_t fCT2_id;   //! Identifiers of the two analyzed telescopes.
+    Int_t fCT1id;   //! 
+    Int_t fCT2id;   //! Identifiers of the two analyzed telescopes.
 
-    Float_t fCT1_x;   //!
-    Float_t fCT1_y;   //! Position of first telescope
-    Float_t fCT2_x;   //!
-    Float_t fCT2_y;   //! Position of second telescope
+    Float_t fCT1x;   //!
+    Float_t fCT1y;   //! Position of first telescope
+    Float_t fCT2x;   //!
+    Float_t fCT2y;   //! Position of second telescope
 
     MStereoPar   *fStereoPar;     //! output container to store result
@@ -54,7 +54,7 @@
     void SetNameStereoPar(const char *name) { fStereoParName = name; }
 
-    void SetCTids(Int_t i, Int_t j) { fCT1_id = i; fCT2_id = j; }
-    void SetCT1coor(Float_t x, Float_t y) { fCT1_x = x; fCT1_y = y; } // in m
-    void SetCT2coor(Float_t x, Float_t y) { fCT2_x = x; fCT2_y = y; } // in m
+    void SetCTids(Int_t i, Int_t j) { fCT1id = i; fCT2id = j; }
+    void SetCT1coor(Float_t x, Float_t y) { fCT1x = x; fCT1y = y; } // in m
+    void SetCT2coor(Float_t x, Float_t y) { fCT2x = x; fCT2y = y; } // in m
 
     ClassDef(MStereoCalc, 0) // Task to calculate some shower parameters in stereo mode