Index: /branches/Mars_McMismatchStudy/fact/analysis/callisto_data_and_mc.C
===================================================================
--- /branches/Mars_McMismatchStudy/fact/analysis/callisto_data_and_mc.C	(revision 17966)
+++ /branches/Mars_McMismatchStudy/fact/analysis/callisto_data_and_mc.C	(revision 17967)
@@ -631,18 +631,14 @@
         bool use_delays=false)
 {
-    // ======================================================
-
-    // true:  Display correctly mapped pixels in the camera displays
-    //        but the value-vs-index plot is in software/spiral indices
-    // false: Display pixels in hardware/linear indices,
-    //        but the order is the camera display is distorted
-    bool usemap = true;
-
-    //const char *map = usemap ? "/scratch/fact/FACTmap111030.txt" : NULL;
+    // ------------------------------------------------------
+    gLog.Separator("Callisto");
+    gLog << all << "Calibrate data of sequence '" << seq.GetFileName() << "'" << endl;
+    gLog << endl;
+    // ------------------------------------------------------
+    
     const char *map = "fact/resources/FACTmap111030.txt";
+    MStatusDisplay *d = new MStatusDisplay;
 
     // ------------------------------------------------------
-
-    MStatusDisplay *d = new MStatusDisplay;
 
     MBadPixelsCam badpixels;
@@ -654,13 +650,6 @@
     badpixels[1208].SetUnsuitable(MBadPixelsPix::kUnsuitable);
     badpixels[1399].SetUnsuitable(MBadPixelsPix::kUnsuitable);
-    //  Twin pixel
-    //     113
-    //     115
-    //     354
-    //     423
-    //    1195
-    //    1393
-
-    // ------------------------------------------------------
+    //  Twin pixel; 113+115, 354+423, 1195 + 1393
+
     // ------------------------------------------------------
 
@@ -668,6 +657,4 @@
     // Data:  52 / 64 / 104 (20% TH)
 
-    // Extraction range in slices. It will always(!) contain the full range
-    // of integration
     const int first_slice =  25; //  10ns
     const int last_slice  = 225; // 125ns
@@ -675,7 +662,4 @@
     Long_t max  =    5; // Number of events to be processed
 
-    // ========================= Result ==================================
-
-    //double scale = 0.1;
     double scale = 0.1024;
 
@@ -696,18 +680,10 @@
     }
 
-    // --------------------------------------------------------------------------------
-
-    gLog.Separator("Callisto");
-    gLog << all << "Calibrate data of sequence '" << seq.GetFileName() << "'" << endl;
-    gLog << endl;
-
-    // ------------------------------------------------------
-
-    ostringstream drsname;
-    drsname << gSystem->DirName(seqfile) << "/";
-    drsname << seq.GetNight().GetNightAsInt() << "_";
-    drsname << Form("%03d", seq.GetDrsSequence()) << ".drs.seq";
-
-    MSequence drs(drsname.str().c_str());
+    ostringstream drs_seq_file_path;
+    drs_seq_file_path << gSystem->DirName(seqfile) << "/";
+    drs_seq_file_path << seq.GetNight().GetNightAsInt() << "_";
+    drs_seq_file_path << Form("%03d", seq.GetDrsSequence()) << ".drs.seq";
+
+    MSequence drs(drs_seq_file_path.str().c_str());
     if (!drs.IsValid())
     {
@@ -716,5 +692,5 @@
     }
 
-    gLog << all << "DRS sequence file: " << drsname.str() << '\n' << endl;
+    gLog << all << "DRS sequence file: " << drs_seq_file_path.str() << '\n' << endl;
 
     TString drsfile = seq.GetFileName(0, MSequence::kRawDrs);