Skip to content

Commit

Permalink
Merge pull request #89 from HGCDAQ/dev-svhgcal-shift-current
Browse files Browse the repository at this point in the history 
Changes on current production machine
  • Loading branch information
@andreypz
andreypz authored Oct 25, 2018
2 parents 36f0783 + 641704d commit 9165fca
Show file tree
Hide file tree
Showing 17 changed files with 299 additions and 192 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test.ini
*.xz
*.bz
*.bz2

*log
.*
\#*#
*~
Expand Down
21 changes: 4 additions & 17 deletions STARTRUN_all.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ xterm -r -sb -sl 100000 -T "EventnumberSyncData collector" -e 'bin/euCliCollecto
xterm -r -sb -sl 100000 -T "EventnumberSyncData collector" -e 'bin/euCliCollector -n EventnumberSyncDataCollector -t dc2 -r tcp://${HOSTIP}:${RCPORT} -a tcp://45001; read' &
#AHCAL onlinemonitoring
xterm -r -sb -sl 100000 -T "directsave data collector" -e 'bin/euCliCollector -n DirectSaveDataCollector -t dc3 -r tcp://${HOSTIP}:${RCPORT}; read' &
#AHCAL slcio writer
##AHCAL slcio writer
xterm -r -sb -sl 100000 -T "directsave data collector" -e 'bin/euCliCollector -n DirectSaveDataCollector -t dc4 -r tcp://${HOSTIP}:${RCPORT}; read' &

################# Producer #################
Expand All @@ -44,13 +44,6 @@ nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal3 -r tcp://$HOSTIP:$RCPOR
nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal4 -r tcp://$HOSTIP:$RCPORT&
nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal5 -r tcp://$HOSTIP:$RCPORT&
nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal6 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal7 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal8 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal9 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal10 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal11 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal12 -r tcp://$HOSTIP:$RCPORT&
# nohup ./bin/euCliProducer -n HGCalProducer -t cms-hgcal13 -r tcp://$HOSTIP:$RCPORT&

################## AHCAL Producer #################
xterm -r -sb -sl 100000 -geometry 160x30 -T "AHCAL1" -e 'bin/euCliProducer -n AHCALProducer -t AHCAL1 -r tcp://$HOSTIP:$RCPORT | tee -a logs/AHCALProducer_${dt}.log'&
Expand All @@ -65,29 +58,23 @@ flog="logs/DWC_Producer_$dt.log"
nohup ssh -Y -T wc "/home/cmsdaq/DAQ/eudaq_v2/bin/euCliProducer -n CMSHGCal_DWC_Producer -t cms-hgcal-dwc -r tcp://${HOSTIP}:${RCPORT};" > $flog 2>&1 &
sleep 2

#printf '\033[22;33m\t Starting the Digitizer Producer on pcminn03 \033[0m \n'
#flog="logs/Digitizer_Producer_$dt.log"
#nohup ssh -Y -T wc "/home/cmsdaq/DAQ/eudaq_v2/bin/euCliProducer -n CMSHGCal_MCP_Producer -t cms-hgcal-mcp -r tcp://${HOSTIP}:${RCPORT}" > $flog 2>&1 &
printf '\033[22;33m\t Starting the Digitizer Producer on pcminn03 \033[0m \n'
flog="logs/Digitizer_Producer_$dt.log"
nohup ssh -Y -T wc "/home/cmsdaq/DAQ/eudaq_v2/bin/euCliProducer -n CMSHGCal_MCP_Producer -t cms-hgcal-mcp -r tcp://${HOSTIP}:${RCPORT}" > $flog 2>&1 &


################## OnlineMonitor ##################
printf '\033[22;33m\t HGC Online Monitor \033[0m \n'
flog="./logs/Run${NEWRUNNUM}_HgcOnlineMon_$dt.log"
config_file="./user/cmshgcal/conf/onlinemon.conf"

#xterm -r -sb -sl 100000 -geometry 200x40+300+750 -T "OnlineMon" -e 'bin/CMSHGCalMonitor --monitor_name CMSHGCalMonitor --config_file user/cmshgcal/conf/onlinemon.conf --reduce 10 --update 500 --reset -r tcp://$HOSTIP:$RCPORT --root |tee -a logs/mon.log ; read' &

nohup ./bin/CMSHGCalMonitor --monitor_name CMSHGCalMonitor --config_file $config_file --reduce 1 --update 1000 --reset -r tcp://$HOSTIP:$RCPORT --root > $flog 2>&1 &

printf "The logs from the Online Monitor are in $flog file. \n"


printf '\033[22;33m\t Standard (Ahcal) Online Monitor \033[0m \n'
flog="./logs/Run${NEWRUNNUM}_StdOnlineMon_$dt.log"
# xterm -r -sb -sl 100000 -T "OnlineMon" -e 'bin/CMSHGCalMonitor --monitor_name CMSHGCalMonitor --reset -r tcp://$HODTIP:$RCPORT |tee -a logs/mon.log ; read' &
#xterm -r -sb -sl 100000 -T "OnlineMon" -e './bin/euCliMonitor -n Ex0Monitor -t StdEventMonitor -a tcp://45001 '&
#xterm -r -sb -sl 100000 -T "AHCAL online" -e 'bin/StdEventMonitor -c ahcalOnlineMonitor.conf --monitor_name StdEventMonitor --reset -r tcp://$HOSTIP:$RCPORT; read' & #online monitor for AHCA

nohup ./bin/StdEventMonitor -c ahcalOnlineMonitor.conf --monitor_name StdEventMonitor --reset -r tcp://$HOSTIP:$RCPORT > $flog 2>&1 &

printf "The logs from this Monitor are in $flog file. \n"
209 changes: 104 additions & 105 deletions combine_all.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RunEventLimit = 10000

