Changeset 19776 for trunk/Mars

Timestamp:

10/15/19 15:52:10 (5 years ago)

Author:

tbretz

Message:

Improved some comments and removed some obsolete code lines.

Location:

trunk/Mars/hawc

Files:

• callisto.C (modified) (4 diffs)
• star.C (modified) (3 diffs)

trunk/Mars/hawc/callisto.C

@@ -6 +6 @@
 
  datafile:
-    A data file written by the fadctrl, e.g. 20170727_006.fits.fz
+    A data file written by the fadctrl, e.g.
+    20170727_006.fits.fz or
+    00000015.003_D_MonteCarlo019_Events.fits.fz
 
  drsfile:
@@ -27 +29 @@
  Mars/build where you have built your Mars environment) ou can do
 
-    root ../hawc/callisto.C\(\"filename.fits.fz\",\"filename.drs.fits\"\)
+    root ../hawc/callisto.C\(\"20191002_018.fits.fz\",\"20191002_013.drs.fits\"\)
 
  or from within root
 
-    [0] .x ../hawc/callisto.C("filename.fits.fz", "filename.drs.fits")
+    [0] .x ../hawc/callisto.C("20191002_018.fits.fz", "20191002_013.drs.fits")
 
 ******************************************************************/
@@ -48 +50 @@
     // false: Display pixels in hardware/linear indices,
     //        but the order is the camera display is distorted
-    bool usemap = true;//drstime ? true : false;
+    bool usemap = false;//drstime ? true : false;
 
     // mapping file (found in Mars/hawc)
@@ -62 +64 @@
     MBadPixelsCam badpixels;
     badpixels.InitSize(64);
-    //badpixels[40].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+    badpixels[61].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+    badpixels[62].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+    badpixels[63].SetUnsuitable(MBadPixelsPix::kUnsuitable);
 
     // Range in which the pulse extraction searches for the

trunk/Mars/hawc/star.C

@@ -6 +6 @@
 
  datafile:
-    A calibarted root file which came out of callist,
-    e.g. 20170727_006_C.root
+    A calibarted root file which came out of callist, e.g.
+    20170727_006_Y.root or
+    00000015.003_Y_MonteCarlo003_Events.root
 
  lvl1, lvl2:
@@ -19 +20 @@
  Mars/build where you have built your Mars environment) ou can do
 
-    root ../hawc/star.C\(\"filename_C.root\"\)
+    root ../hawc/star.C\(\"00000015.003_Y_MonteCarlo003_Events.root\"\)
 
  or from within root
 
-    [0] .x ../hawc/star.C("filename_C.root")
+    [0] .x ../hawc/star.C("00000015.003_Y_MonteCarlo003_Events.root")
 
 ******************************************************************/
@@ -58 +59 @@
     gLog << "Outpath:  " << outpath << endl;
 
-    TString fname = gSystem->ConcatFileName(outpath, gSystem->BaseName(datafile));
-    fname.ReplaceAll("_C_", "_I_");
-
-    gSystem->ExpandPathName(fname);
+    // TString fname = gSystem->ConcatFileName(outpath, gSystem->BaseName(datafile));
+    // fname.ReplaceAll("_C_", "_I_");
+    // gSystem->ExpandPathName(fname);
 
     gLog.Separator();