Add make_ntuples bash function

pps-tb-sw · Aug 12, 2015 · 67d54bb · 67d54bb
1 parent 90247d1
commit 67d54bb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/change_hv_settings.cpp b/change_hv_settings.cpp
@@ -29,10 +29,11 @@ int main(int argc, char *argv[]) {
     try { vme->AddHVModule(0x500000, 0xc); } catch (Exception& e) { e.Dump(); }
     NIM::HVModuleN470* hv = vme->GetHVModule();
     cout << "module id=" << hv->GetModuleId() << endl;
-    hv->ReadMonitoringValues().Dump();
-    /*hv->SetChannelV0(0, 2400);
-    hv->SetChannelI0(0, 500);*/
+    //hv->ReadMonitoringValues().Dump();
+    hv->SetChannelV0(0, 2400);
+    //hv->SetChannelI0(0, 500);
     hv->ReadChannelValues(0).Dump();
+    hv->ReadChannelValues(3).Dump();
 
   } catch (Exception& e) {
     e.Dump();

diff --git a/scripts/make_ntuples.sh b/scripts/make_ntuples.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -z "$1" ] ; then
+  echo "Usage: "$0" <run_id> <board_id>"
+  exit
+fi
+if [ -z "$2" ] ; then
+  echo "Usage: "$0" <run_id> <board_id>"
+  exit
+fi
+
+python $PPS_BASE_PATH/scripts/run_over_all_files.py $1 $2 && hadd -f "run"$1"_board"$2".root" $PPS_DATA_PATH/events_$1_*_board$2.root 
+
diff --git a/test/gastof_occupancy_vs_run.cpp b/test/gastof_occupancy_vs_run.cpp
@@ -18,7 +18,7 @@ int main(int argc, char* argv[]) {
   DIR* dir; struct dirent* ent;
   cout << "Search in directory: " << getenv("PPS_DATA_PATH") << endl;
   VME::TDCMeasurement m; VME::TDCEvent e;
-  int num_triggers = 0;
+  int num_triggers;
   for (int sp=0; sp<1000000; sp++) { // we loop over all spills
     search1.str(""); search1 << "events_" << run_id << "_" << sp << "_";
     bool file_found = false; string filename;
@@ -42,6 +42,7 @@ int main(int argc, char* argv[]) {
     cout << "Opening file " << file.str() << endl;
     try {
       FileReader f(file.str());
+      num_triggers = 0;
       while (true) {
         if (!f.GetNextEvent(&e)) break;
         if (e.GetType()==VME::TDCEvent::GlobalHeader) num_triggers++;
@@ -52,7 +53,7 @@ int main(int argc, char* argv[]) {
     } catch (Exception& e) { cout << "prout" << endl; e.Dump(); }
   }
   cout << "num events = " << occ->Grid()->GetSumOfWeights() << endl;
-  cout << "num triggers = " << num_triggers << endl;
+  cout << "num triggers = " << (num_triggers-trigger_start) << endl;
   occ->Grid()->SetMaximum(0.15);
   occ->Grid()->Scale(1./(num_triggers-trigger_start));
   occ->SetRunInfo(board_id, run_id, 0, Form("Triggers %d-%d", trigger_start, trigger_stop));

diff --git a/test/quartic_occupancy_vs_run.cpp b/test/quartic_occupancy_vs_run.cpp
@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) {
     } catch (Exception& e) { e.Dump(); }
   }
   cout << "num events = " << occ->Grid()->GetSumOfWeights() << endl;
-  cout << "num triggers = " << num_triggers << endl;
+  cout << "num triggers = " << (num_triggers-trigger_start) << endl;
   occ->Grid()->SetMaximum(0.15);
   occ->Grid()->Scale(1./(num_triggers-trigger_start));
   occ->SetRunInfo(board_id, run_id, 0, Form("Triggers %d-%d", trigger_start, trigger_stop));