[DataCollector.dc1]
#EUDAQ_ID = 61
PRODUCERS = "cms-hgcal2;cms-hgcal3;cms-hgcal4;cms-hgcal5"
#PRODUCERS = "cms-hgcal2;cms-hgcal3;cms-hgcal4;cms-hgcal5"
EUDAQ_FW_PATTERN=./data/$12D_run_test_dc1_$6R$X
EUDAQ_MN=CMSHGCalMonitor
#FilePattern = "/data2/calice2017/$12D_dcall$6R$X"
Expand Down Expand Up @@ -134,103 +134,103 @@ ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal7]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 128 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal8]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 256 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal9]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 512 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal10]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 1024 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal11]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 2048 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal12]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 4096 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.cms-hgcal13]
EUDAQ_DC=dc1
ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
TimingRootFilePath = "data_root"
RDoutMask = 8192 #bit mask
DataBlockSize = 30787
UhalLogLevel = 5
TimeToWaitAtEndOfRun = 500
saveRawData = false
checkCRC = false
ThrowFirstTrigger=1
DoCompression = 1
CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
# [Producer.cms-hgcal7]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 128 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
#
# [Producer.cms-hgcal8]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 256 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
#
# [Producer.cms-hgcal9]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 512 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
#
# [Producer.cms-hgcal10]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 1024 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
#
# [Producer.cms-hgcal11]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 2048 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
#
# [Producer.cms-hgcal12]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 4096 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression
#
# [Producer.cms-hgcal13]
# EUDAQ_DC=dc1
# ConnectionFile = "file://user/cmshgcal/etc/connection_nocontrolhub.xml"
# TimingRootFilePath = "data_root"
# RDoutMask = 8192 #bit mask
# DataBlockSize = 30787
# UhalLogLevel = 5
# TimeToWaitAtEndOfRun = 500
# saveRawData = false
# checkCRC = false
# ThrowFirstTrigger=1
# DoCompression = 1
# CompressionLevel = 5 #0 is no compression (but still using boost gzip library); 9 is best compression

[Producer.AHCAL1]
EUDAQ_DC="dc3,dc4" # names of data collectors, where will be data sent
Expand Down Expand Up @@ -282,7 +282,7 @@ MinimumEventHits = 0 # event will be produced only when number of hits is greate
[Producer.cms-hgcal-mcp]
EUDAQ_DC=dc2
AcquisitionMode=0
readoutSleep = 10000
readoutSleep = 15000
LINK_TYPE=OpticalLink
LINK_NUM=0
CONET_NODE=0
Expand All @@ -291,9 +291,9 @@ CORRECTION_LEVEL=AUTO
RECORD_LENGTH=1024
TEST_PATTERN=NO
DRS4_FREQUENCY=0
EXTERNAL_TRIGGER=ACQUISITION_ONLY
FAST_TRIGGER=DISABLED
ENABLED_FAST_TRIGGER_DIGITIZING=NO
EXTERNAL_TRIGGER=DISABLED
FAST_TRIGGER=ACQUISITION_ONLY
ENABLED_FAST_TRIGGER_DIGITIZING=YES
MAX_NUM_EVENTS_BLT=1
POST_TRIGGER=0
TRIGGER_EDGE=FALLING
Expand All @@ -303,12 +303,11 @@ CHANNEL_ENABLE_MASK=0x1
GROUP_ENABLE_MASK=0x1
CHANNELS_TRIGGER=DISABLED
DC_OFFSET_CHANNELS=0
DC_OFFSET_TRIGGERS = 32768
GROUP_TRG_ENABLE_MASK=0xFF
TRIGGER_THRESHOLD_CHANNELS=100
TRIGGER_THRESHOLD_TRIGGERS=20934
GRP_CH_DC_OFFSET_0_0=25

TRIGGER_THRESHOLD_TRIGGERS=25000
DC_OFFSET_TRIGGERS = 32768

[Producer.cms-hgcal-dwc]
EUDAQ_DC=dc2
Expand Down
2 changes: 1 addition & 1 deletion monitors/cmshgcal_onlinemon/include/CMSHGCalLayerSumCollection.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public:
virtual void Write(TFile *file);
virtual void Calculate(const unsigned int currentEventNumber);
//void bookHistograms(const SimpleStandardEvent &simpev);
void bookHistograms(const eudaq::StandardEvent &ev);
void bookHistograms();
CMSHGCalLayerSumHistos *getCMSHGCalLayerSumHistos();
//void setReduce(const unsigned int red);
unsigned int getCollectionType();
Expand Down
9 changes: 7 additions & 2 deletions monitors/cmshgcal_onlinemon/include/CMSHGCalLayerSumHistos.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ public:
TH1I *getNhitFH1Histo(){return h_nhitFH1;}
TH2I *getEnergyVSNhitHisto(){return h_energy_nhit;}
TH2I *getEnergyVSCoGZHisto(){return h_energy_cogz;}
TH2I *getLongitudinalProfile(){return h_energy_layer;}
TH2I *getLongitudinal2D(){return h_energy_layer;}
TProfile *getLongitudinalProfile(){return h_energy_layerProfile;}
TH2I *getCoGZVSNhitsHisto(){return h_cogz_nhits;}

//TProfile *getLongitudinalProfile(){return h_energy_layer->ProfileX();}
///return per-plane histo
/*
Expand Down Expand Up @@ -77,7 +80,9 @@ private:
TH2I *h_energy_nhit;
TH2I *h_energy_cogz;
TH2I *h_energy_layer;

TProfile *h_energy_layerProfile;
TH2I *h_cogz_nhits;

//per-plane histos
/*
TH1F **h_energyMIP_pp;
Expand Down
Loading

0 comments on commit 9165fca

Please sign in to comment.