Skip to content

Commit 368767b

Browse files
committed
update readmes
1 parent bfc6e89 commit 368767b

8 files changed

+38
-1476
lines changed

CONTRIBUTING.md

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
# Contributing to Juicebox and/or Juicebox Assembly Tools
1+
# Contributing to HiC Tools
22

33
:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
44

5-
The following is a set of guidelines for contributing to Juicebox and its modules, which are hosted in the [Aiden Lab Repositories](https://github.com/aidenlab) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
5+
These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a
6+
pull request.
67

78
## Code of Conduct
89

9-
This project and everyone participating in it is governed by the [Juicebox Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [[email protected]](mailto:[email protected]).
10+
This project and everyone participating in it is governed by the [Code of Conduct](CODE_OF_CONDUCT.md). By
11+
participating, you are expected to uphold this code. Please report unacceptable behavior
12+
1013

1114
## I don't want to read this whole thing I just have a question!!!
1215

@@ -16,9 +19,13 @@ While we strongly suggest using the public forum so that the community at large
1619

1720
## **Did you find a bug?**
1821

19-
* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/aidenlab/Juicebox/issues).
22+
* **Ensure the bug was not already reported** by searching on GitHub
23+
under [Issues](https://github.com/aidenlab/hictools/issues).
2024

21-
* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/aidenlab/juicebox/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample, executable test case, or clear set of instructions** demonstrating the expected behavior that is not occurring.
25+
* If you're unable to find an open issue addressing the
26+
problem, [open a new one](https://github.com/aidenlab/juicebox/issues/new). Be sure to include a **title and clear
27+
description**, as much relevant information as possible, and a **code sample, executable test case, or clear set of
28+
instructions** demonstrating the expected behavior that is not occurring.
2229

2330
## **Did you write a patch that fixes a bug?**
2431

Juicer.README

-482
This file was deleted.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Aiden Lab
3+
Copyright (c) 2022 Rice University, Baylor College of Medicine, Aiden Lab
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

+25-103
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
--------------
2-
About Juicebox
2+
About HiC Tools
33
--------------
4-
Juicebox is visualization software for Hi-C data. This distribution includes the source code for Juicebox, <a href="https://github.com/theaidenlab/juicer/wiki/Download">Juicer Tools</a>, and <a href="https://aidenlab.org/assembly/">Assembly Tools</a>. <a href="https://github.com/theaidenlab/juicebox/wiki/Download">Download Juicebox here</a>, or use <a href="https://aidenlab.org/juicebox">Juicebox on the web</a>. Detailed documentation is available <a href="https://github.com/theaidenlab/juicebox/wiki">on the wiki</a>. Instructions below pertain primarily to usage of command line tools and the Juicebox jar files.
4+
HiC Tools is a software package used to build `.hic` files. This distribution includes the source code for this set of
5+
tools and builds the latest `v9` `.hic` files.
56

6-
Juicebox can now be used to visualize and interactively (re)assemble genomes.
7-
Check out the Juicebox Assembly Tools Module website https://aidenlab.org/assembly for
8-
more details on how to use Juicebox for assembly.
7+
Previously, this software used to be bundled with Juicer Tools in the Juicebox repo.
98

9+
HiC Tools was originally created by <a href="https://github.com/jrobinso">Jim Robinson</a>,
10+
<a href="https://github.com/nchernia">Neva C. Durand</a>, and <a href="http://www.erez.com/">Erez Lieberman Aiden</a>.
11+
It has been substantially upgraded and improved by <a href="https://github.com/sa501428">Muhammad S Shamim</a>,
12+
<a href="https://github.com/suhas-rao">Suhas S.P. Rao</a>, and many additional contributors.
1013

11-
Juicebox was created by <a href="https://github.com/jrobinso">Jim Robinson</a>,
12-
<a href="https://github.com/nchernia">Neva C. Durand</a>, and <a href="http://www.erez.com/">Erez Lieberman Aiden</a>. Past contributors include <a href="https://github.com/imachol">Ido Machol</a>, <a href="https://github.com/zgire">Zulkifl Gire</a>, <a href="https://github.com/mhoeger">Marie Hoeger</a>, <a href="https://github.com/asddf123789">Fanny Huang</a>, <a href="https://github.com/mikeehman">Nam Hee Kim</a>, <a href="https://github.com/nguyenkvi">Vi Nguyen</a>, <a href="https://github.com/bluejay9676">Jay Ryu</a>, <a href="https://github.com/musianat">Nathaniel T. Musial</a>, and <a href="https://github.com/ranganmostofa11">Ragib Mostofa</a>.
14+
**If you use HiC Tools in your research, please cite:
15+
Neva C. Durand, Muhammad S. Shamim, Ido Machol, Suhas S. P. Rao, Miriam H. Huntley, Eric S. Lander, and Erez Lieberman
16+
Aiden. "Juicer provides a one-click system for analyzing loop-resolution Hi-C experiments."
17+
Cell Systems 3(1), 2016.**
1318

14-
Ongoing development work is carried out by <a href="https://github.com/sa501428">Muhammad Saad Shamim</a>, <a href="https://github.com/nchernia">Neva C. Durand</a>, and <a href="https://github.com/dudcha">Olga Dudchenko</a>.
1519

1620
--------------
1721
Questions?
@@ -29,111 +33,29 @@ To set up in IDEA, have the Java SDK installed
2933
then you'll point to it (IntelliJ has lots of documentation on this sort of thing).
3034

3135
* Then go to `VCS` -> `checkout from version control`.
32-
* You'll need to do is be sure `*.sizes` is included as a file to be copied over to the class files.
33-
Set this up via IntelliJ `Preferences` -> `Compiler`. Add `?*.sizes` to the list of `Resource Patterns`.
34-
* While there, also go to `Java Compiler` and put this into additional command line options: `-Xlint:all -target 1.7`
35-
The former turns on all warnings, the latter gives some flexibility since some people haven't updated Java to 1.8 yet.
3636
* Then go to `Run` -> `Edit Configurations`.
3737
* With the `+` sign, add `Application`.
38-
* You'll create two of these, one for the GUI (call it Juicebox GUI or whatever you want, really) and one for the CLT.
38+
* You'll create one of these for HiC Tools.
3939
* Set the main class by clicking the little `...` button next to the text box for main class
40-
41-
MainWindow.java is the main method class for the visualization/GUI portion of the software.
42-
HiCTools.java is the main method class for the analysis/CLT portion.
43-
44-
* For the GUI under VM Options:
45-
46-
-Xmx2000m
47-
-Djnlp.loadMenu="https://hicfiles.tc4ga.com/juicebox.properties"
48-
49-
* For the CLT use
50-
51-
-Xmx2000m
52-
53-
* Note that the `Xmx2000m` flag sets the maximum memory heap size to 2GB.
54-
Depending on your computer you might want more or less.
55-
Some tools will break if there's not enough memory and the file is too large,
56-
but don't worry about that for development; 2GB should be fine.
40+
* HiCTools.java is the main method class.
41+
* Under VM Options, set `-Xmx2000m`
42+
* The `Xmx2000m` flag sets the maximum memory heap size to 2GB. Depending on your computer you might want more or less.
43+
Some tools will break if there's not enough memory and the file is too large, but don't worry about that for
44+
development; 2GB should be fine.
5745
* One last note: be sure to `Commit and Push` when you commit files, it's hidden in the dropdown menu button in the
58-
commit window.
46+
commit window.
5947

6048
----------------------------------
6149
Hardware and Software Requirements
6250
----------------------------------
6351
The minimum software requirement to run Juicebox is a working Java installation
64-
(version > 1.6) on Windows, Linux, and Mac OSX. We recommend using the latest
65-
Java version available, but please do not use the Java Beta Version. Minimum
66-
system requirements for running Java can be found at
67-
https://java.com/en/download/help/sysreq.xml. To download and install the latest
68-
Java Runtime Environment (JRE), please go to https://www.java.com/download.
69-
70-
We recommend having at least 2GB free RAM for the best user experience with
71-
Juicebox.
72-
73-
To launch the Juicebox application from command line, type
74-
java -Xms512m -Xmx2048m -jar Juicebox.jar
75-
76-
Note: the -Xms512m flag sets the minimum memory heap size at 512 megabytes, and
77-
the -Xmx2048m flag sets the maximum size at 2048 megabytes (2 gigabytes). These
78-
values may be adjusted as appropriate for your machine.
52+
(version > 1.8) on Windows, Linux, and Mac OSX. We recommend using the latest Java version available, but please do not
53+
use the Java Beta Version. Minimum system requirements for running Java can be found at
54+
https://java.com/en/download/help/sysreq.xml. To download and install the latest Java Runtime Environment (JRE), please
55+
go to https://www.java.com/download.
7956

8057
-------------
8158
Documentation
8259
-------------
83-
We have extensive documentation for how to use Juicebox at
84-
https://github.com/theaidenlab/juicebox/wiki including a video, a Quick Start Guide, and a
85-
detailed tutorial.
86-
87-
For using Juicebox to assemble genomes see https://www.aidenlab.org/assembly/.
88-
89-
------------------------
90-
Command Line Tools Usage
91-
------------------------
92-
93-
See the documentation at https://github.com/theaidenlab/juicer/wiki for information
94-
on how to use the Juicer tools.
95-
96-
--------------------------------
97-
Compiling Jars from Source Files
98-
--------------------------------
99-
1. You should have Java 1.8 JDK and Apache Ant installed on your system. See
100-
below for more information.
101-
2. Go to the folder containing the Juicebox source files and edit the
102-
juicebox.properties file with the proper Java JDK Address.
103-
3. Open the command line, navigate to the folder containing the build.xml file
104-
and type
105-
ant
106-
The process should take no more than a minute to build on most machines.
107-
4. The jars are written to the directory out/. You can change this by editing
108-
the build.xml file.
109-
110-
* Installing Java 1.8 JDK
111-
112-
For Windows/Mac/Linux, the Java 1.8 JDK can be installed from here:
113-
https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
114-
(Alternative) For Ubuntu/LinuxMint
115-
https://tecadmin.net/install-oracle-java-8-jdk-8-ubuntu-via-ppa/
116-
117-
* Installing Apache Ant
118-
Mac
119-
Ant should be installed on most Macs. To verify installation via the command
120-
prompt, type
121-
ant -version
122-
If Ant is not on your Mac, install it via homebrew. At the command prompt, type
123-
brew update
124-
brew install ant
125-
You may need to install Homebrew (https://brew.sh/) on your machine
126-
See the following Stackoverflow post for more details:
127-
https://stackoverflow.com/questions/3222804/how-can-i-install-apache-ant-on-mac-os-x
128-
129-
Windows
130-
Installing Ant requires some minor changes to your system environment. Follow
131-
the instructions in this article:
132-
https://www.nczonline.net/blog/2012/04/12/how-to-install-apache-ant-on-windows/
133-
134-
Linux
135-
In the command prompt, type
136-
sudo apt-get install ant
137-
or
138-
sudo yum install ant
139-
depending on your package installer
60+
We have extensive documentation for how to use HiC Tools at
61+
https://github.com/aidenlab/juicer/wiki.

benchmark.sh

-57
This file was deleted.

0 commit comments

Comments
 (0)