Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3332)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3334)
@@ -13,5 +13,8 @@
          MF filter1("{MMcEvt;1.fEvtNumber%2}<0.5");
          MF filter2("{MMcEvt;1.fEvtNumber%2}>0.5");
-
+     - cleaned up a bit the way the CT coordinates are fed to the task
+       MStereoCalc.
+     - Changed default FADC integration range (center range to adapt to 
+       new camera).
 
 
Index: trunk/MagicSoft/Mars/macros/starmcstereo.C
===================================================================
--- trunk/MagicSoft/Mars/macros/starmcstereo.C	(revision 3332)
+++ trunk/MagicSoft/Mars/macros/starmcstereo.C	(revision 3334)
@@ -33,8 +33,27 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void starmcstereo(Int_t ct1 = 2, Int_t ct2 = 3)
+//
+// User change. 
+//
+
+Float_t ctx[7] = {0., 0., 0., 0., 0., 0., 0.}; 
+Float_t cty[7] = {-70., -40., -30., 30., 50., 60., 70.}; // in meters
+//
+// FIXME: unfortunately present version of reflector was not prepared for
+// stereo configurations and keeps no track of CT position. So the positions
+// must be set above by the user, making sure that they correspond to the
+// files one is analysing.
+//
+
+void starmcstereo(Int_t ct1 = 1, Int_t ct2 = 2)
 {
-  Int_t CT[2] = {ct1, ct2};
-
+  if (ct1 > sizeof(ctx)/sizeof(ctx[0]) || 
+      ct2 > sizeof(ctx)/sizeof(ctx[0]) )
+    {
+      cout << endl << "Wrong CT id number!" << endl;
+      return;
+    }
+
+  Int_t CT[2] = {ct1, ct2};  // Only 2-telescope analysis for the moment
   Int_t NCTs = sizeof(CT)/sizeof(CT[0]);
 
@@ -47,6 +66,6 @@
   Float_t CleanLev[2] = {4., 3.}; // Tail cuts for image analysis
 
-  Int_t BinsHigh[2] = {0, 5}; // First and last FADC bin of the range to be integrated,
-  Int_t BinsLow[2]  = {0, 5}; // for high and low gain respectively.
+  Int_t BinsHigh[2] = {5, 9}; // First and last FADC bin of the range to be integrated,
+  Int_t BinsLow[2]  = {5, 9}; // for high and low gain respectively.
 
   // -------------------------------------------
@@ -204,44 +223,9 @@
   //
 
-  if (CT[0] == 1)
-    stereocalc.SetCT1coor(0.,0.);
-  else if (CT[0] == 2)
-    stereocalc.SetCT1coor(0.,0.);
-  else if (CT[0] == 3)
-    stereocalc.SetCT1coor(60.,60.);  // in meters
-  else if (CT[0] == 4)
-    stereocalc.SetCT1coor(60.,-60.);
-  else if (CT[0] == 5)
-    stereocalc.SetCT1coor(-60.,60.);
-  else if (CT[0] == 6)
-    stereocalc.SetCT1coor(-60.,-60.);
-  else
-    {
-      cout << "Unknown CT id!" << endl;
-      exit;
-    }
-
-  if (NCTs==2)
-    {
-      if (CT[1] == 1)
-	stereocalc.SetCT2coor(0.,0.);
-      else if (CT[1] == 2)
-	stereocalc.SetCT2coor(0.,0.);
-      else if (CT[1] == 3)
-	stereocalc.SetCT2coor(60.,60.);  // in meters
-      else if (CT[1] == 4)
-	stereocalc.SetCT2coor(60.,-60.);
-      else if (CT[1] == 5)
-	stereocalc.SetCT2coor(-60.,60.);
-      else if (CT[1] == 6)
-	stereocalc.SetCT2coor(-60.,-60.);
-      else
-	{
-	  cout << "Unknown CT id!" << endl;
-	  exit;
-	}
-
-      tlist.AddToList(&stereocalc);
-    }
+  stereocalc.SetCT1coor(ctx[CT[0]-1],cty[CT[0]-1]);
+  stereocalc.SetCT2coor(ctx[CT[1]-1],cty[CT[1]-1]);
+
+  tlist.AddToList(&stereocalc);
+
 
   MF filter1("{MMcEvt;1.fEvtNumber%2}<0.5");