Changeset 12669

Timestamp:

11/29/11 16:13:21 (13 years ago)

Author:

lyard

Message:

viewer improvements

File:

• trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (8 diffs)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -281 +281 @@
         }
 #endif
-        if (color < 0)
+        if (color < ss[0])
         {
             pixelsColor[i][0] = tooLowValueCoulour[0];
@@ -288 +288 @@
             continue;
         }
-        if (color > 1)
+        if (color > ss[4])
         {
             pixelsColor[i][0] = tooHighValueCoulour[0];
@@ -523 +523 @@
 
     assignPixelMap(mypMap);
-    buildVerticesList();
-//    for (int i=0;i<1440;i++)
-//        updateNeighbors(i);
 
     for (int i=0;i<160;i++)
@@ -719 +716 @@
         try {
         if (!inputFile->HasKey(*it)){
-            cout << *it << " missing. Aborting load..." << endl;
+            cout << "Warning: header keyword " << *it << " missing." << endl;
             return;}
         }
@@ -728 +725 @@
         }
     }
-    nRows = inputFile->GetInt("NAXIS2");
-    nRoi = inputFile->GetInt("NROI");
-    runNumber = inputFile->GetInt("RUNID");
-    nTM = inputFile->HasKey("NTMARK") ? inputFile->GetInt("NTMARK") : 0;
-    runType = inputFile->HasKey("RUNTYPE") ? inputFile->GetInt("RUNTYPE") : -1;
-    firstDataTime = inputFile->GetInt("TSTART");
-    lastDataTime = inputFile->GetInt("TSTOP");
-    nRoiTM = inputFile->GetInt("NROITM");
-    revision = inputFile->GetInt("REVISION");
+    nRows =          inputFile->HasKey("NAXIS2") ? inputFile->GetInt("NAXIS2") : 0;
+    nRoi =           inputFile->HasKey("NROI") ?  inputFile->GetInt("NROI") : 0;
+    runNumber =      inputFile->HasKey("RUNID") ?  inputFile->GetInt("RUNID") : -1;
+    nTM =            inputFile->HasKey("NTMARK") ? inputFile->GetInt("NTMARK") : 0;
+    runType =        inputFile->HasKey("RUNTYPE") ? inputFile->GetInt("RUNTYPE") : -1;
+    firstDataTime =  inputFile->HasKey("TSTART") ? inputFile->GetInt("TSTART") : -1;
+    lastDataTime =   inputFile->HasKey("TSTOP") ? inputFile->GetInt("TSTOP"): -1;
+    nRoiTM =         inputFile->HasKey("NROITM") ? inputFile->GetInt("NROITM") : 0;
+    revision =       inputFile->HasKey("REVISION") ? inputFile->GetInt("REVISION") : -1;
     builderVersion = inputFile->HasKey("BLDVER") ? inputFile->GetInt("BLDVER") : -1;
-    nBoards = inputFile->GetInt("NBOARD");
-    nPixels = inputFile->GetInt("NPIX");
-    timeSystem = inputFile->GetStr("TIMESYS");
-    creationDate = inputFile->GetStr("DATE");
-    nightInt = inputFile->GetInt("NIGHT");
-    camera = inputFile->GetStr("CAMERA");
-    daq = inputFile->GetStr("DAQ");
-    adcCount = inputFile->HasKey("ADCRANGE") ? inputFile->GetFloat("ADCRANGE") : 2000;
+    nBoards =        inputFile->HasKey("NBOARD") ? inputFile->GetInt("NBOARD") : 0;
+    nPixels =        inputFile->HasKey("NPIX") ?  inputFile->GetInt("NPIX") : 0;
+    timeSystem =     inputFile->HasKey("TIMESYS") ? inputFile->GetStr("TIMESYS") : 0;
+    creationDate =   inputFile->HasKey("DATE") ? inputFile->GetStr("DATE") : 0;
+    nightInt =       inputFile->HasKey("NIGHT") ? inputFile->GetInt("NIGHT") : 0;
+    camera =         inputFile->HasKey("CAMERA") ? inputFile->GetStr("CAMERA") : 0;
+    daq =            inputFile->HasKey("DAQ") ? inputFile->GetStr("DAQ") : 0;
+    adcCount =       inputFile->HasKey("ADCRANGE") ? inputFile->GetFloat("ADCRANGE") : 2000;
 
     if (inputFile->HasKey("OFFSET"))
@@ -1159 +1156 @@
         fDrsCalib.Apply(eventData, rawEventData, startPix, nRoi);
         DrsCalibrate::RemoveSpikes(eventData, nRoi);
+        for (int i=0;i<1024;i++)
+            eventData[i] = eventData[i+1024];
         //TODO apply calibration to the Time markers
     }
@@ -2213 +2212 @@
         return;
 
-//int currentPixel = pixel;
-int currentPixel = 0;
+int currentPixel = pixel;
+//IN ORDER TO GET THE AVERAGE OF ALL PIXELS DISPLAYED IN THE CURVE OF THE VIEWER
+//UNCOMMENT THE 9 LINES BELOW, i.e. UNTIL THE END OF AVERAGE DISPLAY COMMENT MARK
+//int currentPixel = 0;
+//    for (int i=0;i<GLWindow->nRoi;i++)
+//        yval[i] = 0;
+//    for (int j=0;j<1440;j++) {
+//        currentPixel = j;
     for (int i=0;i<GLWindow->nRoi;i++)
-        yval[i] = 0;
-    for (int j=0;j<1440;j++) {
-        currentPixel = j;
-    for (int i=0;i<GLWindow->nRoi;i++)
     {
         xval[i] = i;
-        yval[i] += GLWindow->eventData[GLWindow->nRoi*currentPixel + i];
-    }
-    }
-    for (int i=0;i<GLWindow->nRoi;i++)
-        yval[i] /= 1440;
-
+        yval[i] = GLWindow->eventData[GLWindow->nRoi*currentPixel + i];
+//        yval[i] += GLWindow->eventData[GLWindow->nRoi*currentPixel + i];
+    }
+//    }
+//    for (int i=0;i<GLWindow->nRoi;i++)
+//        yval[i] /= 1440;
+//END OF AVERAGE DISPLAY COMMENTS
 int realNumSamples = GLWindow->nRoi;
     if (GLWindow->nRoiTM != 0)
@@ -2363 +2365 @@
     for (int i=start;i<end;i++)
     {
-        for (int j=0;j<GLWindow->nRoi;j++)
+        for (int j=10;j<GLWindow->nRoi-50;j++)
         {
             int cValue = GLWindow->eventData[i*GLWindow->nRoi+j];