Changeset 66 for tools/ddd/Functions.cpp

Timestamp:

06/17/09 12:40:37 (15 years ago)

Author:

qweitzel

Message:

MO event display improved: start- and stopbin spinbox added

File:

• tools/ddd/Functions.cpp (modified) (5 diffs)

tools/ddd/Functions.cpp

@@ -56 +56 @@
   BoardNo->setEnabled(true);
   PixelID->setEnabled(true);
+  M0Start->setEnabled(true);
+  M0Stop->setEnabled(true);
   EventNo->setValue(1);
   EventNo->setRange(1, RD->RHeader->Events);
+  M0Start->setValue(0);
+  M0Stop->setValue((RD->RHeader->Samples)-1);
+  M0Start->setRange(0,(RD->RHeader->Samples)-1);  
+  M0Stop->setRange(0,(RD->RHeader->Samples)-1);
   ChannelNo->setValue(0);
   ChannelNo->setRange(0, RD->RHeader->NChannels*RD->RHeader->NChips-1);
@@ -72 +78 @@
     BoardNo->setEnabled(false);
     PixelID->setEnabled(false);
+    M0Start->setEnabled(false);
+    M0Stop->setEnabled(false);
     RunHeaderDisplay->clear();
     EventHeaderDisplay->clear();
@@ -150 +158 @@
               int biny = 5-(((superpixel-1)%3)*2)-(int((pixel-1)/2));
               
-              //search maximum sample amplitude within following window -> should not be hardcoded!
-              int StartBin = 100;
-              int StopBin = 120;
+              //search maximum sample amplitude within user specified window
+              //start bin is always smaller than stop bin (taken care of by updated ranges)
+              int StartBin = (int)(M0Start->value());
+              int StopBin = (int)(M0Stop->value());
               
-              for(int l=StartBin; l<(StopBin+1); l++){
+              for(int l=StartBin; l<=StopBin; l++){
+                  
+                float sample = *((short *) (RD->Data + RD->RHeader->NBoards*RD->RHeader->NChips*sizeof(int)) + 
+                                 i*RD->RHeader->NChips*RD->RHeader->NChannels*RD->RHeader->Samples+
+                                 j*RD->RHeader->NChannels*RD->RHeader->Samples+
+                                 k*RD->RHeader->Samples+
+                                 l)*RD->BStruct[i].ScaleFactor;
                 
-/*              float sample = RD->Data[i*RD->RHeader->NChips*RD->RHeader->NChannels*RD->RHeader->Samples+
-                                        j*RD->RHeader->NChannels*RD->RHeader->Samples+
-                                        k*RD->RHeader->Samples+
-                                        l]*RD->BStruct[i].ScaleFactor;
- */
-                float sample = *((short *) (RD->Data + RD->RHeader->NBoards*RD->RHeader->NChips*sizeof(int)) + 
-                                        i*RD->RHeader->NChips*RD->RHeader->NChannels*RD->RHeader->Samples+
-                                        j*RD->RHeader->NChannels*RD->RHeader->Samples+
-                                        k*RD->RHeader->Samples+
-                                        l)*RD->BStruct[i].ScaleFactor;
-                                
                 if (sample > z[binx][biny]) {
                   z[binx][biny]=sample;
@@ -172 +176 @@
                 
               }//sample loop
-              
+
             }//only M0 data
             
@@ -185 +189 @@
       Graph2D->replot();
       //Signal2D->show();
+
+      //update ranges for start and stop bin to avoid startbin > stopbin
+      M0Start->setRange(0, M0Stop->value());  
+      M0Stop->setRange(M0Start->value(),(RD->RHeader->Samples)-1);
 
       delete[] x;       delete[] y;